Browse Source

Revert "shared map view issue debugging - WIP"

This reverts commit b0cad5fa8e.
pull/5248/head
Daniel Spaude 2 years ago
parent
commit
4de7f6f60e
No known key found for this signature in database
GPG Key ID: 654A3D1FA4F35FFE
  1. 5
      packages/nc-gui/composables/useMapViewDataStore.ts
  2. 2
      packages/nc-gui/composables/useViewData.ts
  3. 1
      packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts

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

@ -33,7 +33,7 @@ const [useProvideMapViewStore, useMapViewStore] = useInjectionState(
const formattedData = ref<Row[]>([]) const formattedData = ref<Row[]>([])
// const { api } = useApi() const { api } = useApi()
const { project } = useProject() const { project } = useProject()
@ -71,9 +71,8 @@ const [useProvideMapViewStore, useMapViewStore] = useInjectionState(
} }
async function loadMapMeta() { 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) 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] || {}
} }

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

@ -187,7 +187,6 @@ 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!, {
@ -218,7 +217,6 @@ 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(

1
packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts

@ -4,7 +4,6 @@ import { publicMetaService } from '../../services';
import type { Request, Response } from 'express'; import type { Request, Response } from 'express';
export async function viewMetaGet(req: Request, res: Response) { export async function viewMetaGet(req: Request, res: Response) {
console.log('FOO viewMetaGet');
res.json( res.json(
await publicMetaService.viewMetaGet({ await publicMetaService.viewMetaGet({
password: req.headers?.['xc-password'] as string, password: req.headers?.['xc-password'] as string,

Loading…
Cancel
Save