@dative-gpi/foundation-core-components 1.0.140 → 1.0.142

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/explorers/FSBaseDevicesExplorer.vue

@@ -4,7 +4,7 @@
     :loading="fetchingDeviceExplorerElements"
     :singleSelect="$props.singleSelect"
     :items="deviceExplorerElements"
-    :showSelect="$props.selectable"
+    :selectable="$props.selectable"
     :tableCode="$props.tableCode"
     :itemTo="$props.itemTo"
     :noSearch="$props.recursiveSearch"
@@ -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"
       />

package/components/explorers/FSBaseFoldersExplorer.vue

@@ -6,6 +6,7 @@
     :loading="fetchingFolders || fetchingDashboardOrganisations || fetchingDashboardShallows"
     :tableCode="$props.tableCode"
     :modelValue="selecteds"
+    :selectable="$props.selectable"
     @update:modelValue="onSelect"
     v-bind="$attrs"
   >
@@ -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"
+    :selectable="$props.selectable"
     @update:modelValue="$emit('update:modelValue', $event)"
     v-bind="$attrs"
   >
@@ -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,7 +3,7 @@
     :items="authTokens"
     :loading="fetchingAuthTokens"
     :tableCode="$props.tableCode"
-    :showSelect="false"
+    :selectable="false"
     v-bind="$attrs"
   >
     <template

package/components/lists/chartOrganisationTypes/FSBaseChartOrganisationTypesList.vue

@@ -7,7 +7,7 @@
     :headersOptions="headersOptions"
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"
-    :showSelect="$props.selectable"
+    :selectable="$props.selectable"
     :singleSelect="$props.singleSelect"
     @update:modelValue="$emit('update:modelValue', $event)"
     v-bind="$attrs"

package/components/lists/chartOrganisations/FSBaseChartOrganisationsList.vue

@@ -8,7 +8,7 @@
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"
     :singleSelect="$props.singleSelect"
-    :showSelect="$props.selectable"
+    :selectable="$props.selectable"
     @update:modelValue="$emit('update:modelValue', $event)"
     v-bind="$attrs"
   >

package/components/lists/charts/FSBaseChartsList.vue

@@ -4,7 +4,7 @@
     :loading="fetchingChartOrganisationTypes || fetchingChartOrganisations"
     :headersOptions="headersOptions"
     :items="charts"
-    :showSelect="$props.selectable"
+    :selectable="$props.selectable"
     :singleSelect="$props.singleSelect"
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"

package/components/lists/dashboardOrganisationTypes/FSBaseDashboardOrganisationTypesList.vue

@@ -6,7 +6,7 @@
     :itemTo="$props.itemTo"
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"
-    :showSelect="$props.selectable"
+    :selectable="$props.selectable"
     :singleSelect="$props.singleSelect"
     @update:modelValue="$emit('update:modelValue', $event)"
     v-bind="$attrs"

package/components/lists/dashboards/FSBaseDashboardsList.vue

@@ -5,7 +5,7 @@
     :itemTo="$props.itemTo"
     :loading="fetchingDashboardOrganisationTypes || fetchingDashboardOrganisations || fetchingDashboardShallows"
     :tableCode="$props.tableCode"
-    :showSelect="$props.selectable"
+    :selectable="$props.selectable"
     :singleSelect="$props.singleSelect"
     :modelValue="selecteds"
     @update:modelValue="onSelect"

package/components/lists/dashboards/FSSimpleDashboardsList.vue

@@ -8,9 +8,13 @@
 
 <script lang="ts">
 import { defineComponent, type PropType, watch, computed } from "vue";
+import _ from "lodash";
 
 import type { DashboardOrganisationFilters, DashboardOrganisationTypeFilters } from "@dative-gpi/foundation-core-domain/models";
-import { useDashboardOrganisations, useDashboardOrganisationTypes } from "@dative-gpi/foundation-core-services/composables";
+import { useDashboardOrganisations, useDashboardOrganisationTypes, useDashboardShallows } from "@dative-gpi/foundation-core-services/composables";
+
+import { DashboardType } from '@dative-gpi/foundation-shared-domain/enums';
+import type { DashboardsListItem } from '@dative-gpi/foundation-core-components/utils';
 
 import FSSimpleList from "@dative-gpi/foundation-shared-components/components/lists/FSSimpleList.vue";
 
@@ -29,6 +33,11 @@ export default defineComponent({
       type: Object as PropType<DashboardOrganisationTypeFilters>,
       required: false,
       default: () => ({})
+    },
+    dashboardShallowFilters: {
+      type: Object as PropType<DashboardOrganisationTypeFilters>,
+      required: false,
+      default: () => ({})
     }
   },
   setup(props){
@@ -38,17 +47,35 @@ export default defineComponent({
     const { entities: dashboardOrganisationTypes, 
             getMany: getManyDashboardOrganisationTypes, 
             fetching: fetchingDashboardOrganisationTypes } = useDashboardOrganisationTypes();
+    const { entities: dashboardShallows, 
+            getMany: getManyDashboardShallows, 
+            fetching: fetchingDashboardShallows } = useDashboardShallows();
 
     const fetching = computed(() => fetchingDashboardOrganisations.value 
-      || fetchingDashboardOrganisationTypes.value);
+      || fetchingDashboardOrganisationTypes.value
+      || fetchingDashboardShallows.value);
     
-    const dashboards = computed(() => {
-      return [...dashboardOrganisations.value, ...dashboardOrganisationTypes.value];
+    const dashboards = computed((): DashboardsListItem[] => {
+      return _.sortBy([
+        ...dashboardOrganisationTypes.value.map(g => ({
+          ...g,
+          dashboardType: DashboardType.OrganisationType
+        })) satisfies DashboardsListItem[],
+        ...dashboardOrganisations.value.map(d => ({
+          ...d,
+          dashboardType: DashboardType.Organisation
+        })) as DashboardsListItem[],
+        ...dashboardShallows.value.map(d => ({
+          ...d,
+          dashboardType: DashboardType.Shallow
+        })) as DashboardsListItem[]
+      ], d => d.label);
     });
 
     const fetch = () => {
       getManyDashboardOrganisations(props.dashboardOrganisationFilters);
       getManyDashboardOrganisationTypes(props.dashboardOrganisationTypeFilters);
+      getManyDashboardShallows(props.dashboardShallowFilters);
     }
 
     watch(() => [props.dashboardOrganisationFilters, props.dashboardOrganisationTypeFilters], fetch, { immediate: true });

package/components/lists/deviceOrganisations/FSBaseDeviceOrganisationsList.vue

@@ -4,7 +4,7 @@
     :loading="fetchingDeviceOrganisations"
     :singleSelect="$props.singleSelect"
     :headersOptions="headersOptions"
-    :showSelect="$props.selectable"
+    :selectable="$props.selectable"
     :tableCode="$props.tableCode"
     :items="deviceOrganisations"
     :itemTo="$props.itemTo"

package/components/lists/groups/FSBaseGroupsList.vue

@@ -3,7 +3,7 @@
     defaultMode="iterator"
     :loading="fetchingGroups"
     :items="groups"
-    :showSelect="$props.selectable"
+    :selectable="$props.selectable"
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"
     @update:modelValue="$emit('update:modelValue', $event)"

package/components/lists/locations/FSBaseLocationsList.vue

@@ -3,7 +3,7 @@
     defaultMode="iterator"
     :loading="fetchingLocations"
     :items="locations"
-    :showSelect="$props.selectable"
+    :selectable="$props.selectable"
     :tableCode="tableCode"
     :modelValue="$props.modelValue"
     @update:modelValue="$emit('update:modelValue', $event)"

package/components/lists/models/FSBaseModelsList.vue

@@ -2,7 +2,7 @@
   <FSDataTable
     defaultMode="iterator"
     :singleSelect="$props.singleSelect"
-    :showSelect="$props.selectable"
+    :selectable="$props.selectable"
     :tableCode="$props.tableCode"
     :loading="fetchingModels"
     :items="models"
@@ -63,6 +63,7 @@
     >
       <FSModelTileUI
         :to="$props.itemTo && $props.itemTo(item)"
+        :selectable="$props.selectable"
         :singleSelect="$props.singleSelect"
         :imageId="item.imageId"
         :label="item.label"

package/components/lists/roleOrganisationTypes/FSBaseRoleOrganisationTypesList.vue

@@ -3,7 +3,7 @@
     :items="roleOrganisationTypes"
     :itemTo="$props.itemTo"
     :loading="fetchingRoleOrganisations"
-    :showSelect="$props.selectable"
+    :selectable="$props.selectable"
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"
     @update:modelValue="$emit('update:modelValue', $event)"

package/components/lists/roleOrganisations/FSBaseRoleOrganisationsList.vue

@@ -1,7 +1,7 @@
 <template>
   <FSDataTable
     :loading="fetchingRoleOrganisations"
-    :showSelect="$props.selectable"
+    :selectable="$props.selectable"
     :tableCode="$props.tableCode"
     :items="roleOrganisations"
     :itemTo="$props.itemTo"

package/components/lists/scenarioOrganisationTypes/FSBaseScenarioOrganisationTypesList.vue

@@ -3,7 +3,7 @@
     :items="scenarioOrganisationTypes"
     :itemTo="$props.itemTo"
     :loading="fetchingScenarioOrganisationTypes"
-    :showSelect="$props.selectable"
+    :selectable="$props.selectable"
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"
     @update:modelValue="$emit('update:modelValue', $event)"

package/components/lists/scenarioOrganisations/FSBaseScenarioOrganisationsList.vue

@@ -3,7 +3,7 @@
     :items="scenarioOrganisations"
     :itemTo="$props.itemTo"
     :loading="fetchingScenarioOrganisations"
-    :showSelect="$props.selectable"
+    :selectable="$props.selectable"
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"
     :headersOptions="headersOptions"

package/components/lists/serviceAccountOrganisations/FSBaseServiceAccountOrganisationsList.vue

@@ -3,7 +3,7 @@
     :items="serviceAccountOrganisations"
     :itemTo="$props.itemTo"
     :loading="fetchingServiceAccountOrganisations"
-    :showSelect="$props.selectable"
+    :selectable="$props.selectable"
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"
     @update:modelValue="$emit('update:modelValue', $event)"

package/components/lists/serviceAccountRoleOrganisations/FSBaseServiceAccountRoleOrganisationsList.vue

@@ -2,7 +2,7 @@
   <FSDataTable
     :loading="fetchingServiceAccountRoleOrganisations"
     :items="serviceAccountRoleOrganisations"
-    :showSelect="$props.selectable"
+    :selectable="$props.selectable"
     :tableCode="$props.tableCode"
     :itemTo="$props.itemTo"
     :modelValue="$props.modelValue"

package/components/lists/userOrganisations/FSBaseUserOrganisationsList.vue

@@ -3,7 +3,7 @@
     :items="userOrganisations"
     :itemTo="$props.itemTo"
     :loading="fetchingUserOrganisations"
-    :showSelect="$props.selectable"
+    :selectable="$props.selectable"
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"
     @update:modelValue="$emit('update:modelValue', $event)"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-components",
   "sideEffects": false,
-  "version": "1.0.140",
+  "version": "1.0.142",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,11 +10,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "1.0.140",
-    "@dative-gpi/foundation-core-services": "1.0.140",
-    "@dative-gpi/foundation-shared-components": "1.0.140",
-    "@dative-gpi/foundation-shared-domain": "1.0.140",
-    "@dative-gpi/foundation-shared-services": "1.0.140"
+    "@dative-gpi/foundation-core-domain": "1.0.142",
+    "@dative-gpi/foundation-core-services": "1.0.142",
+    "@dative-gpi/foundation-shared-components": "1.0.142",
+    "@dative-gpi/foundation-shared-domain": "1.0.142",
+    "@dative-gpi/foundation-shared-services": "1.0.142"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -26,5 +26,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "80839b29fa54c0fd76194393337e3104fe8e27d7"
+  "gitHead": "36eca468f78075f88bb6638dbfdee9bdecf270ce"
 }