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

package/components/entities/FSSelectEntitiesList.vue

@@ -19,7 +19,8 @@
             :entity-type="$props.entityType"
             :filters="simpleListFilters"
             :showEdit="false"
-            :showRemove="false"
+            :showRemove="showRemove"
+            @click:remove="onRemove"
             direction="row"
           />
         </FSSlideGroup>
@@ -38,12 +39,23 @@
         {{ $tr("ui.common.entities-list", "Entities list") }}
       </FSText>
       <FSBaseEntitiesList
+        :singleSelect="$props.singleSelect"
         :entity-type="$props.entityType"
         :tableCode="tableCode"
         :modelValue="$props.modelValue"
         @update:modelValue="$emit('update:modelValue', $event)"
         v-bind="baseTableAttrs"
-      />
+      >
+        <template
+          v-for="(_, name) in $slots"
+          v-slot:[getNameSlot(name)]="slotData"
+        >
+          <slot
+            :name="name"
+            v-bind="slotData"
+          />
+        </template>
+      </FSBaseEntitiesList>
     </FSCol>
   </FSCol>
 </template>
@@ -52,7 +64,7 @@
 import { defineComponent, type PropType, computed } from "vue";
 
 import { EntityType } from "@dative-gpi/foundation-shared-domain/enums";
-import type { DashboardOrganisationFilters, DashboardOrganisationTypeFilters, DeviceOrganisationFilters, FolderFilters, GroupFilters, LocationFilters, ModelFilters, UserOrganisationFilters } from "@dative-gpi/foundation-core-domain/models";
+import type { DashboardOrganisationFilters, DashboardOrganisationTypeFilters, DashboardShallowFilters, DeviceOrganisationFilters, FolderFilters, GroupFilters, LocationFilters, ModelFilters, UserOrganisationFilters } from "@dative-gpi/foundation-core-domain/models";
 
 import { TABLES as T } from "../../utils";
 
@@ -81,6 +93,11 @@ export default defineComponent({
       type: Number as PropType<EntityType>,
       required: true
     },
+    singleSelect: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
     modelValue: {
       type: Array as PropType<string[]>,
       required: false,
@@ -90,9 +107,14 @@ export default defineComponent({
       type: Object,
       required: false,
       default: null
+    },
+    showRemove: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
-  setup(props, { attrs }){
+  setup(props, { emit, attrs }){
     const simpleListFilters = computed(() => {
       switch(props.entityType) {
         case EntityType.Device:
@@ -102,8 +124,9 @@ export default defineComponent({
         case EntityType.Dashboard:
           return {
             dashboardOrganisationsIds: props.modelValue,
-            dashboardOrganisationTypesIds: props.modelValue
-          } satisfies DashboardOrganisationFilters & DashboardOrganisationTypeFilters;
+            dashboardOrganisationTypesIds: props.modelValue,
+            dashboardShallowsIds: props.modelValue
+          } satisfies DashboardOrganisationFilters & DashboardOrganisationTypeFilters & DashboardShallowFilters;
         case EntityType.Group:
           return {
             groupsIds: props.modelValue
@@ -182,10 +205,20 @@ export default defineComponent({
       };
     });
 
+    const onRemove = (id: string) => {
+      emit("update:modelValue", props.modelValue.filter((i) => i !== id));
+    }
+
+    const getNameSlot = (name: string | number) => {
+      return name.toString().replace("base-list-", "");
+    }
+
     return {
       simpleListFilters,
       baseTableAttrs,
-      tableCode
+      tableCode,
+      onRemove,
+      getNameSlot
     }
   }
 });

package/components/explorers/FSBaseDevicesExplorer.vue

@@ -0,0 +1,322 @@
+<template>
+  <FSDataTable
+    defaultMode="iterator"
+    :loading="fetchingDeviceExplorerElements"
+    :singleSelect="$props.singleSelect"
+    :items="deviceExplorerElements"
+    :selectable="$props.selectable"
+    :tableCode="$props.tableCode"
+    :itemTo="$props.itemTo"
+    :noSearch="$props.recursiveSearch"
+    :modelValue="$props.modelValue"
+    @update:modelValue="onUpdate"
+    v-model:search="search"
+    v-bind="$attrs"
+  >
+    <template
+      v-for="(_, name) in $slots"
+      v-slot:[name]="slotData"
+    >
+      <slot
+        :name="name"
+        v-bind="slotData"
+      />
+    </template>
+    <template
+      #header.imageId-title
+    >
+      <FSIcon>
+        mdi-panorama-variant-outline
+      </FSIcon>
+    </template>
+    <template
+      #header.connectivity-title
+    >
+      <FSIcon>
+        mdi-wifi
+      </FSIcon>
+    </template>
+    <template
+      #item.imageId="{ item }"
+    >
+      <FSImage
+        v-if="item.imageId"
+        height="32px"
+        width="32px"
+        :imageId="item.imageId"
+        :thumbnail="true"
+      />
+    </template>
+    <template
+      #item.tags="{ item }"
+    >
+      <FSTagGroup
+        variant="slide"
+        :showRemove="false"
+        :tags="item.tags"
+      />
+    </template>
+    <template
+      #item.type="{ item }"
+    >
+      <FSIcon
+        v-if="item.type === DeviceExplorerElementType.Group"
+      >
+        mdi-folder-outline
+      </FSIcon>
+      <FSIcon
+        v-else
+      >
+        mdi-widgets-outline
+      </FSIcon>
+    </template>
+
+    <template
+      #item.icon="{ item }"
+    >
+      <FSIcon
+        v-if="item.type === DeviceExplorerElementType.Group"
+      >
+        {{ item.icon }}
+      </FSIcon>
+    </template>
+    <template
+      #item.connectivity="{ item }"
+    >
+      <FSCol
+        v-if="item.type === DeviceExplorerElementType.DeviceOrganisation"
+      >
+        <FSConnectivity
+          v-if="item.connectivity.status != ConnectivityStatus.None"
+          :deviceConnectivity="item.connectivity"
+        />
+      </FSCol>
+    </template>
+    <template
+      #item.worstAlert="{ item }"
+    >
+      <FSWorstAlert
+        v-if="item.worstAlert"
+        :deviceWorstAlert="item.worstAlert"
+        :deviceAlerts="item.alerts"
+        :alertTo="$props.alertTo"
+      />
+      <div
+        v-else
+      />
+    </template>
+    <template
+      #item.alerts="{ item }"
+    >
+      <FSWorstAlert
+        v-if="item.worstAlert"
+        :deviceWorstAlert="item.worstAlert"
+        :deviceAlerts="item.alerts"
+        :alertTo="$props.alertTo"
+      />
+      <div
+        v-else
+      />
+    </template>
+    <template
+      #item.status="{ item }"
+    >
+      <FSStatusesCarousel
+        v-if="item.type === DeviceExplorerElementType.DeviceOrganisation"
+        :modelStatuses="item.modelStatuses"
+        :deviceStatuses="item.status.statuses"
+      />
+    </template>
+
+    <template
+      #item.tile="{ index, item, toggleSelect }"
+    >
+      <FSGroupTileUI
+        v-if="item.type === DeviceExplorerElementType.Group"
+        :key="index"
+        :to="$props.itemTo && $props.itemTo(item)"
+        :imageId="item.imageId"
+        :icon="item.icon"
+        :label="item.label"
+        :code="item.code"
+        :recursiveGroupsIds="item.recursiveGroupsIds"
+        :recursiveDeviceOrganisationsIds="item.recursiveDeviceOrganisationsIds"
+        :modelValue="isSelected(item.id)"
+        :selectable="$props.selectable"
+        @update:modelValue="toggleSelect(item)"
+      />
+      <FSDeviceOrganisationTileUI
+        v-if="item.type === DeviceExplorerElementType.DeviceOrganisation"
+        :key="index"
+        :to="$props.itemTo && $props.itemTo(item)"
+        :deviceConnectivity="item.connectivity"
+        :deviceStatuses="item.status.statuses"
+        :deviceWorstAlert="item.worstAlert"
+        :deviceAlerts="item.alerts"
+        :imageId="item.imageId"
+        :label="item.label"
+        :code="item.code"
+        :modelStatuses="item.modelStatuses"
+        :alertTo="$props.alertTo"
+        :modelValue="isSelected(item.id)"
+        :selectable="$props.selectable"
+        @update:modelValue="toggleSelect(item)"
+      />
+    </template>
+  </FSDataTable>
+</template>
+  
+<script lang="ts">
+import { computed, defineComponent, type PropType, ref, watch } from "vue";
+import { type RouteLocation } from "vue-router";
+import _ from "lodash";
+  
+import { ConnectivityStatus, DeviceExplorerElementType } from "@dative-gpi/foundation-shared-domain/enums";
+import { useDeviceExplorerElements } from "@dative-gpi/foundation-core-services/composables";
+import { type DeviceExplorerElementInfos} from "@dative-gpi/foundation-core-domain/models";
+import { useDebounce } from "@dative-gpi/foundation-shared-components/composables";
+
+import FSDeviceOrganisationTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSDeviceOrganisationTileUI.vue";
+import FSStatusesCarousel from "@dative-gpi/foundation-shared-components/components/deviceOrganisations/FSStatusesCarousel.vue";
+import FSConnectivity from "@dative-gpi/foundation-shared-components/components/deviceOrganisations/FSConnectivity.vue";
+import FSWorstAlert from "@dative-gpi/foundation-shared-components/components/deviceOrganisations/FSWorstAlert.vue";
+import FSGroupTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSGroupTileUI.vue";
+import FSTagGroup from "@dative-gpi/foundation-shared-components/components/FSTagGroup.vue";
+import FSImage from "@dative-gpi/foundation-shared-components/components/FSImage.vue";
+
+import FSDataTable from "../lists/FSDataTable.vue";
+
+export default defineComponent({
+  name: "FSBaseDevicesExplorer",
+  components: {
+    FSDeviceOrganisationTileUI,
+    FSStatusesCarousel,
+    FSConnectivity,
+    FSGroupTileUI,
+    FSWorstAlert,
+    FSDataTable,
+    FSTagGroup,
+    FSImage
+  },
+  props: {
+    tableCode: {
+      type: String as PropType<string | null>,
+      required: false,
+      default: null
+    },
+    recursiveSearch: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    parentId: {
+      type: String as PropType<string | null>,
+      required: false,
+      default: null
+    },
+    root: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    connectedOnly: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    itemTo: {
+      type: Function as PropType<(item: DeviceExplorerElementInfos) => Partial<RouteLocation>>,
+      required: false
+    },
+    alertTo: {
+      type: Function,
+      required: false,
+      default: null
+    },
+    selectable: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    singleSelect: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    modelValue: {
+      type: Array as PropType<string[]>,
+      default: () => [],
+      required: false
+    }
+  },
+  emits: ["update:modelValue", "update:types"],
+  setup(props, { emit }) {
+    const { entities, fetching: fetchingDeviceExplorerElements, getMany: getManyDeviceExplorerElements } = useDeviceExplorerElements();
+    const { debounce } = useDebounce();
+
+    const search = ref("");
+
+    const deviceExplorerElements = computed((): DeviceExplorerElementInfos[] => {
+      let elements = entities.value.slice();
+      if (props.connectedOnly) {
+        elements = elements.filter(dee => 
+          dee.type === DeviceExplorerElementType.Group ||
+          (dee.connectivity != null && dee.connectivity.status != ConnectivityStatus.None)
+        );
+      }
+      return elements.sort((a, b) => a.type - b.type);
+    });
+
+    const isSelected = (id: string): boolean => {
+      return props.modelValue.includes(id);
+    };
+
+    const onUpdate = (value: string[]): void => {
+      const types = value.map(id => entities.value.find(dee => dee.id === id)?.type);
+      emit("update:types", types);
+
+      emit("update:modelValue", value);
+    }
+
+    const fetch = () => {
+      if (props.recursiveSearch && search.value) {
+        getManyDeviceExplorerElements({
+          ancestorId: props.parentId,
+          search: search.value
+        });
+      }
+      else {
+        getManyDeviceExplorerElements({
+          parentId: props.parentId,
+          root: props.root
+        });
+      }
+    }
+
+    // Delay to wait before fetching after a search change
+    const debounceFetch = (): void => debounce(fetch, 1000);
+  
+    watch([() => props.parentId, () => props.root], (next, previous) => {
+      if ((!next && !previous) || !_.isEqual(next, previous)) {
+        fetch();
+      }
+    }, { immediate: true });
+
+    watch(search, (next, previous) => {
+      if (props.recursiveSearch && next !== previous) {
+        debounceFetch();
+      }
+    });
+
+    return {
+      fetchingDeviceExplorerElements,
+      DeviceExplorerElementType,
+      deviceExplorerElements,
+      ConnectivityStatus,
+      search,
+      isSelected,
+      onUpdate
+    };
+  }
+});
+</script>

package/components/explorers/FSBaseFoldersExplorer.vue

@@ -1,10 +1,13 @@
 <template>
   <FSDataTable
+    defaultMode="iterator"
     :items="items"
     :item-to="$props.itemTo"
     :loading="fetchingFolders || fetchingDashboardOrganisations || fetchingDashboardShallows"
     :tableCode="$props.tableCode"
+    :headersOptions="headersOptions"
     :modelValue="selecteds"
+    :selectable="$props.selectable"
     @update:modelValue="onSelect"
     v-bind="$attrs"
   >
@@ -29,9 +32,10 @@
     >
       <FSImage
         v-if="item.imageId"
-        height="38px"
-        width="38px"
+        height="32px"
+        width="32px"
         :imageId="item.imageId"
+        :thumbnail="true"
       />
     </template>
     <template
@@ -63,19 +67,46 @@
       />
     </template>
     <template
-      #item.tile="{ item, toggleSelect }"
+      #item.tags="{ item }"
+    >
+      <FSTagGroup
+        variant="slide"
+        :showRemove="false"
+        :tags="item.tags"
+      />
+    </template>
+    <template
+      #item.dashboardType="{ item }"
+    >
+      <FSChip
+        v-if="item.type === FoldersListType.Dashboard"
+        :color="ColorEnum.Light"
+        :label="dashboardTypeLabel(item.dashboardType)"
+      />
+      <FSChip
+        v-else-if="item.type === FoldersListType.Folder"
+        :color="ColorEnum.Light"
+        :label="$tr('ui.common.folder', 'Folder')"
+      />
+    </template>
+    <template
+      #item.tile="{ index, item, toggleSelect }"
     >
       <FSFolderTileUI
         v-if="item.type == FoldersListType.Folder"
+        :key="index"
         :bottomColor="item.colors"
         v-bind="item"
+        :selectable="$props.selectable"
         :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"
+        :key="index"
         :bottomColor="item.colors"
+        :selectable="$props.selectable"
         :modelValue="isSelected(item.id)"
         @update:modelValue="toggleSelect(item)"
         :to="$props.itemTo && $props.itemTo(item)"
@@ -83,7 +114,9 @@
       />
       <FSDashboardShallowTileUI
         v-if="item.type == FoldersListType.Dashboard && item.dashboardType == DashboardType.Shallow"
+        :key="index"
         :bottomColor="item.colors"
+        :selectable="$props.selectable"
         :modelValue="isSelected(item.id)"
         @update:modelValue="toggleSelect(item)"
         :to="$props.itemTo && $props.itemTo(item)"
@@ -95,33 +128,41 @@
 
 <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 { computed, defineComponent, onMounted, type PropType, 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 { dashboardTypeLabel, 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 FSChip from '@dative-gpi/foundation-shared-components/components/FSChip.vue';
+import FSImage from "@dative-gpi/foundation-shared-components/components/FSImage.vue";
+import FSTagGroup from "@dative-gpi/foundation-shared-components/components/FSTagGroup.vue";
+import FSIconCheck from "@dative-gpi/foundation-shared-components/components/FSIconCheck.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 FSIconCheck from "@dative-gpi/foundation-shared-components/components/FSIconCheck.vue";
+import FSDashboardOrganisationTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSDashboardOrganisationTileUI.vue";
+
+import FSDataTable from "../lists/FSDataTable.vue";
+import { ColorEnum } from '@dative-gpi/foundation-shared-components/models';
+import { useTranslations } from '@dative-gpi/bones-ui';
 
 export default defineComponent({
   name: "FSBaseFoldersExplorer",
   components: {
-    FSDataTable,
-    FSIcon,
-    FSFolderTileUI,
     FSDashboardOrganisationTileUI,
     FSDashboardShallowTileUI,
-    FSIconCheck
+    FSFolderTileUI,
+    FSDataTable,
+    FSIconCheck,
+    FSTagGroup,
+    FSImage,
+    FSChip,
+    FSIcon
   },
   props: {
     foldersFilters: {
@@ -151,11 +192,16 @@ export default defineComponent({
     tableCode: {
       type: String,
       required: true
+    },
+    selectable: {
+      type: Boolean,
+      required: false,
+      default: true
     }
   },
-  emits: ["update:modelValue", "update:type", "update:dashboard-type"],
+  emits: ["update", "update:modelValue", "update:type", "update:dashboard-type"],
   setup(props, { emit }) {
-
+    const { $tr } = useTranslations();
     const { fetch: fetchUserOrganisation, entity: userOrganisation } = useCurrentUserOrganisation();
     const { entity: organisation, get: getOrganisation } = useOrganisation();
     const { organisationId } = useAppOrganisationId();
@@ -194,14 +240,44 @@ export default defineComponent({
           })) as FoldersListItem[]
         ], d => d.label)
       ]
-    })
+    });
+
+    const headersOptions = computed(() => ({
+      dashboardType: {
+        fixedFilters: [
+          {
+            value: DashboardType.Organisation,
+            text: dashboardTypeLabel(DashboardType.Organisation)
+          },
+          {
+            value: DashboardType.Shallow,
+            text: dashboardTypeLabel(DashboardType.Shallow)
+          },
+          {
+            value: 10,
+            text: $tr("ui.common.folder", "Folder")
+          },
+        ],
+        methodFilter: (value: number, dashboardType: DashboardType) => {
+          if(dashboardType !== DashboardType.None) {
+            return value === dashboardType;
+          } else {
+            return value === 10;
+          }
+        }
+      }
+    }));
 
     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 newDashboardType = selectedItems.map(i => i.dashboardType);
+      const newModelValue = selectedItems.map(i => i.id);
+      const newType = selectedItems.map(i => i.type);
+      emit("update:dashboard-type", newDashboardType);
+      emit("update:modelValue", newModelValue);
+      emit("update:type", newType);
+      emit("update", { dashboardType: newDashboardType, modelValue: newModelValue, type: newType });
     };
 
     const isSelected = (id: string) => {
@@ -246,12 +322,15 @@ export default defineComponent({
       fetchingFolders,
       mainOrganisationDashboardId,
       mainUserDashboardId,
+      headersOptions,
+      ColorEnum,
       selecteds,
       items,
       onSelect,
       isSelected,
       FoldersListType,
-      DashboardType
+      DashboardType,
+      dashboardTypeLabel
     };
   }
 });