@dative-gpi/foundation-shared-components 0.0.190 → 0.0.191

package/components/lists/FSDataTableUI.vue

@@ -1098,14 +1098,9 @@ export default defineComponent({
               emit("click:row", row.item);
             }
           },
-          mobile: (event: PointerEvent, item: any) => {
+          mobile: (event: any, item: any) => {
             if (props.itemTo && router) {
-              if (event.metaKey || event.ctrlKey || event.button === 1) {
-                window.open(router.resolve(props.itemTo(item)).href, "_blank");
-              }
-              else {
-                router.push(props.itemTo(item));
-              }
+              router.push(props.itemTo(item));
             }
             else {
               emit("click:row", item);

package/components/map/FSMap.vue

@@ -97,25 +97,22 @@
 import { computed, defineComponent, onMounted, type PropType, ref, watch } from "vue";
 import { v4 as uuidv4 } from "uuid";
 
-import { MarkerClusterGroup } from 'leaflet.markercluster';
-import * as L from 'leaflet';
-
-import { useAddress } from "../../composables/useAddress";
-
-import FSMapEditPointAddressOverlay from "./FSMapEditPointAddressOverlay.vue";
-import FSButton from '../FSButton.vue';
-import FSCard from '../FSCard.vue';
-import FSChip from '../FSChip.vue';
-import FSCol from '../FSCol.vue';
-import FSRow from '../FSRow.vue';
-
+import { MarkerClusterGroup } from "leaflet.markercluster";
+import * as L from "leaflet";
 
 import { type Address, type SiteInfos } from '@dative-gpi/foundation-shared-domain/models';
-import { type LocationInfos } from '@dative-gpi/foundation-shared-domain/models';
 
-import { ColorEnum, type MapLayer } from "../../models";
+import { ColorEnum, type FSLocation, type MapLayer } from "../../models";
+import { useAddress } from "../../composables/useAddress";
 import { useColors } from "../../composables";
 
+import FSMapEditPointAddressOverlay from "./FSMapEditPointAddressOverlay.vue";
+import FSButton from "../FSButton.vue";
+import FSCard from "../FSCard.vue";
+import FSChip from "../FSChip.vue";
+import FSCol from "../FSCol.vue";
+import FSRow from "../FSRow.vue";
+
 export default defineComponent({
   name: "FSMap",
   components: {
@@ -168,7 +165,7 @@ export default defineComponent({
       default: null
     },
     modelValue: {
-      type: Array as PropType<LocationInfos[]>,
+      type: Array as PropType<FSLocation[]>,
       required: false,
       default: () => [],
     },
@@ -188,7 +185,7 @@ export default defineComponent({
       default: true
     }
   },
-  emits: ['update:modelValue', 'update:selectedLocationId', 'update:selectedSiteId'],
+  emits: ["update:modelValue", "update:selectedLocationId", "update:selectedSiteId"],
   setup(props, { emit }) {
     const { reverseSearch } = useAddress();
     const { getColors } = useColors();
@@ -348,7 +345,9 @@ export default defineComponent({
     };
 
     const onNewAddressEntered = (address: Address) => {
-      if (!props.selectedLocationId) { return; }
+      if (!props.selectedLocationId) {
+        return;
+      }
       modifyLocationAddress(props.selectedLocationId, address);
       map?.flyTo([address.latitude, address.longitude], map?.getZoom() ?? defaultZoom);
     };

package/components/map/FSMapEditPointAddressOverlay.vue

@@ -77,41 +77,39 @@
 </template>
 
 <script lang="ts">
-import type { PropType } from "vue";
-import { defineComponent, ref, watch } from "vue";
+import { defineComponent, type PropType, ref, watch } from "vue";
 
-import FSCard from '../FSCard.vue'
-import FSCol from '../FSCol.vue'
-import FSRow from '../FSRow.vue'
-import FSText from '../FSText.vue'
-import FSButton from '../FSButton.vue'
-import FSNumberField from '../fields/FSNumberField.vue'
-import FSForm from '../FSForm.vue'
-import FSAutoCompleteAddress from '../autocompletes/FSAutoCompleteAddress.vue'
-
-import { Address } from "@dative-gpi/foundation-shared-domain/models/locations/address";
+import { Address } from "@dative-gpi/foundation-shared-domain/models";
 
+import FSAutoCompleteAddress from "../autocompletes/FSAutoCompleteAddress.vue";
+import FSNumberField from "../fields/FSNumberField.vue";
+import FSButton from "../FSButton.vue";
+import FSCard from "../FSCard.vue";
+import FSForm from "../FSForm.vue";
+import FSText from "../FSText.vue";
+import FSCol from "../FSCol.vue";
+import FSRow from "../FSRow.vue";
 
 export default defineComponent({
   name: "FSMapEditPointAddressOverlay.vue",
   components: {
+    FSAutoCompleteAddress,
+    FSNumberField,
+    FSButton,
     FSCard,
-    FSCol,
-    FSRow,
+    FSForm,
     FSText,
-    FSButton,
-    FSNumberField,
-    FSAutoCompleteAddress,
-    FSForm
+    FSCol,
+    FSRow
   },
   props: {
     modelValue: {
       type: Object as PropType<Address>,
       default: null,
       required: false,
-    },
+    }
   },
-  emits: ['update:modelValue', 'update:locationCoord', 'submit', 'cancel'],
+  emits: ["update:modelValue", "update:locationCoord", "submit", "cancel"],
   setup(props, { emit }) {
     const menuLocationCoord = ref(false);
 
@@ -128,7 +126,7 @@ export default defineComponent({
         latitude: latitude.value,
         longitude: longitude.value,
       });
-      emit('update:locationCoord', newModelValue);
+      emit("update:locationCoord", newModelValue);
     };
 
     const onAddressFieldSubmit = (address: Address|null) => {
@@ -152,14 +150,14 @@ export default defineComponent({
     });
 
     return {
+      menuLocationCoord,
+      longitude,
+      latitude,
       onAddressFieldSubmit,
       onCoordinateChange,
       onSubmit,
-      onCancel,
-      latitude,
-      longitude,
-      menuLocationCoord,
+      onCancel
     };
-  },
+  }
 });
 </script>

package/models/map.ts

@@ -1,7 +1,16 @@
-import type { Layer } from "leaflet";
+import { type Layer } from "leaflet";
+
+import { type Address } from "@/shared/foundation-shared-domain";
 
 export interface MapLayer {
-  name:string;
-  label:string;
+  name : string;
+  label: string;
   layer: Layer;
 }
+
+export interface FSLocation {
+  id: string;
+  label: string;
+  icon: string;
+  address: Address;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-components",
   "sideEffects": false,
-  "version": "0.0.190",
+  "version": "0.0.191",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "0.0.190",
-    "@dative-gpi/foundation-shared-services": "0.0.190",
+    "@dative-gpi/foundation-shared-domain": "0.0.191",
+    "@dative-gpi/foundation-shared-services": "0.0.191",
     "leaflet": "1.9.4",
     "leaflet.markercluster": "1.5.3"
   },
@@ -35,5 +35,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "226125292c2f5ed27334b3bdee88b1877a9d9d6a"
+  "gitHead": "19372b25ed0b392e64c1d23933412b045f53a036"
 }