Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BIGTOP-4179: Fix wrong total number of pagination values ​​in job table #34

Merged
merged 6 commits into from
Aug 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 8 additions & 15 deletions bigtop-manager-ui/src/components/job-info/job.vue
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@
loading.value = false
return
}
getJobsList()
initInterval()
}

Expand All @@ -147,13 +146,10 @@
intervalId.value?.resume()
return
}
intervalId.value = useIntervalFn(
async () => {
await getJobsList()
},
MONITOR_SCHEDULE_INTERVAL,
{ immediate: false, immediateCallback: true }
)
intervalId.value = useIntervalFn(getJobsList, MONITOR_SCHEDULE_INTERVAL, {
immediate: true,
immediateCallback: true
})
}

const getJobsList = async () => {
Expand All @@ -163,12 +159,9 @@
pageSize: paginationProps.value.pageSize,
sort: 'desc'
} as Pagination
const { content } = await getJobs(clusterId.value, params)
jobs.value = content.map((v) => {
return {
...v
}
})
const { content, total } = await getJobs(clusterId.value, params)
jobs.value = content.map((v) => ({ ...v }))
paginationProps.value.total = total
loading.value = false
} catch (error) {
console.log('error :>> ', error)
Expand Down Expand Up @@ -255,7 +248,7 @@
</div>
<a-table
v-show="getCurrPage == 'isJobTable'"
:scroll="{ y: 500 }"
:scroll="{ y: 400 }"
:loading="loading"
:data-source="jobs"
:columns="columnsProp"
Expand Down
10 changes: 9 additions & 1 deletion bigtop-manager-ui/src/components/service-add/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
-->

<script setup lang="ts">
import { ref, h, watch, reactive } from 'vue'
import { ref, h, watch, reactive, onUnmounted, onMounted } from 'vue'
import { Modal } from 'ant-design-vue'
import { ExclamationCircleFilled } from '@ant-design/icons-vue'
import { useI18n } from 'vue-i18n'
Expand Down Expand Up @@ -187,6 +187,14 @@
}
})
}

onMounted(() => {
componentStore.resumeIntervalFn()
})

onUnmounted(() => {
componentStore.pauseIntervalFn()
})
</script>

<template>
Expand Down
9 changes: 5 additions & 4 deletions bigtop-manager-ui/src/components/svg-icon/svg-icon.vue
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,16 @@
import { computed } from 'vue'

interface SvgIconProps {
prefix: string
prefix?: string
name: string
color: string
className: string
color?: string
className?: string
}

const props = withDefaults(defineProps<SvgIconProps>(), {
prefix: 'icon',
color: '#000'
color: '#000',
className: ''
})

const symbolId = computed(() => `#${props.prefix}-${props.name}`)
Expand Down
11 changes: 6 additions & 5 deletions bigtop-manager-ui/src/layouts/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
-->

<script setup lang="ts">
import { onMounted } from 'vue'
import { onMounted, onUnmounted } from 'vue'
import LayoutFooter from '@/layouts/footer.vue'
import LayoutContent from '@/layouts/content.vue'
import LayoutHeader from '@/layouts/header.vue'
Expand All @@ -37,14 +37,15 @@

onMounted(() => {
userStore.getUserInfo()

clusterStore.loadClusters()

console.log('loading...')
serviceStore.loadServices()
componentStore.loadHostComponents()
componentStore.resumeIntervalFn()
configStore.loadLatestConfigs()
})

onUnmounted(() => {
componentStore.pauseIntervalFn()
})
</script>

<template>
Expand Down
14 changes: 12 additions & 2 deletions bigtop-manager-ui/src/pages/service/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,14 @@
<script setup lang="ts">
import { storeToRefs } from 'pinia'
import { useRoute } from 'vue-router'
import { computed, onMounted, ref, watch, createVNode } from 'vue'
import {
computed,
onMounted,
ref,
watch,
createVNode,
onUnmounted
} from 'vue'

import { useI18n } from 'vue-i18n'
import { type SelectProps, type MenuProps, Modal } from 'ant-design-vue'
Expand Down Expand Up @@ -200,13 +207,16 @@
activeSelect.value = serviceConfigDesc.value?.[0]
currentConfigVersion.value = serviceConfigDesc.value?.[0].value as number
initConfigVersion.value = serviceConfigDesc.value?.[0].value as number
await componentStore.loadHostComponents()
}

onMounted(() => {
initServiceMeta()
componentStore.resumeIntervalFn()
})

onUnmounted(() => {
componentStore.pauseIntervalFn()
})
</script>

<template>
Expand Down
Loading