@dative-gpi/foundation-core-components 1.1.24-unit-formatter → 1.1.24-unit-formatter-1

package/components/autocompletes/FSAutocompleteDataCategory.vue

@@ -4,7 +4,7 @@
     :toggleSet="!$props.toggleSetDisabled && toggleSet"
     :multiple="$props.multiple"
     :placeholder="placeholder"
-    :items="dataCategories"
+    :items="items"
     :loading="loading"
     :modelValue="$props.modelValue"
     @update:modelValue="onUpdate"
@@ -124,6 +124,15 @@ export default defineComponent({
       return getManyDataCategories({ ...props.dataCategoriesFilters, search: search ?? undefined });
     };
 
+    const items = computed(() => dataCategories.value.map((dataCategory) => {
+      const modelsLabel = dataCategory.models.map((m) => m.label).join(", ");
+      return {
+        id: dataCategory.id,
+        label: modelsLabel ? `${dataCategory.label} (${modelsLabel})` : dataCategory.label,
+        correlated: dataCategory.correlated
+      };
+    }));
+
     const { toggleSet, init, onUpdate } = useAutocomplete(
       dataCategories,
       [() => props.dataCategoriesFilters],
@@ -132,7 +141,7 @@ export default defineComponent({
     );
 
     return {
-      dataCategories,
+      items,
       placeholder,
       ColorEnum,
       toggleSet,

package/components/entities/FSBaseEntitiesList.vue

@@ -47,6 +47,10 @@ export default defineComponent({
           return defineAsyncComponent(() => import("../lists/locations/FSBaseLocationsList.vue"));
         case EntityType.Model:
           return defineAsyncComponent(() => import("../lists/models/FSBaseModelsList.vue"));
+        case EntityType.Grouping:
+          return defineAsyncComponent(() => import("../lists/groupings/FSBaseGroupingsList.vue"));
+        case EntityType.Subgrouping:
+          return defineAsyncComponent(() => import("../lists/subgroupings/FSBaseSubgroupingsList.vue"));
         default:
           return null;
       };

package/components/entities/FSEntityField.vue

@@ -41,7 +41,7 @@ import { defineComponent, ref, 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 { DashboardExplorerElementFilters, DeviceOrganisationFilters, FolderFilters, GroupFilters, GroupingFilters, LocationFilters, ModelFilters, SubgroupingFilters, UserOrganisationFilters } from "@dative-gpi/foundation-core-domain/models";
 
 import FSEntityFieldUI from "@dative-gpi/foundation-shared-components/components/fields/FSEntityFieldUI.vue";
 
@@ -138,10 +138,8 @@ export default defineComponent({
           } satisfies DeviceOrganisationFilters;
         case EntityType.Dashboard:
           return {
-            dashboardOrganisationsIds: props.modelValue,
-            dashboardOrganisationTypesIds: props.modelValue,
-            dashboardShallowsIds: props.modelValue
-          } satisfies DashboardOrganisationFilters & DashboardOrganisationTypeFilters;
+            dashboardExplorerElementsIds: props.modelValue,
+          } satisfies DashboardExplorerElementFilters;
         case EntityType.Group:
           return {
             groupsIds: props.modelValue
@@ -162,6 +160,14 @@ export default defineComponent({
           return {
             modelsIds: props.modelValue
           } satisfies ModelFilters;
+        case EntityType.Grouping:
+          return {
+            groupingsIds: props.modelValue
+          } satisfies GroupingFilters;
+        case EntityType.Subgrouping:
+          return {
+            subgroupingsIds: props.modelValue
+          } satisfies SubgroupingFilters;
         default:
           return undefined;
       };

package/components/entities/FSSelectEntitiesList.vue

@@ -42,6 +42,7 @@
         :singleSelect="$props.singleSelect"
         :entity-type="$props.entityType"
         :tableCode="tableCode"
+        :selectable="true"
         :modelValue="$props.modelValue"
         @update:modelValue="$emit('update:modelValue', $event)"
         v-bind="baseTableAttrs"
@@ -64,7 +65,7 @@
 import { defineComponent, type PropType, computed } from "vue";
 
 import { EntityType } from "@dative-gpi/foundation-shared-domain/enums";
-import type { DashboardOrganisationFilters, DashboardOrganisationTypeFilters, DashboardShallowFilters, DeviceOrganisationFilters, FolderFilters, GroupFilters, LocationFilters, ModelFilters, UserOrganisationFilters } from "@dative-gpi/foundation-core-domain/models";
+import type { DashboardExplorerElementFilters, DeviceOrganisationFilters, FolderFilters, GroupFilters, GroupingFilters, LocationFilters, ModelFilters, SubgroupingFilters, UserOrganisationFilters } from "@dative-gpi/foundation-core-domain/models";
 
 import { TABLES as T } from "../../utils";
 
@@ -123,10 +124,8 @@ export default defineComponent({
           } satisfies DeviceOrganisationFilters;
         case EntityType.Dashboard:
           return {
-            dashboardOrganisationsIds: props.modelValue,
-            dashboardOrganisationTypesIds: props.modelValue,
-            dashboardShallowsIds: props.modelValue
-          } satisfies DashboardOrganisationFilters & DashboardOrganisationTypeFilters & DashboardShallowFilters;
+            dashboardExplorerElementsIds: props.modelValue,
+          } satisfies DashboardExplorerElementFilters;
         case EntityType.Group:
           return {
             groupsIds: props.modelValue
@@ -147,6 +146,14 @@ export default defineComponent({
           return {
             modelsIds: props.modelValue
           } satisfies ModelFilters;
+        case EntityType.Grouping:
+          return {
+            groupingsIds: props.modelValue
+          } satisfies GroupingFilters;
+        case EntityType.Subgrouping:
+          return {
+            subgroupingsIds: props.modelValue
+          } satisfies SubgroupingFilters;
         default:
           return undefined;
       };
@@ -156,6 +163,18 @@ export default defineComponent({
       switch(props.entityType) {
         case EntityType.Device:
           return T.DEVICES_SELECT;
+        case EntityType.Dashboard:
+          return T.DASHBOARDS_SELECT;
+        case EntityType.Group:
+          return T.GROUPS_SELECT;
+        case EntityType.Location:
+          return T.LOCATIONS_SELECT;
+        case EntityType.Model:
+          return T.MODELS_SELECT;
+        case EntityType.Grouping:
+          return T.GROUPINGS_SELECT;
+        case EntityType.Subgrouping:
+          return T.SUBGROUPINGS_SELECT;
         default:
           return null;
       };
@@ -170,9 +189,7 @@ export default defineComponent({
           };
         case EntityType.Dashboard:
           return {
-            dashboardShallowsFilters: props.filters,
-            dashboardOrganisationsFilters: props.filters,
-            dashboardOrganisationTypeFetchFilter: props.filters,
+            dashboardExplorerElementsFilters: props.filters,
             ...attrs
           };
         case EntityType.Group:
@@ -200,6 +217,16 @@ export default defineComponent({
             modelsFilters: props.filters,
             ...attrs
           };
+        case EntityType.Grouping:
+          return {
+            groupingFilters: props.filters,
+            ...attrs
+          };
+        case EntityType.Subgrouping:
+          return {
+            subgroupingFilters: props.filters,
+            ...attrs
+          };
         default:
           return null;
       };

package/components/entities/FSSimpleEntitiesList.vue

@@ -43,6 +43,10 @@ export default defineComponent({
           return defineAsyncComponent(() => import("../lists/locations/FSSimpleLocationsList.vue"));
         case EntityType.Model:
           return defineAsyncComponent(() => import("../lists/models/FSSimpleModelsList.vue"));
+        case EntityType.Grouping:
+          return defineAsyncComponent(() => import("../lists/groupings/FSSimpleGroupingsList.vue"));
+        case EntityType.Subgrouping:
+          return defineAsyncComponent(() => import("../lists/subgroupings/FSSimpleSubgroupingsList.vue"));
         default:
           return null;
       };
@@ -58,8 +62,7 @@ export default defineComponent({
         case EntityType.Dashboard:
           return {
             ...attrs,
-            dashboardOrganisationFilters : props.filters,
-            dashboardOrganisationTypeFilters : props.filters
+            dashboardExplorerElementsFilters: props.filters
           };
         case EntityType.Folder:
           return {
@@ -86,6 +89,16 @@ export default defineComponent({
             ...attrs,
             modelFilters : props.filters
           };
+        case EntityType.Grouping:
+          return {
+            ...attrs,
+            groupingFilters : props.filters
+          };
+        case EntityType.Subgrouping:
+          return {
+            ...attrs,
+            subgroupingFilters : props.filters
+          };
         default:
           return null;
       }

package/components/entities/FSTileEntitiesList.vue

@@ -55,9 +55,7 @@ export default defineComponent({
         case EntityType.Dashboard:
           return {
             ...attrs,
-            dashboardOrganisationFilters : props.filters,
-            dashboardOrganisationTypeFilters : props.filters,
-            dashboardShallowFilters : props.filters
+            dashboardExplorerElementsFilters: props.filters
           };
         case EntityType.Folder:
           return {

package/components/explorers/FSBaseDashboardsExplorer.vue

@@ -0,0 +1,312 @@
+<template>
+  <FSDataTable
+    defaultMode="iterator"
+    :loading="fetchingDashboardExplorerElements"
+    :singleSelect="$props.singleSelect"
+    :items="dashboardExplorerElements"
+    :selectable="$props.selectable"
+    :tableCode="$props.tableCode"
+    :itemTo="$props.itemTo"
+    :noSearch="$props.recursiveSearch"
+    :headersOptions="headersOptions"
+    :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
+      #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 }"
+    >
+      <FSDashboardExplorerElementTypeChip
+        :type="item.type"
+      />
+    </template>
+    <template
+      #item.icon="{ item }"
+    >
+      <FSIcon>
+        {{ item.icon }}
+      </FSIcon>
+    </template>
+    <template
+      #item.locked="{ item }"
+    >
+      <FSIconCheck
+        v-if="item.locked != null"
+        :value="item.locked"
+      />
+    </template>
+    <template
+      #item.tile="{ index, item, toggleSelect }"
+    >
+      <FSFolderTileUI
+        v-if="item.type === DashboardExplorerElementType.Folder"
+        :key="index"
+        :to="$props.itemTo && $props.itemTo(item)"
+        :imageId="item.imageId"
+        :icon="item.icon"
+        :label="item.label"
+        :code="item.code"
+        :bottomColor="item.colors"
+        :recursiveFoldersIds="item.recursiveFoldersIds"
+        :recursiveDashboardOrganisationsIds="item.recursiveDashboardOrganisationsIds"
+        :recursiveDashboardShallowsIds="item.recursiveDashboardShallowsIds"
+        :modelValue="isSelected(item.id)"
+        :selectable="$props.selectable"
+        @update:modelValue="toggleSelect(item)"
+      />
+      <FSDashboardOrganisationTileUI
+        v-if="item.type === DashboardExplorerElementType.DashboardOrganisation"
+        :key="index"
+        :to="$props.itemTo && $props.itemTo(item)"
+        :bottomColor="item.colors"
+        :imageId="item.imageId"
+        :icon="item.icon"
+        :label="item.label"
+        :code="item.code"
+        :modelValue="isSelected(item.id)"
+        :selectable="$props.selectable"
+        @update:modelValue="toggleSelect(item)"
+      />
+      <FSDashboardShallowTileUI
+        v-if="item.type === DashboardExplorerElementType.DashboardShallow"
+        :key="index"
+        :to="$props.itemTo && $props.itemTo(item)"
+        :bottomColor="item.colors"
+        :imageId="item.imageId"
+        :icon="item.icon"
+        :label="item.label"
+        :code="item.code"
+        :modelValue="isSelected(item.id)"
+        :selectable="$props.selectable"
+        @update:modelValue="toggleSelect(item)"
+      />
+      <FSDashboardOrganisationTypeTileUI
+        v-if="item.type === DashboardExplorerElementType.DashboardOrganisationType"
+        :key="index"
+        :to="$props.itemTo && $props.itemTo(item)"
+        :bottomColor="item.colors"
+        :imageId="item.imageId"
+        :icon="item.icon"
+        :label="item.label"
+        :code="item.code"
+        :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 { DashboardExplorerElementType } from "@dative-gpi/foundation-shared-domain/enums";
+import { useDashboardExplorerElements } from "@dative-gpi/foundation-core-services/composables";
+import { type DashboardExplorerElementInfos, type DashboardExplorerElementFilters } from "@dative-gpi/foundation-core-domain/models";
+import { dashboardExplorerElementTypeLabel } from "@dative-gpi/foundation-core-components/utils";
+import { useDebounce } from "@dative-gpi/foundation-shared-components/composables";
+
+import FSDashboardOrganisationTypeTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSDashboardOrganisationTypeTileUI.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 FSFolderTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSFolderTileUI.vue";
+import FSIconCheck from "@dative-gpi/foundation-shared-components/components/FSIconCheck.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 FSDashboardExplorerElementTypeChip from "./FSDashboardExplorerElementTypeChip.vue";
+import FSDataTable from "../lists/FSDataTable.vue";
+
+export default defineComponent({
+  name: "FSBaseDashboardsExplorer",
+  components: {
+    FSDashboardExplorerElementTypeChip,
+    FSDashboardOrganisationTypeTileUI,
+    FSDashboardOrganisationTileUI,
+    FSDashboardShallowTileUI,
+    FSFolderTileUI,
+    FSDataTable,
+    FSIconCheck,
+    FSTagGroup,
+    FSImage,
+    FSIcon
+  },
+  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
+    },
+    allowedTypes: {
+      type: Array as PropType<DashboardExplorerElementType[]>,
+      required: false,
+      default: () => [
+        DashboardExplorerElementType.Folder,
+        DashboardExplorerElementType.DashboardOrganisation,
+        DashboardExplorerElementType.DashboardShallow,
+        DashboardExplorerElementType.DashboardOrganisationType
+      ]
+    },
+    itemTo: {
+      type: Function as PropType<(item: DashboardExplorerElementInfos) => Partial<RouteLocation>>,
+      required: false
+    },
+    selectable: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    singleSelect: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    modelValue: {
+      type: Array as PropType<string[]>,
+      default: () => [],
+      required: false
+    },
+    dashboardExplorerElementsFilters: {
+      type: Object as PropType<DashboardExplorerElementFilters>,
+      required: false,
+      default: () => ({})
+    }
+  },
+  inheritAttrs: false,
+  emits: ["update:modelValue", "update:types"],
+  setup(props, { emit }) {
+    const { entities, fetching: fetchingDashboardExplorerElements, getMany: getManyDashboardExplorerElements } = useDashboardExplorerElements();
+    const { debounce } = useDebounce();
+
+    const search = ref("");
+
+    const dashboardExplorerElements = computed((): DashboardExplorerElementInfos[] => {
+      return entities.value
+        .filter(e => props.allowedTypes.includes(e.type))
+        .sort((a, b) => a.type - b.type);
+    });
+
+    const headersOptions = computed(() => ({
+      type: {
+        fixedFilters: props.allowedTypes.map(t => ({
+          value: t,
+          text: dashboardExplorerElementTypeLabel(t)
+        })),
+        methodFilter: (value: DashboardExplorerElementType, type: DashboardExplorerElementType) => {
+          return value === 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) {
+        getManyDashboardExplorerElements({
+          ancestorId: props.parentId,
+          search: search.value,
+          types: props.allowedTypes,
+          ...props.dashboardExplorerElementsFilters
+        });
+      }
+      else {
+        getManyDashboardExplorerElements({
+          parentId: props.parentId,
+          root: props.root,
+          types: props.allowedTypes,
+          ...props.dashboardExplorerElementsFilters
+        });
+      }
+    }
+
+    // Delay to wait before fetching after a search change
+    const debounceFetch = (): void => debounce(fetch, 1000);
+
+    watch([() => props.parentId, () => props.root, () => props.allowedTypes, () => props.dashboardExplorerElementsFilters], (next, previous) => {
+      if ((!next && !previous) || !_.isEqual(next, previous)) {
+        fetch();
+      }
+    }, { immediate: true });
+
+    watch(search, (next, previous) => {
+      if (props.recursiveSearch && next !== previous) {
+        debounceFetch();
+      }
+    });
+
+    return {
+      fetchingDashboardExplorerElements,
+      DashboardExplorerElementType,
+      dashboardExplorerElements,
+      headersOptions,
+      search,
+      isSelected,
+      onUpdate
+    };
+  }
+});
+</script>

package/components/explorers/FSDashboardExplorerElementTypeChip.vue

@@ -0,0 +1,37 @@
+<template>
+  <FSChip
+    :label="chipLabel"
+    :color="ColorEnum.Light"
+  />
+</template>
+
+<script lang="ts">
+import { computed, defineComponent, type PropType } from "vue";
+
+import type { DashboardExplorerElementType } from "@dative-gpi/foundation-shared-domain/enums";
+import { dashboardExplorerElementTypeLabel } from "@dative-gpi/foundation-core-components/utils";
+
+import FSChip from "@dative-gpi/foundation-shared-components/components/FSChip.vue";
+import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
+
+export default defineComponent({
+  name: "FSDashboardExplorerElementTypeChip",
+  components: {
+    FSChip
+  },
+  props: {
+    type: {
+      type: Number as PropType<DashboardExplorerElementType>,
+      required: true
+    }
+  },
+  setup(props) {
+    const chipLabel = computed(() => dashboardExplorerElementTypeLabel(props.type));
+
+    return {
+      chipLabel,
+      ColorEnum
+    };
+  }
+});
+</script>

package/components/lists/chartOrganisationTypes/FSBaseChartOrganisationTypesList.vue

@@ -70,11 +70,11 @@
       </FSRow>
     </template>
     <template
-      #item.modelsLabels="{ item }"
+      #item.models="{ item }"
     >
       <FSTagGroup
         variant="slide"
-        :tags="item.modelsLabels.map((d: any) => d.label)"
+        :tags="item.models.map((d: any) => d.label)"
         :showRemove="false"
       />
     </template>
@@ -109,7 +109,8 @@ import { getEnumEntries } from "@dative-gpi/foundation-shared-domain/tools";
 import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 import { chartTypeLabel, chartIcon } from "@dative-gpi/foundation-shared-components/tools";
 
-import type { ChartModelLabel, ChartOrganisationTypeFilters, ChartOrganisationTypeInfos } from "@dative-gpi/foundation-core-domain/models";
+import type { ModelInfos } from "@dative-gpi/foundation-core-domain/models";
+import type { ChartOrganisationTypeFilters, ChartOrganisationTypeInfos } from "@dative-gpi/foundation-core-domain/models";
 import { useChartOrganisationTypes } from "@dative-gpi/foundation-core-services/composables";
 
 import FSChartTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSChartTileUI.vue";
@@ -168,8 +169,8 @@ export default defineComponent({
     const { entities: chartOrganisationTypes, fetching: fetchingChartOrganisationTypes, getMany: getManyChartOrganisationTypes } = useChartOrganisationTypes();
 
     const headersOptions = computed(() => ({
-      modelsLabels: {
-        fixedFilters: chartOrganisationTypes.value.map(c => c.modelsLabels).reduce((acc, models) => {
+      models: {
+        fixedFilters: chartOrganisationTypes.value.map(c => c.models).reduce((acc, models) => {
           for (const m of models) {
             if (!acc.map((m) => m.id).includes(m.id)) {
               acc.push(m);
@@ -183,7 +184,7 @@ export default defineComponent({
           value: '',
           text: '--'
         }),
-        methodFilter: (value: string, items: ChartModelLabel[]) => (items.length == 0 && value == '') || (items.length  > 0 && items.some(ml => ml.id == value))
+        methodFilter: (value: string, items: ModelInfos[]) => (items.length == 0 && value == '') || (items.length  > 0 && items.some(ml => ml.id == value))
       },
       chartType: {
         fixedFilters: getEnumEntries(ChartType).map(e => ({

package/components/lists/chartOrganisations/FSBaseChartOrganisationsList.vue

@@ -56,11 +56,11 @@
       />
     </template>
     <template
-      #item.modelsLabels="{ item }"
+      #item.models="{ item }"
     >
       <FSTagGroup
         variant="slide"
-        :tags="item.modelsLabels.map((d: any) => d.label)"
+        :tags="item.models.map((d: any) => d.label)"
         :showRemove="false"
       />
     </template>
@@ -109,7 +109,8 @@ import { getEnumEntries } from "@dative-gpi/foundation-shared-domain/tools";
 import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 import { chartTypeLabel, chartIcon } from "@dative-gpi/foundation-shared-components/tools";
 
-import type { ChartModelLabel, ChartOrganisationFilters, ChartOrganisationInfos } from "@dative-gpi/foundation-core-domain/models";
+import type { ModelInfos } from "@dative-gpi/foundation-core-domain/models";
+import type { ChartOrganisationFilters, ChartOrganisationInfos } from "@dative-gpi/foundation-core-domain/models";
 import { useChartOrganisations } from "@dative-gpi/foundation-core-services/composables";
 
 import FSRow from "@dative-gpi/foundation-shared-components/components/FSRow.vue";
@@ -168,8 +169,8 @@ export default defineComponent({
     const { entities: chartOrganisations, fetching: fetchingChartOrganisations, getMany: getManyChartOrganisations } = useChartOrganisations();
 
     const headersOptions = computed(() => ({
-      modelsLabels: {
-        fixedFilters: chartOrganisations.value.map(c => c.modelsLabels).reduce((acc, models) => {
+      models: {
+        fixedFilters: chartOrganisations.value.map(c => c.models).reduce((acc, models) => {
           for (const m of models) {
             if (!acc.map((m) => m.id).includes(m.id)) {
               acc.push(m);
@@ -183,7 +184,7 @@ export default defineComponent({
           value: '',
           text: '--'
         }),
-        methodFilter: (value: string, items: ChartModelLabel[]) => (items.length == 0 && value == '') || (items.length  > 0 && items.some(ml => ml.id == value))
+        methodFilter: (value: string, items: ModelInfos[]) => (items.length == 0 && value == '') || (items.length  > 0 && items.some(ml => ml.id == value))
       },
       chartType: {
         fixedFilters: getEnumEntries(ChartType).map(e => ({