@dative-gpi/foundation-core-components 1.0.59 → 1.0.61

package/components/entities/FSBaseEntitiesList.vue

@@ -35,8 +35,8 @@ export default defineComponent({
           return defineAsyncComponent(() => import("../lists/groups/FSBaseGroupsList.vue"));
         case EntityType.Location:
           return defineAsyncComponent(() => import("../lists/locations/FSBaseLocationsList.vue"));
-        // case EntityType.Model:
-        //   return defineAsyncComponent(() => import("../lists/models/FSBaseModelsList.vue"));
+        case EntityType.Model:
+          return defineAsyncComponent(() => import("../lists/models/FSBaseModelsList.vue"));
         default:
           return null;
       };

package/components/entities/FSDialogSelectEntities.vue

@@ -63,7 +63,7 @@
 import { defineComponent, type PropType, computed, ref, watch } from "vue";
 
 import { EntityType } from "@dative-gpi/foundation-shared-domain/enums";
-import type { DashboardOrganisationFilters, DashboardOrganisationTypeFilters, DeviceOrganisationFilters } from "@dative-gpi/foundation-core-domain/models";
+import type { DashboardOrganisationFilters, DashboardOrganisationTypeFilters, DeviceOrganisationFilters, FolderFilters, GroupFilters, LocationFilters, ModelFilters, UserOrganisationFilters } from "@dative-gpi/foundation-core-domain/models";
 
 import { TABLES as T } from "../../utils";
 
@@ -121,9 +121,29 @@ export default defineComponent({
           } satisfies DeviceOrganisationFilters;
         case EntityType.Dashboard:
           return {
-            dashboardOrganisationIds: actualSelecteds.value,
-            dashboardOrganisationTypeIds: actualSelecteds.value
+            dashboardOrganisationsIds: actualSelecteds.value,
+            dashboardOrganisationTypesIds: actualSelecteds.value
           } satisfies DashboardOrganisationFilters & DashboardOrganisationTypeFilters;
+        case EntityType.Group:
+          return {
+            groupsIds: actualSelecteds.value
+          } satisfies GroupFilters;
+        case EntityType.Folder:
+          return {
+            foldersIds: actualSelecteds.value
+          } satisfies FolderFilters;
+        case EntityType.Location:
+          return {
+            locationsIds: actualSelecteds.value
+          } satisfies LocationFilters;
+        case EntityType.User:
+          return {
+            userOrganisationsIds: actualSelecteds.value
+          } satisfies UserOrganisationFilters;
+        case EntityType.Model:
+          return {
+            modelsIds: actualSelecteds.value
+          } satisfies ModelFilters;
         default:
           return undefined;
       };
@@ -145,6 +165,38 @@ export default defineComponent({
             deviceOrganisationFilters: props.filters,
             ...attrs
           };
+        case EntityType.Dashboard:
+          return {
+            dashboardShallowsFilters: props.filters,
+            dashboardOrganisationsFilters: props.filters,
+            dashboardOrganisationTypeFetchFilter: props.filters,
+            ...attrs
+          };
+        case EntityType.Group:
+          return {
+            groupsFilters: props.filters,
+            ...attrs
+          };
+        case EntityType.Folder:
+          return {
+            foldersFilters: props.filters,
+            ...attrs
+          };
+        case EntityType.Location:
+          return {
+            locationsFilters: props.filters,
+            ...attrs
+          };
+        case EntityType.User:
+          return {
+            userOrganisationsFilters: props.filters,
+            ...attrs
+          };
+        case EntityType.Model:
+          return {
+            modelsFilters: props.filters,
+            ...attrs
+          };
         default:
           return null;
       };

package/components/explorers/FSBaseFoldersExplorer.vue

@@ -0,0 +1,235 @@
+<template>
+  <FSDataTable
+    :items="items"
+    :item-to="$props.itemTo"
+    :loading="fetchingFolders || fetchingDashboardOrganisations || fetchingDashboardShallows"
+    :tableCode="$props.tableCode"
+    :modelValue="selecteds"
+    @update:modelValue="onSelect"
+    v-bind="$attrs"
+  >
+    <template
+      v-for="(_, name) in $slots"
+      v-slot:[name]="slotData"
+    >
+      <slot
+        :name="name"
+        v-bind="slotData"
+      />
+    </template>
+
+    <template
+      #item.main="{ item }"
+    >
+      <FSIcon
+        v-if="item.id === mainOrganisationDashboardId"
+      >
+        mdi-account-group-outline
+      </FSIcon>
+      <FSIcon
+        v-if="item.id === mainUserDashboardId"
+      >
+        mdi-home
+      </FSIcon>
+    </template>
+
+    <template
+      #item.icon="{ item }"
+    >
+      <FSIcon>
+        {{ item.icon }}
+      </FSIcon>
+    </template>
+
+    <template
+      #item.tile="{ item, toggleSelect }"
+    >
+      <FSFolderTileUI
+        v-if="item.type == FoldersListType.Folder"
+        :bottomColor="item.colors"
+        v-bind="item"
+        :modelValue="isSelected(item.id)"
+        @update:modelValue="toggleSelect(item)"
+        :to="$props.itemTo && $props.itemTo(item)"
+      />
+      <FSDashboardOrganisationTileUI
+        v-if="item.type == FoldersListType.Dashboard && item.dashboardType == DashboardType.Organisation"
+        :bottomColor="item.colors"
+        :modelValue="isSelected(item.id)"
+        @update:modelValue="toggleSelect(item)"
+        :to="$props.itemTo && $props.itemTo(item)"
+        v-bind="item"
+      />
+      <FSDashboardShallowTileUI
+        v-if="item.type == FoldersListType.Dashboard && item.dashboardType == DashboardType.Shallow"
+        :bottomColor="item.colors"
+        :modelValue="isSelected(item.id)"
+        @update:modelValue="toggleSelect(item)"
+        :to="$props.itemTo && $props.itemTo(item)"
+        v-bind="item"
+      />
+    </template>
+  </FSDataTable>
+</template>
+
+<script lang="ts">
+import _ from "lodash";
+import type { PropType} from "vue";
+import type { RouteLocation } from "vue-router";
+import { computed, defineComponent, onMounted, ref, watch } from "vue";
+
+import { useOrganisation } from "@dative-gpi/foundation-shared-services/composables";
+import { useDashboardOrganisations, useFolders, useDashboardShallows, useAppOrganisationId, useCurrentUserOrganisation } from "@dative-gpi/foundation-core-services/composables";
+
+import { DashboardType } from "@dative-gpi/foundation-shared-domain/enums";
+import { FoldersListType, type FoldersListItem } from "@dative-gpi/foundation-core-components/utils";
+import type { FolderFilters, DashboardOrganisationFilters, DashboardShallowFilters, DashboardInfos } from "@dative-gpi/foundation-core-domain/models";
+
+import FSDataTable from "../lists/FSDataTable.vue";
+import FSIcon from "@dative-gpi/foundation-shared-components/components/FSIcon.vue";
+import FSFolderTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSFolderTileUI.vue";
+import FSDashboardOrganisationTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSDashboardOrganisationTileUI.vue";
+import FSDashboardShallowTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSDashboardShallowTileUI.vue";
+
+export default defineComponent({
+  name: "FSBaseFoldersExplorer",
+  components: {
+    FSDataTable,
+    FSIcon,
+    FSFolderTileUI,
+    FSDashboardOrganisationTileUI,
+    FSDashboardShallowTileUI
+  },
+  props: {
+    foldersFilters: {
+      type: Object as PropType<FolderFilters>,
+      default: undefined,
+      required: false
+    },
+    dashboardOrganisationsFilters: {
+      type: Object as PropType<DashboardOrganisationFilters>,
+      default: undefined,
+      required: false
+    },
+    dashboardShallowsFilters: {
+      type: Object as PropType<DashboardShallowFilters>,
+      default: undefined,
+      required: false
+    },
+    modelValue: {
+      type: Array as PropType<string[]>,
+      required: false,
+      default: () => []
+    },
+    itemTo: {
+      type: Function as PropType<(item: DashboardInfos) => Partial<RouteLocation>>,
+      required: false
+    },
+    tableCode: {
+      type: String,
+      required: true
+    }
+  },
+  emits: ["update:modelValue", "update:type", "update:dashboard-type"],
+  setup(props, { emit }) {
+
+    const { fetch: fetchUserOrganisation, entity: userOrganisation } = useCurrentUserOrganisation();
+    const { entity: organisation, get: getOrganisation } = useOrganisation();
+    const { organisationId } = useAppOrganisationId();
+
+    const { entities: dashboardOrganisations, fetching: fetchingDashboardOrganisations, getMany: getManyDashboardOrganisations } = useDashboardOrganisations();
+    const { entities: dashboardShallows, fetching: fetchingDashboardShallows, getMany: getManyDashboardShallows } = useDashboardShallows();
+    const { entities: folders, fetching: fetchingFolders, getMany: getManyFolders } = useFolders();
+
+    const selecteds = ref<string[]>([]);
+
+    const mainUserDashboardId = computed(() => {
+      return userOrganisation.value?.mainDashboardId;
+    });
+
+    const mainOrganisationDashboardId = computed(() => {
+      return organisation.value?.mainDashboardId;
+    });
+
+    const items = computed((): FoldersListItem[] => {
+      return [
+        ...folders.value.map(g => ({
+          ...g,
+          type: FoldersListType.Folder,
+          dashboardType: DashboardType.None
+        })) as FoldersListItem[],
+        ..._.sortBy([
+          ...dashboardOrganisations.value.map(d => ({
+            ...d,
+            type: FoldersListType.Dashboard,
+            dashboardType: DashboardType.Organisation
+          })) as FoldersListItem[],
+          ...dashboardShallows.value.map(d => ({
+            ...d,
+            type: FoldersListType.Dashboard,
+            dashboardType: DashboardType.Shallow
+          })) as FoldersListItem[]
+        ], d => d.label)
+      ]
+    })
+
+    const onSelect = (values: string[]) => {
+      selecteds.value = values;
+      const selectedItems = items.value.filter(i => selecteds.value!.includes(i.id));
+      emit("update:dashboard-type", selectedItems.map(i => i.dashboardType));
+      emit("update:modelValue", selectedItems.map(i => i.id));
+      emit("update:type", selectedItems.map(i => i.type));
+    };
+
+    const isSelected = (id: string) => {
+      return selecteds.value?.includes(id);
+    };
+
+    onMounted(() => {
+      fetchUserOrganisation();
+    })
+
+    watch(() => organisationId.value, () => {
+      if (organisationId.value) {
+        getOrganisation(organisationId.value);
+      }
+    }, { immediate: true });
+
+    watch(() => props.foldersFilters, (next, previous) => {
+      if ((!next && !previous) || !_.isEqual(next, previous)) {
+        getManyFolders(props.foldersFilters, f => f.parentId == props.foldersFilters?.parentId);
+      }
+    }, { immediate: true });
+
+    watch(() => props.dashboardOrganisationsFilters, (next, previous) => {
+      if ((!next && !previous) || !_.isEqual(next, previous)) {
+        getManyDashboardOrganisations(props.dashboardOrganisationsFilters, f => f.folderId == props.foldersFilters?.parentId);
+      }
+    }, { immediate: true });
+
+    watch(() => props.dashboardShallowsFilters, (next, previous) => {
+      if ((!next && !previous) || !_.isEqual(next, previous)) {
+        getManyDashboardShallows(props.dashboardShallowsFilters, f => f.folderId == props.foldersFilters?.parentId);
+      }
+    }, { immediate: true });
+
+    watch(() => props.modelValue, (next) => {
+      selecteds.value = next;
+    }, { immediate: true });
+
+    return {
+      fetchingDashboardOrganisations,
+      fetchingDashboardShallows,
+      fetchingFolders,
+      mainOrganisationDashboardId,
+      mainUserDashboardId,
+      selecteds,
+      items,
+      onSelect,
+      isSelected,
+      FoldersListType,
+      DashboardType
+    };
+  }
+});
+</script>

package/components/lists/FSDataTable.vue

@@ -69,6 +69,8 @@ export default defineComponent({
 
     const computedTable = computed(() => computeTable(props.customSorts, props.customSortRaws));
 
+    console.log(JSON.stringify(computedTable.value));
+
     onUnmounted(() => {
       cancel();
       update();
@@ -88,6 +90,7 @@ export default defineComponent({
         getTable,
         props.tableCode
       );
+      console.log(JSON.stringify(computedTable.value));
     }, { immediate: true });
 
     watch(() => table.value, () => {

package/components/lists/alerts/FSBaseAlertsList.vue

@@ -33,12 +33,20 @@
         variant="full"
         v-model="innerHidePending"
       />
-      <FSTermField
-        variant="default"
-        :editable="!innerNotTreatedOnly"
-        v-model:startDate="startDate"
-        v-model:endDate="endDate"
-      />
+      <FSRow
+        align="center-right"
+      >
+        <FSRow
+          width="hug"
+        >
+          <FSTermField
+            variant="default"
+            :editable="!innerNotTreatedOnly"
+            v-model:startDate="startDate"
+            v-model:endDate="endDate"
+          />
+        </FSRow>
+      </FSRow>
     </template>
     <template
       #item.criticity="{ item }"
@@ -324,7 +332,8 @@ export default defineComponent({
               [AlertStatus.Unresolved, AlertStatus.Resolved, AlertStatus.Triggered] : undefined,
             startDate: startDate.value,
             endDate: endDate.value 
-          });
+          }); // TODO, gérer les conditions pour que les alertes s'affichent ici notamment lorsqu'elles sont acquittées
+          // la FilterFactory gère pas ces conditions correctement
         }
         
       }

package/components/lists/deviceOrganisations/FSBaseDeviceOrganisationsList.vue

@@ -82,16 +82,20 @@
       #item.worstAlert="{ item }"
     >
       <FSWorstAlert
+        v-if="item.worstAlert"
+        :deviceWorstAlert="item.worstAlert"
         :deviceAlerts="item.alerts"
-        :deviceAlert="item.worstAlert"
+        :alertTo="$props.alertTo"
       />
     </template>
     <template
       #item.alerts="{ item }"
     >
       <FSWorstAlert
-        :deviceAlerts="item.alerts.length"
-        :deviceAlert="item.worstAlert"
+        v-if="item.worstAlert"
+        :deviceWorstAlert="item.worstAlert"
+        :deviceAlerts="item.alerts"
+        :alertTo="$props.alertTo"
       />
     </template>
     <template
@@ -134,6 +138,7 @@
         :deviceWorstAlert="item.worstAlert"
         :deviceAlerts="item.alerts"
         :to="$props.itemTo && $props.itemTo(item)"
+        :alertTo="$props.alertTo"
         @update:modelValue="toggleSelect(item)"
       />
     </template>
@@ -197,6 +202,11 @@ export default defineComponent({
       type: Function as PropType<(item: DeviceOrganisationInfos) => Partial<RouteLocation>>,
       required: false
     },
+    alertTo: {
+      type: Function,
+      required: false,
+      default: null
+    },
     singleSelect: {
       type: Boolean,
       required: false,

package/components/lists/folders/FSBaseFoldersList.vue

@@ -1,11 +1,11 @@
 <template>
   <FSDataTable
-    :items="items"
+    :items="folders"
     :item-to="$props.itemTo"
-    :loading="fetchingFolders || fetchingDashboardOrganisations || fetchingDashboardShallows"
+    :loading="fetchingFolders"
     :tableCode="$props.tableCode"
-    :modelValue="selecteds"
-    @update:modelValue="onSelect"
+    :modelValue="$props.modelValue"
+    @update:modelValue="$emit('update:modelValue', $event)"
     v-bind="$attrs"
   >
     <template
@@ -18,21 +18,6 @@
       />
     </template>
 
-    <template
-      #item.main="{ item }"
-    >
-      <FSIcon
-        v-if="item.id === mainOrganisationDashboardId"
-      >
-        mdi-account-group-outline
-      </FSIcon>
-      <FSIcon
-        v-if="item.id === mainUserDashboardId"
-      >
-        mdi-home
-      </FSIcon>
-    </template>
-
     <template
       #item.icon="{ item }"
     >
@@ -45,61 +30,39 @@
       #item.tile="{ item, toggleSelect }"
     >
       <FSFolderTileUI
-        v-if="item.type == FoldersListType.Folder"
-        :bottomColor="item.colors"
-        v-bind="item"
-        :modelValue="isSelected(item.id)"
-        @update:modelValue="toggleSelect(item)"
-        :to="$props.itemTo && $props.itemTo(item)"
-      />
-      <FSDashboardOrganisationTileUI
-        v-if="item.type == FoldersListType.Dashboard && item.dashboardType == DashboardType.Organisation"
         :bottomColor="item.colors"
-        :modelValue="isSelected(item.id)"
-        @update:modelValue="toggleSelect(item)"
-        :to="$props.itemTo && $props.itemTo(item)"
         v-bind="item"
-      />
-      <FSDashboardShallowTileUI
-        v-if="item.type == FoldersListType.Dashboard && item.dashboardType == DashboardType.Shallow"
-        :bottomColor="item.colors"
         :modelValue="isSelected(item.id)"
         @update:modelValue="toggleSelect(item)"
         :to="$props.itemTo && $props.itemTo(item)"
-        v-bind="item"
       />
     </template>
   </FSDataTable>
 </template>
 
 <script lang="ts">
+import _ from "lodash";
 import type { PropType} from "vue";
 import type { RouteLocation } from "vue-router";
-import { computed, defineComponent, onMounted, ref, watch } from "vue";
-import _ from "lodash";
+import { defineComponent, watch } from "vue";
 
-import { useOrganisation } from "@dative-gpi/foundation-shared-services/composables";
-import { useDashboardOrganisations, useFolders, useDashboardShallows, useAppOrganisationId, useCurrentUserOrganisation } from "@dative-gpi/foundation-core-services/composables";
+import { useFolders } from "@dative-gpi/foundation-core-services/composables";
 
 import { DashboardType } from "@dative-gpi/foundation-shared-domain/enums";
-import { FoldersListType, type FoldersListItem } from "@dative-gpi/foundation-core-components/utils";
-import type { FolderFilters, DashboardOrganisationFilters, DashboardShallowFilters, DashboardInfos } from "@dative-gpi/foundation-core-domain/models";
+import { FoldersListType } from "@dative-gpi/foundation-core-components/utils";
+import type { FolderFilters, DashboardInfos } from "@dative-gpi/foundation-core-domain/models";
 
-import FSDataTable from "../FSDataTable.vue";
 import FSIcon from "@dative-gpi/foundation-shared-components/components/FSIcon.vue";
 import FSFolderTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSFolderTileUI.vue";
-import FSDashboardOrganisationTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSDashboardOrganisationTileUI.vue";
-import FSDashboardShallowTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSDashboardShallowTileUI.vue";
 
+import FSDataTable from "../FSDataTable.vue";
 
 export default defineComponent({
   name: "FSBaseFoldersList",
   components: {
     FSDataTable,
     FSIcon,
-    FSFolderTileUI,
-    FSDashboardOrganisationTileUI,
-    FSDashboardShallowTileUI
+    FSFolderTileUI
   },
   props: {
     foldersFilters: {
@@ -107,16 +70,6 @@ export default defineComponent({
       default: undefined,
       required: false
     },
-    dashboardOrganisationsFilters: {
-      type: Object as PropType<DashboardOrganisationFilters>,
-      default: undefined,
-      required: false
-    },
-    dashboardShallowsFilters: {
-      type: Object as PropType<DashboardShallowFilters>,
-      default: undefined,
-      required: false
-    },
     modelValue: {
       type: Array as PropType<string[]>,
       required: false,
@@ -131,101 +84,28 @@ export default defineComponent({
       required: true
     }
   },
-  emits: ["update:modelValue", "update:type", "update:dashboard-type"],
+  emits: ["update:modelValue"],
   setup(props, { emit }) {
 
-    const { fetch: fetchUserOrganisation, entity: userOrganisation } = useCurrentUserOrganisation();
-    const { entity: organisation, get: getOrganisation } = useOrganisation();
-    const { organisationId } = useAppOrganisationId();
-
-    const { entities: dashboardOrganisations, fetching: fetchingDashboardOrganisations, getMany: getManyDashboardOrganisations } = useDashboardOrganisations();
-    const { entities: dashboardShallows, fetching: fetchingDashboardShallows, getMany: getManyDashboardShallows } = useDashboardShallows();
     const { entities: folders, fetching: fetchingFolders, getMany: getManyFolders } = useFolders();
 
-    const selecteds = ref<string[]>([]);
-
-    const mainUserDashboardId = computed(() => {
-      return userOrganisation.value?.mainDashboardId;
-    });
-
-    const mainOrganisationDashboardId = computed(() => {
-      return organisation.value?.mainDashboardId;
-    });
-
-    const items = computed((): FoldersListItem[] => {
-      return [
-        ...folders.value.map(g => ({
-          ...g,
-          type: FoldersListType.Folder,
-          dashboardType: DashboardType.None
-        })) as FoldersListItem[],
-        ..._.sortBy([
-          ...dashboardOrganisations.value.map(d => ({
-            ...d,
-            type: FoldersListType.Dashboard,
-            dashboardType: DashboardType.Organisation
-          })) as FoldersListItem[],
-          ...dashboardShallows.value.map(d => ({
-            ...d,
-            type: FoldersListType.Dashboard,
-            dashboardType: DashboardType.Shallow
-          })) as FoldersListItem[]
-        ], d => d.label)
-      ]
-    })
-
     const onSelect = (values: string[]) => {
-      selecteds.value = values;
-      const selectedItems = items.value.filter(i => selecteds.value!.includes(i.id));
-      emit("update:dashboard-type", selectedItems.map(i => i.dashboardType));
-      emit("update:modelValue", selectedItems.map(i => i.id));
-      emit("update:type", selectedItems.map(i => i.type));
+      emit("update:modelValue", values);
     };
 
     const isSelected = (id: string) => {
-      return selecteds.value?.includes(id);
+      return props.modelValue?.includes(id);
     };
-
-    onMounted(() => {
-      fetchUserOrganisation();
-    })
-
-    watch(() => organisationId.value, () => {
-      if (organisationId.value) {
-        getOrganisation(organisationId.value);
-      }
-    }, { immediate: true });
-
+    
     watch(() => props.foldersFilters, (next, previous) => {
       if ((!next && !previous) || !_.isEqual(next, previous)) {
         getManyFolders(props.foldersFilters, f => f.parentId == props.foldersFilters?.parentId);
       }
     }, { immediate: true });
 
-    watch(() => props.dashboardOrganisationsFilters, (next, previous) => {
-      if ((!next && !previous) || !_.isEqual(next, previous)) {
-        getManyDashboardOrganisations(props.dashboardOrganisationsFilters, f => f.folderId == props.foldersFilters?.parentId);
-      }
-    }, { immediate: true });
-
-    watch(() => props.dashboardShallowsFilters, (next, previous) => {
-      if ((!next && !previous) || !_.isEqual(next, previous)) {
-        getManyDashboardShallows(props.dashboardShallowsFilters, f => f.folderId == props.foldersFilters?.parentId);
-      }
-    }, { immediate: true });
-
-    watch(() => props.modelValue, (next) => {
-      selecteds.value = next;
-    }, { immediate: true });
-
     return {
-      fetchingDashboardOrganisations,
-      fetchingDashboardShallows,
       fetchingFolders,
-      mainOrganisationDashboardId,
-      mainUserDashboardId,
-      selecteds,
-      items,
+      folders,
       onSelect,
       isSelected,
       FoldersListType,