Browse Source

refactor(gui-v2): use useApi

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/3342/head
Pranav C 2 years ago
parent
commit
17c59791f2
  1. 4
      packages/nc-gui-v2/components/smartsheet/Grid.vue
  2. 21
      packages/nc-gui-v2/composables/useViewData.ts
  3. 1
      packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index.vue

4
packages/nc-gui-v2/components/smartsheet/Grid.vue

@ -79,7 +79,7 @@ const expandedFormRowState = ref<Record<string, any>>()
const visibleColLength = $computed(() => fields.value?.length)
const {
loading,
isLoading,
loadData,
paginationData,
formattedData: data,
@ -312,7 +312,7 @@ const onNavigate = (dir: NavigateDir) => {
<template>
<div class="flex flex-col h-full min-h-0 w-full">
<div v-if="loading" class="flex items-center justify-center h-full w-full">
<div v-if="isLoading" class="flex items-center justify-center h-full w-full">
<a-spin size="large" />
</div>
<div v-else class="nc-grid-wrapper min-h-0 flex-1 scrollbar-thin-dull">

21
packages/nc-gui-v2/composables/useViewData.ts

@ -10,6 +10,7 @@ import {
getHTMLEncodedText,
useProject,
useUIPermission,
useApi
} from '#imports'
const formatData = (list: Record<string, any>[]) =>
@ -38,8 +39,7 @@ export function useViewData(
throw new Error('Table meta is not available')
}
const loading = ref(false)
const error = ref<any>()
const { api, isLoading, error } = useApi()
const _paginationData = ref<PaginatedType>({ page: 1, pageSize: 25 })
const aggCommentCount = ref<{ row_id: string; count: number }[]>([])
const galleryData = ref<GalleryType>()
@ -115,12 +115,9 @@ export function useViewData(
}
const loadData = async (params: Parameters<Api<any>['dbViewRow']['list']>[4] = {}) => {
try {
if ((!project?.value?.id || !meta?.value?.id || !viewMeta?.value?.id) && !isPublic.value) return
loading.value = true
error.value = null
const response = !isPublic.value
? await $api.dbViewRow.list('noco', project.value.id!, meta.value.id!, viewMeta!.value.id, {
? await api.dbViewRow.list('noco', project.value.id!, meta.value.id!, viewMeta!.value.id, {
...params,
...(isUIAllowed('sortSync') ? {} : { sortArrJson: JSON.stringify(sorts.value) }),
...(isUIAllowed('filterSync') ? {} : { filterArrJson: JSON.stringify(nestedFilters.value) }),
@ -131,11 +128,6 @@ export function useViewData(
paginationData.value = response.pageInfo
await loadAggCommentsCount()
} catch (e: any) {
error.value = e
} finally {
loading.value = false
}
}
const loadGalleryData = async () => {
@ -201,7 +193,8 @@ export function useViewData(
value: getHTMLEncodedText(toUpdate.row[property]),
prev_value: getHTMLEncodedText(toUpdate.oldRow[property]),
})
.then(() => {})
.then(() => {
})
/** update row data(to sync formula and other related columns) */
Object.assign(toUpdate.row, updatedRowData)
@ -243,7 +236,7 @@ export function useViewData(
const deleteRowById = async (id: string) => {
if (!id) {
throw new Error("Delete not allowed for table which doesn't have primary Key")
throw new Error('Delete not allowed for table which doesn\'t have primary Key')
}
const res: any = await $api.dbViewRow.delete(
@ -361,7 +354,7 @@ export function useViewData(
return {
error,
loading,
isLoading,
loadData,
paginationData,
queryParams,

1
packages/nc-gui-v2/pages/[projectType]/[projectId]/index/index.vue

@ -12,7 +12,6 @@ const { isLoading } = useGlobal()
provide(TabMetaInj, activeTab)
const icon = (tab: TabItem) => {
switch (tab.type) {
case TabType.TABLE:

Loading…
Cancel
Save