@dative-gpi/foundation-shared-components 0.0.205 → 0.0.207

package/components/fields/FSTimeField.vue

@@ -53,8 +53,7 @@
 </template>
 
 <script lang="ts">
-import type { PropType} from "vue";
-import { computed, defineComponent, ref } from "vue";
+import { computed, defineComponent, type PropType, ref, watch } from "vue";
 
 import { useColors, useRules, useSlots } from "@dative-gpi/foundation-shared-components/composables";
 import { getTimeScaleIndex, timeScale } from "@dative-gpi/foundation-shared-components/utils";
@@ -131,16 +130,6 @@ export default defineComponent({
     const innerTime = ref(0);
     const selectedUnit = ref(timeScale[0]);
 
-    if (props.modelValue) {
-      if (getTimeScaleIndex(props.modelValue) !== 0) {
-        selectedUnit.value = timeScale[getTimeScaleIndex(props.modelValue)];
-        innerTime.value = props.modelValue / selectedUnit.value.id;
-      }
-      else {
-        innerTime.value = props.modelValue;
-      }
-    }
-
     const style = computed((): { [key: string] : string | null | undefined } => {
       if (!props.editable) {
         return {
@@ -186,6 +175,22 @@ export default defineComponent({
       emit("update:modelValue", innerTime.value * selectedUnit.value.id);
     };
 
+    const reset = (): void => {
+      if (props.modelValue) {
+        if (getTimeScaleIndex(props.modelValue) !== 0) {
+          selectedUnit.value = timeScale[getTimeScaleIndex(props.modelValue)];
+          innerTime.value = props.modelValue / selectedUnit.value.id;
+        }
+        else {
+          innerTime.value = props.modelValue;
+        }
+      }
+    };
+
+    watch(() => props.modelValue, () => {
+      reset();
+    }, { immediate: true });
+
     return {
       selectedUnit,
       numberSlots,

package/components/fields/FSTranslateField.vue

@@ -19,11 +19,10 @@
     >
       <FSButton
         :prependIcon="$props.buttonPrependIcon"
-        :label="$props.buttonLabel"
         :appendIcon="$props.buttonAppendIcon"
         :variant="$props.buttonVariant"
         :color="$props.buttonColor"
-        :load="fetchingLanguages"
+        :label="$props.buttonLabel"
         @click="dialog = true"
       />
       <slot
@@ -84,12 +83,10 @@
 </template>
 
 <script lang="ts">
-import type { PropType} from "vue";
-import { computed, defineComponent, onMounted, ref } from "vue";
+import { computed, defineComponent, type PropType, ref } from "vue";
 
-import type { ColorBase} from "@dative-gpi/foundation-shared-components/models";
-import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
-import { useLanguages } from "@dative-gpi/foundation-shared-services/composables";
+import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
+import { useAppLanguages } from "@dative-gpi/foundation-shared-services/composables";
 
 import { useColors, useSlots } from "../../composables";
 
@@ -159,14 +156,15 @@ export default defineComponent({
   },
   emits: ["update:modelValue", "update:translations"],
   setup(props, { emit }) {
-    const { getMany: getManyLanguages, fetching: fetchingLanguages, entities: languages } = useLanguages();
+    const { languages } = useAppLanguages();
     const { getColors } = useColors();
     const { slots } = useSlots();
 
     delete slots.append;
+    
+    const dialog = ref(false);
 
     const innerTranslations = ref(props.translations);
-    const dialog = ref(false);
 
     const lights = getColors(ColorEnum.Light);
     const darks = getColors(ColorEnum.Dark);
@@ -220,12 +218,7 @@ export default defineComponent({
       }
     };
 
-    onMounted(() => {
-      getManyLanguages();
-    });
-
     return {
-      fetchingLanguages,
       innerTranslations,
       ColorEnum,
       languages,

package/components/fields/FSTranslateRichTextField.vue

@@ -0,0 +1,185 @@
+<template>
+  <FSCol
+    v-if="$props.translationsExpanded"
+  >
+    <FSCol
+      gap="16px"
+    >
+      <FSRichTextField
+        :editable="false"
+        :label="$tr('ui.translateRichTextField.defaultValue', 'Default value')"
+        :modelValue="$props.modelValue"
+        v-bind="$attrs"
+      />
+      <FSRichTextField
+        v-for="(language, index) in languages"
+        :editable="$props.editable"
+        :key="index"
+        :modelValue="getTranslation(language.code)"
+        @update:modelValue="setTranslation(language.code, $event)"
+        v-bind="$attrs"
+      >
+        <template
+          #label
+        >
+          <FSRow
+            :wrap="false"
+          >
+            <FSSpan
+              class="fs-translate-field-label"
+              font="text-overline"
+            >
+              {{ $tr('ui.translateRichTextField.translateIn', 'Translate in {0}', language.label) }}
+            </FSSpan>
+            <FSIcon>{{ language.icon }}</FSIcon>
+          </FSRow>
+        </template>
+      </FSRichTextField>
+    </FSCol>
+    <FSRow
+      :wrap="false"
+    >
+      <FSButton
+        prependIcon="mdi-cancel"
+        :label="$tr('ui.translateRichTextField.cancelButton.label', 'Cancel')"
+        :fullWidth="true"
+        @click="onCancelTranslations"
+      />
+      <FSButton
+        v-if="$props.editable"
+        prependIcon="mdi-check"
+        color="primary"
+        :label="$tr('ui.translateRichTextField.validateButton.label', 'Validate translations')"
+        :fullWidth="true"
+        @click="onSubmitTranslations"
+      />
+    </FSRow>
+  </FSCol>
+  <FSRichTextField
+    v-else
+    :editable="$props.editable"
+    :modelValue="$props.modelValue"
+    @update:modelValue="$emit('update:modelValue', $event)"
+    v-bind="$attrs"
+  >
+    <template
+      #append-inner
+    >
+      <FSButton
+        prependIcon="mdi-translate"
+        color="primary"
+        :label="$tr('ui.translateRichTextField.translateButton.label', 'Manage translations')"
+        :fullWidth="true"
+        @click="() => $emit('update:translationsExpanded', true)"
+      />
+    </template>
+  </FSRichTextField>
+</template>
+
+<script lang="ts">
+import { defineComponent, type PropType, ref } from 'vue';
+
+import { useAppLanguages } from "@dative-gpi/foundation-shared-services/composables";
+
+import { emptyLexicalState } from '../../utils';
+
+import FSRichTextField from './FSRichTextField.vue';
+import FSButton from '../FSButton.vue';
+import FSIcon from '../FSIcon.vue';
+import FSSpan from '../FSSpan.vue';
+import FSCol from '../FSCol.vue';
+import FSRow from '../FSRow.vue';
+
+export default defineComponent({
+  name: 'FSTranslateRichTextField',
+  components: {
+    FSRichTextField,
+    FSButton,
+    FSIcon,
+    FSSpan,
+    FSCol,
+    FSRow
+  },
+  props: {
+    translationsExpanded: {
+      type: Boolean,
+      default: false,
+    },
+    editable: {
+      type: Boolean,
+      default: true,
+    },
+    modelValue: {
+      type: String as PropType<string | null>,
+      required: false,
+      default: null
+    },
+    translations: {
+      type: Array as PropType<{ languageCode: string; [key: string]: string }[]>,
+      required: false,
+      default: () => []
+    },
+    property: {
+      type: String as PropType<string>,
+      required: false,
+      default: "label"
+    }
+  },
+  emits: ['update:translationsExpanded', 'update:modelValue', 'update:translations'],
+  setup(props, { emit }) {
+    const { languages } = useAppLanguages();
+
+    const innerTranslations = ref(props.translations);
+
+    const getTranslation = (languageCode: string): string => {
+      if (!innerTranslations.value) {
+        return emptyLexicalState;
+      }
+      const translation = innerTranslations.value.find((t) => t.languageCode === languageCode);
+      if (!translation || !translation[props.property]) {
+        return emptyLexicalState;
+      }
+      return translation[props.property].toString();
+    };
+
+    const setTranslation = (languageCode: string, value: string): void => {
+      if (!innerTranslations.value) {
+        innerTranslations.value = [{
+          languageCode,
+          [props.property]: value
+        }]
+        return;
+      }
+      const translation = innerTranslations.value.find((t) => t.languageCode === languageCode);
+      if (translation) {
+        translation[props.property] = value;
+      }
+      else {
+        innerTranslations.value.push({
+          languageCode,
+          [props.property]: value
+        });
+      }
+    };
+
+    const onSubmitTranslations = (): void => {
+      if (props.editable) {
+        emit("update:translations", innerTranslations.value);
+      }
+      emit('update:translationsExpanded', false);
+    };
+
+    const onCancelTranslations  = (): void => {
+      emit('update:translationsExpanded', false);
+    };
+
+    return {
+      languages,
+      onCancelTranslations,
+      onSubmitTranslations,
+      getTranslation,
+      setTranslation
+    };
+  }
+});
+</script>

package/components/map/FSMap.vue

@@ -5,30 +5,34 @@
   >
     <FSCol
       v-if="L"
-      class="fs-map"
       width="fill"
+      :class="['fs-map', { 'fs-map-fullscreen': fullScreen }]"
     >
-      <FSRow
-        v-if="selectableLayers.length > 1"
-        class="fs-map-overlay-layer-choice"
+      <FSCol
+        v-if="$slots.leftoverlay"
+        class="fs-map-overlay-left"
+        height="calc(100% - 32px)"
+        width="hug"
         gap="2px"
       >
-        <FSChip
-          v-for="mapLayer in mapLayers.filter((layer) => selectableLayers.includes(layer.name))"
-          variant="full"
-          :color="innerSelectedLayer === mapLayer.name ? 'dark' : 'light'"
-          :label="mapLayer.label"
-          :key="mapLayer.name"
-          :editable="true"
-          @click="setMapBaseLayer(mapLayer.name as 'osm' | 'imagery')"
-        />
-      </FSRow>
+        <FSCard
+          height="100%"
+        >
+          <FSFadeOut
+            height="fill"
+          >
+            <slot
+              name="leftoverlay"
+            />
+          </FSFadeOut>
+        </FSCard>
+      </FSCol>
       <FSRow
         v-if="$props.editable && !editingLocation && $props.selectedLocationId !== null"
         class="fs-map-overlay-edit-button"
       >
         <FSButton
-          prepend-icon="mdi-pencil"
+          prependIcon="mdi-pencil"
           :label="$tr('ui.map.modify', 'Modify')"
           @click="editingLocation = true"
         />
@@ -41,45 +45,73 @@
           :id="mapId"
         />
       </FSCol>
-
       <FSCol
-        class="fs-map-overlay-container"
+        class="fs-map-overlay-right-top"
         align="center-center"
       >
-        <FSCol
-          class="fs-map-zoom-overlay"
-          align="bottom-center"
-          width="hug"
+        <slot
+          name="toprightoverlay"
         >
-          <FSButton
-            v-if="$props.showMyLocation"
-            prependIcon="mdi-crosshairs-gps"
-            color="primary"
-            variant="full"
-            :elevation="true"
-            :border="false"
-            @click="locate"
-          />
-          <FSCol
-            v-if="$props.showZoomButtons"
-            gap="0"
+          <FSRow
+            gap="2px"
           >
+            <FSMapLayerButton
+              v-if="$props.selectableLayers?.length && $props.selectableLayers.length > 1"
+              :layers="mapLayers.filter((layer) => $props.selectableLayers?.includes(layer.name) ?? true)"
+              v-model="innerSelectedLayer"
+            />
             <FSButton
-              class="fs-map-zoom-plus"
-              prependIcon="mdi-plus"
+              v-if="$props.showFullScreen"
+              prependIcon="mdi-fullscreen"
               :elevation="true"
-              :border="false"
-              @click="zoomIn"
+              @click="fullScreen = !fullScreen"
             />
+          </FSRow>
+        </slot>
+      </FSCol>
+      <FSCol
+        class="fs-map-overlay-right-bottom"
+        align="center-center"
+      >
+        <slot
+          name="bottomrightoverlay"
+        >
+          <FSCol
+            class="fs-map-zoom-overlay"
+            align="bottom-center"
+            width="hug"
+          >
             <FSButton
-              class="fs-map-zoom-minus"
-              prependIcon="mdi-minus"
+              v-if="$props.showMyLocation"
+              prependIcon="mdi-crosshairs-gps"
+              color="primary"
+              variant="full"
               :elevation="true"
               :border="false"
-              @click="zoomOut"
+              @click="locate"
             />
+            <FSCol
+              v-if="$props.showZoomButtons"
+              gap="0"
+            >
+
+              <FSButton
+                class="fs-map-zoom-plus"
+                prependIcon="mdi-plus"
+                :elevation="true"
+                :border="false"
+                @click="zoomIn"
+              />
+              <FSButton
+                class="fs-map-zoom-minus"
+                prependIcon="mdi-minus"
+                :elevation="true"
+                :border="false"
+                @click="zoomOut"
+              />
+            </FSCol>
           </FSCol>
-        </FSCol>
+        </slot>
         <FSMapEditPointAddressOverlay
           v-if="editingLocation"
           :label="$tr('ui.map.address', 'Address')"
@@ -108,9 +140,10 @@ import { ColorEnum, type FSLocation, type MapLayer } from "../../models";
 import { useColors, useAddress } from "../../composables";
 
 import FSMapEditPointAddressOverlay from "./FSMapEditPointAddressOverlay.vue";
+import FSMapLayerButton from "./FSMapLayerButton.vue";
+import FSFadeOut from "../FSFadeOut.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";
 
@@ -118,9 +151,10 @@ export default defineComponent({
   name: "FSMap",
   components: {
     FSMapEditPointAddressOverlay,
+    FSMapLayerButton,
+    FSFadeOut,
     FSButton,
     FSCard,
-    FSChip,
     FSCol,
     FSRow
   },
@@ -185,6 +219,11 @@ export default defineComponent({
       required: false,
       default: true
     },
+    showFullScreen: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     grayscale: {
       type: Boolean,
       required: false,
@@ -202,6 +241,7 @@ export default defineComponent({
     const innerSelectedLayer = ref(props.selectedLayer);
     const innerModelValue = ref(props.modelValue);
     const editingLocation = ref(false);
+    const fullScreen = ref(false);
 
     const mapId = `map-${Math.random().toString(36).substring(7)}`;
     const defaultZoom = 15;
@@ -238,6 +278,7 @@ export default defineComponent({
       {
         name: "osm",
         label: $tr("ui.map.layer.osm", "Map"),
+        image: new URL("../../assets/images/map/osm.png", import.meta.url).href,
         layer: LL.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
           maxZoom: 20,
           attribution: '© OpenStreetMap'
@@ -246,6 +287,7 @@ export default defineComponent({
       {
         name: "imagery",
         label: $tr("ui.map.layer.imagery", "Imagery"),
+        image: new URL("../../assets/images/map/imagery.png", import.meta.url).href,
         layer: LL.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', {
           attribution: 'Tiles &copy; Esri &mdash; Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye, Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community',
           maxZoom: 19
@@ -323,7 +365,7 @@ export default defineComponent({
       baseLayerGroup.addTo(map);
       siteLayerGroup.addTo(map);
       myLocationLayerGroup.addTo(map);
-      setMapBaseLayer(props.selectedLayer);
+      setMapBaseLayer(innerSelectedLayer.value);
       displaySites();
       displayLocations();
       markerLayerGroup.addTo(map);
@@ -340,18 +382,16 @@ export default defineComponent({
     };
 
     const setMapBaseLayer = (layerName: 'osm' | 'imagery') => {
-      innerSelectedLayer.value = layerName;
       const layer = mapLayers.find((mapLayer) => mapLayer.name === layerName) ?? mapLayers[0];
       baseLayerGroup.clearLayers();
       layer.layer.addTo(baseLayerGroup);
     };
 
     const onNewAddressEntered = (address: Address) => {
-      if (!props.selectedLocationId) {
-        return;
-      }
+      if (!map) {return;}
+      if (!props.selectedLocationId) {return;}
       modifyLocationAddress(props.selectedLocationId, address);
-      map?.panTo([address.latitude, address.longitude]);
+      map.panTo([address.latitude, address.longitude]);
     };
 
     const onNewCoordEntered = async (lat: number, lng: number) => {
@@ -365,17 +405,26 @@ export default defineComponent({
     };
 
     const zoomIn = () => {
-      map?.zoomIn();
+      if (!map) {
+        return;
+      }
+      map.zoomIn();
     };
 
     const zoomOut = () => {
-      map?.zoomOut();
+      if (!map) {
+        return;
+      }
+      map.zoomOut();
     };
 
     const locate = () => {
-      map?.locate();
-      map?.on('locationfound', (e: L.LocationEvent) => {
-        map?.panTo(e.latlng);
+      if (!map) {
+        return;
+      }
+      map.locate();
+      map.on('locationfound', (e: L.LocationEvent) => {
+        map.panTo(e.latlng);
         const iconHtml = `<div class="fs-map-mylocation-pin"></div>`;
         const icon = LL.divIcon({
           html: iconHtml,
@@ -391,12 +440,15 @@ export default defineComponent({
     const onCancel = () => {
       editingLocation.value = false;
       innerModelValue.value = props.modelValue;
+      if (!map) {
+        return;
+      }
       displayLocations();
       if (innerModelValue.value.length > 0) {
-        map?.fitBounds(markerLayerGroup.getBounds(), { maxZoom: defaultZoom });
+        map.fitBounds(markerLayerGroup.getBounds(), { maxZoom: defaultZoom });
       }
       else {
-        map?.panTo([props.center[0], props.center[1]]);
+        map.panTo([props.center[0], props.center[1]]);
       }
       if (props.modelValue.length > 1) {
         emit('update:selectedLocationId', null);
@@ -405,12 +457,15 @@ export default defineComponent({
 
     const onSubmit = () => {
       emit('update:modelValue', innerModelValue.value);
+      if (!map) {
+        return;
+      }
       editingLocation.value = false;
       if (innerModelValue.value.length > 0) {
-        map?.fitBounds(markerLayerGroup.getBounds(), { maxZoom: defaultZoom });
+        map.fitBounds(markerLayerGroup.getBounds(), { maxZoom: defaultZoom });
       }
       else {
-        map?.flyTo([props.center[0], props.center[1]], map?.getZoom() ?? defaultZoom, { animate: false });
+        map.flyTo([props.center[0], props.center[1]], map.getZoom() ?? defaultZoom, { animate: false });
       }
       if (props.modelValue.length > 1) {
         emit('update:selectedLocationId', null);
@@ -419,6 +474,9 @@ export default defineComponent({
 
     onMounted(() => {
       initMap();
+      if (props.selectedLocationId && props.modelValue.length === 1) {
+        editingLocation.value = true;
+      }
     });
 
     watch(() => innerModelValue.value, () => {
@@ -426,36 +484,42 @@ export default defineComponent({
     });
 
     watch(() => props.selectedLocationId, () => {
+      if (!props.selectedLocationId || !map) {
+        return;
+      }
+
       Object.values(markers).forEach((marker) => {
         marker.getElement()?.classList.remove('fs-map-location-selected');
       });
 
-      if (!props.selectedLocationId) {
-        return;
-      }
       const marker = markers[props.selectedLocationId];
       marker.getElement()?.classList.add('fs-map-location-selected');
-      map?.flyTo(marker.getLatLng(), 17, { animate: false });
+      map.flyTo(marker.getLatLng(), 17, { animate: false });
     })
 
     watch(() => props.selectedSiteId, () => {
-      if (!props.selectedSiteId) {
+      if (!props.selectedSiteId || !map) {
         return;
       }
       const site = sites[props.selectedSiteId];
       if (site) {
-        map?.fitBounds(site.getBounds(), { maxZoom: 17 });
+        map.fitBounds(site.getBounds(), { maxZoom: 17 });
       }
     });
 
+    watch(innerSelectedLayer, () => {
+      setMapBaseLayer(innerSelectedLayer.value);
+    });
+
     return {
-      L,
       innerSelectedLayer,
       editingLocation,
       innerModelValue,
+      fullScreen,
       mapLayers,
       mapId,
       style,
+      L,
       onNewAddressEntered,
       onNewCoordEntered,
       setMapBaseLayer,