From 7cdac26ffa3955411f0386b4d9d08bcd6aa675de Mon Sep 17 00:00:00 2001
From: flisowna <ewa.agnieszka.flis@gmail.com>
Date: Mon, 27 Feb 2023 14:02:04 +0100
Subject: [PATCH 01/38] add two buttons to geodata column to open location in
 google maps and OSM

---
 packages/nc-gui/components/cell/GeoData.vue | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/cell/GeoData.vue b/packages/nc-gui/components/cell/GeoData.vue
index 0ab6575361..76e7cb1da7 100644
--- a/packages/nc-gui/components/cell/GeoData.vue
+++ b/packages/nc-gui/components/cell/GeoData.vue
@@ -1,6 +1,7 @@
 <script lang="ts" setup>
 import type { GeoLocationType } from 'nocodb-sdk'
 import { Modal as AModal, latLongToJoinedString, useVModel } from '#imports'
+import MdiMapIcon from '~icons/mdi/map-outline'
 
 interface Props {
   modelValue?: string | null
@@ -68,6 +69,18 @@ const onClickSetCurrentLocation = () => {
   }
   navigator.geolocation.getCurrentPosition(onSuccess, onError, options)
 }
+
+const openInGoogleMaps = () => {
+  const [latitude, longitude] = (vModel.value || '').split(';')
+  const url = `https://www.google.com/maps/search/?api=1&query=${latitude},${longitude}`
+  window.open(url, '_blank')
+}
+
+const openInOSM = () => {
+  const [latitude, longitude] = (vModel.value || '').split(';')
+  const url = `https://www.openstreetmap.org/?mlat=${latitude}&mlon=${longitude}#map=15/${latitude}/${longitude}`
+  window.open(url, '_blank')
+}
 </script>
 
 <template>
@@ -128,7 +141,13 @@ const onClickSetCurrentLocation = () => {
           </div>
         </a-form-item>
         <a-form-item>
-          <div class="ml-auto mr-2">
+          <div class="mr-2 flex flex-col items-end gap-1 text-left">
+            <a-button @click="openInOSM"><MdiMapIcon class="mr-2" />Open in OSM</a-button>
+            <a-button @click="openInGoogleMaps"><MdiMapIcon class="mr-2" />Open in Google Maps</a-button>
+          </div>
+        </a-form-item>
+        <a-form-item>
+          <div class="ml-auto mr-2 w-auto">
             <a-button type="text" @click="clear">{{ $t('general.cancel') }}</a-button>
             <a-button type="primary" html-type="submit" data-testid="nc-geo-data-save">{{ $t('general.submit') }}</a-button>
           </div>

From 46c11b33a3004c601875d169e66a9904885de86d Mon Sep 17 00:00:00 2001
From: flisowna <ewa.agnieszka.flis@gmail.com>
Date: Mon, 27 Feb 2023 17:48:18 +0100
Subject: [PATCH 02/38] show open location on an external map only if the
 location is given

---
 packages/nc-gui/components/cell/GeoData.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/cell/GeoData.vue b/packages/nc-gui/components/cell/GeoData.vue
index 76e7cb1da7..791ff0e58d 100644
--- a/packages/nc-gui/components/cell/GeoData.vue
+++ b/packages/nc-gui/components/cell/GeoData.vue
@@ -98,7 +98,7 @@ const openInOSM = () => {
     </div>
     <div v-else data-testid="nc-geo-data-lat-long-set">{{ latLongStr }}</div>
     <template #overlay>
-      <a-form :model="formState" class="flex flex-col" @finish="handleFinish">
+      <a-form :model="formState" class="flex flex-col w-max-58" @finish="handleFinish">
         <a-form-item>
           <div class="flex mt-4 items-center mx-2">
             <div class="mr-2">{{ $t('labels.lat') }}:</div>
@@ -140,7 +140,7 @@ const openInOSM = () => {
             <a-button class="ml-2" @click="onClickSetCurrentLocation">{{ $t('labels.yourLocation') }}</a-button>
           </div>
         </a-form-item>
-        <a-form-item>
+        <a-form-item v-if="vModel">
           <div class="mr-2 flex flex-col items-end gap-1 text-left">
             <a-button @click="openInOSM"><MdiMapIcon class="mr-2" />Open in OSM</a-button>
             <a-button @click="openInGoogleMaps"><MdiMapIcon class="mr-2" />Open in Google Maps</a-button>

From cf6151d462a2edefcb27bba0ef09174169c82aa5 Mon Sep 17 00:00:00 2001
From: flisowna <ewa.agnieszka.flis@gmail.com>
Date: Mon, 27 Feb 2023 22:17:16 +0100
Subject: [PATCH 03/38] add popup in the map shared view, popup opens on click

---
 packages/nc-gui/components/smartsheet/Map.vue | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Map.vue b/packages/nc-gui/components/smartsheet/Map.vue
index d47d531303..41b11548af 100644
--- a/packages/nc-gui/components/smartsheet/Map.vue
+++ b/packages/nc-gui/components/smartsheet/Map.vue
@@ -83,7 +83,7 @@ const expandedFormOnRowIdDlg = computed({
   },
 })
 
-const addMarker = (lat: number, long: number, row: RowType) => {
+const addMarker = (lat: number, long: number, row: RowType, popupContent: string) => {
   if (markersClusterGroupRef.value == null) {
     throw new Error('Marker cluster is null')
   }
@@ -93,6 +93,10 @@ const addMarker = (lat: number, long: number, row: RowType) => {
     expandForm(row)
   })
   markersClusterGroupRef.value?.addLayer(newMarker)
+
+  if (newMarker && isPublic.value) {
+    newMarker.bindPopup(popupContent)
+  }
 }
 
 const resetZoomAndCenterBasedOnLocalStorage = () => {
@@ -189,9 +193,17 @@ watch([formattedData, mapMetaData, markersClusterGroupRef], () => {
       return
     }
 
+    const listItems = Object.entries(row.row)
+      .map(([key, val]) => {
+        const prettyVal = val !== null && (typeof val === 'object' || Array.isArray(val)) ? JSON.stringify(val) : val
+        return `<li><b>${key}</b>: <br/>${prettyVal}</li>`
+      })
+      .join('')
+    const popupContent = `<ul>${listItems}</ul>`
+
     const [lat, long] = primaryGeoDataValue.split(';').map(parseFloat)
 
-    addMarker(lat, long, row)
+    addMarker(lat, long, row, popupContent)
   })
 })
 

From 84bb37267d2bc2c59dee48614a5782bea9cf6598 Mon Sep 17 00:00:00 2001
From: flisowna <ewa.agnieszka.flis@gmail.com>
Date: Mon, 27 Feb 2023 22:24:20 +0100
Subject: [PATCH 04/38] filter content in popup from null entries

---
 packages/nc-gui/components/smartsheet/Map.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/Map.vue b/packages/nc-gui/components/smartsheet/Map.vue
index 41b11548af..6f3574587f 100644
--- a/packages/nc-gui/components/smartsheet/Map.vue
+++ b/packages/nc-gui/components/smartsheet/Map.vue
@@ -194,8 +194,9 @@ watch([formattedData, mapMetaData, markersClusterGroupRef], () => {
     }
 
     const listItems = Object.entries(row.row)
+      .filter(([key, val]) => val !== null)
       .map(([key, val]) => {
-        const prettyVal = val !== null && (typeof val === 'object' || Array.isArray(val)) ? JSON.stringify(val) : val
+        const prettyVal = typeof val === 'object' || Array.isArray(val) ? JSON.stringify(val) : val
         return `<li><b>${key}</b>: <br/>${prettyVal}</li>`
       })
       .join('')

From 58beed0de51a390e0d788f83d99e401c5f2673a8 Mon Sep 17 00:00:00 2001
From: flisowna <ewa.agnieszka.flis@gmail.com>
Date: Mon, 27 Feb 2023 22:33:40 +0100
Subject: [PATCH 05/38] make urls clickable in popups and text selectable

---
 packages/nc-gui/components/smartsheet/Map.vue | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Map.vue b/packages/nc-gui/components/smartsheet/Map.vue
index 6f3574587f..150cb6dbd4 100644
--- a/packages/nc-gui/components/smartsheet/Map.vue
+++ b/packages/nc-gui/components/smartsheet/Map.vue
@@ -196,11 +196,17 @@ watch([formattedData, mapMetaData, markersClusterGroupRef], () => {
     const listItems = Object.entries(row.row)
       .filter(([key, val]) => val !== null)
       .map(([key, val]) => {
-        const prettyVal = typeof val === 'object' || Array.isArray(val) ? JSON.stringify(val) : val
+        let prettyVal = val
+        if (val !== null && (typeof val === 'object' || Array.isArray(val))) {
+          prettyVal = JSON.stringify(val)
+        } else if (typeof val === 'string' && (val.startsWith('http://') || val.startsWith('https://'))) {
+          prettyVal = `<a href="${val}" target="_blank">${val}</a>`
+        }
         return `<li><b>${key}</b>: <br/>${prettyVal}</li>`
       })
       .join('')
-    const popupContent = `<ul>${listItems}</ul>`
+
+    const popupContent = `<ul class="selectable">${listItems}</ul>`
 
     const [lat, long] = primaryGeoDataValue.split(';').map(parseFloat)
 
@@ -276,4 +282,7 @@ const count = computed(() => paginationData.value.totalRows)
   max-height: 255px;
   overflow: scroll;
 }
+.selectable {
+  user-select: text;
+}
 </style>

From 0f372c45babb485b9e18d900852a212e8fad88b1 Mon Sep 17 00:00:00 2001
From: flisowna <ewa.agnieszka.flis@gmail.com>
Date: Mon, 27 Feb 2023 22:39:31 +0100
Subject: [PATCH 06/38] delete id entry from popup

---
 packages/nc-gui/components/smartsheet/Map.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Map.vue b/packages/nc-gui/components/smartsheet/Map.vue
index 150cb6dbd4..c8f6cbfa12 100644
--- a/packages/nc-gui/components/smartsheet/Map.vue
+++ b/packages/nc-gui/components/smartsheet/Map.vue
@@ -194,7 +194,7 @@ watch([formattedData, mapMetaData, markersClusterGroupRef], () => {
     }
 
     const listItems = Object.entries(row.row)
-      .filter(([key, val]) => val !== null)
+      .filter(([key, val]) => val !== null && key !== 'Id')
       .map(([key, val]) => {
         let prettyVal = val
         if (val !== null && (typeof val === 'object' || Array.isArray(val))) {
@@ -206,7 +206,7 @@ watch([formattedData, mapMetaData, markersClusterGroupRef], () => {
       })
       .join('')
 
-    const popupContent = `<ul class="selectable">${listItems}</ul>`
+    const popupContent = `<ul class="popup-content">${listItems}</ul>`
 
     const [lat, long] = primaryGeoDataValue.split(';').map(parseFloat)
 
@@ -282,7 +282,10 @@ const count = computed(() => paginationData.value.totalRows)
   max-height: 255px;
   overflow: scroll;
 }
-.selectable {
+.popup-content {
   user-select: text;
+  display: flex;
+  gap: 10px;
+  flex-direction: column;
 }
 </style>

From 87f6363d74e92c34e60b9e3a6dd86b71ed8cf0c6 Mon Sep 17 00:00:00 2001
From: flisowna <ewa.agnieszka.flis@gmail.com>
Date: Wed, 1 Mar 2023 15:25:04 +0100
Subject: [PATCH 07/38] WIP popupcontent adjustments

---
 packages/nc-gui/components/smartsheet/Map.vue | 25 ++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/Map.vue b/packages/nc-gui/components/smartsheet/Map.vue
index c8f6cbfa12..37f2add3ea 100644
--- a/packages/nc-gui/components/smartsheet/Map.vue
+++ b/packages/nc-gui/components/smartsheet/Map.vue
@@ -6,6 +6,8 @@ import { ViewTypes } from 'nocodb-sdk'
 import { IsPublicInj, OpenNewRecordFormHookInj, latLongToJoinedString, onMounted, provide, ref } from '#imports'
 import type { Row as RowType } from '~/lib'
 
+import Vue from 'vue'
+
 const route = useRoute()
 
 const router = useRouter()
@@ -206,10 +208,31 @@ watch([formattedData, mapMetaData, markersClusterGroupRef], () => {
       })
       .join('')
 
-    const popupContent = `<ul class="popup-content">${listItems}</ul>`
+    // const popupContent = `<ul class="popup-content">${listItems}</ul>`
 
     const [lat, long] = primaryGeoDataValue.split(';').map(parseFloat)
 
+    const popupContent = Vue.extend(MarkerPopupContent)
+      .extend({
+        props: {
+          title: {
+            type: String,
+            default: ‘No title’,
+          },
+          description: {
+            type: String,
+            default: ‘No description’,
+          },
+        },
+      })
+      .create({
+        propsData: {
+          title: row.row[‘Title’],
+          description: row.row[‘Description’],
+        },
+      }).$mount().$el
+
+
     addMarker(lat, long, row, popupContent)
   })
 })

From 0b8c26fffffa09a93a0eb683749bf6256c31f8c7 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Wed, 1 Mar 2023 16:36:06 +0100
Subject: [PATCH 08/38] geo map: work on popup

---
 packages/nc-gui/components/smartsheet/Map.vue | 44 ++++++++++++++++++-
 .../smartsheet/MyPopupComponent.vue           | 13 ++++++
 2 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 packages/nc-gui/components/smartsheet/MyPopupComponent.vue

diff --git a/packages/nc-gui/components/smartsheet/Map.vue b/packages/nc-gui/components/smartsheet/Map.vue
index c8f6cbfa12..054a21edb9 100644
--- a/packages/nc-gui/components/smartsheet/Map.vue
+++ b/packages/nc-gui/components/smartsheet/Map.vue
@@ -3,11 +3,25 @@ import 'leaflet/dist/leaflet.css'
 import L, { LatLng } from 'leaflet'
 import 'leaflet.markercluster'
 import { ViewTypes } from 'nocodb-sdk'
+// import * as Vue from 'vue'
+// import MyPopupComponent from './MyPopupComponent'
+// import { defineComponent, ref } from 'vue'
+// import Vue from 'vue'
 import { IsPublicInj, OpenNewRecordFormHookInj, latLongToJoinedString, onMounted, provide, ref } from '#imports'
 import type { Row as RowType } from '~/lib'
+// import { LazySmartsheetMyPopupComponent } from '~~/.nuxt/components'
+
+// Vue.config.ignoredElements.push('my-popup-component')
 
 const route = useRoute()
 
+// const popupIsOpen = ref(false)
+const popupIsOpen = ref(true)
+const popupContainer = ref()
+const popUpRow = ref<RowType>()
+const fields = inject(FieldsInj, ref([]))
+console.log('FOO fields', fields)
+
 const router = useRouter()
 
 const reloadViewDataHook = inject(ReloadViewDataHookInj)
@@ -95,7 +109,31 @@ const addMarker = (lat: number, long: number, row: RowType, popupContent: string
   markersClusterGroupRef.value?.addLayer(newMarker)
 
   if (newMarker && isPublic.value) {
-    newMarker.bindPopup(popupContent)
+    // newMarker.setPopupContent(popupContainer.value!)
+
+    popUpRow.value = row
+
+    newMarker.bindPopup(popupContainer.value!)
+    // newMarker.bindPopup(popupContent)
+    // const vm = new Vue({
+    //   render: (h: any) =>
+    //     h(LazySmartsheetMyPopupComponent, {
+    //       props: {
+    //         title: 'Marker Title',
+    //         description: 'Marker Description',
+    //       },
+    //     }),
+    // })
+
+    // newMarker.bindPopup(vm.$el, { maxWidth: 300 })
+
+    // newMarker.on('popupopen', () => {
+    //   vm.$mount()
+    // })
+
+    // newMarker.on('popupclose', () => {
+    //   vm.$destroy()
+    // })
   }
 }
 
@@ -225,6 +263,8 @@ const count = computed(() => paginationData.value.totalRows)
 </script>
 
 <template>
+  <div ref="popupContainer">Hi<LazySmartsheetMyPopupComponent></LazySmartsheetMyPopupComponent></div>
+
   <div class="flex flex-col h-full w-full no-underline" data-testid="nc-map-wrapper">
     <div id="mapContainer" ref="mapContainerRef" class="w-full h-screen">
       <a-tooltip placement="bottom" class="h-2 w-auto max-w-fit-content absolute top-3 right-3 p-2 z-500 cursor-default">
@@ -278,10 +318,12 @@ const count = computed(() => paginationData.value.totalRows)
 .no-underline a {
   text-decoration: none !important;
 }
+
 .leaflet-popup-content-wrapper {
   max-height: 255px;
   overflow: scroll;
 }
+
 .popup-content {
   user-select: text;
   display: flex;
diff --git a/packages/nc-gui/components/smartsheet/MyPopupComponent.vue b/packages/nc-gui/components/smartsheet/MyPopupComponent.vue
new file mode 100644
index 0000000000..5292b84638
--- /dev/null
+++ b/packages/nc-gui/components/smartsheet/MyPopupComponent.vue
@@ -0,0 +1,13 @@
+<script lang="ts" setup></script>
+
+<template>
+  <div>Test</div>
+  <!-- <div v-if="popupIsOpen" ref="popupContainer">
+    <div v-for="column in fields" :key="column.id">
+      <LazyCellTextArea v-if="isTextArea(column)" v-model="popUpRow?.row[column.title]" />
+      <LazyCellCheckbox v-else-if="isBoolean(column, abstractType)" v-model="vModel" />
+    </div>
+    FOOBAR
+    <div>{{ popUpRow?.row.Title }}</div>
+  </div> -->
+</template>

From 095b6238bac3dc41c0f3e189da737debcfe6e86b Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Wed, 1 Mar 2023 17:05:25 +0100
Subject: [PATCH 09/38] geo map: work on popup

---
 packages/nc-gui/components/smartsheet/Map.vue |  2 +-
 .../smartsheet/MyPopupComponent.vue           | 60 ++++++++++++++++---
 2 files changed, 53 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Map.vue b/packages/nc-gui/components/smartsheet/Map.vue
index 054a21edb9..d7537bb72b 100644
--- a/packages/nc-gui/components/smartsheet/Map.vue
+++ b/packages/nc-gui/components/smartsheet/Map.vue
@@ -263,7 +263,7 @@ const count = computed(() => paginationData.value.totalRows)
 </script>
 
 <template>
-  <div ref="popupContainer">Hi<LazySmartsheetMyPopupComponent></LazySmartsheetMyPopupComponent></div>
+  <!-- <div ref="popupContainer" v-if="popupIsOpen"><LazySmartsheetMyPopupComponent :fields="fields" :row="{}"></LazySmartsheetMyPopupComponent></div> -->
 
   <div class="flex flex-col h-full w-full no-underline" data-testid="nc-map-wrapper">
     <div id="mapContainer" ref="mapContainerRef" class="w-full h-screen">
diff --git a/packages/nc-gui/components/smartsheet/MyPopupComponent.vue b/packages/nc-gui/components/smartsheet/MyPopupComponent.vue
index 5292b84638..8afe2879d7 100644
--- a/packages/nc-gui/components/smartsheet/MyPopupComponent.vue
+++ b/packages/nc-gui/components/smartsheet/MyPopupComponent.vue
@@ -1,13 +1,57 @@
-<script lang="ts" setup></script>
+<script lang="ts" setup>
+import type { ColumnType } from 'nocodb-sdk'
+import { isVirtualCol } from 'nocodb-sdk'
+import type { Row } from '~/lib'
+// defineProps({
+// //   popupIsOpen: {
+// //     type: Boolean,
+// //     required: true,
+// //   },
+//   popUpRow: {
+//     type: Object,
+//     required: true,
+//   },
+//   fields: {
+//     type: Array,
+//     required: true,
+//   },
+// //   abstractType: {
+// //     type: String,
+// //     required: true,
+// //   },
+// })
+
+const props = defineProps<{
+  fields: ColumnType[]
+  row: Row
+}>()
+
+// const cellValueByColum = (column: ColumnType) => {
+//   return {
+//     get() {
+//       return props.row?.row[column.id!]
+//     },
+//     set() {},
+//   }
+// }
+</script>
 
 <template>
   <div>Test</div>
-  <!-- <div v-if="popupIsOpen" ref="popupContainer">
-    <div v-for="column in fields" :key="column.id">
-      <LazyCellTextArea v-if="isTextArea(column)" v-model="popUpRow?.row[column.title]" />
-      <LazyCellCheckbox v-else-if="isBoolean(column, abstractType)" v-model="vModel" />
+  <!-- <div v-if="popupIsOpen" ref="popupContainer"> -->
+  <div ref="popupContainer">
+    FOO
+    <div v-for="column in props.fields" :key="column.id">
+      {{ JSON.stringify(column) }}
+      {{ JSON.stringify(props.fields) }}
+      <!-- <LazyCellTextArea v-if="isTextArea(column)" v-model="cellValueByColum(column)" /> -->
+      <!-- <LazySmartsheetVirtualCell
+        v-if="isVirtualCol(column)"
+        v-model="props.row.row[col.title]"
+        :column="column"
+        :row="props.row"
+      /> -->
     </div>
-    FOOBAR
-    <div>{{ popUpRow?.row.Title }}</div>
-  </div> -->
+    <!-- <div>{{ popUpRow?.row.Title }}</div> -->
+  </div>
 </template>

From f2abd5d834ef408578f7a828c644befdaad0ab8c Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Wed, 1 Mar 2023 17:14:47 +0100
Subject: [PATCH 10/38] geo map: work on popup

---
 packages/nc-gui/components/smartsheet/Map.vue | 59 +++++++++++--------
 .../smartsheet/MyPopupComponent.vue           |  2 +-
 2 files changed, 34 insertions(+), 27 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Map.vue b/packages/nc-gui/components/smartsheet/Map.vue
index d7537bb72b..37eb1d9946 100644
--- a/packages/nc-gui/components/smartsheet/Map.vue
+++ b/packages/nc-gui/components/smartsheet/Map.vue
@@ -8,7 +8,7 @@ import { ViewTypes } from 'nocodb-sdk'
 // import { defineComponent, ref } from 'vue'
 // import Vue from 'vue'
 import { IsPublicInj, OpenNewRecordFormHookInj, latLongToJoinedString, onMounted, provide, ref } from '#imports'
-import type { Row as RowType } from '~/lib'
+import type { Row, Row as RowType } from '~/lib'
 // import { LazySmartsheetMyPopupComponent } from '~~/.nuxt/components'
 
 // Vue.config.ignoredElements.push('my-popup-component')
@@ -16,9 +16,9 @@ import type { Row as RowType } from '~/lib'
 const route = useRoute()
 
 // const popupIsOpen = ref(false)
-const popupIsOpen = ref(true)
+const popupIsOpen = ref(false)
 const popupContainer = ref()
-const popUpRow = ref<RowType>()
+const popUpRow = ref<Row>()
 const fields = inject(FieldsInj, ref([]))
 console.log('FOO fields', fields)
 
@@ -97,7 +97,8 @@ const expandedFormOnRowIdDlg = computed({
   },
 })
 
-const addMarker = (lat: number, long: number, row: RowType, popupContent: string) => {
+// const addMarker = (lat: number, long: number, row: RowType, popupContent: string) => {
+const addMarker = (lat: number, long: number, row: RowType) => {
   if (markersClusterGroupRef.value == null) {
     throw new Error('Marker cluster is null')
   }
@@ -127,13 +128,15 @@ const addMarker = (lat: number, long: number, row: RowType, popupContent: string
 
     // newMarker.bindPopup(vm.$el, { maxWidth: 300 })
 
-    // newMarker.on('popupopen', () => {
-    //   vm.$mount()
-    // })
+    newMarker.on('popupopen', () => {
+      popupIsOpen.value = true
+      // vm.$mount()
+    })
 
-    // newMarker.on('popupclose', () => {
-    //   vm.$destroy()
-    // })
+    newMarker.on('popupclose', () => {
+      popupIsOpen.value = false
+      // vm.$destroy()
+    })
   }
 }
 
@@ -231,24 +234,25 @@ watch([formattedData, mapMetaData, markersClusterGroupRef], () => {
       return
     }
 
-    const listItems = Object.entries(row.row)
-      .filter(([key, val]) => val !== null && key !== 'Id')
-      .map(([key, val]) => {
-        let prettyVal = val
-        if (val !== null && (typeof val === 'object' || Array.isArray(val))) {
-          prettyVal = JSON.stringify(val)
-        } else if (typeof val === 'string' && (val.startsWith('http://') || val.startsWith('https://'))) {
-          prettyVal = `<a href="${val}" target="_blank">${val}</a>`
-        }
-        return `<li><b>${key}</b>: <br/>${prettyVal}</li>`
-      })
-      .join('')
-
-    const popupContent = `<ul class="popup-content">${listItems}</ul>`
+    // const listItems = Object.entries(row.row)
+    //   .filter(([key, val]) => val !== null && key !== 'Id')
+    //   .map(([key, val]) => {
+    //     let prettyVal = val
+    //     if (val !== null && (typeof val === 'object' || Array.isArray(val))) {
+    //       prettyVal = JSON.stringify(val)
+    //     } else if (typeof val === 'string' && (val.startsWith('http://') || val.startsWith('https://'))) {
+    //       prettyVal = `<a href="${val}" target="_blank">${val}</a>`
+    //     }
+    //     return `<li><b>${key}</b>: <br/>${prettyVal}</li>`
+    //   })
+    //   .join('')
+
+    // const popupContent = `<ul class="popup-content">${listItems}</ul>`
 
     const [lat, long] = primaryGeoDataValue.split(';').map(parseFloat)
 
-    addMarker(lat, long, row, popupContent)
+    // addMarker(lat, long, row, popupContent)
+    addMarker(lat, long, row)
   })
 })
 
@@ -263,7 +267,10 @@ const count = computed(() => paginationData.value.totalRows)
 </script>
 
 <template>
-  <!-- <div ref="popupContainer" v-if="popupIsOpen"><LazySmartsheetMyPopupComponent :fields="fields" :row="{}"></LazySmartsheetMyPopupComponent></div> -->
+  <div v-if="popupIsOpen" ref="popupContainer">
+    <LazySmartsheetMyPopupComponent :fields="fields" :row="popUpRow"></LazySmartsheetMyPopupComponent>
+  </div>
+  <!-- <div ref="popupContainer" v-if="popupIsOpen">FOO-Hi<LazySmartsheetMyPopupComponent></LazySmartsheetMyPopupComponent></div> -->
 
   <div class="flex flex-col h-full w-full no-underline" data-testid="nc-map-wrapper">
     <div id="mapContainer" ref="mapContainerRef" class="w-full h-screen">
diff --git a/packages/nc-gui/components/smartsheet/MyPopupComponent.vue b/packages/nc-gui/components/smartsheet/MyPopupComponent.vue
index 8afe2879d7..7775c56df8 100644
--- a/packages/nc-gui/components/smartsheet/MyPopupComponent.vue
+++ b/packages/nc-gui/components/smartsheet/MyPopupComponent.vue
@@ -23,7 +23,7 @@ import type { Row } from '~/lib'
 
 const props = defineProps<{
   fields: ColumnType[]
-  row: Row
+  row: RowType
 }>()
 
 // const cellValueByColum = (column: ColumnType) => {

From 3c19e8f143440748ef809e2d45b318a72e437f74 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Wed, 1 Mar 2023 17:54:36 +0100
Subject: [PATCH 11/38] geo map: work on popup

---
 .../smartsheet/MyPopupComponent.vue           | 54 ++++++++++++++-----
 1 file changed, 41 insertions(+), 13 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/MyPopupComponent.vue b/packages/nc-gui/components/smartsheet/MyPopupComponent.vue
index 7775c56df8..4ad41eda1d 100644
--- a/packages/nc-gui/components/smartsheet/MyPopupComponent.vue
+++ b/packages/nc-gui/components/smartsheet/MyPopupComponent.vue
@@ -1,7 +1,14 @@
 <script lang="ts" setup>
-import type { ColumnType } from 'nocodb-sdk'
+import type { ColumnType, TableType } from 'nocodb-sdk'
 import { isVirtualCol } from 'nocodb-sdk'
-import type { Row } from '~/lib'
+import type { Ref } from 'vue'
+// import type { Row } from '~/lib'
+// const props =
+const props = defineProps<{
+  fields: ColumnType[]
+  row: Row
+}>()
+
 // defineProps({
 // //   popupIsOpen: {
 // //     type: Boolean,
@@ -21,10 +28,15 @@ import type { Row } from '~/lib'
 // //   },
 // })
 
-const props = defineProps<{
-  fields: ColumnType[]
-  row: RowType
-}>()
+const currentRow = toRef(props, 'row')
+
+const { meta } = useSmartsheetStoreOrThrow()
+
+// const rowStore = useProvideSmartsheetRowStore(meta as Ref<TableType>, currentRow)
+const { row } = useProvideSmartsheetRowStore(meta as Ref<TableType>, currentRow)
+
+console.log('rowStore', row.value.row)
+// const { currentRow: row } = useSmartsheetRowStoreOrThrow()
 
 // const cellValueByColum = (column: ColumnType) => {
 //   return {
@@ -37,20 +49,36 @@ const props = defineProps<{
 </script>
 
 <template>
-  <div>Test</div>
   <!-- <div v-if="popupIsOpen" ref="popupContainer"> -->
   <div ref="popupContainer">
-    FOO
-    <div v-for="column in props.fields" :key="column.id">
-      {{ JSON.stringify(column) }}
-      {{ JSON.stringify(props.fields) }}
-      <!-- <LazyCellTextArea v-if="isTextArea(column)" v-model="cellValueByColum(column)" /> -->
+    <!-- FOO: {{ JSON.stringify(rowStore.row._object.fields) }} -->
+    <!-- currenetRow: {{ JSON.stringify(currentRow) }} <br />
+    meta: {{ JSON.stringify(meta) }} <br /> -->
+    <!-- rowStore: {{ JSON.stringify(rowStore.row) }} -->
+    <!-- FOO
+      {{ JSON.stringify(row) }} -->
+    <div v-for="col in fields" :key="col.id">
+      <LazySmartsheetVirtualCell v-if="isVirtualCol(col)" v-model="row.row[col.title]" :column="col" :row="row" />
+      <LazySmartsheetCell v-else v-model="row.row[col.title]" :column="col" :edit-enabled="false" :read-only="true" />
+
+      <!-- {{ JSON.stringify(column) }} -->
+      <!-- <LazySmartsheetCell v-else v-model="row.row[column.title]" :column="column" :edit-enabled="false" :read-only="true" /> -->
+
       <!-- <LazySmartsheetVirtualCell
         v-if="isVirtualCol(column)"
-        v-model="props.row.row[col.title]"
+        v-model="rowStore.row[column.title]"
         :column="column"
         :row="props.row"
+      />
+      <LazySmartsheetCell
+        v-if="!isVirtualCol(column)"
+        v-model="rowStore.row[column.title]"
+        :column="column"
+        :edit-enabled="false"
+        :read-only="true"
       /> -->
+
+      <!-- <LazyCellTextArea v-if="isTextArea(column)" v-model="cellValueByColum(column)" /> -->
     </div>
     <!-- <div>{{ popUpRow?.row.Title }}</div> -->
   </div>

From 855a5d0c8823cf8823a02bd81e7c3455bce139af Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Wed, 1 Mar 2023 17:57:27 +0100
Subject: [PATCH 12/38] geo map: work on popup

---
 .../smartsheet/MyPopupComponent.vue           | 56 ++++++++++++++++++-
 1 file changed, 54 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/MyPopupComponent.vue b/packages/nc-gui/components/smartsheet/MyPopupComponent.vue
index 4ad41eda1d..06d551ad86 100644
--- a/packages/nc-gui/components/smartsheet/MyPopupComponent.vue
+++ b/packages/nc-gui/components/smartsheet/MyPopupComponent.vue
@@ -2,6 +2,33 @@
 import type { ColumnType, TableType } from 'nocodb-sdk'
 import { isVirtualCol } from 'nocodb-sdk'
 import type { Ref } from 'vue'
+import {
+  ActiveViewInj,
+  ChangePageInj,
+  FieldsInj,
+  IsFormInj,
+  IsGalleryInj,
+  IsGridInj,
+  MetaInj,
+  NavigateDir,
+  OpenNewRecordFormHookInj,
+  PaginationDataInj,
+  ReloadRowDataHookInj,
+  ReloadViewDataHookInj,
+  ReloadViewMetaHookInj,
+  computed,
+  createEventHook,
+  extractPkFromRow,
+  inject,
+  isImage,
+  isLTAR,
+  nextTick,
+  onMounted,
+  provide,
+  ref,
+  useAttachment,
+  useViewData,
+} from '#imports'
 // import type { Row } from '~/lib'
 // const props =
 const props = defineProps<{
@@ -46,6 +73,13 @@ console.log('rowStore', row.value.row)
 //     set() {},
 //   }
 // }
+
+const isRowEmpty = (record: any, col: any) => {
+  const val = record.row[col.title]
+  if (!val) return true
+
+  return Array.isArray(val) && val.length === 0
+}
 </script>
 
 <template>
@@ -58,8 +92,26 @@ console.log('rowStore', row.value.row)
     <!-- FOO
       {{ JSON.stringify(row) }} -->
     <div v-for="col in fields" :key="col.id">
-      <LazySmartsheetVirtualCell v-if="isVirtualCol(col)" v-model="row.row[col.title]" :column="col" :row="row" />
-      <LazySmartsheetCell v-else v-model="row.row[col.title]" :column="col" :edit-enabled="false" :read-only="true" />
+      <div
+        v-if="!isRowEmpty(row, col) || isLTAR(col.uidt)"
+        class="flex flex-col space-y-1 px-4 mb-6 bg-gray-50 rounded-lg w-full"
+      >
+        <div class="flex flex-row w-full justify-start border-b-1 border-gray-100 py-2.5">
+          <div class="w-full text-gray-600">
+            <LazySmartsheetHeaderVirtualCell v-if="isVirtualCol(col)" :column="col" :hide-menu="true" />
+
+            <LazySmartsheetHeaderCell v-else :column="col" :hide-menu="true" />
+          </div>
+        </div>
+
+        <div class="flex flex-row w-full pb-3 pt-2 pl-2 items-center justify-start">
+          <LazySmartsheetVirtualCell v-if="isVirtualCol(col)" v-model="row.row[col.title]" :column="col" :row="row" />
+
+          <LazySmartsheetCell v-else v-model="row.row[col.title]" :column="col" :edit-enabled="false" :read-only="true" />
+        </div>
+      </div>
+      <!-- <LazySmartsheetVirtualCell v-if="isVirtualCol(col)" v-model="row.row[col.title]" :column="col" :row="row" />
+      <LazySmartsheetCell v-else v-model="row.row[col.title]" :column="col" :edit-enabled="false" :read-only="true" /> -->
 
       <!-- {{ JSON.stringify(column) }} -->
       <!-- <LazySmartsheetCell v-else v-model="row.row[column.title]" :column="column" :edit-enabled="false" :read-only="true" /> -->

From b9a63745000b8d6ea07929b45464d03fad89df0e Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Thu, 2 Mar 2023 09:09:35 +0100
Subject: [PATCH 13/38] geo map: work on popup

---
 packages/nc-gui/components.d.ts               |   1 +
 .../smartsheet/MyPopupComponent.vue           | 230 +++++++++++++-----
 2 files changed, 169 insertions(+), 62 deletions(-)

diff --git a/packages/nc-gui/components.d.ts b/packages/nc-gui/components.d.ts
index 78f37aba7f..e3914200e0 100644
--- a/packages/nc-gui/components.d.ts
+++ b/packages/nc-gui/components.d.ts
@@ -103,6 +103,7 @@ declare module '@vue/runtime-core' {
     MaterialSymbolsFileCopyOutline: typeof import('~icons/material-symbols/file-copy-outline')['default']
     MaterialSymbolsKeyboardReturn: typeof import('~icons/material-symbols/keyboard-return')['default']
     MaterialSymbolsLightModeOutline: typeof import('~icons/material-symbols/light-mode-outline')['default']
+    MaterialSymbolsMobileFriendly: typeof import('~icons/material-symbols/mobile-friendly')['default']
     MaterialSymbolsRocketLaunchOutline: typeof import('~icons/material-symbols/rocket-launch-outline')['default']
     MaterialSymbolsSendOutline: typeof import('~icons/material-symbols/send-outline')['default']
     MaterialSymbolsTranslate: typeof import('~icons/material-symbols/translate')['default']
diff --git a/packages/nc-gui/components/smartsheet/MyPopupComponent.vue b/packages/nc-gui/components/smartsheet/MyPopupComponent.vue
index 06d551ad86..e7ee8434d7 100644
--- a/packages/nc-gui/components/smartsheet/MyPopupComponent.vue
+++ b/packages/nc-gui/components/smartsheet/MyPopupComponent.vue
@@ -1,7 +1,11 @@
 <script lang="ts" setup>
 import type { ColumnType, TableType } from 'nocodb-sdk'
-import { isVirtualCol } from 'nocodb-sdk'
+// import { isVirtualCol } from 'nocodb-sdk'
 import type { Ref } from 'vue'
+// import type { Row } from '~/lib'
+// const props =
+
+import { ViewTypes, isVirtualCol } from 'nocodb-sdk'
 import {
   ActiveViewInj,
   ChangePageInj,
@@ -10,15 +14,11 @@ import {
   IsGalleryInj,
   IsGridInj,
   MetaInj,
-  NavigateDir,
-  OpenNewRecordFormHookInj,
   PaginationDataInj,
   ReloadRowDataHookInj,
   ReloadViewDataHookInj,
   ReloadViewMetaHookInj,
   computed,
-  createEventHook,
-  extractPkFromRow,
   inject,
   isImage,
   isLTAR,
@@ -29,13 +29,95 @@ import {
   useAttachment,
   useViewData,
 } from '#imports'
-// import type { Row } from '~/lib'
-// const props =
+import type { Row } from '~/lib'
+
+interface Attachment {
+  url: string
+}
+
 const props = defineProps<{
   fields: ColumnType[]
   row: Row
 }>()
 
+const meta = inject(MetaInj, ref())
+const view = inject(ActiveViewInj, ref())
+const reloadViewMetaHook = inject(ReloadViewMetaHookInj)
+const reloadViewDataHook = inject(ReloadViewDataHookInj)
+
+const { loadData, paginationData, loadGalleryData, galleryData, changePage, addEmptyRow } = useViewData(meta, view)
+
+provide(IsFormInj, ref(false))
+provide(IsGalleryInj, ref(true))
+provide(IsGridInj, ref(false))
+provide(PaginationDataInj, paginationData)
+provide(ChangePageInj, changePage)
+
+const fields = inject(FieldsInj, ref([]))
+
+const { getPossibleAttachmentSrc } = useAttachment()
+
+const fieldsWithoutCover = computed(() => fields.value.filter((f) => f.id !== galleryData.value?.fk_cover_image_col_id))
+
+const coverImageColumn: any = $(
+  computed(() =>
+    meta.value?.columnsById
+      ? meta.value.columnsById[galleryData.value?.fk_cover_image_col_id as keyof typeof meta.value.columnsById]
+      : {},
+  ),
+)
+
+const isRowEmpty = (record: any, col: any) => {
+  const val = record.row[col.title]
+  if (!val) return true
+
+  return Array.isArray(val) && val.length === 0
+}
+
+const attachments = (record: any): Attachment[] => {
+  try {
+    if (coverImageColumn?.title && record.row[coverImageColumn.title]) {
+      return typeof record.row[coverImageColumn.title] === 'string'
+        ? JSON.parse(record.row[coverImageColumn.title])
+        : record.row[coverImageColumn.title]
+    }
+    return []
+  } catch (e) {
+    return []
+  }
+}
+
+const reloadAttachments = ref(false)
+
+reloadViewMetaHook?.on(async () => {
+  await loadGalleryData()
+
+  reloadAttachments.value = true
+
+  nextTick(() => {
+    reloadAttachments.value = false
+  })
+})
+reloadViewDataHook?.on(async () => {
+  await loadData()
+})
+
+onMounted(async () => {
+  await loadData()
+
+  await loadGalleryData()
+})
+
+// provide view data reload hook as fallback to row data reload
+provide(ReloadRowDataHookInj, reloadViewDataHook)
+
+watch(view, async (nextView) => {
+  if (nextView?.type === ViewTypes.GALLERY) {
+    await loadData()
+    await loadGalleryData()
+  }
+})
+
 // defineProps({
 // //   popupIsOpen: {
 // //     type: Boolean,
@@ -57,12 +139,12 @@ const props = defineProps<{
 
 const currentRow = toRef(props, 'row')
 
-const { meta } = useSmartsheetStoreOrThrow()
+// const { meta } = useSmartsheetStoreOrThrow()
 
 // const rowStore = useProvideSmartsheetRowStore(meta as Ref<TableType>, currentRow)
 const { row } = useProvideSmartsheetRowStore(meta as Ref<TableType>, currentRow)
 
-console.log('rowStore', row.value.row)
+// console.log('rowStore', row.value.row)
 // const { currentRow: row } = useSmartsheetRowStoreOrThrow()
 
 // const cellValueByColum = (column: ColumnType) => {
@@ -73,65 +155,89 @@ console.log('rowStore', row.value.row)
 //     set() {},
 //   }
 // }
-
-const isRowEmpty = (record: any, col: any) => {
-  const val = record.row[col.title]
-  if (!val) return true
-
-  return Array.isArray(val) && val.length === 0
-}
 </script>
 
 <template>
-  <!-- <div v-if="popupIsOpen" ref="popupContainer"> -->
-  <div ref="popupContainer">
-    <!-- FOO: {{ JSON.stringify(rowStore.row._object.fields) }} -->
-    <!-- currenetRow: {{ JSON.stringify(currentRow) }} <br />
-    meta: {{ JSON.stringify(meta) }} <br /> -->
-    <!-- rowStore: {{ JSON.stringify(rowStore.row) }} -->
-    <!-- FOO
-      {{ JSON.stringify(row) }} -->
-    <div v-for="col in fields" :key="col.id">
-      <div
-        v-if="!isRowEmpty(row, col) || isLTAR(col.uidt)"
-        class="flex flex-col space-y-1 px-4 mb-6 bg-gray-50 rounded-lg w-full"
-      >
-        <div class="flex flex-row w-full justify-start border-b-1 border-gray-100 py-2.5">
-          <div class="w-full text-gray-600">
-            <LazySmartsheetHeaderVirtualCell v-if="isVirtualCol(col)" :column="col" :hide-menu="true" />
-
-            <LazySmartsheetHeaderCell v-else :column="col" :hide-menu="true" />
+  <LazySmartsheetRow :row="row">
+    <a-card
+      hoverable
+      class="!rounded-lg h-full overflow-hidden break-all max-w-[450px]"
+      :data-testid="`nc-gallery-card-${row.row.id}`"
+    >
+      <template v-if="galleryData?.fk_cover_image_col_id" #cover>
+        <a-carousel v-if="!reloadAttachments && attachments(row).length" autoplay class="gallery-carousel" arrows>
+          <template #customPaging>
+            <a>
+              <div class="pt-[12px]">
+                <div></div>
+              </div>
+            </a>
+          </template>
+
+          <template #prevArrow>
+            <div style="z-index: 1"></div>
+          </template>
+
+          <template #nextArrow>
+            <div style="z-index: 1"></div>
+          </template>
+
+          <template v-for="(attachment, index) in attachments(row)">
+            <LazyCellAttachmentImage
+              v-if="isImage(attachment.title, attachment.mimetype ?? attachment.type)"
+              :key="`carousel-${row.row.id}-${index}`"
+              class="h-52 object-contain"
+              :srcs="getPossibleAttachmentSrc(attachment)"
+            />
+          </template>
+        </a-carousel>
+
+        <MdiFileImageBox v-else class="w-full h-48 my-4 text-cool-gray-200" />
+      </template>
+
+      <div v-for="col in fieldsWithoutCover" :key="`record-${row.row.id}-${col.id}`">
+        <div
+          v-if="!isRowEmpty(row, col) || isLTAR(col.uidt)"
+          class="flex flex-col space-y-1 px-4 mb-6 bg-gray-50 rounded-lg w-full"
+        >
+          <div class="flex flex-row w-full justify-start border-b-1 border-gray-100 py-2.5">
+            <div class="w-full text-gray-600">
+              <LazySmartsheetHeaderVirtualCell v-if="isVirtualCol(col)" :column="col" :hide-menu="true" />
+
+              <LazySmartsheetHeaderCell v-else :column="col" :hide-menu="true" />
+            </div>
           </div>
-        </div>
 
-        <div class="flex flex-row w-full pb-3 pt-2 pl-2 items-center justify-start">
-          <LazySmartsheetVirtualCell v-if="isVirtualCol(col)" v-model="row.row[col.title]" :column="col" :row="row" />
+          <div class="flex flex-row w-full pb-3 pt-2 pl-2 items-center justify-start">
+            <LazySmartsheetVirtualCell v-if="isVirtualCol(col)" v-model="row.row[col.title]" :column="col" :row="row" />
 
-          <LazySmartsheetCell v-else v-model="row.row[col.title]" :column="col" :edit-enabled="false" :read-only="true" />
+            <LazySmartsheetCell v-else v-model="row.row[col.title]" :column="col" :edit-enabled="false" :read-only="true" />
+          </div>
         </div>
       </div>
-      <!-- <LazySmartsheetVirtualCell v-if="isVirtualCol(col)" v-model="row.row[col.title]" :column="col" :row="row" />
-      <LazySmartsheetCell v-else v-model="row.row[col.title]" :column="col" :edit-enabled="false" :read-only="true" /> -->
-
-      <!-- {{ JSON.stringify(column) }} -->
-      <!-- <LazySmartsheetCell v-else v-model="row.row[column.title]" :column="column" :edit-enabled="false" :read-only="true" /> -->
-
-      <!-- <LazySmartsheetVirtualCell
-        v-if="isVirtualCol(column)"
-        v-model="rowStore.row[column.title]"
-        :column="column"
-        :row="props.row"
-      />
-      <LazySmartsheetCell
-        v-if="!isVirtualCol(column)"
-        v-model="rowStore.row[column.title]"
-        :column="column"
-        :edit-enabled="false"
-        :read-only="true"
-      /> -->
-
-      <!-- <LazyCellTextArea v-if="isTextArea(column)" v-model="cellValueByColum(column)" /> -->
-    </div>
-    <!-- <div>{{ popUpRow?.row.Title }}</div> -->
-  </div>
+    </a-card>
+  </LazySmartsheetRow>
+
+  <!-- <div ref="popupContainer">
+        <div v-for="col in fields" :key="col.id">
+          <div
+            v-if="!isRowEmpty(row, col) || isLTAR(col.uidt)"
+            class="flex flex-col space-y-1 px-4 mb-6 bg-gray-50 rounded-lg w-full"
+          >
+            <div class="flex flex-row w-full justify-start border-b-1 border-gray-100 py-2.5">
+              <div class="w-full text-gray-600">
+                <LazySmartsheetHeaderVirtualCell v-if="isVirtualCol(col)" :column="col" :hide-menu="true" />
+
+                <LazySmartsheetHeaderCell v-else :column="col" :hide-menu="true" />
+              </div>
+            </div>
+
+            <div class="flex flex-row w-full pb-3 pt-2 pl-2 items-center justify-start">
+              <LazySmartsheetVirtualCell v-if="isVirtualCol(col)" v-model="row.row[col.title]" :column="col" :row="row" />
+
+              <LazySmartsheetCell v-else v-model="row.row[col.title]" :column="col" :edit-enabled="false" :read-only="true" />
+            </div>
+          </div>
+        </div>
+      </div> -->
 </template>

From 5044cca4cc9af3494f1e88480f8c05ff7eec6496 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Thu, 2 Mar 2023 09:37:09 +0100
Subject: [PATCH 14/38] geo map: work on popup

---
 packages/nc-gui/components/smartsheet/Map.vue | 82 +++++++++++--------
 1 file changed, 48 insertions(+), 34 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Map.vue b/packages/nc-gui/components/smartsheet/Map.vue
index 37eb1d9946..84f8e3d81c 100644
--- a/packages/nc-gui/components/smartsheet/Map.vue
+++ b/packages/nc-gui/components/smartsheet/Map.vue
@@ -105,39 +105,44 @@ const addMarker = (lat: number, long: number, row: RowType) => {
   const newMarker = L.marker([lat, long], {
     alt: `${lat}, ${long}`,
   }).on('click', () => {
-    expandForm(row)
+    if (newMarker && isPublic.value) {
+      popUpRow.value = row
+      popupIsOpen.value = true
+    } else {
+      expandForm(row)
+    }
   })
   markersClusterGroupRef.value?.addLayer(newMarker)
 
-  if (newMarker && isPublic.value) {
-    // newMarker.setPopupContent(popupContainer.value!)
-
-    popUpRow.value = row
-
-    newMarker.bindPopup(popupContainer.value!)
-    // newMarker.bindPopup(popupContent)
-    // const vm = new Vue({
-    //   render: (h: any) =>
-    //     h(LazySmartsheetMyPopupComponent, {
-    //       props: {
-    //         title: 'Marker Title',
-    //         description: 'Marker Description',
-    //       },
-    //     }),
-    // })
-
-    // newMarker.bindPopup(vm.$el, { maxWidth: 300 })
-
-    newMarker.on('popupopen', () => {
-      popupIsOpen.value = true
-      // vm.$mount()
-    })
-
-    newMarker.on('popupclose', () => {
-      popupIsOpen.value = false
-      // vm.$destroy()
-    })
-  }
+  // if (newMarker && isPublic.value) {
+  //   // newMarker.setPopupContent(popupContainer.value!)
+
+  //   popUpRow.value = row
+
+  //   newMarker.bindPopup(popupContainer.value!)
+  //   // newMarker.bindPopup(popupContent)
+  //   // const vm = new Vue({
+  //   //   render: (h: any) =>
+  //   //     h(LazySmartsheetMyPopupComponent, {
+  //   //       props: {
+  //   //         title: 'Marker Title',
+  //   //         description: 'Marker Description',
+  //   //       },
+  //   //     }),
+  //   // })
+
+  //   // newMarker.bindPopup(vm.$el, { maxWidth: 300 })
+
+  //   newMarker.on('popupopen', () => {
+  //     popupIsOpen.value = true
+  //     // vm.$mount()
+  //   })
+
+  //   newMarker.on('popupclose', () => {
+  //     popupIsOpen.value = false
+  //     // vm.$destroy()
+  //   })
+  // }
 }
 
 const resetZoomAndCenterBasedOnLocalStorage = () => {
@@ -263,14 +268,23 @@ watch(view, async (nextView) => {
   }
 })
 
+// @cancel="emit('closed')"
 const count = computed(() => paginationData.value.totalRows)
 </script>
 
 <template>
-  <div v-if="popupIsOpen" ref="popupContainer">
-    <LazySmartsheetMyPopupComponent :fields="fields" :row="popUpRow"></LazySmartsheetMyPopupComponent>
-  </div>
-  <!-- <div ref="popupContainer" v-if="popupIsOpen">FOO-Hi<LazySmartsheetMyPopupComponent></LazySmartsheetMyPopupComponent></div> -->
+  <a-modal
+    v-model:visible="popupIsOpen"
+    :class="{ active: popupIsOpen }"
+    :footer="null"
+    centered
+    :closable="false"
+    @close="popupIsOpen = false"
+  >
+    <!-- <div v-if="popupIsOpen" ref="popupContainer"> -->
+    <LazySmartsheetMyPopupComponent v-if="popUpRow" :fields="fields" :row="popUpRow"></LazySmartsheetMyPopupComponent>
+    <!-- </div> -->
+  </a-modal>
 
   <div class="flex flex-col h-full w-full no-underline" data-testid="nc-map-wrapper">
     <div id="mapContainer" ref="mapContainerRef" class="w-full h-screen">

From 39a88352eb56a656a7dd739cc07ef7b3d6c4a072 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Fri, 3 Mar 2023 13:36:45 +0100
Subject: [PATCH 15/38] cleanup

---
 packages/nc-gui/components/smartsheet/Map.vue | 74 +------------------
 ...Component.vue => SharedMapMarkerPopup.vue} | 63 +---------------
 2 files changed, 3 insertions(+), 134 deletions(-)
 rename packages/nc-gui/components/smartsheet/{MyPopupComponent.vue => SharedMapMarkerPopup.vue} (71%)

diff --git a/packages/nc-gui/components/smartsheet/Map.vue b/packages/nc-gui/components/smartsheet/Map.vue
index 84f8e3d81c..f4bbbe2267 100644
--- a/packages/nc-gui/components/smartsheet/Map.vue
+++ b/packages/nc-gui/components/smartsheet/Map.vue
@@ -3,24 +3,13 @@ import 'leaflet/dist/leaflet.css'
 import L, { LatLng } from 'leaflet'
 import 'leaflet.markercluster'
 import { ViewTypes } from 'nocodb-sdk'
-// import * as Vue from 'vue'
-// import MyPopupComponent from './MyPopupComponent'
-// import { defineComponent, ref } from 'vue'
-// import Vue from 'vue'
 import { IsPublicInj, OpenNewRecordFormHookInj, latLongToJoinedString, onMounted, provide, ref } from '#imports'
 import type { Row, Row as RowType } from '~/lib'
-// import { LazySmartsheetMyPopupComponent } from '~~/.nuxt/components'
-
-// Vue.config.ignoredElements.push('my-popup-component')
-
 const route = useRoute()
 
-// const popupIsOpen = ref(false)
 const popupIsOpen = ref(false)
-const popupContainer = ref()
 const popUpRow = ref<Row>()
 const fields = inject(FieldsInj, ref([]))
-console.log('FOO fields', fields)
 
 const router = useRouter()
 
@@ -97,7 +86,6 @@ const expandedFormOnRowIdDlg = computed({
   },
 })
 
-// const addMarker = (lat: number, long: number, row: RowType, popupContent: string) => {
 const addMarker = (lat: number, long: number, row: RowType) => {
   if (markersClusterGroupRef.value == null) {
     throw new Error('Marker cluster is null')
@@ -113,36 +101,6 @@ const addMarker = (lat: number, long: number, row: RowType) => {
     }
   })
   markersClusterGroupRef.value?.addLayer(newMarker)
-
-  // if (newMarker && isPublic.value) {
-  //   // newMarker.setPopupContent(popupContainer.value!)
-
-  //   popUpRow.value = row
-
-  //   newMarker.bindPopup(popupContainer.value!)
-  //   // newMarker.bindPopup(popupContent)
-  //   // const vm = new Vue({
-  //   //   render: (h: any) =>
-  //   //     h(LazySmartsheetMyPopupComponent, {
-  //   //       props: {
-  //   //         title: 'Marker Title',
-  //   //         description: 'Marker Description',
-  //   //       },
-  //   //     }),
-  //   // })
-
-  //   // newMarker.bindPopup(vm.$el, { maxWidth: 300 })
-
-  //   newMarker.on('popupopen', () => {
-  //     popupIsOpen.value = true
-  //     // vm.$mount()
-  //   })
-
-  //   newMarker.on('popupclose', () => {
-  //     popupIsOpen.value = false
-  //     // vm.$destroy()
-  //   })
-  // }
 }
 
 const resetZoomAndCenterBasedOnLocalStorage = () => {
@@ -238,25 +196,7 @@ watch([formattedData, mapMetaData, markersClusterGroupRef], () => {
     if (primaryGeoDataValue == null) {
       return
     }
-
-    // const listItems = Object.entries(row.row)
-    //   .filter(([key, val]) => val !== null && key !== 'Id')
-    //   .map(([key, val]) => {
-    //     let prettyVal = val
-    //     if (val !== null && (typeof val === 'object' || Array.isArray(val))) {
-    //       prettyVal = JSON.stringify(val)
-    //     } else if (typeof val === 'string' && (val.startsWith('http://') || val.startsWith('https://'))) {
-    //       prettyVal = `<a href="${val}" target="_blank">${val}</a>`
-    //     }
-    //     return `<li><b>${key}</b>: <br/>${prettyVal}</li>`
-    //   })
-    //   .join('')
-
-    // const popupContent = `<ul class="popup-content">${listItems}</ul>`
-
     const [lat, long] = primaryGeoDataValue.split(';').map(parseFloat)
-
-    // addMarker(lat, long, row, popupContent)
     addMarker(lat, long, row)
   })
 })
@@ -268,22 +208,12 @@ watch(view, async (nextView) => {
   }
 })
 
-// @cancel="emit('closed')"
 const count = computed(() => paginationData.value.totalRows)
 </script>
 
 <template>
-  <a-modal
-    v-model:visible="popupIsOpen"
-    :class="{ active: popupIsOpen }"
-    :footer="null"
-    centered
-    :closable="false"
-    @close="popupIsOpen = false"
-  >
-    <!-- <div v-if="popupIsOpen" ref="popupContainer"> -->
-    <LazySmartsheetMyPopupComponent v-if="popUpRow" :fields="fields" :row="popUpRow"></LazySmartsheetMyPopupComponent>
-    <!-- </div> -->
+  <a-modal v-model:visible="popupIsOpen" :footer="null" centered :closable="false" @close="popupIsOpen = false">
+    <LazySmartsheetSharedMapMarkerPopup v-if="popUpRow" :fields="fields" :row="popUpRow"></LazySmartsheetSharedMapMarkerPopup>
   </a-modal>
 
   <div class="flex flex-col h-full w-full no-underline" data-testid="nc-map-wrapper">
diff --git a/packages/nc-gui/components/smartsheet/MyPopupComponent.vue b/packages/nc-gui/components/smartsheet/SharedMapMarkerPopup.vue
similarity index 71%
rename from packages/nc-gui/components/smartsheet/MyPopupComponent.vue
rename to packages/nc-gui/components/smartsheet/SharedMapMarkerPopup.vue
index e7ee8434d7..7fbc4caf8d 100644
--- a/packages/nc-gui/components/smartsheet/MyPopupComponent.vue
+++ b/packages/nc-gui/components/smartsheet/SharedMapMarkerPopup.vue
@@ -1,9 +1,6 @@
 <script lang="ts" setup>
 import type { ColumnType, TableType } from 'nocodb-sdk'
-// import { isVirtualCol } from 'nocodb-sdk'
 import type { Ref } from 'vue'
-// import type { Row } from '~/lib'
-// const props =
 
 import { ViewTypes, isVirtualCol } from 'nocodb-sdk'
 import {
@@ -45,7 +42,7 @@ const view = inject(ActiveViewInj, ref())
 const reloadViewMetaHook = inject(ReloadViewMetaHookInj)
 const reloadViewDataHook = inject(ReloadViewDataHookInj)
 
-const { loadData, paginationData, loadGalleryData, galleryData, changePage, addEmptyRow } = useViewData(meta, view)
+const { loadData, paginationData, loadGalleryData, galleryData, changePage } = useViewData(meta, view)
 
 provide(IsFormInj, ref(false))
 provide(IsGalleryInj, ref(true))
@@ -108,7 +105,6 @@ onMounted(async () => {
   await loadGalleryData()
 })
 
-// provide view data reload hook as fallback to row data reload
 provide(ReloadRowDataHookInj, reloadViewDataHook)
 
 watch(view, async (nextView) => {
@@ -118,43 +114,9 @@ watch(view, async (nextView) => {
   }
 })
 
-// defineProps({
-// //   popupIsOpen: {
-// //     type: Boolean,
-// //     required: true,
-// //   },
-//   popUpRow: {
-//     type: Object,
-//     required: true,
-//   },
-//   fields: {
-//     type: Array,
-//     required: true,
-//   },
-// //   abstractType: {
-// //     type: String,
-// //     required: true,
-// //   },
-// })
-
 const currentRow = toRef(props, 'row')
 
-// const { meta } = useSmartsheetStoreOrThrow()
-
-// const rowStore = useProvideSmartsheetRowStore(meta as Ref<TableType>, currentRow)
 const { row } = useProvideSmartsheetRowStore(meta as Ref<TableType>, currentRow)
-
-// console.log('rowStore', row.value.row)
-// const { currentRow: row } = useSmartsheetRowStoreOrThrow()
-
-// const cellValueByColum = (column: ColumnType) => {
-//   return {
-//     get() {
-//       return props.row?.row[column.id!]
-//     },
-//     set() {},
-//   }
-// }
 </script>
 
 <template>
@@ -217,27 +179,4 @@ const { row } = useProvideSmartsheetRowStore(meta as Ref<TableType>, currentRow)
       </div>
     </a-card>
   </LazySmartsheetRow>
-
-  <!-- <div ref="popupContainer">
-        <div v-for="col in fields" :key="col.id">
-          <div
-            v-if="!isRowEmpty(row, col) || isLTAR(col.uidt)"
-            class="flex flex-col space-y-1 px-4 mb-6 bg-gray-50 rounded-lg w-full"
-          >
-            <div class="flex flex-row w-full justify-start border-b-1 border-gray-100 py-2.5">
-              <div class="w-full text-gray-600">
-                <LazySmartsheetHeaderVirtualCell v-if="isVirtualCol(col)" :column="col" :hide-menu="true" />
-
-                <LazySmartsheetHeaderCell v-else :column="col" :hide-menu="true" />
-              </div>
-            </div>
-
-            <div class="flex flex-row w-full pb-3 pt-2 pl-2 items-center justify-start">
-              <LazySmartsheetVirtualCell v-if="isVirtualCol(col)" v-model="row.row[col.title]" :column="col" :row="row" />
-
-              <LazySmartsheetCell v-else v-model="row.row[col.title]" :column="col" :edit-enabled="false" :read-only="true" />
-            </div>
-          </div>
-        </div>
-      </div> -->
 </template>

From 29e308bdab06a532e62110acf1bda737823dce14 Mon Sep 17 00:00:00 2001
From: flisowna <ewa.agnieszka.flis@gmail.com>
Date: Fri, 3 Mar 2023 14:34:39 +0100
Subject: [PATCH 16/38] fix follow-up issue of geodata layout

---
 packages/nc-gui/components/cell/GeoData.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/cell/GeoData.vue b/packages/nc-gui/components/cell/GeoData.vue
index 0ab6575361..c28413b5be 100644
--- a/packages/nc-gui/components/cell/GeoData.vue
+++ b/packages/nc-gui/components/cell/GeoData.vue
@@ -85,7 +85,7 @@ const onClickSetCurrentLocation = () => {
     </div>
     <div v-else data-testid="nc-geo-data-lat-long-set">{{ latLongStr }}</div>
     <template #overlay>
-      <a-form :model="formState" class="flex flex-col" @finish="handleFinish">
+      <a-form :model="formState" class="flex flex-col w-max-58" @finish="handleFinish">
         <a-form-item>
           <div class="flex mt-4 items-center mx-2">
             <div class="mr-2">{{ $t('labels.lat') }}:</div>

From d4d61405d57b7f7017fed2842b3b71ceea7c904d Mon Sep 17 00:00:00 2001
From: flisowna <ewa.agnieszka.flis@gmail.com>
Date: Fri, 3 Mar 2023 14:50:25 +0100
Subject: [PATCH 17/38] open geodata type column only in expanded form or grid
 view

---
 packages/nc-gui/components/cell/GeoData.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/cell/GeoData.vue b/packages/nc-gui/components/cell/GeoData.vue
index c28413b5be..67bd50a2ed 100644
--- a/packages/nc-gui/components/cell/GeoData.vue
+++ b/packages/nc-gui/components/cell/GeoData.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { GeoLocationType } from 'nocodb-sdk'
-import { Modal as AModal, latLongToJoinedString, useVModel } from '#imports'
+import { Modal as AModal, ReadonlyInj, latLongToJoinedString, useVModel } from '#imports'
 
 interface Props {
   modelValue?: string | null
@@ -16,6 +16,8 @@ const emits = defineEmits<Emits>()
 
 const vModel = useVModel(props, 'modelValue', emits)
 
+const readonly = inject(ReadonlyInj)
+
 let isExpanded = $ref(false)
 
 let isLoading = $ref(false)
@@ -84,7 +86,7 @@ const onClickSetCurrentLocation = () => {
       </div>
     </div>
     <div v-else data-testid="nc-geo-data-lat-long-set">{{ latLongStr }}</div>
-    <template #overlay>
+    <template v-if="!readonly" #overlay>
       <a-form :model="formState" class="flex flex-col w-max-58" @finish="handleFinish">
         <a-form-item>
           <div class="flex mt-4 items-center mx-2">

From 19b14d9e4216b8eb4663fb7b4e1db8cc64776d17 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Fri, 10 Mar 2023 16:04:52 +0100
Subject: [PATCH 18/38] shared map view issue debugging - WIP

---
 .../nc-gui/composables/useMapViewDataStore.ts | 53 ++++++++++---------
 .../publicControllers/publicMeta.ctl.ts       |  1 +
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/packages/nc-gui/composables/useMapViewDataStore.ts b/packages/nc-gui/composables/useMapViewDataStore.ts
index 1ac4a6ecba..f8ffde3a60 100644
--- a/packages/nc-gui/composables/useMapViewDataStore.ts
+++ b/packages/nc-gui/composables/useMapViewDataStore.ts
@@ -33,7 +33,7 @@ const [useProvideMapViewStore, useMapViewStore] = useInjectionState(
 
     const formattedData = ref<Row[]>([])
 
-    const { api } = useApi()
+    // const { api } = useApi()
 
     const { project } = useProject()
 
@@ -61,42 +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() {
-      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] || {}
+      alert('loadMapData')
+      // 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] || {}
     }
 
     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/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts b/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts
index 3517527884..680107b06c 100644
--- a/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts
+++ b/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts
@@ -4,6 +4,7 @@ import { publicMetaService } from '../../services';
 import type { Request, Response } from 'express';
 
 export async function viewMetaGet(req: Request, res: Response) {
+  console.log('FOO viewMetaGet');
   res.json(
     await publicMetaService.viewMetaGet({
       password: req.headers?.['xc-password'] as string,

From b7fc4ffa9a4b6c3593b4a733b6f889d41617c8fa Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Fri, 10 Mar 2023 16:46:16 +0100
Subject: [PATCH 19/38] shared map view issue debugging - WIP

---
 .../nc-gui/composables/useMapViewDataStore.ts | 48 +++++++++----------
 packages/nc-gui/composables/useViewData.ts    |  2 +
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/packages/nc-gui/composables/useMapViewDataStore.ts b/packages/nc-gui/composables/useMapViewDataStore.ts
index f8ffde3a60..afb883b325 100644
--- 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
index cd2ba8dde9..7b699c6e9c 100644
--- 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(

From 3e23a453dd6753c063dfc185127b417bb7997987 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Mon, 13 Mar 2023 12:19:25 +0100
Subject: [PATCH 20/38] Revert "shared map view issue debugging - WIP"

This reverts commit b7fc4ffa9a4b6c3593b4a733b6f889d41617c8fa.
---
 .../nc-gui/composables/useMapViewDataStore.ts | 48 +++++++++----------
 packages/nc-gui/composables/useViewData.ts    |  2 -
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/packages/nc-gui/composables/useMapViewDataStore.ts b/packages/nc-gui/composables/useMapViewDataStore.ts
index afb883b325..f8ffde3a60 100644
--- 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
index 7b699c6e9c..cd2ba8dde9 100644
--- a/packages/nc-gui/composables/useViewData.ts
+++ b/packages/nc-gui/composables/useViewData.ts
@@ -187,7 +187,6 @@ 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!, {
@@ -218,7 +217,6 @@ export function useViewData(
     galleryData.value = isPublic.value
       ? (sharedView.value?.view as GalleryType)
       : await $api.dbView.galleryRead(viewMeta.value.id)
-    // debugger
   }
 
   async function insertRow(

From 9b95cd6a2c68d7f34f3510f02b48da6b6acd587b Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Mon, 13 Mar 2023 12:19:32 +0100
Subject: [PATCH 21/38] Revert "shared map view issue debugging - WIP"

This reverts commit 19b14d9e4216b8eb4663fb7b4e1db8cc64776d17.
---
 .../nc-gui/composables/useMapViewDataStore.ts | 53 +++++++++----------
 .../publicControllers/publicMeta.ctl.ts       |  1 -
 2 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/packages/nc-gui/composables/useMapViewDataStore.ts b/packages/nc-gui/composables/useMapViewDataStore.ts
index f8ffde3a60..1ac4a6ecba 100644
--- a/packages/nc-gui/composables/useMapViewDataStore.ts
+++ b/packages/nc-gui/composables/useMapViewDataStore.ts
@@ -33,7 +33,7 @@ const [useProvideMapViewStore, useMapViewStore] = useInjectionState(
 
     const formattedData = ref<Row[]>([])
 
-    // const { api } = useApi()
+    const { api } = useApi()
 
     const { project } = useProject()
 
@@ -61,43 +61,42 @@ 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
-      // 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] || {}
+      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] || {}
     }
 
     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/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts b/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts
index 680107b06c..3517527884 100644
--- a/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts
+++ b/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts
@@ -4,7 +4,6 @@ import { publicMetaService } from '../../services';
 import type { Request, Response } from 'express';
 
 export async function viewMetaGet(req: Request, res: Response) {
-  console.log('FOO viewMetaGet');
   res.json(
     await publicMetaService.viewMetaGet({
       password: req.headers?.['xc-password'] as string,

From b0cad5fa8e9dbabbd7604700554b5ace5799a9a5 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Mon, 13 Mar 2023 12:22:06 +0100
Subject: [PATCH 22/38] shared map view issue debugging - WIP

---
 packages/nc-gui/composables/useMapViewDataStore.ts           | 5 +++--
 packages/nc-gui/composables/useViewData.ts                   | 2 ++
 .../src/lib/controllers/publicControllers/publicMeta.ctl.ts  | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/composables/useMapViewDataStore.ts b/packages/nc-gui/composables/useMapViewDataStore.ts
index 1ac4a6ecba..afb883b325 100644
--- a/packages/nc-gui/composables/useMapViewDataStore.ts
+++ b/packages/nc-gui/composables/useMapViewDataStore.ts
@@ -33,7 +33,7 @@ const [useProvideMapViewStore, useMapViewStore] = useInjectionState(
 
     const formattedData = ref<Row[]>([])
 
-    const { api } = useApi()
+    // const { api } = useApi()
 
     const { project } = useProject()
 
@@ -71,8 +71,9 @@ const [useProvideMapViewStore, useMapViewStore] = useInjectionState(
     }
 
     async function loadMapMeta() {
+      alert('loadMapData')
       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 =
         (meta.value.columns as ColumnType[]).filter((f) => f.id === mapMetaData.value.fk_geo_data_col_id)[0] || {}
     }
diff --git a/packages/nc-gui/composables/useViewData.ts b/packages/nc-gui/composables/useViewData.ts
index cd2ba8dde9..7b699c6e9c 100644
--- 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(
diff --git a/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts b/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts
index 3517527884..680107b06c 100644
--- a/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts
+++ b/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts
@@ -4,6 +4,7 @@ import { publicMetaService } from '../../services';
 import type { Request, Response } from 'express';
 
 export async function viewMetaGet(req: Request, res: Response) {
+  console.log('FOO viewMetaGet');
   res.json(
     await publicMetaService.viewMetaGet({
       password: req.headers?.['xc-password'] as string,

From 4de7f6f60e45e5d03a6a2ae87a438e3bff163900 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Mon, 13 Mar 2023 12:23:44 +0100
Subject: [PATCH 23/38] Revert "shared map view issue debugging - WIP"

This reverts commit b0cad5fa8e9dbabbd7604700554b5ace5799a9a5.
---
 packages/nc-gui/composables/useMapViewDataStore.ts           | 5 ++---
 packages/nc-gui/composables/useViewData.ts                   | 2 --
 .../src/lib/controllers/publicControllers/publicMeta.ctl.ts  | 1 -
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/composables/useMapViewDataStore.ts b/packages/nc-gui/composables/useMapViewDataStore.ts
index afb883b325..1ac4a6ecba 100644
--- a/packages/nc-gui/composables/useMapViewDataStore.ts
+++ b/packages/nc-gui/composables/useMapViewDataStore.ts
@@ -33,7 +33,7 @@ const [useProvideMapViewStore, useMapViewStore] = useInjectionState(
 
     const formattedData = ref<Row[]>([])
 
-    // const { api } = useApi()
+    const { api } = useApi()
 
     const { project } = useProject()
 
@@ -71,9 +71,8 @@ const [useProvideMapViewStore, useMapViewStore] = useInjectionState(
     }
 
     async function loadMapMeta() {
-      alert('loadMapData')
       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 =
         (meta.value.columns as ColumnType[]).filter((f) => f.id === mapMetaData.value.fk_geo_data_col_id)[0] || {}
     }
diff --git a/packages/nc-gui/composables/useViewData.ts b/packages/nc-gui/composables/useViewData.ts
index 7b699c6e9c..cd2ba8dde9 100644
--- a/packages/nc-gui/composables/useViewData.ts
+++ b/packages/nc-gui/composables/useViewData.ts
@@ -187,7 +187,6 @@ 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!, {
@@ -218,7 +217,6 @@ export function useViewData(
     galleryData.value = isPublic.value
       ? (sharedView.value?.view as GalleryType)
       : await $api.dbView.galleryRead(viewMeta.value.id)
-    // debugger
   }
 
   async function insertRow(
diff --git a/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts b/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts
index 680107b06c..3517527884 100644
--- a/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts
+++ b/packages/nocodb/src/lib/controllers/publicControllers/publicMeta.ctl.ts
@@ -4,7 +4,6 @@ import { publicMetaService } from '../../services';
 import type { Request, Response } from 'express';
 
 export async function viewMetaGet(req: Request, res: Response) {
-  console.log('FOO viewMetaGet');
   res.json(
     await publicMetaService.viewMetaGet({
       password: req.headers?.['xc-password'] as string,

From b732fcc2275820c54ac8056756ab21e511a02635 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Mon, 13 Mar 2023 14:36:34 +0100
Subject: [PATCH 24/38] fix shared map view issue - WIP - fix type issue

---
 packages/nc-gui/composables/useMapViewDataStore.ts |  2 +-
 packages/nc-gui/composables/useSharedView.ts       | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/composables/useMapViewDataStore.ts b/packages/nc-gui/composables/useMapViewDataStore.ts
index 1ac4a6ecba..60f064f412 100644
--- a/packages/nc-gui/composables/useMapViewDataStore.ts
+++ b/packages/nc-gui/composables/useMapViewDataStore.ts
@@ -22,7 +22,7 @@ const formatData = (list: Record<string, any>[]) =>
 
 const [useProvideMapViewStore, useMapViewStore] = useInjectionState(
   (
-    meta: Ref<TableType | undefined>,
+    meta: Ref<MapType | undefined>,
     viewMeta: Ref<ViewType | MapType | undefined> | ComputedRef<(ViewType & { id: string }) | undefined>,
     shared = false,
     where?: ComputedRef<string | undefined>,
diff --git a/packages/nc-gui/composables/useSharedView.ts b/packages/nc-gui/composables/useSharedView.ts
index b5b888be22..2723223926 100644
--- a/packages/nc-gui/composables/useSharedView.ts
+++ b/packages/nc-gui/composables/useSharedView.ts
@@ -1,4 +1,14 @@
-import type { ExportTypes, FilterType, KanbanType, PaginatedType, RequestParams, SortType, TableType, ViewType } from 'nocodb-sdk'
+import type {
+  ExportTypes,
+  FilterType,
+  KanbanType,
+  MapType,
+  PaginatedType,
+  RequestParams,
+  SortType,
+  TableType,
+  ViewType,
+} from 'nocodb-sdk'
 import { UITypes } from 'nocodb-sdk'
 import { computed, useGlobal, useMetas, useNuxtApp, useState } from '#imports'
 
@@ -21,7 +31,7 @@ export function useSharedView() {
 
   const allowCSVDownload = useState<boolean>('allowCSVDownload', () => false)
 
-  const meta = useState<TableType | KanbanType | undefined>('meta', () => undefined)
+  const meta = useState<TableType | KanbanType | MapType | undefined>('meta', () => undefined)
 
   const formColumns = computed(
     () =>

From fd5cb3f58e3e06b4c2d39aa515a94e45fe535ce2 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Mon, 13 Mar 2023 15:00:03 +0100
Subject: [PATCH 25/38] fix shared map view issue - shared map view works now

---
 packages/nc-gui/composables/useMapViewDataStore.ts | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/nc-gui/composables/useMapViewDataStore.ts b/packages/nc-gui/composables/useMapViewDataStore.ts
index 60f064f412..99e92d35b5 100644
--- a/packages/nc-gui/composables/useMapViewDataStore.ts
+++ b/packages/nc-gui/composables/useMapViewDataStore.ts
@@ -45,7 +45,7 @@ const [useProvideMapViewStore, useMapViewStore] = useInjectionState(
 
     const { sorts, nestedFilters } = useSmartsheetStoreOrThrow()
 
-    const { fetchSharedViewData } = useSharedView()
+    const { sharedView, fetchSharedViewData } = useSharedView()
 
     const mapMetaData = ref<MapType>({})
 
@@ -72,7 +72,10 @@ const [useProvideMapViewStore, useMapViewStore] = useInjectionState(
 
     async function loadMapMeta() {
       if (!viewMeta?.value?.id || !meta?.value?.columns) return
-      mapMetaData.value = await $api.dbView.mapRead(viewMeta.value.id)
+      mapMetaData.value = isPublic.value ? (sharedView.value?.view as MapType) : await $api.dbView.mapRead(viewMeta.value.id)
+
+      // 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] || {}
     }

From bf3872e362ddf4b3ae5989c4ab0a28a94f8690c2 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Mon, 13 Mar 2023 16:25:27 +0100
Subject: [PATCH 26/38] fix shared map view issue - fetch up to 1000 map
 markers also on shared map views

---
 packages/nc-gui/composables/useMapViewDataStore.ts | 6 +++---
 packages/nc-gui/composables/useSharedView.ts       | 8 ++++++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/composables/useMapViewDataStore.ts b/packages/nc-gui/composables/useMapViewDataStore.ts
index 99e92d35b5..a851f67fe8 100644
--- a/packages/nc-gui/composables/useMapViewDataStore.ts
+++ b/packages/nc-gui/composables/useMapViewDataStore.ts
@@ -31,6 +31,8 @@ const [useProvideMapViewStore, useMapViewStore] = useInjectionState(
       throw new Error('Table meta is not available')
     }
 
+    const defaultPageSize = 1000
+
     const formattedData = ref<Row[]>([])
 
     const { api } = useApi()
@@ -45,14 +47,12 @@ const [useProvideMapViewStore, useMapViewStore] = useInjectionState(
 
     const { sorts, nestedFilters } = useSmartsheetStoreOrThrow()
 
-    const { sharedView, fetchSharedViewData } = useSharedView()
+    const { sharedView, fetchSharedViewData } = useSharedView(defaultPageSize)
 
     const mapMetaData = ref<MapType>({})
 
     const geoDataFieldColumn = ref<ColumnType | undefined>()
 
-    const defaultPageSize = 1000
-
     const paginationData = ref<PaginatedType>({ page: 1, pageSize: defaultPageSize })
 
     const queryParams = computed(() => ({
diff --git a/packages/nc-gui/composables/useSharedView.ts b/packages/nc-gui/composables/useSharedView.ts
index 2723223926..23668842b4 100644
--- a/packages/nc-gui/composables/useSharedView.ts
+++ b/packages/nc-gui/composables/useSharedView.ts
@@ -12,7 +12,7 @@ import type {
 import { UITypes } from 'nocodb-sdk'
 import { computed, useGlobal, useMetas, useNuxtApp, useState } from '#imports'
 
-export function useSharedView() {
+export function useSharedView(limit?: number) {
   const nestedFilters = ref<(FilterType & { status?: 'update' | 'delete' | 'create'; parentId?: string })[]>([])
 
   const { appInfo } = $(useGlobal())
@@ -21,7 +21,10 @@ export function useSharedView() {
 
   const appInfoDefaultLimit = appInfo.defaultLimit || 25
 
-  const paginationData = useState<PaginatedType>('paginationData', () => ({ page: 1, pageSize: appInfoDefaultLimit }))
+  const paginationData = useState<PaginatedType>('paginationData', () => ({
+    page: 1,
+    pageSize: appInfoDefaultLimit,
+  }))
 
   const sharedView = useState<ViewType | undefined>('sharedView', () => undefined)
 
@@ -113,6 +116,7 @@ export function useSharedView() {
     const { data } = await $api.public.dataList(
       sharedView.value.uuid!,
       {
+        limit,
         offset,
         filterArrJson: JSON.stringify(filtersArr ?? nestedFilters.value),
         sortArrJson: JSON.stringify(sortsArr ?? sorts.value),

From 5b7267e99314c62d3ff3b227056d51d67715e650 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Mon, 13 Mar 2023 18:29:12 +0100
Subject: [PATCH 27/38] geo data: update db type mappings

---
 packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts  |  5 +-
 packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts  |  4 ++
 packages/nocodb-sdk/src/lib/sqlUi/OracleUi.ts |  3 +
 packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts     |  4 ++
 .../nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts   | 57 +++++++------------
 packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts |  4 ++
 6 files changed, 36 insertions(+), 41 deletions(-)

diff --git a/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
index af3259aa78..905695c5d9 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/MssqlUi.ts
@@ -983,7 +983,6 @@ export class MssqlUi {
         break;
       case 'Date':
         colProp.dt = 'date';
-
         break;
       case 'Year':
         colProp.dt = 'int';
@@ -1093,6 +1092,7 @@ export class MssqlUi {
       case 'LongText':
       case 'Attachment':
       case 'Collaborator':
+      case 'GeoData':
         return ['char', 'ntext', 'text', 'varchar', 'nvarchar'];
 
       case 'JSON':
@@ -1136,9 +1136,6 @@ export class MssqlUi {
       case 'Decimal':
         return ['decimal', 'float'];
 
-      case 'GeoData':
-        return ['decimal', 'float'];
-
       case 'Currency':
         return [
           'int',
diff --git a/packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts
index 94ebdfbd32..7455bc7687 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/MysqlUi.ts
@@ -973,6 +973,9 @@ export class MysqlUi {
       case 'Attachment':
         colProp.dt = 'text';
         break;
+      case 'GeoData':
+        colProp.dt = 'text';
+        break;
       case 'Checkbox':
         colProp.dt = 'tinyint';
         colProp.dtxp = 1;
@@ -1107,6 +1110,7 @@ export class MysqlUi {
       case 'SingleLineText':
       case 'LongText':
       case 'Collaborator':
+      case 'GeoData':
         return [
           'char',
           'varchar',
diff --git a/packages/nocodb-sdk/src/lib/sqlUi/OracleUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/OracleUi.ts
index 3498a0835e..7038ffa3ad 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/OracleUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/OracleUi.ts
@@ -825,6 +825,9 @@ export class OracleUi {
       case 'Attachment':
         colProp.dt = 'clob';
         break;
+      case 'GeoData':
+        colProp.dt = 'varchar';
+        break;
       case 'Checkbox':
         colProp.dt = 'tinyint';
         colProp.dtxp = 1;
diff --git a/packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts
index d141b961d7..ea958b8030 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/PgUi.ts
@@ -1594,6 +1594,9 @@ export class PgUi {
       case 'Attachment':
         colProp.dt = 'text';
         break;
+      case 'GeoData':
+        colProp.dt = 'text';
+        break;
       case 'Checkbox':
         colProp.dt = 'bool';
         colProp.cdf = 'false';
@@ -1734,6 +1737,7 @@ export class PgUi {
       case 'SingleLineText':
       case 'LongText':
       case 'Collaborator':
+      case 'GeoData':
         return ['char', 'character', 'character varying', 'text'];
 
       case 'Attachment':
diff --git a/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts
index e0e020418c..086c4c731c 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/SnowflakeUi.ts
@@ -686,6 +686,9 @@ export class SnowflakeUi {
       case 'Attachment':
         colProp.dt = 'TEXT';
         break;
+      case 'GeoData':
+        colProp.dt = 'TEXT';
+        break;
       case 'Checkbox':
         colProp.dt = 'BOOLEAN';
         colProp.cdf = '0';
@@ -802,9 +805,7 @@ export class SnowflakeUi {
         if (idType === 'AG') {
           return ['VARCHAR'];
         } else if (idType === 'AI') {
-          return [
-            'NUMBER'
-          ];
+          return ['NUMBER'];
         } else {
           return dbTypes;
         }
@@ -814,6 +815,7 @@ export class SnowflakeUi {
       case 'SingleLineText':
       case 'LongText':
       case 'Collaborator':
+      case 'GeoData':
         return ['CHAR', 'CHARACTER', 'VARCHAR', 'TEXT'];
 
       case 'Attachment':
@@ -822,13 +824,7 @@ export class SnowflakeUi {
       case 'JSON':
         return ['TEXT'];
       case 'Checkbox':
-        return [
-          'BIT',
-          'BOOLEAN',
-          'TINYINT',
-          'INT',
-          'BIGINT',
-        ];
+        return ['BIT', 'BOOLEAN', 'TINYINT', 'INT', 'BIGINT'];
 
       case 'MultiSelect':
         return ['TEXT'];
@@ -840,10 +836,7 @@ export class SnowflakeUi {
         return ['INT'];
 
       case 'Time':
-        return [
-          'TIMESTAMP',
-          'VARCHAR',
-        ];
+        return ['TIMESTAMP', 'VARCHAR'];
 
       case 'PhoneNumber':
       case 'Email':
@@ -872,7 +865,14 @@ export class SnowflakeUi {
         ];
 
       case 'Decimal':
-        return ['DOUBLE', 'DOUBLE PRECISION', 'FLOAT', 'FLOAT4', 'FLOAT8', 'NUMERIC'];
+        return [
+          'DOUBLE',
+          'DOUBLE PRECISION',
+          'FLOAT',
+          'FLOAT4',
+          'FLOAT8',
+          'NUMERIC',
+        ];
 
       case 'Currency':
         return [
@@ -941,44 +941,27 @@ export class SnowflakeUi {
         return ['VARCHAR'];
 
       case 'Count':
-        return [
-          'NUMBER',
-          'INT',
-          'INTEGER',
-          'BIGINT',
-        ];
+        return ['NUMBER', 'INT', 'INTEGER', 'BIGINT'];
 
       case 'Lookup':
         return ['VARCHAR'];
 
       case 'Date':
-        return [
-          'DATE',
-          'TIMESTAMP',
-        ];
+        return ['DATE', 'TIMESTAMP'];
 
       case 'DateTime':
       case 'CreateTime':
       case 'LastModifiedTime':
-        return [
-          'TIMESTAMP',
-        ];
+        return ['TIMESTAMP'];
 
       case 'AutoNumber':
-        return [
-          'NUMBER',
-          'INT',
-          'INTEGER',
-          'BIGINT',
-        ];
+        return ['NUMBER', 'INT', 'INTEGER', 'BIGINT'];
 
       case 'Barcode':
         return ['VARCHAR'];
 
       case 'Geometry':
-        return [
-          'TEXT',
-        ];
+        return ['TEXT'];
 
       case 'Button':
       default:
diff --git a/packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts b/packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts
index 09bb11827e..76f1cae131 100644
--- a/packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts
+++ b/packages/nocodb-sdk/src/lib/sqlUi/SqliteUi.ts
@@ -787,6 +787,9 @@ export class SqliteUi {
       case 'Attachment':
         colProp.dt = 'text';
         break;
+      case 'GeoData':
+        colProp.dt = 'text';
+        break;
       case 'Checkbox':
         colProp.dt = 'boolean';
         colProp.cdf = '0';
@@ -923,6 +926,7 @@ export class SqliteUi {
       case 'LongText':
       case 'Attachment':
       case 'Collaborator':
+      case 'GeoData':
         return ['character', 'text', 'varchar'];
 
       case 'Checkbox':

From 3eb372749c635f8e2196d6267aa37dad38f3ac60 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Mon, 13 Mar 2023 18:58:00 +0100
Subject: [PATCH 28/38] geo data col: change wording and adapt layout of
 buttons

---
 packages/nc-gui/components/cell/GeoData.vue | 16 +++++++++-------
 packages/nc-gui/lang/ar.json                |  2 +-
 packages/nc-gui/lang/bn_IN.json             |  2 +-
 packages/nc-gui/lang/cs.json                |  2 +-
 packages/nc-gui/lang/da.json                |  2 +-
 packages/nc-gui/lang/de.json                |  2 +-
 packages/nc-gui/lang/en.json                |  6 ++++--
 packages/nc-gui/lang/es.json                |  2 +-
 packages/nc-gui/lang/eu.json                |  2 +-
 packages/nc-gui/lang/fa.json                |  2 +-
 packages/nc-gui/lang/fi.json                |  2 +-
 packages/nc-gui/lang/fr.json                |  2 +-
 packages/nc-gui/lang/he.json                |  2 +-
 packages/nc-gui/lang/hi.json                |  2 +-
 packages/nc-gui/lang/hr.json                |  2 +-
 packages/nc-gui/lang/id.json                |  2 +-
 packages/nc-gui/lang/it.json                |  2 +-
 packages/nc-gui/lang/ja.json                |  2 +-
 packages/nc-gui/lang/ko.json                |  2 +-
 packages/nc-gui/lang/lv.json                |  2 +-
 packages/nc-gui/lang/nl.json                |  2 +-
 packages/nc-gui/lang/no.json                |  2 +-
 packages/nc-gui/lang/pl.json                |  2 +-
 packages/nc-gui/lang/pt.json                |  2 +-
 packages/nc-gui/lang/pt_BR.json             |  2 +-
 packages/nc-gui/lang/ru.json                |  2 +-
 packages/nc-gui/lang/sk.json                |  2 +-
 packages/nc-gui/lang/sl.json                |  2 +-
 packages/nc-gui/lang/sv.json                |  2 +-
 packages/nc-gui/lang/th.json                |  2 +-
 packages/nc-gui/lang/tr.json                |  2 +-
 packages/nc-gui/lang/uk.json                |  2 +-
 packages/nc-gui/lang/vi.json                |  2 +-
 packages/nc-gui/lang/zh-Hans.json           |  2 +-
 packages/nc-gui/lang/zh-Hant.json           |  2 +-
 35 files changed, 46 insertions(+), 42 deletions(-)

diff --git a/packages/nc-gui/components/cell/GeoData.vue b/packages/nc-gui/components/cell/GeoData.vue
index 6ac16b9478..0e779da61f 100644
--- a/packages/nc-gui/components/cell/GeoData.vue
+++ b/packages/nc-gui/components/cell/GeoData.vue
@@ -2,6 +2,8 @@
 import type { GeoLocationType } from 'nocodb-sdk'
 import { Modal as AModal, latLongToJoinedString, useVModel } from '#imports'
 import MdiMapIcon from '~icons/mdi/map-outline'
+import GpsFixedIcon from '~icons/mdi/gps-fixed'
+import OpenInNewIcon from '~icons/mdi/open-in-new'
 
 interface Props {
   modelValue?: string | null
@@ -134,16 +136,16 @@ const openInOSM = () => {
             />
           </div>
         </a-form-item>
-        <a-form-item>
-          <div class="flex items-center mr-2">
+        <a-form-item v-if="vModel">
+          <div class="mr-2 flex flex-col items-end gap-1 text-left">
             <MdiReload v-if="isLoading" :class="{ 'animate-infinite animate-spin text-gray-500': isLoading }" />
-            <a-button class="ml-2" @click="onClickSetCurrentLocation">{{ $t('labels.yourLocation') }}</a-button>
+            <a-button class="ml-2" @click="onClickSetCurrentLocation"
+              ><GpsFixedIcon class="mr-2" />{{ $t('labels.currentLocation') }}</a-button
+            >
           </div>
-        </a-form-item>
-        <a-form-item v-if="vModel">
           <div class="mr-2 flex flex-col items-end gap-1 text-left">
-            <a-button @click="openInOSM"><MdiMapIcon class="mr-2" />Open in OSM</a-button>
-            <a-button @click="openInGoogleMaps"><MdiMapIcon class="mr-2" />Open in Google Maps</a-button>
+            <a-button @click="openInOSM"><OpenInNewIcon class="mr-2" />{{ $t('activity.map.openInOpenStreetMap') }}</a-button>
+            <a-button @click="openInGoogleMaps"><OpenInNewIcon class="mr-2" />{{ $t('activity.map.openInGoogleMaps') }}</a-button>
           </div>
         </a-form-item>
         <a-form-item>
diff --git a/packages/nc-gui/lang/ar.json b/packages/nc-gui/lang/ar.json
index 26c204e25b..fda8cc9bd6 100644
--- a/packages/nc-gui/lang/ar.json
+++ b/packages/nc-gui/lang/ar.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Barcode format",
     "qrCodeValueTooLong": "Too many characters for a QR code",
     "barcodeValueTooLong": "Too many characters for a barcode",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "وظيفة التجميع",
diff --git a/packages/nc-gui/lang/bn_IN.json b/packages/nc-gui/lang/bn_IN.json
index f33c7f131c..71d4c0a12d 100644
--- a/packages/nc-gui/lang/bn_IN.json
+++ b/packages/nc-gui/lang/bn_IN.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Barcode format",
     "qrCodeValueTooLong": "Too many characters for a QR code",
     "barcodeValueTooLong": "Too many characters for a barcode",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "সামগ্রিক ফাংশন",
diff --git a/packages/nc-gui/lang/cs.json b/packages/nc-gui/lang/cs.json
index 9e37208137..d0392da431 100644
--- a/packages/nc-gui/lang/cs.json
+++ b/packages/nc-gui/lang/cs.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Formát čárového kódu",
     "qrCodeValueTooLong": "Příliš mnoho znaků pro QR kód",
     "barcodeValueTooLong": "Příliš mnoho znaků pro čárový kód",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Agregační funkce",
diff --git a/packages/nc-gui/lang/da.json b/packages/nc-gui/lang/da.json
index ff663368a2..bd89890802 100644
--- a/packages/nc-gui/lang/da.json
+++ b/packages/nc-gui/lang/da.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Stregkodeformat",
     "qrCodeValueTooLong": "For mange tegn til en QR-kode",
     "barcodeValueTooLong": "For mange tegn til en stregkode",
-    "yourLocation": "Din Placering",
+    "currentLocation": "Din Placering",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Aggregate Function.",
diff --git a/packages/nc-gui/lang/de.json b/packages/nc-gui/lang/de.json
index 7755573d83..63c9d9e899 100644
--- a/packages/nc-gui/lang/de.json
+++ b/packages/nc-gui/lang/de.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Barcode-Format",
     "qrCodeValueTooLong": "Zu viele Zeichen für einen QR-Code",
     "barcodeValueTooLong": "Zu viele Zeichen für einen Barcode",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Globale Funktion",
diff --git a/packages/nc-gui/lang/en.json b/packages/nc-gui/lang/en.json
index 2407c25191..461cd6f519 100644
--- a/packages/nc-gui/lang/en.json
+++ b/packages/nc-gui/lang/en.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Barcode format",
     "qrCodeValueTooLong": "Too many characters for a QR code",
     "barcodeValueTooLong": "Too many characters for a barcode",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Aggregate function",
@@ -462,7 +462,9 @@
     },
     "map": {
       "mappedBy": "Mapped By",
-      "chooseMappingField": "Choose a Mapping Field"
+      "chooseMappingField": "Choose a Mapping Field",
+      "openInGoogleMaps": "Google Maps",
+      "openInOpenStreetMap": "OSM"
     }
   },
   "tooltip": {
diff --git a/packages/nc-gui/lang/es.json b/packages/nc-gui/lang/es.json
index 8083d12c77..5192ccbb46 100644
--- a/packages/nc-gui/lang/es.json
+++ b/packages/nc-gui/lang/es.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Formato del código de barras",
     "qrCodeValueTooLong": "Demasiados caracteres para un código QR",
     "barcodeValueTooLong": "Demasiados caracteres para un código de barras",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Función agregada",
diff --git a/packages/nc-gui/lang/eu.json b/packages/nc-gui/lang/eu.json
index 5c07152283..4f5d3639a1 100644
--- a/packages/nc-gui/lang/eu.json
+++ b/packages/nc-gui/lang/eu.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Barcode format",
     "qrCodeValueTooLong": "Too many characters for a QR code",
     "barcodeValueTooLong": "Too many characters for a barcode",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Aggregate function",
diff --git a/packages/nc-gui/lang/fa.json b/packages/nc-gui/lang/fa.json
index 9d0f71daf5..cbb7409696 100644
--- a/packages/nc-gui/lang/fa.json
+++ b/packages/nc-gui/lang/fa.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Barcode format",
     "qrCodeValueTooLong": "Too many characters for a QR code",
     "barcodeValueTooLong": "Too many characters for a barcode",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "تابع جمع",
diff --git a/packages/nc-gui/lang/fi.json b/packages/nc-gui/lang/fi.json
index df9f79d663..c2512787aa 100644
--- a/packages/nc-gui/lang/fi.json
+++ b/packages/nc-gui/lang/fi.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Viivakoodin muoto",
     "qrCodeValueTooLong": "Liian monta merkkiä QR-koodiin",
     "barcodeValueTooLong": "Liikaa merkkejä viivakoodiin",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Kokonaistoiminto",
diff --git a/packages/nc-gui/lang/fr.json b/packages/nc-gui/lang/fr.json
index 3fc72b3c50..c3c640621d 100644
--- a/packages/nc-gui/lang/fr.json
+++ b/packages/nc-gui/lang/fr.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Format du code-barres",
     "qrCodeValueTooLong": "Trop de caractères pour un code QR",
     "barcodeValueTooLong": "Trop de caractères pour un code-barres",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Fonction agrégée",
diff --git a/packages/nc-gui/lang/he.json b/packages/nc-gui/lang/he.json
index e94b64fda4..157296d467 100644
--- a/packages/nc-gui/lang/he.json
+++ b/packages/nc-gui/lang/he.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Barcode format",
     "qrCodeValueTooLong": "Too many characters for a QR code",
     "barcodeValueTooLong": "Too many characters for a barcode",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "פונקציה מצטברת",
diff --git a/packages/nc-gui/lang/hi.json b/packages/nc-gui/lang/hi.json
index d2ee6cf202..59e0bb3fcf 100644
--- a/packages/nc-gui/lang/hi.json
+++ b/packages/nc-gui/lang/hi.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Barcode format",
     "qrCodeValueTooLong": "Too many characters for a QR code",
     "barcodeValueTooLong": "Too many characters for a barcode",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "कुल समारोह",
diff --git a/packages/nc-gui/lang/hr.json b/packages/nc-gui/lang/hr.json
index b8d4e65de4..198701f80f 100644
--- a/packages/nc-gui/lang/hr.json
+++ b/packages/nc-gui/lang/hr.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Barcode format",
     "qrCodeValueTooLong": "Too many characters for a QR code",
     "barcodeValueTooLong": "Too many characters for a barcode",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Agregatna funkcija",
diff --git a/packages/nc-gui/lang/id.json b/packages/nc-gui/lang/id.json
index b010e87ffb..45e8d628de 100644
--- a/packages/nc-gui/lang/id.json
+++ b/packages/nc-gui/lang/id.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Format kode batang",
     "qrCodeValueTooLong": "Terlalu banyak karakter untuk kode QR",
     "barcodeValueTooLong": "Terlalu banyak karakter untuk barcode",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Fungsi agregat.",
diff --git a/packages/nc-gui/lang/it.json b/packages/nc-gui/lang/it.json
index 0c013a7a2e..8c859cd4ca 100644
--- a/packages/nc-gui/lang/it.json
+++ b/packages/nc-gui/lang/it.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Formato del codice a barre",
     "qrCodeValueTooLong": "Troppi caratteri per un codice QR",
     "barcodeValueTooLong": "Troppi caratteri per un codice a barre",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Aggrega funzione",
diff --git a/packages/nc-gui/lang/ja.json b/packages/nc-gui/lang/ja.json
index 32660df6c9..8e73e310fc 100644
--- a/packages/nc-gui/lang/ja.json
+++ b/packages/nc-gui/lang/ja.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "バーコードのフォーマット",
     "qrCodeValueTooLong": "QRコードにするには文字数が多すぎる",
     "barcodeValueTooLong": "バーコードの文字数が多すぎる",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "集約関数",
diff --git a/packages/nc-gui/lang/ko.json b/packages/nc-gui/lang/ko.json
index 8750b16da6..15ffba9c10 100644
--- a/packages/nc-gui/lang/ko.json
+++ b/packages/nc-gui/lang/ko.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Barcode format",
     "qrCodeValueTooLong": "Too many characters for a QR code",
     "barcodeValueTooLong": "Too many characters for a barcode",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "집합 함수",
diff --git a/packages/nc-gui/lang/lv.json b/packages/nc-gui/lang/lv.json
index e829794413..4b956bccd3 100644
--- a/packages/nc-gui/lang/lv.json
+++ b/packages/nc-gui/lang/lv.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Svītrkoda formāts",
     "qrCodeValueTooLong": "Pārāk daudz rakstzīmju QR kodam",
     "barcodeValueTooLong": "Pārāk daudz zīmju svītrkodam",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Agregācijas funkcija",
diff --git a/packages/nc-gui/lang/nl.json b/packages/nc-gui/lang/nl.json
index 87c859c727..cbf2690e61 100644
--- a/packages/nc-gui/lang/nl.json
+++ b/packages/nc-gui/lang/nl.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Barcode formaat",
     "qrCodeValueTooLong": "Te veel tekens voor een QR-code",
     "barcodeValueTooLong": "Te veel tekens voor een streepjescode",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Geaggregeerde functie",
diff --git a/packages/nc-gui/lang/no.json b/packages/nc-gui/lang/no.json
index 48578f91a4..15ba17011a 100644
--- a/packages/nc-gui/lang/no.json
+++ b/packages/nc-gui/lang/no.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Barcode format",
     "qrCodeValueTooLong": "Too many characters for a QR code",
     "barcodeValueTooLong": "Too many characters for a barcode",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Samlet funksjon",
diff --git a/packages/nc-gui/lang/pl.json b/packages/nc-gui/lang/pl.json
index 6b40787b6a..30bbe0baf3 100644
--- a/packages/nc-gui/lang/pl.json
+++ b/packages/nc-gui/lang/pl.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Format kodu kreskowego",
     "qrCodeValueTooLong": "Zbyt wiele znaków dla kodu QR",
     "barcodeValueTooLong": "Zbyt wiele znaków dla kodu kreskowego",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Funkcja agregacji",
diff --git a/packages/nc-gui/lang/pt.json b/packages/nc-gui/lang/pt.json
index 4acd062047..c0325aea6b 100644
--- a/packages/nc-gui/lang/pt.json
+++ b/packages/nc-gui/lang/pt.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Formato do código de barras",
     "qrCodeValueTooLong": "Demasiados caracteres para um código QR",
     "barcodeValueTooLong": "Demasiados caracteres para um código de barras",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Função agregada",
diff --git a/packages/nc-gui/lang/pt_BR.json b/packages/nc-gui/lang/pt_BR.json
index 1ce3a257f7..5039552a63 100644
--- a/packages/nc-gui/lang/pt_BR.json
+++ b/packages/nc-gui/lang/pt_BR.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Formato do código de barras",
     "qrCodeValueTooLong": "Demasiados caracteres para um código QR",
     "barcodeValueTooLong": "Demasiados caracteres para um código de barras",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Função agregada",
diff --git a/packages/nc-gui/lang/ru.json b/packages/nc-gui/lang/ru.json
index f4af5a6914..6c4ece9825 100644
--- a/packages/nc-gui/lang/ru.json
+++ b/packages/nc-gui/lang/ru.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Формат штрих-кода",
     "qrCodeValueTooLong": "Слишком много символов для QR-кода",
     "barcodeValueTooLong": "Слишком много символов для штрихкода",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Агрегатная функция",
diff --git a/packages/nc-gui/lang/sk.json b/packages/nc-gui/lang/sk.json
index 1e44b4a008..1169e88486 100644
--- a/packages/nc-gui/lang/sk.json
+++ b/packages/nc-gui/lang/sk.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Formát čiarového kódu",
     "qrCodeValueTooLong": "Príliš veľa znakov pre kód QR",
     "barcodeValueTooLong": "Príliš veľa znakov pre čiarový kód",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Súhrnná funkcia",
diff --git a/packages/nc-gui/lang/sl.json b/packages/nc-gui/lang/sl.json
index 342f80a0c1..408b08e7f2 100644
--- a/packages/nc-gui/lang/sl.json
+++ b/packages/nc-gui/lang/sl.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Format črtne kode",
     "qrCodeValueTooLong": "Preveč znakov za kodo QR",
     "barcodeValueTooLong": "Preveč znakov za črtno kodo",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Agregatna funkcija",
diff --git a/packages/nc-gui/lang/sv.json b/packages/nc-gui/lang/sv.json
index dfda739496..0c6a50b838 100644
--- a/packages/nc-gui/lang/sv.json
+++ b/packages/nc-gui/lang/sv.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Streckkodsformat",
     "qrCodeValueTooLong": "För många tecken för en QR-kod",
     "barcodeValueTooLong": "För många tecken för en streckkod",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Aggregatfunktion",
diff --git a/packages/nc-gui/lang/th.json b/packages/nc-gui/lang/th.json
index 589a2b476b..cb43c7abb0 100644
--- a/packages/nc-gui/lang/th.json
+++ b/packages/nc-gui/lang/th.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Barcode format",
     "qrCodeValueTooLong": "Too many characters for a QR code",
     "barcodeValueTooLong": "Too many characters for a barcode",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "ฟังก์ชั่นรวม",
diff --git a/packages/nc-gui/lang/tr.json b/packages/nc-gui/lang/tr.json
index c3ce9382e3..31b14f38b0 100644
--- a/packages/nc-gui/lang/tr.json
+++ b/packages/nc-gui/lang/tr.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Barkod formatı",
     "qrCodeValueTooLong": "QR kodu için çok fazla karakter",
     "barcodeValueTooLong": "Barkod için çok fazla karakter",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Birleştirme fonksiyonu",
diff --git a/packages/nc-gui/lang/uk.json b/packages/nc-gui/lang/uk.json
index 37e1d4d4d0..9422af259a 100644
--- a/packages/nc-gui/lang/uk.json
+++ b/packages/nc-gui/lang/uk.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Формат штрих-коду",
     "qrCodeValueTooLong": "Забагато символів для QR-коду",
     "barcodeValueTooLong": "Забагато символів для штрих-коду",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Агрегатна функція",
diff --git a/packages/nc-gui/lang/vi.json b/packages/nc-gui/lang/vi.json
index 9c58464de0..0bde66d48e 100644
--- a/packages/nc-gui/lang/vi.json
+++ b/packages/nc-gui/lang/vi.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Barcode format",
     "qrCodeValueTooLong": "Too many characters for a QR code",
     "barcodeValueTooLong": "Too many characters for a barcode",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "Chức năng tổng hợp",
diff --git a/packages/nc-gui/lang/zh-Hans.json b/packages/nc-gui/lang/zh-Hans.json
index 30cda803b1..c063297ab2 100644
--- a/packages/nc-gui/lang/zh-Hans.json
+++ b/packages/nc-gui/lang/zh-Hans.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "条形码码制",
     "qrCodeValueTooLong": "字数超出二维码容量",
     "barcodeValueTooLong": "字数超出条形码容量",
-    "yourLocation": "您所在的位置",
+    "currentLocation": "您所在的位置",
     "lng": "经度",
     "lat": "纬度",
     "aggregateFunction": "汇总功能",
diff --git a/packages/nc-gui/lang/zh-Hant.json b/packages/nc-gui/lang/zh-Hant.json
index 94b2e029b4..a2db255b50 100644
--- a/packages/nc-gui/lang/zh-Hant.json
+++ b/packages/nc-gui/lang/zh-Hant.json
@@ -257,7 +257,7 @@
     "barcodeFormat": "Barcode format",
     "qrCodeValueTooLong": "Too many characters for a QR code",
     "barcodeValueTooLong": "Too many characters for a barcode",
-    "yourLocation": "Your Location",
+    "currentLocation": "Current Location",
     "lng": "Lng",
     "lat": "Lat",
     "aggregateFunction": "匯總功能",

From 6baa3cc9a0a636bf12ee744175dbf7d96382f1b6 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Mon, 13 Mar 2023 19:02:24 +0100
Subject: [PATCH 29/38] geo data col: change wording and adapt layout of
 buttons

---
 packages/nc-gui/components/cell/GeoData.vue | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components/cell/GeoData.vue b/packages/nc-gui/components/cell/GeoData.vue
index 0e779da61f..9c546689a3 100644
--- a/packages/nc-gui/components/cell/GeoData.vue
+++ b/packages/nc-gui/components/cell/GeoData.vue
@@ -1,7 +1,6 @@
 <script lang="ts" setup>
 import type { GeoLocationType } from 'nocodb-sdk'
 import { Modal as AModal, latLongToJoinedString, useVModel } from '#imports'
-import MdiMapIcon from '~icons/mdi/map-outline'
 import GpsFixedIcon from '~icons/mdi/gps-fixed'
 import OpenInNewIcon from '~icons/mdi/open-in-new'
 
@@ -89,7 +88,7 @@ const openInOSM = () => {
   <a-dropdown :is="isExpanded ? AModal : 'div'" v-model:visible="isExpanded" trigger="click">
     <div
       v-if="!isLocationSet"
-      class="group cursor-pointer flex gap-1 items-center mx-auto max-w-32 justify-center active:(ring ring-accent ring-opacity-100) rounded border-1 p-1 shadow-sm hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
+      class="group cursor-pointer flex gap-1 items-center mx-auto max-w-64 justify-center active:(ring ring-accent ring-opacity-100) rounded border-1 p-1 shadow-sm hover:(bg-primary bg-opacity-10) dark:(!bg-slate-500)"
     >
       <div class="flex items-center gap-2" data-testid="nc-geo-data-set-location-button">
         <MdiMapMarker class="transform dark:(!text-white) group-hover:(!text-accent scale-120) text-gray-500 text-[0.75rem]" />
@@ -100,7 +99,7 @@ const openInOSM = () => {
     </div>
     <div v-else data-testid="nc-geo-data-lat-long-set">{{ latLongStr }}</div>
     <template #overlay>
-      <a-form :model="formState" class="flex flex-col w-max-58" @finish="handleFinish">
+      <a-form :model="formState" class="flex flex-col w-max-64" @finish="handleFinish">
         <a-form-item>
           <div class="flex mt-4 items-center mx-2">
             <div class="mr-2">{{ $t('labels.lat') }}:</div>
@@ -136,14 +135,16 @@ const openInOSM = () => {
             />
           </div>
         </a-form-item>
-        <a-form-item v-if="vModel">
+        <a-form-item>
           <div class="mr-2 flex flex-col items-end gap-1 text-left">
             <MdiReload v-if="isLoading" :class="{ 'animate-infinite animate-spin text-gray-500': isLoading }" />
             <a-button class="ml-2" @click="onClickSetCurrentLocation"
               ><GpsFixedIcon class="mr-2" />{{ $t('labels.currentLocation') }}</a-button
             >
           </div>
-          <div class="mr-2 flex flex-col items-end gap-1 text-left">
+        </a-form-item>
+        <a-form-item v-if="vModel">
+          <div class="mr-2 flex flex-row items-end gap-1 text-left">
             <a-button @click="openInOSM"><OpenInNewIcon class="mr-2" />{{ $t('activity.map.openInOpenStreetMap') }}</a-button>
             <a-button @click="openInGoogleMaps"><OpenInNewIcon class="mr-2" />{{ $t('activity.map.openInGoogleMaps') }}</a-button>
           </div>

From 0be1d018beedf7f2660cd3e5238e8e48cc7468b1 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Tue, 14 Mar 2023 18:38:31 +0100
Subject: [PATCH 30/38] code cleanup

---
 packages/nc-gui/composables/useMapViewDataStore.ts | 2 --
 1 file changed, 2 deletions(-)

diff --git a/packages/nc-gui/composables/useMapViewDataStore.ts b/packages/nc-gui/composables/useMapViewDataStore.ts
index f9af05bc44..496ced6a9a 100644
--- a/packages/nc-gui/composables/useMapViewDataStore.ts
+++ b/packages/nc-gui/composables/useMapViewDataStore.ts
@@ -74,8 +74,6 @@ const [useProvideMapViewStore, useMapViewStore] = useInjectionState(
       if (!viewMeta?.value?.id || !meta?.value?.columns) return
       mapMetaData.value = isPublic.value ? (sharedView.value?.view as MapType) : await $api.dbView.mapRead(viewMeta.value.id)
 
-      // 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] || {}
     }

From ce8cb699a8bd885ee14ff92728a030f0da705a96 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Tue, 14 Mar 2023 18:39:52 +0100
Subject: [PATCH 31/38] code cleanup

---
 packages/nc-gui/components.d.ts             | 1 +
 packages/nc-gui/components/cell/GeoData.vue | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/nc-gui/components.d.ts b/packages/nc-gui/components.d.ts
index b08a5350cc..023966715d 100644
--- a/packages/nc-gui/components.d.ts
+++ b/packages/nc-gui/components.d.ts
@@ -188,6 +188,7 @@ declare module '@vue/runtime-core' {
     MdiFunction: typeof import('~icons/mdi/function')['default']
     MdiGestureDoubleTap: typeof import('~icons/mdi/gesture-double-tap')['default']
     MdiGithub: typeof import('~icons/mdi/github')['default']
+    MdiGpsFixed: typeof import('~icons/mdi/gps-fixed')['default']
     MdiGraphOutline: typeof import('~icons/mdi/graph-outline')['default']
     MdiHeart: typeof import('~icons/mdi/heart')['default']
     MdiHook: typeof import('~icons/mdi/hook')['default']
diff --git a/packages/nc-gui/components/cell/GeoData.vue b/packages/nc-gui/components/cell/GeoData.vue
index 9c546689a3..d17cd77076 100644
--- a/packages/nc-gui/components/cell/GeoData.vue
+++ b/packages/nc-gui/components/cell/GeoData.vue
@@ -1,8 +1,6 @@
 <script lang="ts" setup>
 import type { GeoLocationType } from 'nocodb-sdk'
 import { Modal as AModal, latLongToJoinedString, useVModel } from '#imports'
-import GpsFixedIcon from '~icons/mdi/gps-fixed'
-import OpenInNewIcon from '~icons/mdi/open-in-new'
 
 interface Props {
   modelValue?: string | null
@@ -139,14 +137,14 @@ const openInOSM = () => {
           <div class="mr-2 flex flex-col items-end gap-1 text-left">
             <MdiReload v-if="isLoading" :class="{ 'animate-infinite animate-spin text-gray-500': isLoading }" />
             <a-button class="ml-2" @click="onClickSetCurrentLocation"
-              ><GpsFixedIcon class="mr-2" />{{ $t('labels.currentLocation') }}</a-button
+              ><MdiGpsFixed class="mr-2" />{{ $t('labels.currentLocation') }}</a-button
             >
           </div>
         </a-form-item>
         <a-form-item v-if="vModel">
           <div class="mr-2 flex flex-row items-end gap-1 text-left">
-            <a-button @click="openInOSM"><OpenInNewIcon class="mr-2" />{{ $t('activity.map.openInOpenStreetMap') }}</a-button>
-            <a-button @click="openInGoogleMaps"><OpenInNewIcon class="mr-2" />{{ $t('activity.map.openInGoogleMaps') }}</a-button>
+            <a-button @click="openInOSM"><MdiOpenInNew class="mr-2" />{{ $t('activity.map.openInOpenStreetMap') }}</a-button>
+            <a-button @click="openInGoogleMaps"><MdiOpenInNew class="mr-2" />{{ $t('activity.map.openInGoogleMaps') }}</a-button>
           </div>
         </a-form-item>
         <a-form-item>

From a6b0a090e04eb6c6ae5fbad22544dd22c24afb1e Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Tue, 14 Mar 2023 18:44:32 +0100
Subject: [PATCH 32/38] code cleanup

---
 packages/nc-gui/components/smartsheet/Map.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/Map.vue b/packages/nc-gui/components/smartsheet/Map.vue
index a8afa55eb7..64979996c1 100644
--- a/packages/nc-gui/components/smartsheet/Map.vue
+++ b/packages/nc-gui/components/smartsheet/Map.vue
@@ -4,7 +4,7 @@ import L, { LatLng } from 'leaflet'
 import 'leaflet.markercluster'
 import { ViewTypes } from 'nocodb-sdk'
 import { IsPublicInj, OpenNewRecordFormHookInj, latLongToJoinedString, onMounted, provide, ref } from '#imports'
-import type { Row, Row as RowType } from '~/lib'
+import type { Row } from '~/lib'
 
 const route = useRoute()
 
@@ -37,7 +37,7 @@ const openNewRecordFormHook = inject(OpenNewRecordFormHookInj, createEventHook()
 
 const expandedFormDlg = ref(false)
 
-const expandedFormRow = ref<RowType>()
+const expandedFormRow = ref<Row>()
 
 const expandedFormRowState = ref<Record<string, any>>()
 
@@ -51,7 +51,7 @@ const getMapZoomLocalStorageKey = (viewId: string) => {
 }
 const getMapCenterLocalStorageKey = (viewId: string) => `mapView.${viewId}.center`
 
-const expandForm = (row: RowType, state?: Record<string, any>) => {
+const expandForm = (row: Row, state?: Record<string, any>) => {
   const rowId = extractPkFromRow(row.row, meta.value!.columns!)
   if (rowId) {
     router.push({
@@ -87,7 +87,7 @@ const expandedFormOnRowIdDlg = computed({
   },
 })
 
-const addMarker = (lat: number, long: number, row: RowType) => {
+const addMarker = (lat: number, long: number, row: Row) => {
   if (markersClusterGroupRef.value == null) {
     throw new Error('Marker cluster is null')
   }

From 9ef951ec12c624183a97052139daef45180be4c0 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Tue, 14 Mar 2023 18:51:09 +0100
Subject: [PATCH 33/38] code cleanup

---
 packages/nc-gui/components/smartsheet/SharedMapMarkerPopup.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/SharedMapMarkerPopup.vue b/packages/nc-gui/components/smartsheet/SharedMapMarkerPopup.vue
index 7fbc4caf8d..75526a0221 100644
--- a/packages/nc-gui/components/smartsheet/SharedMapMarkerPopup.vue
+++ b/packages/nc-gui/components/smartsheet/SharedMapMarkerPopup.vue
@@ -124,7 +124,7 @@ const { row } = useProvideSmartsheetRowStore(meta as Ref<TableType>, currentRow)
     <a-card
       hoverable
       class="!rounded-lg h-full overflow-hidden break-all max-w-[450px]"
-      :data-testid="`nc-gallery-card-${row.row.id}`"
+      :data-testid="`nc-shared-map-marker-popup-card-${row.row.id}`"
     >
       <template v-if="galleryData?.fk_cover_image_col_id" #cover>
         <a-carousel v-if="!reloadAttachments && attachments(row).length" autoplay class="gallery-carousel" arrows>

From f281035348b532daadba6d9d17a9b8d8c1ac88fe Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Tue, 14 Mar 2023 19:02:20 +0100
Subject: [PATCH 34/38] code cleanup

---
 .../smartsheet/SharedMapMarkerPopup.vue       | 94 +------------------
 1 file changed, 3 insertions(+), 91 deletions(-)

diff --git a/packages/nc-gui/components/smartsheet/SharedMapMarkerPopup.vue b/packages/nc-gui/components/smartsheet/SharedMapMarkerPopup.vue
index 75526a0221..28a33ed0ec 100644
--- a/packages/nc-gui/components/smartsheet/SharedMapMarkerPopup.vue
+++ b/packages/nc-gui/components/smartsheet/SharedMapMarkerPopup.vue
@@ -2,36 +2,26 @@
 import type { ColumnType, TableType } from 'nocodb-sdk'
 import type { Ref } from 'vue'
 
-import { ViewTypes, isVirtualCol } from 'nocodb-sdk'
+import { isVirtualCol } from 'nocodb-sdk'
 import {
   ActiveViewInj,
   ChangePageInj,
   FieldsInj,
   IsFormInj,
-  IsGalleryInj,
   IsGridInj,
   MetaInj,
   PaginationDataInj,
   ReloadRowDataHookInj,
   ReloadViewDataHookInj,
-  ReloadViewMetaHookInj,
-  computed,
   inject,
-  isImage,
   isLTAR,
-  nextTick,
   onMounted,
   provide,
   ref,
-  useAttachment,
   useViewData,
 } from '#imports'
 import type { Row } from '~/lib'
 
-interface Attachment {
-  url: string
-}
-
 const props = defineProps<{
   fields: ColumnType[]
   row: Row
@@ -39,31 +29,17 @@ const props = defineProps<{
 
 const meta = inject(MetaInj, ref())
 const view = inject(ActiveViewInj, ref())
-const reloadViewMetaHook = inject(ReloadViewMetaHookInj)
 const reloadViewDataHook = inject(ReloadViewDataHookInj)
 
-const { loadData, paginationData, loadGalleryData, galleryData, changePage } = useViewData(meta, view)
+const { loadData, paginationData, changePage } = useViewData(meta, view)
 
 provide(IsFormInj, ref(false))
-provide(IsGalleryInj, ref(true))
 provide(IsGridInj, ref(false))
 provide(PaginationDataInj, paginationData)
 provide(ChangePageInj, changePage)
 
 const fields = inject(FieldsInj, ref([]))
 
-const { getPossibleAttachmentSrc } = useAttachment()
-
-const fieldsWithoutCover = computed(() => fields.value.filter((f) => f.id !== galleryData.value?.fk_cover_image_col_id))
-
-const coverImageColumn: any = $(
-  computed(() =>
-    meta.value?.columnsById
-      ? meta.value.columnsById[galleryData.value?.fk_cover_image_col_id as keyof typeof meta.value.columnsById]
-      : {},
-  ),
-)
-
 const isRowEmpty = (record: any, col: any) => {
   const val = record.row[col.title]
   if (!val) return true
@@ -71,49 +47,16 @@ const isRowEmpty = (record: any, col: any) => {
   return Array.isArray(val) && val.length === 0
 }
 
-const attachments = (record: any): Attachment[] => {
-  try {
-    if (coverImageColumn?.title && record.row[coverImageColumn.title]) {
-      return typeof record.row[coverImageColumn.title] === 'string'
-        ? JSON.parse(record.row[coverImageColumn.title])
-        : record.row[coverImageColumn.title]
-    }
-    return []
-  } catch (e) {
-    return []
-  }
-}
-
-const reloadAttachments = ref(false)
-
-reloadViewMetaHook?.on(async () => {
-  await loadGalleryData()
-
-  reloadAttachments.value = true
-
-  nextTick(() => {
-    reloadAttachments.value = false
-  })
-})
 reloadViewDataHook?.on(async () => {
   await loadData()
 })
 
 onMounted(async () => {
   await loadData()
-
-  await loadGalleryData()
 })
 
 provide(ReloadRowDataHookInj, reloadViewDataHook)
 
-watch(view, async (nextView) => {
-  if (nextView?.type === ViewTypes.GALLERY) {
-    await loadData()
-    await loadGalleryData()
-  }
-})
-
 const currentRow = toRef(props, 'row')
 
 const { row } = useProvideSmartsheetRowStore(meta as Ref<TableType>, currentRow)
@@ -126,38 +69,7 @@ const { row } = useProvideSmartsheetRowStore(meta as Ref<TableType>, currentRow)
       class="!rounded-lg h-full overflow-hidden break-all max-w-[450px]"
       :data-testid="`nc-shared-map-marker-popup-card-${row.row.id}`"
     >
-      <template v-if="galleryData?.fk_cover_image_col_id" #cover>
-        <a-carousel v-if="!reloadAttachments && attachments(row).length" autoplay class="gallery-carousel" arrows>
-          <template #customPaging>
-            <a>
-              <div class="pt-[12px]">
-                <div></div>
-              </div>
-            </a>
-          </template>
-
-          <template #prevArrow>
-            <div style="z-index: 1"></div>
-          </template>
-
-          <template #nextArrow>
-            <div style="z-index: 1"></div>
-          </template>
-
-          <template v-for="(attachment, index) in attachments(row)">
-            <LazyCellAttachmentImage
-              v-if="isImage(attachment.title, attachment.mimetype ?? attachment.type)"
-              :key="`carousel-${row.row.id}-${index}`"
-              class="h-52 object-contain"
-              :srcs="getPossibleAttachmentSrc(attachment)"
-            />
-          </template>
-        </a-carousel>
-
-        <MdiFileImageBox v-else class="w-full h-48 my-4 text-cool-gray-200" />
-      </template>
-
-      <div v-for="col in fieldsWithoutCover" :key="`record-${row.row.id}-${col.id}`">
+      <div v-for="col in fields" :key="`record-${row.row.id}-${col.id}`">
         <div
           v-if="!isRowEmpty(row, col) || isLTAR(col.uidt)"
           class="flex flex-col space-y-1 px-4 mb-6 bg-gray-50 rounded-lg w-full"

From 2c40e2ad58d7de28072a26918ce59b02516dc1e2 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Tue, 14 Mar 2023 19:29:01 +0100
Subject: [PATCH 35/38] code cleanup

---
 packages/nc-gui/composables/useMapViewDataStore.ts | 2 +-
 packages/nc-gui/composables/useSharedView.ts       | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/composables/useMapViewDataStore.ts b/packages/nc-gui/composables/useMapViewDataStore.ts
index 496ced6a9a..e75fa85774 100644
--- a/packages/nc-gui/composables/useMapViewDataStore.ts
+++ b/packages/nc-gui/composables/useMapViewDataStore.ts
@@ -47,7 +47,7 @@ const [useProvideMapViewStore, useMapViewStore] = useInjectionState(
 
     const { sorts, nestedFilters } = useSmartsheetStoreOrThrow()
 
-    const { sharedView, fetchSharedViewData } = useSharedView(defaultPageSize)
+    const { sharedView, fetchSharedViewData } = useSharedView()
 
     const mapMetaData = ref<MapType>({})
 
diff --git a/packages/nc-gui/composables/useSharedView.ts b/packages/nc-gui/composables/useSharedView.ts
index d079caa878..d61660395c 100644
--- a/packages/nc-gui/composables/useSharedView.ts
+++ b/packages/nc-gui/composables/useSharedView.ts
@@ -1,4 +1,4 @@
-import type {
+import {
   ExportTypes,
   FilterType,
   KanbanType,
@@ -8,11 +8,12 @@ import type {
   SortType,
   TableType,
   ViewType,
+  ViewTypes,
 } from 'nocodb-sdk'
 import { UITypes } from 'nocodb-sdk'
 import { computed, storeToRefs, useGlobal, useMetas, useNuxtApp, useState } from '#imports'
 
-export function useSharedView(limit?: number) {
+export function useSharedView() {
   const nestedFilters = ref<(FilterType & { status?: 'update' | 'delete' | 'create'; parentId?: string })[]>([])
 
   const { appInfo } = $(useGlobal())
@@ -121,7 +122,7 @@ export function useSharedView(limit?: number) {
     return await $api.public.dataList(
       sharedView.value.uuid!,
       {
-        limit,
+        limit: sharedView.value?.type === ViewTypes.MAP ? 1000 : undefined,
         ...param,
         filterArrJson: JSON.stringify(param.filtersArr ?? nestedFilters.value),
         sortArrJson: JSON.stringify(param.sortsArr ?? sorts.value),

From 65231b57ed15342427c513898f5e254b891a584a Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Wed, 15 Mar 2023 02:03:18 +0100
Subject: [PATCH 36/38] don't show 'Mapped by' dropdown on public map view

---
 packages/nc-gui/components.d.ts                            | 1 +
 packages/nc-gui/components/smartsheet/toolbar/MappedBy.vue | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/nc-gui/components.d.ts b/packages/nc-gui/components.d.ts
index 023966715d..41be648f73 100644
--- a/packages/nc-gui/components.d.ts
+++ b/packages/nc-gui/components.d.ts
@@ -239,6 +239,7 @@ declare module '@vue/runtime-core' {
     MdiTableColumnPlusBefore: typeof import('~icons/mdi/table-column-plus-before')['default']
     MdiTableKey: typeof import('~icons/mdi/table-key')['default']
     MdiTableLarge: typeof import('~icons/mdi/table-large')['default']
+    MdiTestTube: typeof import('~icons/mdi/test-tube')['default']
     MdiText: typeof import('~icons/mdi/text')['default']
     MdiThumbUp: typeof import('~icons/mdi/thumb-up')['default']
     MdiTrashCan: typeof import('~icons/mdi/trash-can')['default']
diff --git a/packages/nc-gui/components/smartsheet/toolbar/MappedBy.vue b/packages/nc-gui/components/smartsheet/toolbar/MappedBy.vue
index 5ed2615f1a..cc1b016848 100644
--- a/packages/nc-gui/components/smartsheet/toolbar/MappedBy.vue
+++ b/packages/nc-gui/components/smartsheet/toolbar/MappedBy.vue
@@ -5,6 +5,7 @@ import type { SelectProps } from 'ant-design-vue'
 import {
   ActiveViewInj,
   IsLockedInj,
+  IsPublicInj,
   MetaInj,
   ReloadViewDataHookInj,
   computed,
@@ -24,6 +25,8 @@ const reloadDataHook = inject(ReloadViewDataHookInj)!
 
 const isLocked = inject(IsLockedInj, ref(false))
 
+const IsPublic = inject(IsPublicInj, ref(false))
+
 const { fields, loadViewColumns, metaColumnById } = useViewColumns(activeView, meta, () => reloadDataHook.trigger())
 
 const { loadMapData, loadMapMeta, updateMapMeta, mapMetaData, geoDataFieldColumn } = useMapViewStoreOrThrow()
@@ -72,7 +75,7 @@ const handleChange = () => {
 </script>
 
 <template>
-  <a-dropdown v-model:visible="mappedByDropdown" :trigger="['click']">
+  <a-dropdown v-if="!IsPublic" v-model:visible="mappedByDropdown" :trigger="['click']">
     <div class="nc-map-btn">
       <a-button v-e="['c:map:change-grouping-field']" class="nc-map-stacked-by-menu-btn nc-toolbar-btn" :disabled="isLocked">
         <div class="flex items-center gap-1">

From 2409250e8bed0741490f63d124097f6f3a9d1acf Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Wed, 15 Mar 2023 02:14:15 +0100
Subject: [PATCH 37/38] geo data support: udate docs

---
 .../content/en/setup-and-usages/column-types.md | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/packages/noco-docs/content/en/setup-and-usages/column-types.md b/packages/noco-docs/content/en/setup-and-usages/column-types.md
index 182999b520..a5948735bd 100644
--- a/packages/noco-docs/content/en/setup-and-usages/column-types.md
+++ b/packages/noco-docs/content/en/setup-and-usages/column-types.md
@@ -325,7 +325,22 @@ For more about rollup, please visit [here](./rollup).
 |**SQL Server**|geometry|
 |**SQLite**|text|
 
-<!-- TODO: add GeoData -->
+
+### GeoData
+
+Encodes a geographic location which consists of a latitude and a longitude. 
+Both are internally stored as one string, where latitude and longitude are separated by ';'
+Example: "52.2134;29.1442"
+
+#### Available Database Types
+
+|Database| Types|
+|-----|----------|
+|**MySQL**|char, varchar, nchar, text, tinytext, mediumtext, longtext|
+|**PostgreSQL**|char, character, character varying, text|
+|**SQL Server**|decimal, float|
+|**SQLite**|character, text, varchar|
+
 
 ### JSON
 

From 119395d69803d03d948e5dea57e035b021a23c08 Mon Sep 17 00:00:00 2001
From: Daniel Spaude <daniel@spaude.de>
Date: Wed, 15 Mar 2023 13:55:21 +0100
Subject: [PATCH 38/38] make cell container relative

... so that the UI-locking overlay (e.g. in shared views) are not taking up too much space
---
 packages/nc-gui/components/smartsheet/Cell.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nc-gui/components/smartsheet/Cell.vue b/packages/nc-gui/components/smartsheet/Cell.vue
index 5144f2d1cd..1a76886aa6 100644
--- a/packages/nc-gui/components/smartsheet/Cell.vue
+++ b/packages/nc-gui/components/smartsheet/Cell.vue
@@ -153,7 +153,7 @@ const onContextmenu = (e: MouseEvent) => {
 
 <template>
   <div
-    class="nc-cell w-full h-full"
+    class="nc-cell w-full h-full relative"
     :class="[
       `nc-cell-${(column?.uidt || 'default').toLowerCase()}`,
       { 'text-blue-600': isPrimary(column) && !props.virtual && !isForm },