@dative-gpi/foundation-shared-components 1.0.158-sankey2 → 1.0.159-notification

package/components/FSInstantPicker.vue

@@ -97,9 +97,9 @@ import FSCol from '@dative-gpi/foundation-shared-components/components/FSCol.vue
 import FSSpan from '@dative-gpi/foundation-shared-components/components/FSSpan.vue';
 import FSText from '@dative-gpi/foundation-shared-components/components/FSText.vue';
 import FSSlider from '@dative-gpi/foundation-shared-components/components/FSSlider.vue';
-import FSPlayButtons from '@dative-gpi/foundation-shared-components/components/FSPlayButtons.vue';
 import FSBaseField from '@dative-gpi/foundation-shared-components/components/fields/FSBaseField.vue';
 import FSTermField from '@dative-gpi/foundation-shared-components/components/fields/FSTermField.vue';
+import FSPlayButtons from '@dative-gpi/foundation-shared-components/components/FSPlayButtons.vue';
 
 export default defineComponent({
   name: "FSInstantPicker",
@@ -110,7 +110,7 @@ export default defineComponent({
     FSSlider,
     FSTermField,
     FSBaseField,
-    FSPlayButtons,
+    FSPlayButtons
   },
   props: {
     label: {
@@ -119,7 +119,8 @@ export default defineComponent({
     },
     modelValue: {
       type: Number,
-      required: false
+      required: false,
+      default: 0,
     },
     startDate: {
       type: String,
@@ -230,12 +231,6 @@ export default defineComponent({
       }
     }, { immediate: true });
 
-    watch(() => props.modelValue, (value) => {
-      if(!value) {
-        emit('update:modelValue', endTimestamp.value);
-      }
-    }, { immediate: true });
-
     watch(playing, (value) => {
       if(!value && playingInterval.value) {
         clearInterval(playingInterval.value);

package/components/map/FSMap.vue

@@ -389,8 +389,6 @@ export default defineComponent({
       if(!map.value || !props.bounds) {
         return;
       }
-
-      //console.log("Bounds changed", props.bounds);
       fitBounds(props.bounds, { maxZoom: 14 });
     });
 

package/components/map/FSMapMarker.vue

@@ -3,11 +3,13 @@
 </template>
 
 <script lang="ts">
-import { inject, type PropType, type Ref, watch, ref, onUnmounted, onMounted } from 'vue';
+import { inject, type PropType, type Ref, watch, ref, onUnmounted, computed } from 'vue';
+import { type RouteLocation } from "vue-router";
 
-import { type Map, divIcon, type LatLng, marker, type Marker, type MarkerClusterGroup, type LeafletMouseEvent } from 'leaflet';
+import { type Map, divIcon, type LatLng, marker, type Marker, type MarkerClusterGroup } from 'leaflet';
 
 import { useColors } from "../../composables";
+import { useRouting } from '@dative-gpi/foundation-shared-services/composables';
 
 import { gpsMarkerHtml, locationMarkerHtml, pinMarkerHtml } from '../../utils/leafletMarkers';
 import { MAP, MARKERCLUSTERGROUP } from './keys';
@@ -41,14 +43,28 @@ export default {
     label: {
       type: String,
       required: false
+    },
+    to: {
+      type: Object as PropType<RouteLocation | null>,
+      required: false
     }
   },
-  emits: ['click'],
+  emits: ['click', 'auxclick'],
   setup(props, { emit }) {
     const map = inject<Ref<Map | null>>(MAP);
     const markerClusterGroup = inject<Ref<MarkerClusterGroup | null>>(MARKERCLUSTERGROUP, ref(null));
-
+      
     const { getColors } = useColors();
+    const { handleRoutingEvent } = useRouting();
+
+    if(!map) {
+      throw new Error('FSMapTileLayer must be used inside a FSMap component');
+    }
+
+    if(!map.value) {
+      throw new Error('FSMapTileLayer must be used inside a FSMap component with a map');
+    }
+      
     const getMarkerIcon = () => {
       if(props.variant === 'gps') {
         const size = 16;
@@ -81,12 +97,32 @@ export default {
 
     const actualMarker = ref(marker(props.latlng ?? [0, 0], { icon: getMarkerIcon() }));
 
-    if(!map) {
-      throw new Error('FSMapTileLayer must be used inside a FSMap component');
+    const markerElement = computed(() => {
+      return actualMarker.value.getElement();
+    });
+
+    const onClick = (event: MouseEvent) => {
+      if(props.to) {
+        handleRoutingEvent(event, props.to, true);
+        return;
+      }
+      
+      emit('click', {
+        ...event,
+        latlng: props.latlng
+      });
     }
 
-    if(!map.value) {
-      throw new Error('FSMapTileLayer must be used inside a FSMap component with a map');
+    const onAuxClick = (event: MouseEvent) => {
+      if(props.to) {
+        handleRoutingEvent(event, props.to);
+        return;
+      }
+
+      emit('auxclick', {
+        ...event,
+        latlng: props.latlng
+      });
     }
 
     watch(map, () => {
@@ -118,11 +154,14 @@ export default {
       actualMarker.value.setLatLng(props.latlng);
     });
 
-    onMounted(() => {
-      actualMarker.value.on('click', (event: LeafletMouseEvent) => {
-        emit('click', event);
-      });
-    });
+    watch(markerElement, (newMarkerElement) => {
+      if(!newMarkerElement) {
+        return;
+      }
+
+      newMarkerElement.addEventListener('click', onClick);
+      newMarkerElement.addEventListener('auxclick', onAuxClick);
+    }, { immediate: true });
 
     onUnmounted(() => {
       if(actualMarker.value && map.value) {

package/composables/useMapLayers.ts

@@ -13,7 +13,7 @@ export const useMapLayers = () => {
     {
       name: MapLayers.Map,
       label: $tr("ui.map-layer.map", "Map"),
-      image: new URL("../../assets/images/map/map.png", import.meta.url).href,
+      image: new URL("../assets/images/map/map.png", import.meta.url).href,
       layers: [
         tileLayer(`https://{s}.google.com/vt/lyrs=m&x={x}&y={y}&z={z}&key=${apiKey}`, {
           maxZoom: 22,
@@ -26,7 +26,7 @@ export const useMapLayers = () => {
     {
       name: MapLayers.Imagery,
       label: $tr("ui.map-layer.imagery", "Imagery"),
-      image: new URL("../../assets/images/map/imagery.png", import.meta.url).href,
+      image: new URL("../assets/images/map/imagery.png", import.meta.url).href,
       layers: [
         tileLayer(`https://{s}.google.com/vt/lyrs=s,h&x={x}&y={y}&z={z}&key=${apiKey}`, {
           maxZoom: 22,
@@ -39,7 +39,7 @@ export const useMapLayers = () => {
     {
       name: MapLayers.Snow,
       label: $tr("ui.map-layer.snow", "Snow ski map"),
-      image: new URL("../../assets/images/map/snow.png", import.meta.url).href,
+      image: new URL("../assets/images/map/snow.png", import.meta.url).href,
       layers: [
         tileLayer(`https://{s}.google.com/vt/lyrs=m&x={x}&y={y}&z={z}&key=${apiKey}`, {
           maxZoom: 22,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-components",
   "sideEffects": false,
-  "version": "1.0.158-sankey2",
+  "version": "1.0.159-notification",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.158-sankey2",
-    "@dative-gpi/foundation-shared-services": "1.0.158-sankey2"
+    "@dative-gpi/foundation-shared-domain": "1.0.159-notification",
+    "@dative-gpi/foundation-shared-services": "1.0.159-notification"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -35,5 +35,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "3bdd971b1260dda85c68b5c550521861a513c2f1"
+  "gitHead": "bd9f45c4be8554c7778b5388f3d60d25c9244054"
 }

package/styles/components/index.scss

@@ -48,7 +48,6 @@
 @import "fs_password_field.scss";
 @import "fs_progress_bar.scss";
 @import "fs_radio.scss";
-@import "fs_range_slider.scss";
 @import "fs_rich_text_field.scss";
 @import "fs_row.scss";
 @import "fs_select_field.scss";

package/tools/alertsTools.ts

@@ -74,9 +74,10 @@ export const AlertTools = {
   },
   criticityLabel(value: Criticity): string {
     switch (value) {
+      case Criticity.Information: return $tr('ui.common.information', 'Information');
       case Criticity.Warning: return $tr('ui.common.warning', 'Warning');
       case Criticity.Error: return $tr('ui.common.error', 'Error');
-      default: return $tr('ui.common.information', 'Information');
+      default: return $tr("ui.common.none", "None");
     }
   },
   statusColor(status: AlertStatus): ColorEnum {

package/components/FSRangePicker.vue

@@ -1,275 +0,0 @@
-<template>
-  <FSBaseField
-    :description="$props.description"
-    :hideHeader="$props.hideHeader"
-    :required="$props.required"
-    :disabled="$props.disabled"
-    :label="$props.label"
-  >
-    <FSRow
-      align="bottom-center"
-      gap="32px"
-    >
-      <FSTermField
-        width="430px"
-        :label="$tr('ui.instant-picker.analyze-period', 'Analyze Period')"
-        :startDate="$props.startDate"
-        :endDate="$props.endDate"
-        :disabled="$props.disabled"
-        @update:startDate="$emit('update:startDate', $event)"
-        @update:endDate="$emit('update:endDate', $event)"
-      />
-      <FSRow
-        padding="0 0 2px 0"
-        align="center-center"
-      >
-        <FSCol
-          width="fill"
-        >
-          <FSRangeSlider
-            minWidth='min(300px, 90vw)'
-            :disabled="$props.disabled"
-            :color="ColorEnum.Light"
-            :thumbColor="ColorEnum.Primary"
-            :trackFillColor="ColorEnum.Primary"
-            :trackSize="8"
-            thumb-label="always"
-            :step="$props.stepTime"
-            :min="startTimestamp"
-            :max="endTimestamp"
-            :ticks="ticks"
-            showTicks="always"
-            :tick-size="0"
-            :modelValue="$props.modelValue"
-            @update:modelValue="$emit('update:modelValue', $event)"
-          >
-            <template
-              #thumb-label="{ modelValue }"
-            >
-              <FSSpan
-                font="text-overline"
-              >
-                {{ epochToMonthShortTimeFormat(modelValue) }}
-              </FSSpan>
-            </template>
-            <template
-              #tick-label="{ tick }"
-            >
-              <FSRow>
-                <FSText
-                  :color="lightColors.dark"
-                  font="text-overline"
-                >
-                  {{ intervalTime <= 3600000
-                    ?
-                      epochToShortTimeOnlyFormat(tick.value)
-                    :
-                      epochToDayMonthShortOnly(tick.value)
-                  }}
-                </FSText>
-              </FSRow>
-            </template>
-          </FSRangeSlider>
-        </FSCol>
-        <FSPlayButtons
-          v-if="$props.playable"
-          :disabled="$props.disabled"
-          :modelValue="playing"
-          @click:backward="onClickBackward"
-          @click:forward="onClickForward"
-          @update:modelValue="onPlayingChange"
-        />
-      </FSRow>
-    </FSRow>
-  </FSBaseField>
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, ref, watch } from "vue";
-
-import { useDateFormat, useDateExpression } from "@dative-gpi/foundation-shared-services/composables";
-
-import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
-import { useBreakpoints, useColors } from '@dative-gpi/foundation-shared-components/composables';
-
-import FSCol from '@dative-gpi/foundation-shared-components/components/FSCol.vue';
-import FSSpan from '@dative-gpi/foundation-shared-components/components/FSSpan.vue';
-import FSText from '@dative-gpi/foundation-shared-components/components/FSText.vue';
-import FSPlayButtons from '@dative-gpi/foundation-shared-components/components/FSPlayButtons.vue';
-import FSRangeSlider from '@dative-gpi/foundation-shared-components/components/FSRangeSlider.vue';
-import FSBaseField from '@dative-gpi/foundation-shared-components/components/fields/FSBaseField.vue';
-import FSTermField from '@dative-gpi/foundation-shared-components/components/fields/FSTermField.vue';
-
-export default defineComponent({
-  name: "FSRangePicker",
-  components: {
-    FSCol,
-    FSSpan,
-    FSText,
-    FSTermField,
-    FSBaseField,
-    FSRangeSlider,
-    FSPlayButtons,
-  },
-  props: {
-    label: {
-      type: String,
-      required: false,
-    },
-    mode: {
-      type: String as () => 'single' | 'range',
-      required: false,
-      default: 'single'
-    },
-    modelValue: {
-      type: Object as () => [number, number],
-      required: true
-    },
-    startDate: {
-      type: String,
-      required: true
-    },
-    endDate: {
-      type: String,
-      required: true
-    },
-    description: {
-      type: String,
-      required: false,
-      default: null
-    },
-    hideHeader: {
-      type: Boolean,
-      required: false,
-      default: false
-    },
-    required: {
-      type: Boolean,
-      required: false,
-      default: false
-    },
-    disabled: {
-      type: Boolean,
-      required: false,
-      default: false
-    },
-    playable: {
-      type: Boolean,
-      required: false,
-      default: true
-    },
-    stepTime: {
-      type: Number,
-      required: false,
-      default: 60000
-    },
-    playingStepDuration: {
-      type: Number,
-      required: false,
-      default: 50
-    }
-  },
-  emits: ['update:modelValue', 'update:startDate', 'update:endDate'],
-  setup(props, { emit }) {
-    const { epochToShortTimeOnlyFormat, epochToShortDateFormat, epochToDayMonthShortOnly, epochToISO, epochToMonthShortTimeFormat } = useDateFormat();
-    const { convert : convertTermToEpoch } = useDateExpression();
-    const { isMobileSized, isExtraSmall } = useBreakpoints();
-    const { getColors } = useColors();
-
-    const lightColors = getColors(ColorEnum.Light);
-    const playing = ref(false);
-    const playingInterval = ref();
-
-    const startTimestamp = computed(() => convertTermToEpoch(props.startDate));
-    const endTimestamp = computed(() => convertTermToEpoch(props.endDate));
-
-    const intervalTime = computed(() => {
-      const possibleIntervals = [60000, 3600000, 86400000];
-
-      const interval = possibleIntervals.find(interval => {
-        return (endTimestamp.value - startTimestamp.value) / interval < 100;
-      });
-
-      if (interval) {
-        return interval;
-      }
-      return 86400000;
-    });
-
-    const ticks = computed(() => {
-      const ticks: number[] = [];
-
-      const rangeDuration = endTimestamp.value - startTimestamp.value;
-      const interval = rangeDuration / maximumTickToShow.value;
-
-      for (let i = 1; i < maximumTickToShow.value; i++) {
-        ticks.push(startTimestamp.value + i * interval);
-      }
-      return ticks;
-    });
-
-    const maximumTickToShow = computed(() => {
-      if (isExtraSmall.value) {
-        return 4;
-      }
-      if (isMobileSized.value) {
-        return 5;
-      }
-      return 6;
-    });
-
-    const onPlayingChange = (value: boolean) => {
-      playing.value = value;
-    };
-
-    const onClickBackward = () => {
-      const rangeDuration = props.modelValue[1] - props.modelValue[0];
-      emit('update:modelValue', [startTimestamp.value, startTimestamp.value + rangeDuration]);
-    };
-
-    const onClickForward = () => {
-      const rangeDuration = props.modelValue[1] - props.modelValue[0];
-      emit('update:modelValue', [endTimestamp.value - rangeDuration, endTimestamp.value]);
-    };
-
-    watch(() => [props.startDate, props.endDate], () => {
-      if((props.modelValue[0] < startTimestamp.value || props.modelValue[1] > endTimestamp.value)) {
-        emit('update:modelValue', [startTimestamp.value, endTimestamp.value]);
-      }
-    }, { immediate: true });
-
-    watch(playing, (value) => {
-      if(!value && playingInterval.value) {
-        clearInterval(playingInterval.value);
-      } else {
-        playingInterval.value = setInterval(() => {
-          if(props.modelValue[0] + props.stepTime <= endTimestamp.value && props.modelValue[1] + props.stepTime <= endTimestamp.value) {
-            emit('update:modelValue', [props.modelValue[0] + props.stepTime, props.modelValue[1] + props.stepTime]);
-          } else {
-            playing.value = false;
-          }
-        }, props.playingStepDuration);
-      }
-    });
-
-    return {
-      ticks,
-      playing,
-      ColorEnum,
-      lightColors,
-      intervalTime,
-      endTimestamp,
-      startTimestamp,
-      maximumTickToShow,
-      epochToISO,
-      onPlayingChange,
-      onClickForward,
-      onClickBackward,
-      epochToShortDateFormat,
-      epochToShortTimeOnlyFormat,
-      epochToDayMonthShortOnly,
-      epochToMonthShortTimeFormat
-    };
-  },
-});
-</script>

package/components/FSRangeSlider.vue

@@ -1,112 +0,0 @@
-<template>
-  <FSBaseField
-    :label="$props.label"
-    :description="$props.description"
-    :required="$props.required"
-    :disabled="$props.disabled"
-    :style="style"
-  >
-    <v-range-slider
-      class="fs-range-slider"
-      hide-details
-      :disabled="$props.disabled"
-      :ripple="false"
-      :style="style"
-      :elevation="0"
-      :tickSize="4"
-      :modelValue="$props.modelValue ?? undefined"
-      @update:modelValue="$emit('update:modelValue', $event)"
-      v-bind="$attrs"
-    >
-      <template
-        v-for="(_, name) in $slots"
-        v-slot:[name]="slotData"
-      >
-        <slot
-          :name="name"
-          v-bind="slotData"
-        />
-      </template>
-    </v-range-slider>
-  </FSBaseField>
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, type PropType, type StyleValue } from "vue";
-
-import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
-import { useColors } from "@dative-gpi/foundation-shared-components/composables";
-
-import FSBaseField from '@dative-gpi/foundation-shared-components/components/fields/FSBaseField.vue';
-
-export default defineComponent({
-  name: "FSRangeSlider",
-  components: {
-    FSBaseField
-  },
-  props: {
-    label: {
-      type: String as PropType<string | null>,
-      required: false,
-      default: null
-    },
-    description: {
-      type: String as PropType<string | null>,
-      required: false,
-      default: null
-    },
-    modelValue: {
-      type: Object as PropType<[number, number] | null>,
-      required: false,
-      default: null
-    },
-    color: {
-      type: String as PropType<ColorBase>,
-      required: false,
-      default: ColorEnum.Dark
-    },
-    required: {
-      type: Boolean,
-      required: false,
-      default: false
-    },
-    disabled: {
-      type: Boolean,
-      required: false,
-      default: false
-    }
-  },
-  emits: ["update:modelValue"],
-  setup(props) {
-    const { getColors } = useColors();
-
-    const colors = computed(() => getColors(props.color));
-    const lights = getColors(ColorEnum.Light);
-    const darks = getColors(ColorEnum.Dark);
-
-    const style = computed((): StyleValue => {
-      if (props.disabled) {
-        return {
-          "--fs-range-slider-cursor"     : "default",
-          "--fs-range-slider-track-color": lights.base,
-          "--fs-range-slider-thumb-color": lights.dark,
-          "--fs-range-slider-fill-color" : lights.dark,
-          "--fs-range-slider-color"      : lights.dark
-        };
-      }
-      console.log(colors.value);
-      return {
-        "--fs-range-slider-cursor"     : "pointer",
-        "--fs-range-slider-track-color": colors.value.light,
-        "--fs-range-slider-fill-color" : colors.value.base,
-        "--fs-range-slider-thumb-color": colors.value.base,
-        "--fs-range-slider-color"      : darks.base
-      };
-    });
-
-    return {
-      style
-    };
-  } 
-});
-</script>

package/styles/components/fs_range_slider.scss

@@ -1,51 +0,0 @@
-.fs-range-slider {
-    padding: 0px !important;
-    width: calc(100% - 16px);
-
-    & .v-slider__container {
-        cursor: var(--fs-range-slider-cursor);
-        margin-left: 8px;
-        margin-right: 8px;
-        opacity: 1 !important;
-    }
-
-    & .v-slider-track__background {
-        background-color: var(--fs-range-slider-track-color);
-        height: 6px !important;
-        opacity: 1;
-    }
-
-    & .v-slider-track__fill {
-        background-color: var(--fs-range-slider-fill-color);
-        opacity: 0.7 !important;
-    }
-
-    & .v-slider-track__tick {
-        background-color: var(--fs-range-slider-thumb-color);
-        border-radius: 50%;
-    }
-
-    & .v-slider-thumb {
-        color: var(--fs-range-slider-thumb-color);
-
-        &__surface:before {
-            display: none !important;
-        }
-
-        &__surface:after {
-            display: none !important;
-        }
-
-        &__ripple {
-            display: none !important;
-        }
-    }
-}
-
-.fs-range-slider-label {
-    color: var(--fs-range-slider-color);
-}
-
-.fs-range-slider-description {
-    color: var(--fs-range-slider-color);
-}