@dative-gpi/foundation-core-components 1.0.63 → 1.0.64

package/components/lists/FSDataTable.vue

@@ -29,6 +29,7 @@ import { computed, defineComponent, onUnmounted, type PropType, watch } from "vu
 
 import { useUserOrganisationTable, useUpdateUserOrganisationTable, useDataTables } from "@dative-gpi/foundation-core-services/composables";
 import { useDebounce, useTables } from "@dative-gpi/foundation-shared-components/composables";
+import { type FSDataTableColumn } from "@dative-gpi/foundation-shared-components/models";
 
 import FSLoadDataTable from "@dative-gpi/foundation-shared-components/components/lists/FSLoadDataTable.vue";
 import FSDataTableUI from "@dative-gpi/foundation-shared-components/components/lists/FSDataTableUI.vue";
@@ -49,13 +50,8 @@ export default defineComponent({
       required: false,
       default: 1000
     },
-    customSorts: {
-      type: Object as PropType<{ [key: string]: any }>,
-      required: false,
-      default: () => ({})
-    },
-    customSortRaws: {
-      type: Object as PropType<{ [key: string]: any }>,
+    headersOptions: {
+      type: Object as PropType<{ [key: string]: Partial<FSDataTableColumn> }>,
       required: false,
       default: () => ({})
     }
@@ -67,7 +63,7 @@ export default defineComponent({
     const { getTable, setTable } = useTables();
     const { debounce, cancel } = useDebounce();
 
-    const computedTable = computed(() => computeTable(props.customSorts, props.customSortRaws));
+    const computedTable = computed(() => computeTable(props.headersOptions));
 
     onUnmounted(() => {
       cancel();

package/components/lists/deviceOrganisations/FSBaseDeviceOrganisationsList.vue

@@ -1,10 +1,10 @@
 <template>
   <FSDataTable
-    :items="deviceOrganisations"
-    :customSorts="customSorts"
-    :itemTo="$props.itemTo"
     :loading="fetchingDeviceOrganisations"
+    :headersOptions="headersOptions"
     :tableCode="$props.tableCode"
+    :items="deviceOrganisations"
+    :itemTo="$props.itemTo"
     :modelValue="$props.modelValue"
     @update:modelValue="$emit('update:modelValue', $event)"
     v-bind="$attrs"
@@ -87,6 +87,9 @@
         :deviceAlerts="item.alerts"
         :alertTo="$props.alertTo"
       />
+      <div
+        v-else
+      />
     </template>
     <template
       #item.alerts="{ item }"
@@ -97,6 +100,9 @@
         :deviceAlerts="item.alerts"
         :alertTo="$props.alertTo"
       />
+      <div
+        v-else
+      />
     </template>
     <template
       #item.status="{ item }"
@@ -146,16 +152,15 @@
 </template>
   
 <script lang="ts">
-import type { PropType} from "vue";
-import type { RouteLocation } from "vue-router";
-import { computed, defineComponent, onMounted, watch } from "vue";
+import { computed, defineComponent, onMounted, type PropType, watch } from "vue";
+import { type RouteLocation } from "vue-router";
 import _ from "lodash";
   
-import { alphanumericSort } from "@dative-gpi/foundation-shared-components/utils";
+import { alphanumericSort, connectivityLabel } from "@dative-gpi/foundation-shared-components/utils";
 import { ConnectivityStatus, PropertyEntity } from "@dative-gpi/foundation-shared-domain/enums";
 
 import { useCustomProperties, useDeviceOrganisations } from "@dative-gpi/foundation-core-services/composables";
-import type { DeviceConnectivityDetails, DeviceOrganisationFilters, DeviceOrganisationInfos} from "@dative-gpi/foundation-core-domain/models";
+import type { DeviceConnectivityDetails, DeviceOrganisationAlert, DeviceOrganisationFilters, DeviceOrganisationInfos} from "@dative-gpi/foundation-core-domain/models";
 
 import FSDataTable from "../FSDataTable.vue";
 import FSMetaValue from "../../customProperties/FSMetaValue.vue";
@@ -228,17 +233,61 @@ export default defineComponent({
       }
       return entities.value;
     });
-  
-    const customSorts = computed(() => {
-      return {
-        connectable: (a:DeviceConnectivityDetails, b:DeviceConnectivityDetails) => {
-          return alphanumericSort(a?.status, b?.status);
-        },
-        connectivity: (a:DeviceConnectivityDetails, b:DeviceConnectivityDetails) => {
-          return alphanumericSort(a?.status, b?.status);
-        }
-      }
-    });
+
+    const headersOptions = computed(() => ({
+      connectable: {
+        fixedFilters: [{
+          value: ConnectivityStatus.None,
+          text: "—"
+        }, {
+          value: ConnectivityStatus.Offline,
+          text: connectivityLabel(ConnectivityStatus.Offline)
+        }, {
+          value: ConnectivityStatus.AlmostOffline,
+          text: connectivityLabel(ConnectivityStatus.AlmostOffline)
+        }, {
+          value: ConnectivityStatus.PartiallyConnected,
+          text: connectivityLabel(ConnectivityStatus.PartiallyConnected)
+        }, {
+          value: ConnectivityStatus.Connected,
+          text: connectivityLabel(ConnectivityStatus.Connected)
+        }],
+        methodFilter: (value: ConnectivityStatus, item: DeviceConnectivityDetails) => !item.status && !value || item.status == value,
+        sort: (a: DeviceConnectivityDetails, b: DeviceConnectivityDetails) => alphanumericSort(a?.status, b?.status)
+      },
+      connectivity: {
+        fixedFilters: [{
+          value: ConnectivityStatus.None,
+          text: "—"
+        }, {
+          value: ConnectivityStatus.Offline,
+          text: connectivityLabel(ConnectivityStatus.Offline)
+        }, {
+          value: ConnectivityStatus.AlmostOffline,
+          text: connectivityLabel(ConnectivityStatus.AlmostOffline)
+        }, {
+          value: ConnectivityStatus.PartiallyConnected,
+          text: connectivityLabel(ConnectivityStatus.PartiallyConnected)
+        }, {
+          value: ConnectivityStatus.Connected,
+          text: connectivityLabel(ConnectivityStatus.Connected)
+        }],
+        methodFilter: (value: ConnectivityStatus, item: DeviceConnectivityDetails) => !item.status && !value || item.status == value,
+        sort: (a: DeviceConnectivityDetails, b: DeviceConnectivityDetails) => alphanumericSort(a?.status, b?.status)
+      },
+      worstAlert: {
+        sort: (a: DeviceOrganisationAlert, b: DeviceOrganisationAlert) => alphanumericSort(a?.criticity, b?.criticity)
+      },
+      // ...customProperties.value.reduce((acc, cp) => ({
+      //   ...acc,
+      //   [`meta.${cp.code}`]: {
+      //     innerValue: (item: DeviceOrganisationInfos) => {
+      //       return item
+      //     },
+      //     sort: (a: string, b: string) => alphanumericSort(a, b)
+      //   }
+      // }), {})
+    }));
   
     const isSelected = (id: string): boolean => {
       return props.modelValue.includes(id);
@@ -262,7 +311,7 @@ export default defineComponent({
       deviceOrganisations,
       ConnectivityStatus,
       customProperties,
-      customSorts,
+      headersOptions,
       isSelected
     };
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-components",
   "sideEffects": false,
-  "version": "1.0.63",
+  "version": "1.0.64",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,11 +10,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "1.0.63",
-    "@dative-gpi/foundation-core-services": "1.0.63",
-    "@dative-gpi/foundation-shared-components": "1.0.63",
-    "@dative-gpi/foundation-shared-domain": "1.0.63",
-    "@dative-gpi/foundation-shared-services": "1.0.63"
+    "@dative-gpi/foundation-core-domain": "1.0.64",
+    "@dative-gpi/foundation-core-services": "1.0.64",
+    "@dative-gpi/foundation-shared-components": "1.0.64",
+    "@dative-gpi/foundation-shared-domain": "1.0.64",
+    "@dative-gpi/foundation-shared-services": "1.0.64"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^0.0.75",
@@ -26,5 +26,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "b2fbfec30ab5c2f3edeaddbc7eed0d3c98fe71c4"
+  "gitHead": "2774a6e01e85f2b27b543f3fdd91a9370b95fbee"
 }