shared map view issue debugging - WIP

humannocode · Mar 10, 2023 · b7fc4ff · b7fc4ff
1 parent 19b14d9
commit b7fc4ff
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/packages/nc-gui/composables/useMapViewDataStore.ts b/packages/nc-gui/composables/useMapViewDataStore.ts
@@ -61,43 +61,43 @@ const [useProvideMapViewStore, useMapViewStore] = useInjectionState(
     }))
 
     async function syncCount() {
-      // const { count } = await $api.dbViewRow.count(
-      //   NOCO,
-      //   project?.value?.title as string,
-      //   meta?.value?.id as string,
-      //   viewMeta?.value?.id as string,
-      // )
-      // paginationData.value.totalRows = count
+      const { count } = await $api.dbViewRow.count(
+        NOCO,
+        project?.value?.title as string,
+        meta?.value?.id as string,
+        viewMeta?.value?.id as string,
+      )
+      paginationData.value.totalRows = count
     }
 
     async function loadMapMeta() {
       alert('loadMapData')
-      // if (!viewMeta?.value?.id || !meta?.value?.columns) return
+      if (!viewMeta?.value?.id || !meta?.value?.columns) return
       // mapMetaData.value = await $api.dbView.mapRead(viewMeta.value.id)
-      // geoDataFieldColumn.value =
-      //   (meta.value.columns as ColumnType[]).filter((f) => f.id === mapMetaData.value.fk_geo_data_col_id)[0] || {}
+      geoDataFieldColumn.value =
+        (meta.value.columns as ColumnType[]).filter((f) => f.id === mapMetaData.value.fk_geo_data_col_id)[0] || {}
     }
 
     async function loadMapData() {
-      // if ((!project?.value?.id || !meta.value?.id || !viewMeta.value?.id) && !isPublic?.value) return
+      if ((!project?.value?.id || !meta.value?.id || !viewMeta.value?.id) && !isPublic?.value) return
 
-      // const res = !isPublic.value
-      //   ? await api.dbViewRow.list('noco', project.value.id!, meta.value!.id!, viewMeta.value!.id!, {
-      //       ...queryParams.value,
-      //       ...(isUIAllowed('filterSync') ? {} : { filterArrJson: JSON.stringify(nestedFilters.value) }),
-      //       where: where?.value,
-      //     })
-      //   : await fetchSharedViewData({ sortsArr: sorts.value, filtersArr: nestedFilters.value })
+      const res = !isPublic.value
+        ? await api.dbViewRow.list('noco', project.value.id!, meta.value!.id!, viewMeta.value!.id!, {
+            ...queryParams.value,
+            ...(isUIAllowed('filterSync') ? {} : { filterArrJson: JSON.stringify(nestedFilters.value) }),
+            where: where?.value,
+          })
+        : await fetchSharedViewData({ sortsArr: sorts.value, filtersArr: nestedFilters.value })
 
-      // formattedData.value = formatData(res.list)
+      formattedData.value = formatData(res.list)
     }
 
     async function updateMapMeta(updateObj: Partial<MapType>) {
-      // if (!viewMeta?.value?.id || !isUIAllowed('xcDatatableEditable')) return
-      // await $api.dbView.mapUpdate(viewMeta.value.id, {
-      //   ...mapMetaData.value,
-      //   ...updateObj,
-      // })
+      if (!viewMeta?.value?.id || !isUIAllowed('xcDatatableEditable')) return
+      await $api.dbView.mapUpdate(viewMeta.value.id, {
+        ...mapMetaData.value,
+        ...updateObj,
+      })
     }
 
     const { getMeta } = useMetas()

diff --git a/packages/nc-gui/composables/useViewData.ts b/packages/nc-gui/composables/useViewData.ts
@@ -187,6 +187,7 @@ export function useViewData(
   }
 
   async function loadData(params: Parameters<Api<any>['dbViewRow']['list']>[4] = {}) {
+    debugger
     if ((!project?.value?.id || !meta.value?.id || !viewMeta.value?.id) && !isPublic.value) return
     const response = !isPublic.value
       ? await api.dbViewRow.list('noco', project.value.id!, meta.value!.id!, viewMeta.value!.id!, {
@@ -217,6 +218,7 @@ export function useViewData(
     galleryData.value = isPublic.value
       ? (sharedView.value?.view as GalleryType)
       : await $api.dbView.galleryRead(viewMeta.value.id)
+    // debugger
   }
 
   async function insertRow(