@dative-gpi/foundation-core-components 1.1.24-widget-2 → 1.1.25-fix-device-group

package/components/lists/deviceOrganisations/FSBaseDeviceOrganisationsList.vue

@@ -122,6 +122,32 @@
         :subgroupings="item.subgroupings"
       />
     </template>
+    <template
+      #filter.connectivity-custom="{ filter, toggle, variant }"
+    >
+      <FSChip
+        align="center-left"
+        :variant="variant"
+        :height="['30px', '24px']"
+        :color="ColorEnum.Primary"
+        :label="filter.text"
+        :clickable="true"
+        :border="false"
+        @click="toggle()"
+      >
+        <template
+          #prepend
+        >
+          <FSIcon
+            v-if="connectivityIcon(filter.value)"
+            size="s"
+            :color="variant === CardVariants.Full ? null : connectivityColor(filter.value)"
+          >
+            {{ connectivityIcon(filter.value) }}
+          </FSIcon>
+        </template>
+      </FSChip>
+    </template>
     <template
       #filter.subgroupings-custom="{ filter, toggle, variant }"
     >
@@ -198,7 +224,8 @@ 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 { alphanumericSort, connectivityLabel, connectivityIcon, connectivityColor } from "@dative-gpi/foundation-shared-components/utils";
+import { CardVariants, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 import { AlertTools } from "@dative-gpi/foundation-shared-components/tools";
 
 import type { DeviceConnectivityDetails, DeviceOrganisationAlert, DeviceOrganisationFilters, DeviceOrganisationInfos, DeviceStatusDetails} from "@dative-gpi/foundation-core-domain/models";
@@ -216,6 +243,8 @@ import FSIconCheck from "@dative-gpi/foundation-shared-components/components/FSI
 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 FSChip from "@dative-gpi/foundation-shared-components/components/FSChip.vue";
+import FSIcon from "@dative-gpi/foundation-shared-components/components/FSIcon.vue";
 import FSSubgroupingsChipGroup from "../subgroupings/FSSubgroupingsChipGroup.vue";
 
 export default defineComponent({
@@ -232,7 +261,9 @@ export default defineComponent({
     FSMetaValue,
     FSTagGroup,
     FSImage,
-    FSSpan
+    FSSpan,
+    FSChip,
+    FSIcon
   },
   props: {
     tableCode: {
@@ -444,10 +475,14 @@ export default defineComponent({
       fetchingDeviceOrganisations,
       fecthingCustomProperties,
       deviceOrganisations,
+      connectivityColor,
+      connectivityIcon,
       ConnectivityStatus,
       customProperties,
       subgroupingMap,
       headersOptions,
+      CardVariants,
+      ColorEnum,
       isSelected
     };
   }

package/package.json

@@ -4,7 +4,7 @@
     "url": "https://github.com/Dative-GPI/foundation-shared-ui.git"
   },
   "sideEffects": false,
-  "version": "1.1.24-widget-2",
+  "version": "1.1.25-fix-device-group",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -13,11 +13,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "1.1.24-widget-2",
-    "@dative-gpi/foundation-core-services": "1.1.24-widget-2",
-    "@dative-gpi/foundation-shared-components": "1.1.24-widget-2",
-    "@dative-gpi/foundation-shared-domain": "1.1.24-widget-2",
-    "@dative-gpi/foundation-shared-services": "1.1.24-widget-2"
+    "@dative-gpi/foundation-core-domain": "1.1.25-fix-device-group",
+    "@dative-gpi/foundation-core-services": "1.1.25-fix-device-group",
+    "@dative-gpi/foundation-shared-components": "1.1.25-fix-device-group",
+    "@dative-gpi/foundation-shared-domain": "1.1.25-fix-device-group",
+    "@dative-gpi/foundation-shared-services": "1.1.25-fix-device-group"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -29,5 +29,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "e3b64258974077d06ddad77bc4133e4e5aa08c31"
+  "gitHead": "d62e80d14150b5dcebdb84d75d10fc37881c4d8a"
 }

package/components/configurations/FSBaseSelectPresetConfiguration.vue

@@ -1,105 +0,0 @@
-<template>
-  <FSEntitySelectPresetConfiguration
-    :settings="$props.settings"
-    :useEntityPreset="$props.useEntityPreset"
-    :entityPresetCode="$props.entityPresetCode"
-    :entityType="$props.entityType"
-    :entitiesIds="$props.entitiesIds"
-    :singleEntity="$props.singleEntity"
-    @update:useEntityPreset="$emit('update:useEntityPreset', $event)"
-    @update:entityPresetCode="$emit('update:entityPresetCode', $event)"
-    @update:entityType="$emit('update:entityType', $event)"
-    @update:entitiesIds="$emit('update:entitiesIds', $event)"
-    @update="$emit('update', $event)"
-  />
-  <FSDateSelectPresetConfiguration
-    :settings="$props.settings"
-    :useDatePreset="$props.useDatePreset"
-    :datePresetCode="$props.datePresetCode"
-    :startDate="$props.startDate"
-    :endDate="$props.endDate"
-    @update:useDatePreset="$emit('update:useDatePreset', $event)"
-    @update:datePresetCode="$emit('update:datePresetCode', $event)"
-    @update:startDate="$emit('update:startDate', $event)"
-    @update:endDate="$emit('update:endDate', $event)"
-    @update="$emit('update', $event)"
-  />
-</template>
-  
-<script lang="ts">
-import { defineComponent, type PropType } from "vue";
-  
-import { EntityType } from "@dative-gpi/foundation-shared-domain/enums";
-import type { DashboardSettings } from "@dative-gpi/foundation-core-domain/models";
-  
-import FSEntitySelectPresetConfiguration from "./FSEntitySelectPresetConfiguration.vue";
-import FSDateSelectPresetConfiguration from "./FSDateSelectPresetConfiguration.vue";
-  
-export default defineComponent({
-  name: "FSBaseSelectPresetConfiguration",
-  components: {
-    FSEntitySelectPresetConfiguration,
-    FSDateSelectPresetConfiguration
-  },
-  props: {
-    settings: {
-      type: Object as PropType<DashboardSettings>,
-      required: true,
-    },
-    useEntityPreset: {
-      type: Boolean,
-      required: true,
-    },
-    entityPresetCode: {
-      type: String,
-      required: false,
-      default: "",
-    },
-    entityType: {
-      type: Number as PropType<EntityType>,
-      required: false,
-      default: EntityType.None
-    },
-    entitiesIds: {
-      type: Array as PropType<string[]>,
-      required: false,
-      default: () => [],
-    },
-    singleEntity: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-    useDatePreset: {
-      type: Boolean,
-      required: true,
-    },
-    datePresetCode: {
-      type: String,
-      required: false,
-      default: "",
-    },
-    startDate: {
-      type: String,
-      required: false,
-      default: "now - 1d",
-    },
-    endDate: {
-      type: String,
-      required: false,
-      default: "now",
-    }
-  },
-  emits: [
-    "update",
-    "update:useEntityPreset",
-    "update:entityPresetCode",
-    "update:entityType",
-    "update:entitiesIds",
-    "update:useDatePreset",
-    "update:datePresetCode",
-    "update:startDate",
-    "update:endDate",
-  ],
-});
-</script>

package/components/configurations/FSBaseTitleConfiguration.vue

@@ -1,54 +0,0 @@
-<template>
-  <FSTranslateField
-    property="title"
-    :label="$tr('ui.common.title', 'Title')"
-    :modelValue="$props.title"
-    :maxWidth="null"
-    :translations="$props.translations"
-    @update:modelValue="$emit('update:title', $event)"
-    @update:translations="$emit('update:translations', $event)"
-  />
-  <FSTranslateField
-    v-if="$props.showSubtitle"
-    property="subtitle"
-    :maxWidth="null"
-    :label="$tr('ui.widget.subtitle', 'Subtitle')"
-    :modelValue="$props.subtitle"
-    @update:modelValue="$emit('update:subtitle', $event)"
-    @update:translations="$emit('update:translations', $event)"
-  />
-</template>
-
-<script lang="ts">
-import { defineComponent, type PropType } from "vue";
-
-import type { Translation } from "@dative-gpi/foundation-shared-components/models";
-import FSTranslateField from "@dative-gpi/foundation-shared-components/components/fields/FSTranslateField.vue";
-  
-export default defineComponent({
-  name: "FSBaseTitleConfiguration",
-  components: {
-    FSTranslateField
-  },
-  props: {
-    title: {
-      type: String,
-      required: false
-    },
-    subtitle: {
-      type: String,
-      required: false
-    },
-    translations: {
-      type: Array as PropType<Translation[]>,
-      required: false
-    },
-    showSubtitle: {
-      type: Boolean,
-      required: false,
-      default: true
-    }
-  },
-  emits: ["update:title", "update:subtitle", "update:translations"]
-});
-</script>

package/components/configurations/FSDateSelectPresetConfiguration.vue

@@ -1,78 +0,0 @@
-<template>
-  <FSSwitch
-    :maxWidth="null"
-    :label="$tr('ui.widget.use-date-preset', 'Use a date preset from dashboard')"
-    :modelValue="$props.useDatePreset"
-    @update:modelValue="$emit('update:useDatePreset', $event); $emit('update', { useDatePreset: $event })"
-  />
-  <FSSelectDashboardDatePreset
-    v-if="$props.useDatePreset"
-    :maxWidth="null"
-    :label="$tr('ui.widget.date-preset', 'Date preset')"
-    :items="$props.settings.datePresets"
-    :modelValue="$props.datePresetCode"
-    @update:modelValue="$emit('update:datePresetCode', $event); $emit('update', { datePresetCode: $event })"
-  />
-  <template
-    v-else
-  >
-    <FSTermField
-      :maxWidth="null"
-      :label="$tr('ui.widget.date-setting', 'Date setting')"
-      :startDate="$props.startDate"
-      :endDate="$props.endDate"
-      @update:startDate="$emit('update:startDate', $event)"
-      @update:endDate="$emit('update:endDate', $event)"
-      @update="$emit('update', $event)"
-    />
-  </template>
-</template>
-
-<script lang="ts">
-import { defineComponent, type PropType } from "vue";
-import type { DashboardSettings } from "@dative-gpi/foundation-core-domain/models";
-import FSSwitch from "@dative-gpi/foundation-shared-components/components/FSSwitch.vue";
-import FSTermField from "@dative-gpi/foundation-shared-components/components/fields/FSTermField.vue";
-import FSSelectDashboardDatePreset from "../dashboards/FSSelectDashboardDatePreset.vue";
-
-export default defineComponent({
-  name: "FSDateSelectPresetConfiguration",
-  components: {
-    FSSwitch,
-    FSTermField,
-    FSSelectDashboardDatePreset
-  },
-  props: {
-    settings: {
-      type: Object as PropType<DashboardSettings>,
-      required: true,
-    },
-    useDatePreset: {
-      type: Boolean,
-      required: true,
-    },
-    datePresetCode: {
-      type: String,
-      required: false,
-      default: "",
-    },
-    startDate: {
-      type: String,
-      required: false,
-      default: "now - 1d",
-    },
-    endDate: {
-      type: String,
-      required: false,
-      default: "now",
-    }
-  },
-  emits: [
-    "update",
-    "update:useDatePreset",
-    "update:datePresetCode",
-    "update:startDate",
-    "update:endDate"
-  ],
-});
-</script>

package/components/configurations/FSEntitySelectPresetConfiguration.vue

@@ -1,88 +0,0 @@
-<template>
-  <FSSwitch
-    :maxWidth="null"
-    :label="$tr('ui.widget.use-entity-preset', 'Use an entity preset from dashboard')"
-    :modelValue="$props.useEntityPreset"
-    @update:modelValue="$emit('update:useEntityPreset', $event); $emit('update', { useEntityPreset: $event })"
-  />
-  <FSSelectDashboardEntityPreset
-    v-if="$props.useEntityPreset"
-    :maxWidth="null"
-    :label="$tr('ui.common.entity-preset', 'Entity preset')"
-    :items="$props.settings.entityPresets"
-    :modelValue="$props.entityPresetCode"
-    @update:modelValue="$emit('update:entityPresetCode', $event); $emit('update', { entityPresetCode: $event })"
-  />
-  <FSSelectEntitiesField
-    v-else
-    :maxWidth="null"
-    :label="$tr('ui.widget.entities-settings', 'Entities settings')"
-    :entityType="$props.entityType"
-    :entitiesIds="$props.entitiesIds"
-    :singleEntity="$props.singleEntity"
-    :allowedEntityTypes="$props.allowedEntityTypes"
-    @update:entityType="$emit('update:entityType', $event)"
-    @update:entitiesIds="$emit('update:entitiesIds', $event)"
-    @update="$emit('update', $event)"
-  />
-</template>
-
-<script lang="ts">
-import { defineComponent, type PropType } from "vue";
-import { EntityType } from "@dative-gpi/foundation-shared-domain/enums";
-import type { DashboardSettings } from "@dative-gpi/foundation-core-domain/models";
-import FSSwitch from "@dative-gpi/foundation-shared-components/components/FSSwitch.vue";
-import FSSelectDashboardEntityPreset from "../dashboards/FSSelectDashboardEntityPreset.vue";
-import FSSelectEntitiesField from "../entities/FSSelectEntitiesField.vue";
-
-export default defineComponent({
-  name: "FSEntitySelectPresetConfiguration",
-  components: {
-    FSSwitch,
-    FSSelectDashboardEntityPreset,
-    FSSelectEntitiesField
-  },
-  props: {
-    settings: {
-      type: Object as PropType<DashboardSettings>,
-      required: true,
-    },
-    useEntityPreset: {
-      type: Boolean,
-      required: true,
-    },
-    entityPresetCode: {
-      type: String,
-      required: false,
-      default: "",
-    },
-    entityType: {
-      type: Number as PropType<EntityType>,
-      required: false,
-      default: EntityType.None
-    },
-    entitiesIds: {
-      type: Array as PropType<string[]>,
-      required: false,
-      default: () => [],
-    },
-    singleEntity: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-    allowedEntityTypes: {
-      type: Array as PropType<EntityType[]>,
-      required: false,
-      default: () => [EntityType.Model, EntityType.Group, EntityType.Location, EntityType.Device, EntityType.Grouping, EntityType.Subgrouping],
-    },
-  },
-  emits: [
-    "update",
-    "update:useEntityPreset",
-    "update:entityPresetCode",
-    "update:entityType",
-    "update:entitiesIds"
-  ],
-});
-</script>

package/components/dashboards/FSSelectDashboardDatePreset.vue

@@ -1,35 +0,0 @@
-<template>
-  <FSSelectField
-    itemTitle="labelDefault"
-    itemValue="hiddenCode"
-    :items="$props.items"
-    :modelValue="$props.modelValue"
-    @update:modelValue="$emit('update:modelValue', $event)"
-    v-bind="$attrs"
-  />
-</template>
-
-<script lang="ts">
-import { defineComponent, type PropType } from "vue";
-
-import FSSelectField from "@dative-gpi/foundation-shared-components/components/fields/FSSelectField.vue";
-
-export default defineComponent({
-  name: "FSSelectDashboardDatePreset",
-  components: {
-    FSSelectField
-  },
-  props: {
-    items: {
-      type: Array as PropType<any[]>,
-      required: true
-    },
-    modelValue: {
-      type: String as PropType<string | null>,
-      required: false,
-      default: null
-    }
-  },
-  emits: ["update:modelValue"]
-});
-</script>

package/components/dashboards/FSSelectDashboardEntityPreset.vue

@@ -1,36 +0,0 @@
-<template>
-  <FSAutocompleteField
-    itemTitle="labelDefault"
-    itemValue="hiddenCode"
-    :items="$props.items"
-    :modelValue="$props.modelValue"
-    :clearable="true"
-    @update:modelValue="$emit('update:modelValue', $event)"
-    v-bind="$attrs"
-  />
-</template>
-
-<script lang="ts">
-import { defineComponent, type PropType } from "vue";
-
-import FSAutocompleteField from "@dative-gpi/foundation-shared-components/components/fields/FSAutocompleteField.vue";
-
-export default defineComponent({
-  name: "FSSelectDashboardEntityPreset",
-  components: {
-    FSAutocompleteField
-  },
-  props: {
-    items: {
-      type: Array as PropType<any[]>,
-      required: true
-    },
-    modelValue: {
-      type: String as PropType<string | null>,
-      required: false,
-      default: null
-    }
-  },
-  emits: ["update:modelValue"]
-});
-</script>

package/components/entities/FSSelectEntitiesField.vue

@@ -1,77 +0,0 @@
-<template>
-  <FSEntityField
-    v-bind="$attrs"
-    :filters="$props.filters"
-    :singleSelect="$props.singleEntity"
-    :entityType="$props.entityType"
-    :modelValue="$props.entitiesIds"
-    @update:entityType="onChangeEntityType"
-    @update:modelValue="$emit('update:entitiesIds', $event)"
-    @update="$emit('update', { entityType: $event.entityType, entitiesIds: $event.modelValue })"
-  />
-</template>
-
-<script lang="ts">
-import { defineComponent, type PropType, ref } from "vue";
-
-import { EntityType } from "@dative-gpi/foundation-shared-domain/enums";
-import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
-
-import { type DeviceOrganisationFilters, type GroupFilters, type LocationFilters, type ModelFilters } from "@dative-gpi/foundation-core-domain/models";
-
-import FSEntityField from "./FSEntityField.vue";
-
-export default defineComponent({
-  name: "FSSelectEntitiesField",
-  components: {
-    FSEntityField
-  },
-  props: {
-    singleEntity: {
-      type: Boolean,
-      required: false,
-      default: false
-    },
-    entityType: {
-      type: Number as PropType<EntityType>,
-      required: false,
-      default: EntityType.Device
-    },
-    entitiesFilters: {
-      type: String as PropType<string | null>,
-      required: false,
-      default: null
-    },
-    entitiesIds: {
-      type: Array as PropType<string[]>,
-      required: false,
-      default: () => []
-    },
-    filters: {
-      type: Object as PropType<DeviceOrganisationFilters | LocationFilters | GroupFilters | ModelFilters>,
-      required: false,
-      default: null
-    }
-  },
-  emits: ["update:entityType", "update:entitiesIds", "update"],
-  setup(props, { emit }) {
-    const dialog = ref(false);
-
-    const onChangeEntityType = (value: EntityType): void => {
-      emit("update:entityType", value);
-      emit("update:entitiesIds", []);
-      emit("update", {
-        entityType: value,
-        entitiesIds: []
-      });
-    };
-
-    return {
-      EntityType,
-      ColorEnum,
-      dialog,
-      onChangeEntityType
-    };
-  }
-});
-</script>