@dative-gpi/foundation-shared-components 1.0.70 → 1.0.71-groupings-2

package/components/fields/FSDateTimeRangeField.vue

@@ -6,7 +6,7 @@
     :color="$props.color"
     :hideHeader="$props.hideHeader"
     :required="$props.required"
-    :editable="$props.editable"
+    :disabled="$props.disabled"
     :readonly="true"
     :rules="$props.rules"
     :messages="messages"
@@ -15,6 +15,7 @@
     :modelValue="toShortTimeFormat"
     @click="onClick"
     @update:modelValue="onClear"
+    v-bind="$attrs"
   >
     <template
       #prepend-inner
@@ -25,7 +26,7 @@
         <FSButton
           variant="icon"
           icon="mdi-calendar"
-          :editable="$props.editable"
+          :disabled="$props.disabled"
           :color="ColorEnum.Dark"
         />
       </slot>
@@ -40,66 +41,34 @@
       />
     </template>
   </FSTextField>
-  <FSDialogSubmit
+  <FSDateTimeRangeDialog
     :title="$props.label"
     :submitButtonColor="$props.color"
-    @click:submitButton="onSubmit"
-    v-model="dialog"
-  >
-    <template
-      #body
-    >
-      <FSCol>
-        <FSCalendarTwin
-          :color="$props.color"
-          v-model="innerDateRange"
-        />
-        <FSRow>
-          <FSCol>
-            <FSClock
-              :color="$props.color"
-              :date="innerDateLeft"
-              v-model="innerTimeLeft"
-            />
-          </FSCol>
-          <FSCol>
-            <FSClock
-              :color="$props.color"
-              :date="innerDateRight"
-              v-model="innerTimeRight"
-            />
-          </FSCol>
-        </FSRow>
-      </FSCol>
-    </template>
-  </FSDialogSubmit>
+    :dialog="dialog"
+    :modelValue="$props.modelValue"
+    :color="$props.color"
+    @cancel="dialog = false"
+    @update:modelValue="onSubmit($event)"
+  />
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, type PropType, ref, watch } from "vue";
+import { computed, defineComponent, type PropType, ref } from "vue";
 
 import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
-import { useAppTimeZone, useDateFormat } from "@dative-gpi/foundation-shared-services/composables";
+import { useDateFormat } from "@dative-gpi/foundation-shared-services/composables";
 import { useRules } from "@dative-gpi/foundation-shared-components/composables";
 
-import FSDialogSubmit from "../FSDialogSubmit.vue";
-import FSCalendarTwin from "../FSCalendarTwin.vue";
+import FSDateTimeRangeDialog from "./FSDateTimeRangeDialog.vue";
 import FSTextField from "./FSTextField.vue";
 import FSButton from "../FSButton.vue";
-import FSClock from "../FSClock.vue";
-import FSCol from "../FSCol.vue";
-import FSRow from "../FSRow.vue";
 
 export default defineComponent({
   name: "FSDateTimeRangeField",
   components: {
-    FSDialogSubmit,
-    FSCalendarTwin,
+    FSDateTimeRangeDialog,
     FSTextField,
-    FSButton,
-    FSClock,
-    FSCol,
-    FSRow
+    FSButton
   },
   props: {
     label: {
@@ -137,24 +106,19 @@ export default defineComponent({
       required: false,
       default: () => []
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     }
   },
   emits: ["update:modelValue"],
   setup(props, { emit }) {
-    const { getUserOffset } = useAppTimeZone();
     const { epochToShortTimeFormat } = useDateFormat();
     const { validateOn, getMessages } = useRules();
 
     const dialog = ref(false);
 
-    const innerDateRange = ref<number[] | null>(null);
-    const innerTimeRight = ref(0);
-    const innerTimeLeft = ref(0);
-
     const toShortTimeFormat = computed((): string => {
       if (!props.modelValue || !Array.isArray(props.modelValue) || !props.modelValue.length) {
         return "";
@@ -162,88 +126,32 @@ export default defineComponent({
       return props.modelValue.map((epoch) => epochToShortTimeFormat(epoch)).join(" - ");
     });
 
-    const innerDateLeft = computed((): number | null => {
-      if (innerDateRange.value && Array.isArray(innerDateRange.value) && innerDateRange.value.length) {
-        return innerDateRange.value[0];
-      }
-      return null;
-    });
-
-    const innerDateRight= computed((): number | null => {
-      if (innerDateRange.value && Array.isArray(innerDateRange.value) && innerDateRange.value.length > 1) {
-        return innerDateRange.value[1];
-      }
-      return null;
-    });
-
     const messages = computed((): string[] => getMessages(props.modelValue, props.rules, true));
 
     const onClick = (): void => {
-      if (props.editable) {
+      if (!props.disabled) {
         dialog.value = true;
       }
     };
 
-    const onClear = (): void => {
-      emit("update:modelValue", null);
-      innerTimeLeft.value = 0;
-      innerTimeRight.value = 0;
-      innerDateRange.value = null;
-    };
-
-    const onSubmit = (): void => {
-      if (innerDateRange.value && Array.isArray(innerDateRange.value) && innerDateRange.value.length > 1) {
-        emit("update:modelValue", [innerDateRange.value[0] + innerTimeLeft.value, innerDateRange.value[1] + innerTimeRight.value]);
-      }
+    const onSubmit = (value: number[]): void => {
+      emit("update:modelValue", value);
       dialog.value = false;
     };
 
-    const reset = (): void => {
-      if (props.modelValue && Array.isArray(props.modelValue)) {
-        // FSClock just gives two numbers without consideration for the time zone
-        // We must adjust the time to the user's time zone
-        switch (props.modelValue.length) {
-          case 0: {
-            break;
-          }
-          case 1: {
-            innerTimeLeft.value = Math.floor((props.modelValue[0] + getUserOffset()) % (24 * 60 * 60 * 1000));
-            innerDateRange.value = [props.modelValue[0] - innerTimeLeft.value];
-            break;
-          }
-          default: {
-            innerTimeLeft.value = Math.floor((props.modelValue[0] + getUserOffset()) % (24 * 60 * 60 * 1000));
-            innerTimeRight.value = Math.floor((props.modelValue[1] + getUserOffset()) % (24 * 60 * 60 * 1000));
-            innerDateRange.value = [props.modelValue[0] - innerTimeLeft.value, props.modelValue[1] - innerTimeRight.value];
-            break;
-          }
-        }
-      }
-      else {
-        innerDateRange.value = null;
-        innerTimeLeft.value = 0;
-        innerTimeRight.value = 0;
-      }
+    const onClear = (): void => {
+      emit("update:modelValue", null);
     };
 
-    watch(() => props.modelValue, () => {
-      reset();
-    }, { immediate: true });
-
     return {
       toShortTimeFormat,
-      innerDateLeft,
-      innerTimeLeft,
-      innerDateRight,
-      innerTimeRight,
-      innerDateRange,
       validateOn,
       ColorEnum,
       messages,
       dialog,
       onSubmit,
       onClear,
-      onClick
+      onClick,
     };
   }
 });

package/components/fields/FSEntityFieldUI.vue

@@ -3,7 +3,7 @@
     :description="$props.description"
     :hideHeader="$props.hideHeader"
     :required="$props.required"
-    :editable="$props.editable"
+    :disabled="$props.disabled"
     :label="$props.label"
     :messages="messages"
   >
@@ -14,18 +14,20 @@
         :wrap="false"
       >
         <FSSelectField
+          :disabled="$props.disabled"
+          :items="actualEntityTypes"
           :hideHeader="true"
+          :clearable="false"
           :modelValue="$props.entityType"
           @update:modelValue="$emit('update:entityType', $event)"
-          :items="actualEntityTypes"
-          :clearable="false"
         />
         <template
           v-if="itemsCount > 0"
         >
           <FSButton
-            :label="$tr('ui.entity-field.edit', 'Edit')"
             icon="mdi-pencil"
+            :label="$tr('ui.common.edit', 'Edit')"
+            :disabled="$props.disabled"
             @click="$emit('click:select')"
           />
         </template>
@@ -33,8 +35,9 @@
           v-else
         >
           <FSButton
-            :label="$tr('ui.entity-field.select', 'Select')"
             icon="mdi-plus-circle-multiple-outline"
+            :label="$tr('ui.common.select', 'Select')"
+            :disabled="$props.disabled"
             @click="$emit('click:select')"
           />
         </template>
@@ -60,7 +63,7 @@
               <FSSpan
                 font="text-overline"
               >
-                {{ $tr('ui.entity-field.selected', '{0} selected(s)', itemsCount) }}
+                {{ $tr('entity-field.selected', '{0} selected(s)', itemsCount) }}
               </FSSpan>
             </FSRow>
           </FSColor>
@@ -84,7 +87,7 @@
               <FSSpan
                 font="text-overline"
               >
-                {{ $tr('ui.entity-field.no-entity-selected', 'No entity selected') }}
+                {{ $tr('entity-field.no-entity-selected', 'No entity selected') }}
               </FSSpan>
             </FSRow>
           </FSColor>
@@ -167,10 +170,10 @@ export default defineComponent({
       required: false,
       default: null
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     },
     entityType: {
       type: Number as PropType<EntityType>,
@@ -205,31 +208,31 @@ export default defineComponent({
       const items = [
         {
           id: EntityType.Model,
-          label: $tr("ui.entity-type.models", "Models")
+          label: $tr("ui.common.models", "Model(s)")
         },
         {
           id: EntityType.Group,
-          label: $tr("ui.entity-type.groups", "Groups")
+          label: $tr("ui.common.groups", "Groups")
         },
         {
           id: EntityType.Location,
-          label: $tr("ui.entity-type.locations", "Locations")
+          label: $tr("ui.common.locations", "Locations")
         },
         {
           id: EntityType.Device,
-          label: $tr("ui.entity-type.devices", "Devices")
+          label: $tr("ui.common.devices", "Devices")
         },
         {
           id: EntityType.User,
-          label: $tr("ui.entity-type.users", "Users")
+          label: $tr("ui.common.users", "Users")
         },
         {
           id: EntityType.Dashboard,
-          label: $tr("ui.entity-type.dashboards", "Dashboards")
+          label: $tr("ui.common.dashboards", "Dashboards")
         },
         {
           id: EntityType.Folder,
-          label: $tr("ui.entity-type.folders", "Folders")
+          label: $tr("ui.common.folders", "Folders")
         }
       ];
 

package/components/fields/FSGradientField.vue

@@ -6,7 +6,7 @@
       :label="$props.label"
       :description="$props.description"
       :required="$props.required"
-      :editable="$props.editable"
+      :disabled="$props.disabled"
       v-bind="$attrs"
     >
       <FSRow>
@@ -15,14 +15,14 @@
           :allowOpacity="$props.allowOpacity"
           :modelValue="$props.modelValue[colorIndex - 1]"
           :required="$props.required"
-          :editable="$props.editable"
+          :disabled="$props.disabled"
           :key="colorIndex"
           @update:modelValue="$emit('update:modelValue', $props.modelValue.map((color, i) => colorIndex === i + 1 ? $event : color))"
         />
       </FSRow>
       <FSSelectField
         class="fs-gradient-field-select"
-        :editable="$props.editable"
+        :disabled="$props.disabled"
         :clearable="false"
         :items="items"
         modelValue="custom"
@@ -92,10 +92,10 @@ export default defineComponent({
       required: false,
       default: false
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     },
     allowOpacity: {
       type: Boolean,

package/components/fields/FSIconField.vue

@@ -1,15 +1,18 @@
 <template>
-  <FSCol>
+  <FSCol
+    :maxWidth="$props.maxWidth"
+  >
     <FSTextField
       :label="$props.label"
       :description="$props.description"
       :hideHeader="$props.hideHeader"
       :required="$props.required"
-      :editable="$props.editable"
+      :disabled="$props.disabled"
       :rules="$props.rules"
       :messages="messages"
       :validateOn="validateOn"
       :validationValue="$props.modelValue"
+      :maxWidth="null"
       v-model="innerValue"
       v-bind="$attrs"
     >
@@ -28,14 +31,13 @@
       </template>
     </FSTextField>
     <FSToggleSet
-      class="fs-icon-field-set"
       ref="toggleSetRef"
       variant="slide"
       :buttonColor="$props.buttonColor"
       :activeColor="$props.activeColor"
       :modelValue="$props.modelValue"
       :required="$props.required"
-      :editable="$props.editable"
+      :disabled="$props.disabled"
       :values="icons"
       @update:modelValue="$emit('update:modelValue', $event)"
     />
@@ -43,7 +45,7 @@
 </template>
 
 <script lang="ts">
-import type { PropType} from "vue";
+import type { PropType, StyleValue } from "vue";
 import { computed, defineComponent, ref, watch } from "vue";
 
 import { Icons, sortByLevenshteinDistance } from "@dative-gpi/foundation-shared-components/utils";
@@ -120,11 +122,16 @@ export default defineComponent({
       required: false,
       default: () => []
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
-    }
+      default: false
+    },
+    maxWidth: {
+      type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
+      required: false,
+      default: "600px"
+    },
   },
   emits: ["update:modelValue"],
   setup(props) {
@@ -139,7 +146,7 @@ export default defineComponent({
     const innerValue = ref<string | null>(null);
 
     const style = computed((): StyleValue => {
-      if (!props.editable) {
+      if (props.disabled) {
         return {
           "--fs-icon-field-color": lights.dark
         };

package/components/fields/FSMapAddressField.vue

@@ -0,0 +1,187 @@
+<template>
+  <FSCol>
+    <FSMap
+      :lockZoomOnFlyTo="true"
+      v-model:center="center"
+      :enableScrollWheelZoom="true"
+      :showMyLocation="true"
+      :zoom="5"
+      v-model:currentLayer="mapLayer"
+      @click:latlng="(latlng: any) => onNewLatLng(latlng.lat, latlng.lng, false)"
+      v-bind="$attrs"
+    >
+      <FSMapMarker
+        v-if="actualLatitude && actualLongitude"
+        :label="$props.label"
+        :icon="$props.icon"
+        :latlng="{ lat: actualLatitude, lng: actualLongitude }"
+        :selected="true"
+      />
+    </FSMap>
+    <FSCol>
+      <FSAutoCompleteAddress
+        :maxWidth="null"
+        :modelValue="$props.modelValue"
+        @update:modelValue="$emit('update:modelValue', $event)"
+      />
+      <FSRow>
+        <FSNumberField
+          :label="$tr('ui.location.latitude', 'Latitude')"
+          :modelValue="actualLatitude"
+          :clearable="false"
+          :rules="[NumberRules.max(90), NumberRules.min(-90), NumberRules.required()]"
+          @update:modelValue="onNewLatLng($event, actualLongitude ?? 0, true)"
+        />
+        <FSNumberField
+          :label="$tr('ui.location.longitude', 'Longitude')"
+          :modelValue="actualLongitude"
+          :clearable="false"
+          :rules="[NumberRules.max(180), NumberRules.min(-180), NumberRules.required()]"
+          @update:modelValue="onNewLatLng(actualLatitude ?? 0, $event, true)"
+        />
+      </FSRow>
+    </FSCol>
+  </FSCol>
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, ref, watch, type PropType } from "vue";
+
+import type { Address } from "@dative-gpi/foundation-shared-domain";
+import { useAddress } from "@dative-gpi/foundation-shared-components/composables";
+import { MapLayers, NumberRules } from '@dative-gpi/foundation-shared-components/models';
+
+import FSAutoCompleteAddress from '@dative-gpi/foundation-shared-components/components/autocompletes/FSAutoCompleteAddress.vue';
+import FSNumberField from "@dative-gpi/foundation-shared-components/components/fields/FSNumberField.vue"
+import FSMapMarker from '@dative-gpi/foundation-shared-components/components/map/FSMapMarker.vue';
+import FSMap from "@dative-gpi/foundation-shared-components/components/map/FSMap.vue";
+import FSRow from '@dative-gpi/foundation-shared-components/components/FSRow.vue';
+import FSCol from '@dative-gpi/foundation-shared-components/components/FSCol.vue';
+
+
+export function debounceAsync<T, U extends any[]>(
+  callback: (...args: U) => Promise<T>,
+  wait: number,
+): (...args: U) => Promise<T> {
+  let timeoutId: number | null = null;
+  let rejectPromise: (((reason?: any) => void) | null) = null;
+
+  return (...args: U) => {
+    if (timeoutId) {
+      clearTimeout(timeoutId);
+      timeoutId = null;
+    }
+    if (rejectPromise) {
+      rejectPromise("debounced");
+      rejectPromise = null;
+    }
+
+    return new Promise<T>((resolve) => {
+      const timeoutPromise = new Promise<void>((resolve, reject) => {
+        timeoutId = setTimeout(resolve, wait);
+        rejectPromise = reject;
+      });
+      timeoutPromise.then(async () => {
+        resolve(await callback(...args));
+      });
+    });
+  };
+}
+
+export default defineComponent({
+  name: "FSMapAddressField",
+  components: {
+    FSAutoCompleteAddress,
+    FSNumberField,
+    FSMapMarker,
+    FSMap,
+    FSRow,
+    FSCol
+  },
+  emits: ["update:modelValue"],
+  props: {
+    label: {
+      type: String,
+      required: true,
+    },
+    icon: {
+      type: String,
+      required: true,
+    },
+    modelValue: {
+      type: Object as PropType<Address | null>,
+      required: false,
+    }
+  },
+  setup(props, { emit }) {
+    const { reverseSearch } = useAddress();
+
+    const loading = ref(false);
+    const actualLatitude = ref<number | null>(null);
+    const actualLongitude = ref<number | null>(null);
+    const mapLayer = ref(MapLayers.Map);
+
+    const center = computed(() => {
+      return props.modelValue ? [props.modelValue.latitude, props.modelValue.longitude] : null;
+    });
+
+    const reverseSearchDebounced = debounceAsync(reverseSearch, 500);
+    
+    const onNewLatLng = async (lat: number|string, lng: number|string, debounced: boolean) => {
+      if(typeof lat === 'string') {
+        lat = parseFloat(lat);
+        if(isNaN(lat)) {
+          return;
+        }
+      }
+
+      if(typeof lng === 'string') {
+        lng = parseFloat(lng);
+        if(isNaN(lng)) {
+          return;
+        }
+      }
+
+      actualLatitude.value = lat;
+      actualLongitude.value = lng;
+
+      let fullAddress;
+      loading.value = true;
+      if(debounced) {
+        try {
+          fullAddress = await reverseSearchDebounced(lat, lng);
+        } catch {
+          return;
+        }
+      } else {
+        fullAddress = await reverseSearch(lat, lng);
+      }
+
+      emit("update:modelValue", {
+        ...fullAddress,
+        latitude: actualLatitude.value,
+        longitude: actualLongitude.value,
+      });
+      loading.value = false;
+    }
+
+    watch(() => props.modelValue, (newValue) => {
+      if(newValue) {
+        actualLatitude.value = newValue.latitude;
+        actualLongitude.value = newValue.longitude;
+      }
+    }, { immediate: true });
+
+    return {
+      center, 
+      mapLayer,
+      NumberRules,
+      actualLatitude,
+      actualLongitude,
+      onNewLatLng
+    };
+  }
+});
+
+
+</script>

package/components/fields/FSNumberField.vue

@@ -2,7 +2,7 @@
   <FSTextField
     class="fs-number-field"
     minWidth="80px"
-    :editable="$props.editable"
+    :disabled="$props.disabled"
     :modelValue="$props.modelValue?.toString()"
     @update:modelValue="onUpdate"
     v-bind="$attrs"
@@ -35,18 +35,22 @@ export default defineComponent({
       required: false,
       default: null
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     }
   },
   emits: ["update:modelValue"],
   setup(_, { emit }) {
-    const onUpdate = (value: string) => {
+    const onUpdate = (value: string | null | undefined) => {
       if (value === "-") {
         return;
       }
+      if(value === null || value === undefined) {
+        emit("update:modelValue", null);
+        return;
+      }
       const match = /[-]?([0-9 ]*[,.]?)?[0-9]*/.exec(value);
       if (match != null && !isNaN(parseFloat(match[0].replace(",", ".").replace(" ", "")))) {
         emit("update:modelValue", parseFloat(match[0].replace(",", ".").replace(" ", "")));