Browse Source

shared map view issue debugging - WIP

pull/5248/head
Daniel Spaude 2 years ago
parent
commit
b7fc4ffa9a
No known key found for this signature in database
GPG Key ID: 654A3D1FA4F35FFE
  1. 48
      packages/nc-gui/composables/useMapViewDataStore.ts
  2. 2
      packages/nc-gui/composables/useViewData.ts

48
packages/nc-gui/composables/useMapViewDataStore.ts

@ -61,43 +61,43 @@ const [useProvideMapViewStore, useMapViewStore] = useInjectionState(
})) }))
async function syncCount() { async function syncCount() {
// const { count } = await $api.dbViewRow.count( const { count } = await $api.dbViewRow.count(
// NOCO, NOCO,
// project?.value?.title as string, project?.value?.title as string,
// meta?.value?.id as string, meta?.value?.id as string,
// viewMeta?.value?.id as string, viewMeta?.value?.id as string,
// ) )
// paginationData.value.totalRows = count paginationData.value.totalRows = count
} }
async function loadMapMeta() { async function loadMapMeta() {
alert('loadMapData') 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) // mapMetaData.value = await $api.dbView.mapRead(viewMeta.value.id)
// geoDataFieldColumn.value = geoDataFieldColumn.value =
// (meta.value.columns as ColumnType[]).filter((f) => f.id === mapMetaData.value.fk_geo_data_col_id)[0] || {} (meta.value.columns as ColumnType[]).filter((f) => f.id === mapMetaData.value.fk_geo_data_col_id)[0] || {}
} }
async function loadMapData() { 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 const res = !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!, {
// ...queryParams.value, ...queryParams.value,
// ...(isUIAllowed('filterSync') ? {} : { filterArrJson: JSON.stringify(nestedFilters.value) }), ...(isUIAllowed('filterSync') ? {} : { filterArrJson: JSON.stringify(nestedFilters.value) }),
// where: where?.value, where: where?.value,
// }) })
// : await fetchSharedViewData({ sortsArr: sorts.value, filtersArr: nestedFilters.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>) { async function updateMapMeta(updateObj: Partial<MapType>) {
// if (!viewMeta?.value?.id || !isUIAllowed('xcDatatableEditable')) return if (!viewMeta?.value?.id || !isUIAllowed('xcDatatableEditable')) return
// await $api.dbView.mapUpdate(viewMeta.value.id, { await $api.dbView.mapUpdate(viewMeta.value.id, {
// ...mapMetaData.value, ...mapMetaData.value,
// ...updateObj, ...updateObj,
// }) })
} }
const { getMeta } = useMetas() const { getMeta } = useMetas()

2
packages/nc-gui/composables/useViewData.ts

@ -187,6 +187,7 @@ export function useViewData(
} }
async function loadData(params: Parameters<Api<any>['dbViewRow']['list']>[4] = {}) { async function loadData(params: Parameters<Api<any>['dbViewRow']['list']>[4] = {}) {
debugger
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 response = !isPublic.value 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!, {
@ -217,6 +218,7 @@ export function useViewData(
galleryData.value = isPublic.value galleryData.value = isPublic.value
? (sharedView.value?.view as GalleryType) ? (sharedView.value?.view as GalleryType)
: await $api.dbView.galleryRead(viewMeta.value.id) : await $api.dbView.galleryRead(viewMeta.value.id)
// debugger
} }
async function insertRow( async function insertRow(

Loading…
Cancel
Save