@dative-gpi/foundation-core-components 1.0.91 → 1.0.92

package/components/lists/chartOrganisationTypes/FSBaseChartOrganisationTypesList.vue

@@ -3,6 +3,7 @@
     :items="chartOrganisationTypes"
     :itemTo="$props.itemTo"
     :loading="fetchingChartOrganisationTypes"
+    :headersOptions="headersOptions"
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"
     @update:modelValue="$emit('update:modelValue', $event)"
@@ -50,6 +51,20 @@
         :tags="item.tags"
       />
     </template>
+    <template
+      #item.chartType="{ item }"
+    >
+      <FSRow
+        :wrap="false"
+      >
+        <FSIcon
+          :icon="chartIcon(item.chartType)"
+        />
+        <FSText>
+          {{ chartTypeLabel(item.chartType) }}
+        </FSText>
+      </FSRow>
+    </template>
     <template
       #item.modelsLabels="{ item }"
     >
@@ -74,22 +89,22 @@
 </template>
 
 <script lang="ts">
-import _ from "lodash";
-import { defineComponent, type PropType, watch } from "vue";
+import { computed, defineComponent, type PropType, watch } from "vue";
 import type { RouteLocation } from "vue-router";
+import _ from "lodash";
 
-import {ColorEnum} from "@dative-gpi/foundation-shared-components/models";
-
-import type { ChartOrganisationTypeFilters, ChartOrganisationTypeInfos } from "@dative-gpi/foundation-core-domain/models";
-
+import type { ChartModelLabel, ChartOrganisationTypeFilters, ChartOrganisationTypeInfos } from "@dative-gpi/foundation-core-domain/models";
 import { useChartOrganisationTypes } from "@dative-gpi/foundation-core-services/composables";
+import { chartTypeLabel, chartIcon } from "@dative-gpi/foundation-shared-components/tools";
+import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 
 import FSChartTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSChartTileUI.vue";
-import FSDataTable from "../FSDataTable.vue";
 import FSTagGroup from "@dative-gpi/foundation-shared-components/components/FSTagGroup.vue";
 import FSImage from "@dative-gpi/foundation-shared-components/components/FSImage.vue";
 import FSIcon from "@dative-gpi/foundation-shared-components/components/FSIcon.vue";
 
+import FSDataTable from "../FSDataTable.vue";
+
 export default defineComponent({
   name: "FSBaseChartOrganisationTypesList",
   components: {
@@ -122,9 +137,24 @@ export default defineComponent({
   },
   emits: ["update:modelValue"],
   setup(props) {
-
     const { entities: chartOrganisationTypes, fetching: fetchingChartOrganisationTypes, getMany: getManyChartOrganisationTypes } = useChartOrganisationTypes();
 
+    const headersOptions = computed(() => ({
+      modelsLabels: {
+        fixedFilters: chartOrganisationTypes.value.map(c => c.modelsLabels).reduce((acc, models) => {
+          for (const m of models) {
+            if (!acc.map((m) => m.id).includes(m.id)) {
+              acc.push(m);
+            }
+          }
+          return acc;
+        }, []).map((m) =>  ({
+          value: m.id,
+          text: m.label
+        })),
+        methodFilter: (value: string, items: ChartModelLabel[]) => items.some(ml => ml.id == value)
+      }}));
+      
     const isSelected = (id: string): boolean => {
       return props.modelValue.includes(id);
     };
@@ -140,10 +170,13 @@ export default defineComponent({
     }, { immediate: true });
 
     return {
-      ColorEnum,
       fetchingChartOrganisationTypes,
       chartOrganisationTypes,
-      isSelected
+      headersOptions,
+      ColorEnum,
+      chartTypeLabel,
+      isSelected,
+      chartIcon
     };
   }
 });

package/components/lists/chartOrganisations/FSBaseChartOrganisationsList.vue

@@ -3,6 +3,7 @@
     :items="chartOrganisations"
     :itemTo="$props.itemTo"
     :loading="fetchingChartOrganisations"
+    :headersOptions="headersOptions"
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"
     @update:modelValue="$emit('update:modelValue', $event)"
@@ -70,25 +71,40 @@
         :to="$props.itemTo && $props.itemTo(item)"
       />
     </template>
+    <template
+      #item.chartType="{ item }"
+    >
+      <FSRow
+        :wrap="false"
+      >
+        <FSIcon
+          :icon="chartIcon(item.chartType)"
+        />
+        <FSText>
+          {{ chartTypeLabel(item.chartType) }}
+        </FSText>
+      </FSRow>
+    </template>
   </FSDataTable>
 </template>
 
 <script lang="ts">
-import { defineComponent, type PropType, watch } from "vue";
+import { computed, defineComponent, type PropType, watch } from "vue";
 import type { RouteLocation } from "vue-router";
 import _ from "lodash";
 
-import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
-
-import { type ChartOrganisationFilters, type ChartOrganisationInfos } from "@dative-gpi/foundation-core-domain/models";
+import type { ChartModelLabel, ChartOrganisationFilters, ChartOrganisationInfos } from "@dative-gpi/foundation-core-domain/models";
+import { chartTypeLabel, chartIcon } from "@dative-gpi/foundation-shared-components/tools";
 import { useChartOrganisations } from "@dative-gpi/foundation-core-services/composables";
+import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 
-import FSDataTable from "../FSDataTable.vue";
 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 FSChartTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSChartTileUI.vue";
 
+import FSDataTable from "../FSDataTable.vue";
+
 export default defineComponent({
   name: "FSBaseChartOrganisationsList",
   components: {
@@ -121,9 +137,25 @@ export default defineComponent({
   },
   emits: ["update:modelValue"],
   setup(props) {
-
     const { entities: chartOrganisations, fetching: fetchingChartOrganisations, getMany: getManyChartOrganisations } = useChartOrganisations();
 
+    const headersOptions = computed(() => ({
+      modelsLabels: {
+        fixedFilters: chartOrganisations.value.map(c => c.modelsLabels).reduce((acc, models) => {
+          for (const m of models) {
+            if (!acc.map((m) => m.id).includes(m.id)) {
+              acc.push(m);
+            }
+          }
+          return acc;
+        }, []).map((m) =>  ({
+          value: m.id,
+          text: m.label
+        })),
+        methodFilter: (value: string, items: ChartModelLabel[]) => items.some(ml => ml.id == value)
+      }}));
+
+
     const isSelected = (id: string): boolean => {
       return props.modelValue.includes(id);
     };
@@ -139,10 +171,13 @@ export default defineComponent({
     }, { immediate: true });
 
     return {
-      ColorEnum,
       fetchingChartOrganisations,
       chartOrganisations,
-      isSelected
+      headersOptions,
+      ColorEnum,
+      chartTypeLabel,
+      isSelected,
+      chartIcon
     };
   }
 });

package/components/lists/charts/FSBaseChartsList.vue

@@ -2,6 +2,7 @@
   <FSDataTable
     defaultMode="iterator"
     :loading="fetchingChartOrganisationTypes || fetchingChartOrganisations"
+    :headersOptions="headersOptions"
     :items="charts"
     :tableCode="$props.tableCode"
     :modelValue="$props.modelValue"
@@ -50,6 +51,20 @@
         :tags="item.tags"
       />
     </template>
+    <template
+      #item.chartType="{ item }"
+    >
+      <FSRow
+        :wrap="false"
+      >
+        <FSIcon
+          :icon="chartIcon(item.chartType)"
+        />
+        <FSText>
+          {{ chartTypeLabel(item.chartType) }}
+        </FSText>
+      </FSRow>
+    </template>
     <template
       #item.modelsLabels="{ item }"
     >
@@ -78,16 +93,16 @@
 import { defineComponent, type PropType, watch, computed } from "vue";
 import _ from "lodash";
 
-import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
-
-import type { ChartOrganisationFilters, ChartOrganisationTypeFilters } from "@dative-gpi/foundation-core-domain/models";
-
+import type { ChartModelLabel, ChartOrganisationFilters, ChartOrganisationTypeFilters } from "@dative-gpi/foundation-core-domain/models";
 import { useChartOrganisations, useChartOrganisationTypes } from "@dative-gpi/foundation-core-services/composables";
+import { chartTypeLabel, chartIcon } from "@dative-gpi/foundation-shared-components/tools";
+import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 
 import FSChartTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSChartTileUI.vue";
 import FSTagGroup from "@dative-gpi/foundation-shared-components/components/FSTagGroup.vue";
 import FSImage from "@dative-gpi/foundation-shared-components/components/FSImage.vue";
 import FSIcon from "@dative-gpi/foundation-shared-components/components/FSIcon.vue";
+
 import FSDataTable from "../FSDataTable.vue";
 
 export default defineComponent({
@@ -123,7 +138,6 @@ export default defineComponent({
   },
   emits: ["update:modelValue", "update:scope"],
   setup(props, { emit }) {
-
     const { entities: chartOrganisations, fetching: fetchingChartOrganisations, getMany: getManyChartOrganisations } = useChartOrganisations();
     const { entities: chartOrganisationTypes, fetching: fetchingChartOrganisationTypes, getMany: getManyChartOrganisationTypes } = useChartOrganisationTypes();
 
@@ -137,60 +151,69 @@ export default defineComponent({
     }
 
     const charts = computed(() => {
-      return chartOrganisations.value.map(c => {
-        return {
-          id: c.id,
-          imageId: c.imageId,
-          chartId: c.chartId,
-          chartCategoryId: c.chartCategoryId,
-          chartCategoryLabel: c.chartCategoryLabel,
-          scope: c.scope,
-          label: c.label,
-          title: c.title,
-          code: c.code,
-          icon: c.icon,
-          tags: c.tags,
-          multiple: c.multiple,
-          chartType: c.chartType,
-          modelsLabels: c.modelsLabels
-        }
-      })
-        .concat(chartOrganisationTypes.value.map(c => {
-          return {
-            id: c.id,
-            imageId: c.imageId,
-            chartId: c.chartId,
-            chartCategoryId: c.chartCategoryId,
-            chartCategoryLabel: c.chartCategoryLabel,
-            scope: c.scope,
-            label: c.label,
-            title: c.title,
-            code: c.code,
-            icon: c.icon,
-            tags: c.tags,
-            multiple: c.multiple,
-            chartType: c.chartType,
-            modelsLabels: c.modelsLabels
+      return chartOrganisations.value.map(c => ({
+        id: c.id,
+        imageId: c.imageId,
+        chartId: c.chartId,
+        chartCategoryId: c.chartCategoryId,
+        chartCategoryLabel: c.chartCategoryLabel,
+        scope: c.scope,
+        label: c.label,
+        title: c.title,
+        code: c.code,
+        icon: c.icon,
+        tags: c.tags,
+        multiple: c.multiple,
+        chartType: c.chartType,
+        modelsLabels: c.modelsLabels
+      })).concat(chartOrganisationTypes.value.map(c => ({
+        id: c.id,
+        imageId: c.imageId,
+        chartId: c.chartId,
+        chartCategoryId: c.chartCategoryId,
+        chartCategoryLabel: c.chartCategoryLabel,
+        scope: c.scope,
+        label: c.label,
+        title: c.title,
+        code: c.code,
+        icon: c.icon,
+        tags: c.tags,
+        multiple: c.multiple,
+        chartType: c.chartType,
+        modelsLabels: c.modelsLabels
+      })));
+    });
+
+    const headersOptions = computed(() => ({
+      modelsLabels: {
+        fixedFilters: chartOrganisationTypes.value.map(c => c.modelsLabels).reduce((acc, models) => {
+          for(const m of models){
+            if(!acc.map((m) => m.id).includes(m.id)){
+              acc.push(m);
+            }
           }
-        }))
-    })
+          return acc;
+        }, []).map((m) =>  ({
+          value: m.id,
+          text: m.label
+        })),
+        methodFilter: (value: string, items: ChartModelLabel[]) => items.some(ml => ml.id == value)
+      }}));
 
-    const update = (value : string) =>
-    {
+    const update = (value : string) => {
       const item = isSelected(value);
-
-      if(item){
-        onSelect(props.modelValue.filter(m => m != value))
+      if (item) {
+        onSelect(props.modelValue.filter(m => m != value));
       }
-      else{
-        onSelect([...props.modelValue, value])
+      else {
+        onSelect([...props.modelValue, value]);
       }
     }
 
     const onSelect = (values: string[] | null) => {
       if(!values){
-        emit("update:modelValue", [])
-        emit("update:scope", [])
+        emit("update:modelValue", []);
+        emit("update:scope", []);
         return;
       }
       const selectedItems = charts.value.filter(i => values.includes(i.id));
@@ -209,9 +232,12 @@ export default defineComponent({
       fetchingChartOrganisations,
       chartOrganisationTypes,
       chartOrganisations,
+      headersOptions,
       ColorEnum,
       charts,
+      chartTypeLabel,
       isSelected,
+      chartIcon,
       onSelect,
       update
     };

package/components/lists/comments/FSBaseCommentsList.vue

@@ -21,20 +21,24 @@
         :userImageId="currentUser?.imageId"
       />
     </FSRow>
-    <FSCommentTileUI
-      v-for="comment in orderedComments"
-      :key="comment.id"
-      :timestamp="epochToLongTimeFormat(comment.timestamp)"
-      :userName="comment.userName"
-      :userImageId="comment.userImageId"
-      :canEditRemove="currentUser?.id === comment.userId"
-      :comment="comment.comment"
-      :edited="comment.edited"
-      :removing="removing"
-      :id="comment.id"
-      @edit="updateComment"
-      @remove="removeComment(comment.id)"
-    />
+    <FSCol
+      gap="12px"
+    >
+      <FSCommentTileUI
+        v-for="comment in orderedComments"
+        :key="comment.id"
+        :timestamp="epochToLongTimeFormat(comment.timestamp)"
+        :userName="comment.userName"
+        :userImageId="comment.userImageId"
+        :canEditRemove="currentUser?.id === comment.userId"
+        :comment="comment.comment"
+        :edited="comment.edited"
+        :removing="removing"
+        :id="comment.id"
+        @edit="updateComment"
+        @remove="removeComment(comment.id)"
+      />
+    </FSCol>
   </FSCol>
 </template>
 

package/components/lists/deviceOrganisations/FSBaseDeviceOrganisationsList.vue

@@ -278,7 +278,14 @@ export default defineComponent({
           value: ConnectivityStatus.Connected,
           text: connectivityLabel(ConnectivityStatus.Connected)
         }],
-        methodFilter: (value: ConnectivityStatus, item: DeviceConnectivityDetails) => !item.status && !value || item.status == value,
+        methodFilter: (value: ConnectivityStatus, item: DeviceConnectivityDetails) => {
+          switch(value) {
+            case ConnectivityStatus.None:
+              return !item.status;
+            default:
+              return item.status == value;
+          }
+        },
         sort: (a: DeviceConnectivityDetails, b: DeviceConnectivityDetails) => alphanumericSort(a?.status, b?.status)
       },
       connectivity: {
@@ -298,7 +305,14 @@ export default defineComponent({
           value: ConnectivityStatus.Connected,
           text: connectivityLabel(ConnectivityStatus.Connected)
         }],
-        methodFilter: (value: ConnectivityStatus, item: DeviceConnectivityDetails) => !item.status && !value || item.status == value,
+        methodFilter: (value: ConnectivityStatus, item: DeviceConnectivityDetails) => {
+          switch(value) {
+            case ConnectivityStatus.None:
+              return !item.status;
+            default:
+              return item.status == value;
+          }
+        },
         sort: (a: DeviceConnectivityDetails, b: DeviceConnectivityDetails) => alphanumericSort(a?.status, b?.status)
       },
       worstAlert: {
@@ -316,9 +330,9 @@ export default defineComponent({
           }))): undefined,
           methodFilterRaw: (value: any, item: DeviceOrganisationInfos) => {
             if (cp.useOnlyAllowedValues) {
-              return (!Object.keys(cp.allowedValues).includes(item.meta[cp.code])) && !value || item.meta[cp.code] === value;
+              return (!Object.keys(cp.allowedValues).includes(item.meta[cp.code])) && !value || item.meta[cp.code] == value
             }
-            return !item.meta[cp.code] && !value || item.meta[cp.code] === value;
+            return item.meta[cp.code] == value
           },
           sort: (a: string, b: string) => alphanumericSort(a, b)
         }

package/package.json

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