@dative-gpi/foundation-core-components 1.0.129 → 1.0.130-maps2

package/components/explorers/FSBaseDevicesExplorer.vue

@@ -282,7 +282,7 @@ export default defineComponent({
     }
 
     // Delay to wait before fetching after a search change
-    const debounceFetch = (): void => debounce(fetch, 1500);
+    const debounceFetch = (): void => debounce(fetch, 1000);
   
     watch([() => props.parentId, () => props.root], (next, previous) => {
       if ((!next && !previous) || !_.isEqual(next, previous)) {

package/components/explorers/FSBaseFoldersExplorer.vue

@@ -1,5 +1,6 @@
 <template>
   <FSDataTable
+    defaultMode="iterator"
     :items="items"
     :item-to="$props.itemTo"
     :loading="fetchingFolders || fetchingDashboardOrganisations || fetchingDashboardShallows"
@@ -63,6 +64,15 @@
         :value="item.locked"
       />
     </template>
+    <template
+      #item.tags="{ item }"
+    >
+      <FSTagGroup
+        variant="slide"
+        :editable="false"
+        :tags="item.tags"
+      />
+    </template>
     <template
       #item.tile="{ item, toggleSelect }"
     >
@@ -108,6 +118,7 @@ import type { FolderFilters, DashboardOrganisationFilters, DashboardShallowFilte
 
 import FSIcon from "@dative-gpi/foundation-shared-components/components/FSIcon.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 FSDashboardShallowTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSDashboardShallowTileUI.vue";
@@ -118,13 +129,14 @@ import FSDataTable from "../lists/FSDataTable.vue";
 export default defineComponent({
   name: "FSBaseFoldersExplorer",
   components: {
-    FSDataTable,
-    FSIcon,
-    FSFolderTileUI,
     FSDashboardOrganisationTileUI,
     FSDashboardShallowTileUI,
+    FSFolderTileUI,
+    FSDataTable,
     FSIconCheck,
-    FSImage
+    FSTagGroup,
+    FSImage,
+    FSIcon
   },
   props: {
     foldersFilters: {

package/components/lists/alerts/FSBaseAlertsList.vue

@@ -24,6 +24,7 @@
       #item.criticity="{ item }"
     >
       <FSRow
+        :wrap="false" 
         align="center-left"
         gap="2px"
       >

package/components/lists/chartOrganisationTypes/FSBaseChartOrganisationTypesList.vue

@@ -1,5 +1,6 @@
 <template>
   <FSDataTable
+    defaultMode="iterator"
     :items="chartOrganisationTypes"
     :itemTo="$props.itemTo"
     :loading="fetchingChartOrganisationTypes"

package/components/lists/chartOrganisations/FSBaseChartOrganisationsList.vue

@@ -1,5 +1,6 @@
 <template>
   <FSDataTable
+    defaultMode="iterator"
     :items="chartOrganisations"
     :itemTo="$props.itemTo"
     :loading="fetchingChartOrganisations"

package/components/lists/dashboardOrganisationTypes/FSBaseDashboardOrganisationTypesList.vue

@@ -54,6 +54,15 @@
         :label="$tr('ui.common.all', 'All')"
       />
     </template>
+    <template
+      #item.tags="{ item }"
+    >
+      <FSTagGroup
+        variant="slide"
+        :editable="false"
+        :tags="item.tags"
+      />
+    </template>
     <template
       #item.tile="{ item, toggleSelect }"
     >
@@ -69,26 +78,28 @@
 </template>
 
 <script lang="ts">
-import type { PropType} from "vue";
+import { computed, defineComponent, onMounted, type PropType, watch } from "vue";
 import type { RouteLocation } from "vue-router";
-import { computed, defineComponent, onMounted, watch } from "vue";
 import _ from "lodash";
 
 import { useAppOrganisationId, useCurrentUserOrganisation, useDashboardOrganisationTypes } from "@dative-gpi/foundation-core-services/composables";
 import type { DashboardOrganisationTypeFilters, DashboardOrganisationTypeInfos } from "@dative-gpi/foundation-core-domain/models";
 import { useOrganisation } from "@dative-gpi/foundation-shared-services/composables";
 
-import FSDataTable from "../FSDataTable.vue";
+import FSTagGroup from "@dative-gpi/foundation-shared-components/components/FSTagGroup.vue";
 import FSIcon from "@dative-gpi/foundation-shared-components/components/FSIcon.vue";
 import FSRow from "@dative-gpi/foundation-shared-components/components/FSRow.vue";
 import FSText from "@dative-gpi/foundation-shared-components/components/FSText.vue";
 import FSChip from "@dative-gpi/foundation-shared-components/components/FSChip.vue";
 import FSDashboardOrganisationTypeTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSDashboardOrganisationTypeTileUI.vue";
 
+import FSDataTable from "../FSDataTable.vue";
+
 export default defineComponent({
   name: "FSBaseDashboardOrganisationTypesList",
   components: {
     FSDataTable,
+    FSTagGroup,
     FSIcon,
     FSRow,
     FSText,

package/components/lists/dashboards/FSBaseDashboardsList.vue

@@ -18,7 +18,6 @@
         v-bind="slotData"
       />
     </template>
-
     <template
       #item.icon="{ item }"
     >
@@ -26,7 +25,6 @@
         {{ item.icon }}
       </FSIcon>
     </template>
-
     <template
       #item.main="{ item }"
     >
@@ -41,7 +39,15 @@
         mdi-home
       </FSIcon>
     </template>
-
+    <template
+      #item.tags="{ item }"
+    >
+      <FSTagGroup
+        variant="slide"
+        :editable="false"
+        :tags="item.tags"
+      />
+    </template>
     <template
       #item.tile="{ item, toggleSelect }"
     >
@@ -75,9 +81,8 @@
 
 <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 { useAppOrganisationId, useCurrentUserOrganisation, useDashboardOrganisations, useDashboardOrganisationTypes, useDashboardShallows } from "@dative-gpi/foundation-core-services/composables";
 import type { DashboardOrganisationTypeFilters, DashboardOrganisationFilters, DashboardShallowFilters, DashboardInfos } from "@dative-gpi/foundation-core-domain/models";
@@ -86,16 +91,19 @@ import { useOrganisation } from "@dative-gpi/foundation-shared-services/composab
 import type { DashboardsListItem } from "@/core/foundation-core-components/utils";
 import { DashboardType } from "@dative-gpi/foundation-shared-domain/enums";
 
-import FSDataTable from "../FSDataTable.vue";
+import FSTagGroup from "@dative-gpi/foundation-shared-components/components/FSTagGroup.vue";
 import FSIcon from "@dative-gpi/foundation-shared-components/components/FSIcon.vue";
 import FSDashboardShallowTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSDashboardShallowTileUI.vue";
 import FSDashboardOrganisationTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSDashboardOrganisationTileUI.vue";
 import FSDashboardOrganisationTypeTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSDashboardOrganisationTypeTileUI.vue";
 
+import FSDataTable from "../FSDataTable.vue";
+
 export default defineComponent({
   name: "FSBaseDashboardsList",
   components: {
     FSDataTable,
+    FSTagGroup,
     FSIcon,
     FSDashboardOrganisationTileUI,
     FSDashboardOrganisationTypeTileUI,

package/components/lists/dataCategories/FSBaseDataCategoriesList.vue

@@ -19,6 +19,7 @@
       maskHeight="0px"
     >
       <FSDataTable
+        defaultMode="iterator"
         :loading="fetchingDataCategories"
         :items="dataCategories"
         :modelValue="$props.modelValue"

package/components/lists/dataDefinitions/FSBaseDataDefinitionsList.vue

@@ -1,5 +1,6 @@
 <template>
   <FSDataTable
+    defaultMode="iterator"
     :loading="fetchingDataDefinitions"
     :items="dataDefinitions"
     :tableCode="$props.tableCode"

package/components/lists/deviceOrganisations/FSBaseDeviceOrganisationsList.vue

@@ -160,11 +160,14 @@
 import { computed, defineComponent, onMounted, type PropType, watch } from "vue";
 import { type RouteLocation } from "vue-router";
 import _ from "lodash";
+
+import { useTranslations as useTranslationsProvider } from "@dative-gpi/bones-ui";
   
+import { ConnectivityStatus, Criticity, PropertyEntity } from "@dative-gpi/foundation-shared-domain/enums";
 import { alphanumericSort, connectivityLabel } from "@dative-gpi/foundation-shared-components/utils";
-import { ConnectivityStatus, PropertyEntity } from "@dative-gpi/foundation-shared-domain/enums";
+import { AlertTools } from "@dative-gpi/foundation-shared-components/tools";
 
-import type { DeviceConnectivityDetails, DeviceOrganisationAlert, DeviceOrganisationFilters, DeviceOrganisationInfos} from "@dative-gpi/foundation-core-domain/models";
+import type { DeviceConnectivityDetails, DeviceOrganisationAlert, DeviceOrganisationFilters, DeviceOrganisationInfos, DeviceStatusDetails} from "@dative-gpi/foundation-core-domain/models";
 import { useCustomProperties, useDeviceOrganisations } from "@dative-gpi/foundation-core-services/composables";
 
 import FSMetaValue from "../../customProperties/FSMetaValue.vue";
@@ -236,6 +239,7 @@ export default defineComponent({
   setup(props) {
     const { fetching: fecthingCustomProperties, entities: customProperties, getMany: getManyCustomProperties } = useCustomProperties();
     const { entities, fetching: fetchingDeviceOrganisations, getMany: getManyDeviceOrganisations } = useDeviceOrganisations();
+    const { $tr } = useTranslationsProvider();
   
     const deviceOrganisations = computed((): DeviceOrganisationInfos[] => {
       if (props.connectedOnly) {
@@ -245,6 +249,19 @@ export default defineComponent({
     });
 
     const headersOptions = computed(() => ({
+      status: {
+        fixedFilters: [{
+          value: true,
+          text: $tr("ui.device-organisation.has-statuses", "Has statuses")
+        }, {
+          value: false,
+          text: $tr("ui.device-organisation.has-no-statuses", "Has no statuses")
+        }],
+        methodFilter: (value: boolean, item: DeviceStatusDetails) => {
+          return value ? item.statuses.length > 0 : item.statuses.length === 0;
+        },
+        sort: (a: DeviceStatusDetails, b: DeviceStatusDetails) => a.statuses.length - b.statuses.length
+      },
       connectivity: {
         fixedFilters: [{
           value: ConnectivityStatus.None,
@@ -272,7 +289,41 @@ export default defineComponent({
         },
         sort: (a: DeviceConnectivityDetails, b: DeviceConnectivityDetails) => alphanumericSort(a?.status, b?.status)
       },
+      alerts: {
+        fixedFilters: [{
+          value: true,
+          text: $tr("ui.device-organisation.has-alerts", "Has alerts")
+        }, {
+          value: false,
+          text: $tr("ui.device-organisation.has-no-alerts", "Has no alerts")
+        }],
+        methodFilter: (value: boolean, item: DeviceOrganisationAlert[]) => {
+          return value ? item.length > 0 : item.length === 0;
+        },
+        sort: (a: DeviceOrganisationAlert[], b: DeviceOrganisationAlert[]) => a.length - b.length
+      },
       worstAlert: {
+        fixedFilters: [{
+          value: Criticity.None,
+          text: "—"
+        }, {
+          value: Criticity.Information,
+          text: AlertTools.criticityLabel(Criticity.Information)
+        }, {
+          value: Criticity.Warning,
+          text: AlertTools.criticityLabel(Criticity.Warning)
+        }, {
+          value: Criticity.Error,
+          text: AlertTools.criticityLabel(Criticity.Error)
+        }],
+        methodFilter: (value: Criticity, item: DeviceOrganisationAlert | null) => {
+          switch(value) {
+            case Criticity.None:
+              return !item;
+            default:
+              return item != null && item.criticity === value;
+          }
+        },
         sort: (a: DeviceOrganisationAlert, b: DeviceOrganisationAlert) => alphanumericSort(a?.criticity, b?.criticity)
       },
       ...customProperties.value.reduce((acc, cp) => ({

package/components/lists/serviceAccountOrganisations/FSBaseServiceAccountOrganisationsList.vue

@@ -1,6 +1,5 @@
 <template>
   <FSDataTable
-    defaultMode="iterator"
     :items="serviceAccountOrganisations"
     :itemTo="$props.itemTo"
     :loading="fetchingServiceAccountOrganisations"

package/components/lists/userOrganisations/FSBaseUserOrganisationsList.vue

@@ -1,6 +1,5 @@
 <template>
   <FSDataTable
-    defaultMode="iterator"
     :items="userOrganisations"
     :itemTo="$props.itemTo"
     :loading="fetchingUserOrganisations"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-components",
   "sideEffects": false,
-  "version": "1.0.129",
+  "version": "1.0.130-maps2",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,11 +10,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "1.0.129",
-    "@dative-gpi/foundation-core-services": "1.0.129",
-    "@dative-gpi/foundation-shared-components": "1.0.129",
-    "@dative-gpi/foundation-shared-domain": "1.0.129",
-    "@dative-gpi/foundation-shared-services": "1.0.129"
+    "@dative-gpi/foundation-core-domain": "1.0.130-maps2",
+    "@dative-gpi/foundation-core-services": "1.0.130-maps2",
+    "@dative-gpi/foundation-shared-components": "1.0.130-maps2",
+    "@dative-gpi/foundation-shared-domain": "1.0.130-maps2",
+    "@dative-gpi/foundation-shared-services": "1.0.130-maps2"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -26,5 +26,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "73ebbdb8cfd158e2748933ec57315bc1b5fc4835"
+  "gitHead": "a0739b48282166f721cf6c2376a430e4690d92ef"
 }