@dative-gpi/foundation-core-components 1.1.3-groupings → 1.1.3-sandbox-1

package/components/entities/FSBaseEntitiesList.vue

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

package/components/entities/FSSelectEntitiesList.vue

@@ -64,7 +64,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, SubgroupingFilters, 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";
 
@@ -147,10 +147,6 @@ export default defineComponent({
           return {
             modelsIds: props.modelValue
           } satisfies ModelFilters;
-        case EntityType.Subgrouping:
-          return {
-            subgroupingsIds: props.modelValue
-          } satisfies SubgroupingFilters;
         default:
           return undefined;
       };
@@ -168,8 +164,6 @@ export default defineComponent({
           return T.LOCATIONS_SELECT;
         case EntityType.Model:
           return T.MODELS_SELECT;
-        case EntityType.Subgrouping:
-          return T.SUBGROUPINGS_SELECT;
         default:
           return null;
       };
@@ -214,11 +208,6 @@ export default defineComponent({
             modelsFilters: props.filters,
             ...attrs
           };
-        case EntityType.Subgrouping:
-          return {
-            subgroupingFilters: props.filters,
-            ...attrs
-          };
         default:
           return null;
       };

package/components/entities/FSSimpleEntitiesList.vue

@@ -43,8 +43,6 @@ export default defineComponent({
           return defineAsyncComponent(() => import("../lists/locations/FSSimpleLocationsList.vue"));
         case EntityType.Model:
           return defineAsyncComponent(() => import("../lists/models/FSSimpleModelsList.vue"));
-        case EntityType.Subgrouping:
-          return defineAsyncComponent(() => import("../lists/subgroupings/FSSimpleSubgroupingsList.vue"));
         default:
           return null;
       };
@@ -89,11 +87,6 @@ export default defineComponent({
             ...attrs,
             modelFilters : props.filters
           };
-        case EntityType.Subgrouping:
-          return {
-            ...attrs,
-            subgroupingFilters : props.filters
-          };
         default:
           return null;
       }

package/components/lists/deviceOrganisations/FSBaseDeviceOrganisationsList.vue

@@ -115,25 +115,6 @@
         {{ item.ownerAddress ? item.ownerAddress.formattedAddress : '' }}
       </FSSpan>
     </template>
-    <template
-      #item.subgroupings="{ item }"
-    >
-      <FSSubgroupingsChipList
-        :subgroupings="item.subgroupings"
-      />
-    </template>
-    <template
-      #filter.subgroupings="{ filter }"
-    >
-      <FSSubgroupingChip
-        v-if="filter.value && subgroupingMap[filter.value]"
-        :groupingLabel="subgroupingMap[filter.value].groupingLabel"
-        :groupingIcon="subgroupingMap[filter.value].groupingIcon"
-        :groupingColor="subgroupingMap[filter.value].groupingColor"
-        :label="subgroupingMap[filter.value].label"
-        :icon="subgroupingMap[filter.value].icon"
-      />
-    </template>
     <template
       #item.actions="{ item }"
     >
@@ -207,19 +188,15 @@ import FSDeviceOrganisationTileUI from "@dative-gpi/foundation-shared-components
 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 FSSubgroupingChip from "@dative-gpi/foundation-shared-components/components/FSSubgroupingChip.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 FSSpan from '@dative-gpi/foundation-shared-components/components/FSSpan.vue';
-import FSSubgroupingsChipList from "../subgroupings/FSSubgroupingsChipList.vue";
 
 export default defineComponent({
   name: "FSBaseDeviceOrganisationsList",
   components: {
     FSDeviceOrganisationTileUI,
-    FSSubgroupingsChipList,
-    FSSubgroupingChip,
     FSStatusesCarousel,
     FSConnectivity,
     FSWorstAlert,
@@ -284,33 +261,7 @@ export default defineComponent({
       return entities.value;
     });
 
-    const subgroupingFilters = computed(() => {
-      const filters: { value: string | null, text: string }[] = [{
-        value: null,
-        text: "—"
-      }];
-      
-      const uniqueSubgroupings = _.uniqBy(
-        entities.value.flatMap(device => device.subgroupings),
-        'id'
-      );
-      
-      filters.push(...uniqueSubgroupings.map(subgrouping => ({
-        value: subgrouping.id,
-        text: `${subgrouping.groupingLabel} - ${subgrouping.label}`
-      })));
-      
-      return filters.sort((a, b) => a.text.localeCompare(b.text));
-    });
-
-    const subgroupingMap = computed(() => {
-      return _.chain(entities.value)
-        .flatMap(device => device.subgroupings)
-        .keyBy('id')
-        .value();
-    });
-
-    const headersOptions = computed((): Record<string, any> => ({
+    const headersOptions = computed(() => ({
       status: {
         fixedFilters: [{
           value: true,
@@ -388,16 +339,6 @@ export default defineComponent({
         },
         sort: (a: DeviceOrganisationAlert, b: DeviceOrganisationAlert) => alphanumericSort(a?.criticity, b?.criticity)
       },
-      subgroupings: {
-        fixedFilters: subgroupingFilters.value,
-        methodFilterRaw: (value: string | null, item: DeviceOrganisationInfos) => {
-          if (!value) {
-            return item.subgroupings.length === 0;
-          }
-          return item.subgroupings.some(s => s.id === value);
-        },
-        sort: (a: any[], b: any[]) => a.length - b.length
-      },
       ...customProperties.value.reduce((acc, cp) => ({
         ...acc,
         [`meta.${cp.code}`]: {
@@ -441,7 +382,6 @@ export default defineComponent({
       deviceOrganisations,
       ConnectivityStatus,
       customProperties,
-      subgroupingMap,
       headersOptions,
       isSelected
     };

package/package.json

@@ -4,7 +4,7 @@
     "url": "https://github.com/Dative-GPI/foundation-shared-ui.git"
   },
   "sideEffects": false,
-  "version": "1.1.3-groupings",
+  "version": "1.1.3-sandbox-1",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -13,11 +13,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "1.1.3-groupings",
-    "@dative-gpi/foundation-core-services": "1.1.3-groupings",
-    "@dative-gpi/foundation-shared-components": "1.1.3-groupings",
-    "@dative-gpi/foundation-shared-domain": "1.1.3-groupings",
-    "@dative-gpi/foundation-shared-services": "1.1.3-groupings"
+    "@dative-gpi/foundation-core-domain": "1.1.3-sandbox-1",
+    "@dative-gpi/foundation-core-services": "1.1.3-sandbox-1",
+    "@dative-gpi/foundation-shared-components": "1.1.3-sandbox-1",
+    "@dative-gpi/foundation-shared-domain": "1.1.3-sandbox-1",
+    "@dative-gpi/foundation-shared-services": "1.1.3-sandbox-1"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -29,5 +29,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "ad40c30f9ecd5b50de62619fa3cfab64e63d7cc5"
+  "gitHead": "8857dc338d7d3ec5f09ce9f67b0b359ae25e8e40"
 }

package/utils/tables.ts

@@ -22,7 +22,6 @@ export const GROUPS_SELECT = "ui.tables.group.select";
 export const LOCATIONS_SELECT = "ui.tables.location.select";
 export const MODELS_SELECT = "ui.tables.model.select";
 export const DASHBOARDS_SELECT = "ui.tables.dashboard-mock.select";
-export const SUBGROUPINGS_SELECT = "ui.tables.subgrouping.select";
 
 export const WIDGET_DASHBOARDS_EXPLORER = "ui.tables.folder-mock.widget";
 

package/components/lists/subgroupings/FSBaseSubgroupingsList.vue

@@ -1,179 +0,0 @@
-<template>
-  <FSDataTable
-    :loading="fetchingSubgroupings"
-    :items="subgroupings"
-    :itemTo="$props.itemTo"
-    :tableCode="$props.tableCode"
-    :selectable="$props.selectable"
-    :showSearch="true"
-    :disableIterator="true"
-    :singleSelect="$props.singleSelect"
-    :groupBy="groupBy"
-    :modelValue="$props.modelValue"
-    @update:modelValue="$emit('update:modelValue', $event)"
-    v-bind="$attrs"
-  >
-    <template
-      v-for="(_, name) in $slots"
-      v-slot:[name]="slotData"
-    >
-      <slot
-        :name="name"
-        v-bind="slotData"
-      />
-    </template>
-    <template
-      #group-header="{ item }"
-    >
-      <FSRow
-        height="54px"
-        padding="16px 16px 16px 56px"
-        align="center-left"
-        :style="{ backgroundColor: getColors(ColorEnum.Light).base }"
-      >
-        <FSGroupingChip
-          :label="getGroupingLabel(item.value)"
-          :iconColor="getGroupingColor(item.value)"
-          :icon="getGroupingIcon(item.value)"
-        />
-      </FSRow>
-    </template>
-    <template
-      #item.icon="{ item }"
-    >
-      <FSIcon>
-        {{ item.icon }}
-      </FSIcon>
-    </template>
-    <template
-      #item.tile="{ item, toggleSelect }"
-    >
-      <FSSubgroupingTileUI
-        :selectable="$props.selectable"
-        :modelValue="isSelected(item.id)"
-        :singleSelect="$props.singleSelect"
-        :deviceOrganisationsCount="item.deviceOrganisationsCount"
-        :label="item.label"
-        :icon="item.icon"
-        :to="$props.itemTo && $props.itemTo(item)"
-        @update:modelValue="toggleSelect(item)"
-      />
-    </template>
-  </FSDataTable>
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, type PropType, watch } from "vue";
-import { type RouteLocation } from "vue-router";
-import _ from "lodash";
-
-import type { SubgroupingFilters, SubgroupingInfos } from "@dative-gpi/foundation-core-domain/models";
-import { useSubgroupings } from "@dative-gpi/foundation-core-services/composables";
-
-import FSDataTable from "../FSDataTable.vue";
-
-import FSSubgroupingTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSSubgroupingTileUI.vue";
-import FSGroupingChip from "@dative-gpi/foundation-shared-components/components/FSGroupingChip.vue";
-import FSIcon from "@dative-gpi/foundation-shared-components/components/FSIcon.vue";
-import FSRow from "@dative-gpi/foundation-shared-components/components/FSRow.vue";
-
-import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
-import { useColors } from "@dative-gpi/foundation-shared-components/composables";
-
-export default defineComponent({
-  name: "FSBaseSubgroupingsList",
-  components: {
-    FSSubgroupingTileUI,
-    FSGroupingChip,
-    FSDataTable,
-    FSIcon,
-    FSRow
-  },
-  props: {
-    tableCode: {
-      type: String as PropType<string | null>,
-      required: false,
-      default: null
-    },
-    itemTo: {
-      type: Function as PropType<(item: SubgroupingInfos) => Partial<RouteLocation>>,
-      required: false
-    },
-    subgroupingFilters: {
-      type: Object as PropType<SubgroupingFilters>,
-      required: false,
-      default: null
-    },
-    selectable: {
-      type: Boolean,
-      required: false,
-      default: true
-    },
-    singleSelect: {
-      type: Boolean,
-      required: false,
-      default: false
-    },
-    modelValue: {
-      type: Array as PropType<string[]>,
-      required: false,
-      default: () => []
-    }
-  },
-  emits: ["update:modelValue"],
-  setup(props) {
-    const { getMany: fetchSubgroupings, fetching: fetchingSubgroupings, entities: subgroupings } = useSubgroupings();
-    const { getColors } = useColors();
-
-    const groupBy = computed(() => ({
-      key: "groupingId",
-      order: "asc" as const
-    }));
-
-    const groupingMap = computed(() => {
-      return _.chain(subgroupings.value)
-        .keyBy('groupingId')
-        .mapValues(s => ({
-          label: s.groupingLabel,
-          color: s.groupingColor,
-          icon: s.groupingIcon
-        }))
-        .value();
-    });
-
-    const getGroupingLabel = (groupingId: string): string => {
-      return groupingMap.value[groupingId]?.label ?? "";
-    };
-
-    const getGroupingColor = (groupingId: string): string => {
-      return groupingMap.value[groupingId]?.color ?? "";
-    };
-
-    const getGroupingIcon = (groupingId: string): string => {
-      return groupingMap.value[groupingId]?.icon ?? "";
-    };
-
-    const isSelected = (id: string) => {
-      return props.modelValue.includes(id);
-    };
-
-    watch(() => props.subgroupingFilters, (next, previous) => {
-      if ((!next && !previous) || !_.isEqual(next, previous)) {
-        fetchSubgroupings(props.subgroupingFilters);
-      }
-    }, { immediate: true });
-
-    return {
-      fetchingSubgroupings,
-      getGroupingLabel,
-      getGroupingColor,
-      getGroupingIcon,
-      subgroupings,
-      isSelected,
-      getColors,
-      ColorEnum,
-      groupBy
-    };
-  }
-});
-</script>

package/components/lists/subgroupings/FSSimpleSubgroupingsList.vue

@@ -1,44 +0,0 @@
-<template>
-  <FSSimpleList
-    :items="subgroupings"
-    :loading="fetching"
-    v-bind="$attrs"
-  />
-</template>
-
-<script lang="ts">
-import { defineComponent, type PropType, watch } from "vue";
-
-import type { SubgroupingFilters } from "@dative-gpi/foundation-core-domain/models";
-import { useSubgroupings } from "@dative-gpi/foundation-core-services/composables";
-
-import FSSimpleList from "@dative-gpi/foundation-shared-components/components/lists/FSSimpleList.vue";
-
-export default defineComponent({
-  name: "FSSimpleSubgroupingsList",
-  components: {
-    FSSimpleList,
-  },
-  props: {
-    subgroupingFilters: {
-      type: Object as PropType<SubgroupingFilters>,
-      required: false,
-      default: () => ({})
-    }
-  },
-  setup(props) {
-    const { entities: subgroupings, getMany, fetching } = useSubgroupings();
-
-    const fetch = () => {
-      getMany(props.subgroupingFilters);
-    };
-
-    watch(() => props.subgroupingFilters, fetch, { immediate: true });
-
-    return {
-      subgroupings,
-      fetching
-    };
-  }
-});
-</script>

package/components/lists/subgroupings/FSSubgroupingsChipList.vue

@@ -1,45 +0,0 @@
-<template>
-  <FSChipGroup
-    v-if="$props.subgroupings && $props.subgroupings.length > 0"
-    :variant="$props.variant"
-  >
-    <FSSubgroupingChip
-      v-for="(item, index) in $props.subgroupings"  
-      :key="index"
-      :groupingLabel="item.groupingLabel"
-      :groupingIcon="item.groupingIcon"
-      :groupingColor="item.groupingColor"
-      :label="item.label"
-      :icon="item.icon"  
-    />
-  </FSChipGroup>
-</template>
-
-<script lang="ts">
-import type { PropType} from "vue";
-import { defineComponent } from "vue";
-
-import type { SubgroupingInfos } from "@dative-gpi/foundation-core-domain/models";
-
-import FSSubgroupingChip from "@dative-gpi/foundation-shared-components/components/FSSubgroupingChip.vue";
-import FSChipGroup from "@dative-gpi/foundation-shared-components/components/FSChipGroup.vue";
-
-export default defineComponent({
-  name: "FSSubgroupingsChipList",
-  components: {
-    FSSubgroupingChip,
-    FSChipGroup
-  },
-  props: {
-    subgroupings: {
-      type: Array as PropType<SubgroupingInfos[]>,
-      required: true
-    },
-    variant: {
-      type: String as PropType<"wrap" | "slide" | "menu">,
-      required: false,
-      default: "menu"
-    }
-  }
-});
-</script>