@dative-gpi/foundation-core-components 1.0.139 → 1.0.140-selectable2

package/components/autocompletes/FSAutocompleteChart.vue

@@ -25,7 +25,6 @@
       <FSChip
         :color="chartOriginColor(item.type)"
         :label="chartOriginLabel(item.type)"
-        :editable="false"
       />
     </template>
     <template
@@ -46,7 +45,6 @@
           <FSChip
             :color="chartOriginColor(props.item.type)"
             :label="chartOriginLabel(props.item.type)"
-            :editable="false"
           />
         </template>
       </FSButton>

package/components/autocompletes/FSAutocompleteDashboard.vue

@@ -25,7 +25,6 @@
       <FSChip
         :color="dashboardTypeColor(item.type)"
         :label="dashboardTypeLabel(item.type)"
-        :editable="false"
       />
     </template>
     <template
@@ -46,7 +45,6 @@
           <FSChip
             :color="dashboardTypeColor(props.item.type)"
             :label="dashboardTypeLabel(props.item.type)"
-            :editable="false"
           />
         </template>
       </FSButton>

package/components/autocompletes/FSAutocompleteRole.vue

@@ -25,7 +25,6 @@
       <FSChip
         :color="roleTypeColor(item.type)"
         :label="roleTypeLabel(item.type)"
-        :editable="false"
       />
     </template>
     <template
@@ -46,7 +45,6 @@
           <FSChip
             :color="roleTypeColor(props.item.type)"
             :label="roleTypeLabel(props.item.type)"
-            :editable="false"
           />
         </template>
       </FSButton>

package/components/customProperties/FSMetaField.vue

@@ -1,7 +1,7 @@
 <template>
   <FSSelectField
     v-if="$props.customProperty.useOnlyAllowedValues"
-    :editable="$props.editable"
+    :disabled="$props.disabled"
     :itemTitle="itemTitle"
     :label="$props.label"
     :class="classes"
@@ -30,35 +30,35 @@
   >
     <FSNumberField
       v-if="$props.customProperty.dataType === PropertyDataType.Number"
-      :editable="$props.editable"
+      :disabled="$props.disabled"
       :label="$props.label"
       :modelValue="asNumber()"
       @update:modelValue="onUpdate"
     />
     <FSSwitch
       v-else-if="$props.customProperty.dataType === PropertyDataType.Boolean"
-      :editable="$props.editable"
+      :disabled="$props.disabled"
       :label="$props.label"
       :modelValue="asBoolean()"
       @update:modelValue="onUpdate"
     />
     <FSTextField
       v-else-if="$props.customProperty.dataType === PropertyDataType.String"
-      :editable="$props.editable"
+      :disabled="$props.disabled"
       :label="$props.label"
       :modelValue="$props.modelValue"
       @update:modelValue="onUpdate"
     />
     <FSDateTimeField
       v-else-if="$props.customProperty.dataType === PropertyDataType.DateTime"
-      :editable="$props.editable"
+      :disabled="$props.disabled"
       :label="$props.label"
       :modelValue="asNumber()"
       @update:modelValue="onUpdate"
     />
     <FSIconField
       v-else-if="$props.customProperty.dataType === PropertyDataType.Icon"
-      :editable="$props.editable"
+      :disabled="$props.disabled"
       :label="$props.label" 
       :modelValue="modelValue"
       @update:modelValue="onUpdate"
@@ -108,10 +108,10 @@ export default defineComponent({
       required: false,
       default: null
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     }
   },
   emits: ["update:modelValue"],

package/components/customProperties/FSMetaFormContent.vue

@@ -17,7 +17,7 @@
       <FSMetaField
         v-for="(property, index) in properties"
         :customProperty="property"
-        :editable="editable"
+        :disabled="disabled"
         :key="index"
         :modelValue="modelValue[property.code]"
         @update:modelValue="(event) => $emit('update:modelValue', { ...modelValue, [property.code]: event})"
@@ -50,12 +50,13 @@ export default defineComponent({
       type: Object as PropType<{ [key: string]: string }>,
       required: true
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     }
   },
+  emits: ["update:modelValue"],
   setup(props) {
     const categories = props.customProperties.reduce((acc, curr) => {
       if (acc[curr.categoryLabel] === undefined) {

package/components/customProperties/helpers.ts

@@ -1,16 +1,16 @@
-import { useAppTimeZone } from "@dative-gpi/foundation-shared-services/composables";
+import { useDateExpression } from "@dative-gpi/foundation-shared-services/composables";
 import { FilterType, PropertyDataType } from "@dative-gpi/foundation-shared-domain/enums";
 
 import { type CustomPropertyInfos,  } from "../../../foundation-core-domain/models";
 
-const { getOffsetDifference } = useAppTimeZone();
+const { convert: convertExpressionToEpoch } = useDateExpression();
 
 export const getColor = (property: CustomPropertyInfos, value: string): string | undefined => {
     if (property.colorful) {
         for (const color of [...property.colorMap].sort((a, b) => b.priority - a.priority)) {
             let filterValues = [...color.filterValues];
             if ([PropertyDataType.DateTime].includes(property.dataType)) {
-                filterValues = filterValues.map(fv => getEpoch(fv));
+                filterValues = filterValues.map(fv => convertExpressionToEpoch(fv).toString());
             }
             switch (color.filterType) {
                 case FilterType.None: return color.color;
@@ -80,113 +80,3 @@ export const getColor = (property: CustomPropertyInfos, value: string): string |
         }
     }
 }
-
-const getEpoch = (expression: string): string => {
-    if (!isNaN(parseInt(expression))) {
-        return expression;
-    }
-
-    const date = new Date();
-    if (expression.startsWith("now")) {
-        expression = expression.substring(3).replace(/\s/g, "");
-    }
-    else {
-        return (date.getTime()).toString();
-    }
-    let match = /^(?:(?:([-+])(\d*))?(\w+))?(?:\/(\w))?/g.exec(expression);
-    while (match != null && (match[0] != null && match[0].length > 0)) {
-        if (match[1] != null && match[3] != null) {
-            if (!["-", "+"].includes(match[1]) || isNaN(parseInt(match[2])) || !["s", "m", "h", "d", "w", "M", "y"].includes(match[3])) {
-                return (date.getTime()).toString();
-            }
-            const offset = match[1] == "-" ? -1 * parseInt(match[2]): 1* parseInt(match[2]);
-            switch (match[3]) {
-                case "s": {
-                    date.setSeconds(date.getSeconds() + offset);
-                    break;
-                }
-                case "m": {
-                    date.setMinutes(date.getMinutes() + offset);
-                    break;
-                }
-                case "h": {
-                    date.setHours(date.getHours() + offset);
-                    break;
-                }
-                case "d": {
-                    date.setDate(date.getDate() + offset);
-                    break;
-                }
-                case "w": {
-                    date.setDate(date.getDate() + offset * 7);
-                    break;
-                }
-                case "M": {
-                    date.setMonth(date.getMonth() + offset);
-                    break;
-                }
-                case "y": {
-                    date.setFullYear(date.getFullYear() + offset);
-                    break;
-                }
-            }
-        }
-        if (match[4] != null) {
-            if (!["s", "m", "h", "d", "w", "M", "y"].includes(match[4])) {
-                return (date.getTime()).toString();
-            }
-            switch (match[4]) {
-                case "s": {
-                    date.setMilliseconds(0);
-                    break;
-                }
-                case "m": {
-                    date.setMilliseconds(0);
-                    date.setSeconds(0);
-                    break;
-                }
-                case "h": {
-                    date.setMilliseconds(0);
-                    date.setSeconds(0);
-                    date.setMinutes(0);
-                    break;
-                }
-                case "d": {
-                    date.setMilliseconds(0);
-                    date.setSeconds(0);
-                    date.setMinutes(0);
-                    date.setHours(0);
-                    break;
-                }
-                case "w": {
-                    date.setMilliseconds(0);
-                    date.setSeconds(0);
-                    date.setMinutes(0);
-                    date.setHours(0);
-                    date.setDate(date.getDate() - date.getDay() + (date.getDay() === 0 ? -6 : 1));
-                    break;
-                }
-                case "M": {
-                    date.setMilliseconds(0);
-                    date.setSeconds(0);
-                    date.setMinutes(0);
-                    date.setHours(0);
-                    date.setDate(1);
-                    break;
-                }
-                case "y": {
-                    date.setMilliseconds(0);
-                    date.setSeconds(0);
-                    date.setMinutes(0);
-                    date.setHours(0);
-                    date.setDate(1);
-                    date.setMonth(0);
-                    break;
-                }
-            }
-        }
-        expression = expression.substring(match[0].length);
-        match = /(?:(?:([-+])(\d*))?(\w+))?(?:\/(\w))?/g.exec(expression);
-    }
-    return (date.getTime() + getOffsetDifference()).toString();
-}

package/components/entities/FSEntityField.vue

@@ -3,7 +3,7 @@
     :description="$props.description"
     :hideHeader="$props.hideHeader"
     :required="$props.required"
-    :editable="$props.editable"
+    :disabled="$props.disabled"
     :label="$props.label"
     :messages="$props.messages"
     :entityType="$props.entityType"
@@ -96,10 +96,10 @@ export default defineComponent({
       required: false,
       default: null
     },
-    editable: {
+    disabled: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     },
     entityType: {
       type: Number as PropType<EntityType>,

package/components/explorers/FSBaseDevicesExplorer.vue

@@ -4,7 +4,7 @@
     :loading="fetchingDeviceExplorerElements"
     :singleSelect="$props.singleSelect"
     :items="deviceExplorerElements"
-    :showSelect="$props.editable"
+    :showSelect="$props.selectable"
     :tableCode="$props.tableCode"
     :itemTo="$props.itemTo"
     :noSearch="$props.recursiveSearch"
@@ -52,7 +52,7 @@
     >
       <FSTagGroup
         variant="slide"
-        :editable="false"
+        :disabled="true"
         :tags="item.tags"
       />
     </template>
@@ -135,6 +135,7 @@
         v-if="item.type === DeviceExplorerElementType.Group"
         :to="$props.itemTo && $props.itemTo(item)"
         :modelValue="isSelected(item.id)"
+        :selectable="$props.selectable"
         @update:modelValue="toggleSelect(item)"
         v-bind="item"
       />
@@ -147,6 +148,7 @@
         :deviceAlerts="item.alerts"
         :alertTo="$props.alertTo"
         :modelValue="isSelected(item.id)"
+        :selectable="$props.selectable"
         @update:modelValue="toggleSelect(item)"
         v-bind="item"
       />
@@ -221,7 +223,7 @@ export default defineComponent({
       required: false,
       default: null
     },
-    editable: {
+    selectable: {
       type: Boolean,
       required: false,
       default: true

package/components/explorers/FSBaseFoldersExplorer.vue

@@ -6,6 +6,7 @@
     :loading="fetchingFolders || fetchingDashboardOrganisations || fetchingDashboardShallows"
     :tableCode="$props.tableCode"
     :modelValue="selecteds"
+    :showSelect="$props.selectable"
     @update:modelValue="onSelect"
     v-bind="$attrs"
   >
@@ -69,7 +70,7 @@
     >
       <FSTagGroup
         variant="slide"
-        :editable="false"
+        :showRemove="false"
         :tags="item.tags"
       />
     </template>
@@ -80,6 +81,7 @@
         v-if="item.type == FoldersListType.Folder"
         :bottomColor="item.colors"
         v-bind="item"
+        :selectable="$props.selectable"
         :modelValue="isSelected(item.id)"
         @update:modelValue="toggleSelect(item)"
         :to="$props.itemTo && $props.itemTo(item)"
@@ -87,6 +89,7 @@
       <FSDashboardOrganisationTileUI
         v-if="item.type == FoldersListType.Dashboard && item.dashboardType == DashboardType.Organisation"
         :bottomColor="item.colors"
+        :selectable="$props.selectable"
         :modelValue="isSelected(item.id)"
         @update:modelValue="toggleSelect(item)"
         :to="$props.itemTo && $props.itemTo(item)"
@@ -95,6 +98,7 @@
       <FSDashboardShallowTileUI
         v-if="item.type == FoldersListType.Dashboard && item.dashboardType == DashboardType.Shallow"
         :bottomColor="item.colors"
+        :selectable="$props.selectable"
         :modelValue="isSelected(item.id)"
         @update:modelValue="toggleSelect(item)"
         :to="$props.itemTo && $props.itemTo(item)"
@@ -166,6 +170,11 @@ export default defineComponent({
     tableCode: {
       type: String,
       required: true
+    },
+    selectable: {
+      type: Boolean,
+      required: false,
+      default: true
     }
   },
   emits: ["update", "update:modelValue", "update:type", "update:dashboard-type"],

package/components/lists/alerts/FSBaseAlertsList.vue

@@ -7,6 +7,7 @@
     :loading="fetchingAlerts"
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"
+    :showSelect="$props.selectable"
     @update:modelValue="$emit('update:modelValue', $event)"
     v-bind="$attrs"
   >
@@ -50,7 +51,7 @@
     >
       <FSTagGroup
         variant="slide"
-        :editable="false"
+        :showRemove="false"
         :tags="item.tags"
       />
     </template>
@@ -60,7 +61,7 @@
       <FSTagGroup
         variant="slide"
         :tags="item.groupByValues.map((gbv: any) => `${gbv.label}: ${gbv.value}`)"
-        :editable="false"
+        :showRemove="false"
       />
     </template>
     <template
@@ -120,7 +121,7 @@
       <FSTagGroup
         variant="slide"
         :tags="item.history.map((h: any) => AlertTools.statusLabel(h.status))"
-        :editable="false"
+        :showRemove="false"
       />
     </template>
     <template
@@ -196,16 +197,19 @@
       </FSSpan>
     </template>
     <template
-      #item.tile="{ item }"
+      #item.tile="{ item, toggleSelect }"
     >
       <FSAlertTileUI
         variant="standard"
         :label="item.label"
         :deviceOrganisationLabel="item.deviceOrganisationLabel"
         :icon="item.icon"
+        :selectable="$props.selectable"
         :triggerProcessedTimestamp="item.triggerProcessedTimestamp"
         :to="$props.itemTo && $props.itemTo(item)"
+        :modelValue="isSelected(item.id)"
         :color="alertColorByCriticity(item.criticity)"
+        @update:modelValue="toggleSelect(item)"
       />
     </template>
   </FSDataTable>
@@ -280,6 +284,11 @@ export default defineComponent({
       type: Function as PropType<(item: AlertInfos) => Partial<RouteLocation>>,
       required: false
     },
+    selectable: {
+      type: Boolean,
+      required: false,
+      default: true
+    }
   },
   emits: ["update:modelValue"],
   setup(props) {
@@ -295,6 +304,10 @@ export default defineComponent({
       return AlertTools.criticityColor(criticity);
     };
 
+    const isSelected = (id: string): boolean => {
+      return props.modelValue.includes(id);
+    };
+
     const alertsOrdered = computed(() => {
       const als = [...alerts.value]
       return  als.sort((a: AlertInfos, b: AlertInfos) => {
@@ -331,7 +344,8 @@ export default defineComponent({
       ColorEnum,
       epochToShortTimeFormat,
       alertColorByCriticity,
-      criticityColor
+      criticityColor,
+      isSelected
     };
   }
 });

package/components/lists/authTokens/FSBaseAuthTokensList.vue

@@ -3,6 +3,7 @@
     :items="authTokens"
     :loading="fetchingAuthTokens"
     :tableCode="$props.tableCode"
+    :showSelect="false"
     v-bind="$attrs"
   >
     <template

package/components/lists/chartOrganisationTypes/FSBaseChartOrganisationTypesList.vue

@@ -7,6 +7,8 @@
     :headersOptions="headersOptions"
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"
+    :showSelect="$props.selectable"
+    :singleSelect="$props.singleSelect"
     @update:modelValue="$emit('update:modelValue', $event)"
     v-bind="$attrs"
   >
@@ -49,7 +51,7 @@
     >
       <FSTagGroup
         variant="slide"
-        :editable="false"
+        :disabled="true"
         :tags="item.tags"
       />
     </template>
@@ -71,21 +73,23 @@
       #item.modelsLabels="{ item }"
     >
       <FSTagGroup
-        :editable="false"
+        :disabled="true"
         :tags="item.modelsLabels.map((d: any) => d.label)"
       />
     </template>
     <template
-      #item.tile="{item}"
+      #item.tile="{ item, toggleSelect}"
     >
       <FSChartTileUI
-        variant="standard"
         :label="item.label"
         :category-label="item.chartCategoryLabel"
+        :singleSelect="$props.singleSelect"
+        :selectable="$props.selectable"
         :icon="item.icon"
         :imageId="item.imageId"
         :type="item.chartType"
-        :color="ColorEnum.Light"
+        :modelValue="isSelected(item.id)"
+        @update:modelValue="toggleSelect(item)"
         :to="$props.itemTo && $props.itemTo(item)"
       />
     </template>
@@ -144,6 +148,16 @@ export default defineComponent({
       type: Array as PropType<string[]>,
       default: () => [],
       required: false
+    },
+    selectable: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    singleSelect: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   emits: ["update:modelValue"],

package/components/lists/chartOrganisations/FSBaseChartOrganisationsList.vue

@@ -7,6 +7,8 @@
     :headersOptions="headersOptions"
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"
+    :singleSelect="$props.singleSelect"
+    :showSelect="$props.selectable"
     @update:modelValue="$emit('update:modelValue', $event)"
     v-bind="$attrs"
   >
@@ -49,7 +51,7 @@
     >
       <FSTagGroup
         variant="slide"
-        :editable="false"
+        :disabled="true"
         :tags="item.tags"
       />
     </template>
@@ -57,24 +59,10 @@
       #item.modelsLabels="{ item }"
     >
       <FSTagGroup
-        :editable="false"
+        :disabled="true"
         :tags="item.modelsLabels.map((d: any) => d.label)"
       />
     </template>
-    <template
-      #item.tile="{ item }"
-    >
-      <FSChartTileUI
-        variant="standard"
-        :label="item.label"
-        :categoryLabel="item.chartCategoryLabel"
-        :icon="item.icon"
-        :imageId="item.imageId"
-        :type="item.chartType"
-        :color="ColorEnum.Light"
-        :to="$props.itemTo && $props.itemTo(item)"
-      />
-    </template>
     <template
       #item.chartType="{ item }"
     >
@@ -89,6 +77,22 @@
         </FSText>
       </FSRow>
     </template>
+    <template
+      #item.tile="{ item, toggleSelect }"
+    >
+      <FSChartTileUI
+        :label="item.label"
+        :singleSelect="$props.singleSelect"
+        :selectable="$props.selectable"
+        :categoryLabel="item.chartCategoryLabel"
+        :icon="item.icon"
+        :imageId="item.imageId"
+        :type="item.chartType"
+        :modelValue="isSelected(item.id)"
+        @update:modelValue="toggleSelect(item)"
+        :to="$props.itemTo && $props.itemTo(item)"
+      />
+    </template>
   </FSDataTable>
 </template>
 
@@ -144,7 +148,17 @@ export default defineComponent({
       type: Array as PropType<string[]>,
       default: () => [],
       required: false
-    }
+    },
+    selectable: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    singleSelect: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
   },
   emits: ["update:modelValue"],
   setup(props) {