@dative-gpi/foundation-core-components 1.0.27 → 1.0.28-remove-deprecated2

package/components/lists/serviceAccountRoleOrganisations/FSBaseServiceAccountRoleOrganisationsList.vue

@@ -0,0 +1,128 @@
+<template>
+  <FSDataTable
+    :loading="fetchingServiceAccountRoleOrganisations"
+    :items="serviceAccountRoleOrganisations"
+    :showSelect="$props.editable"
+    :tableCode="$props.tableCode"
+    :itemTo="$props.itemTo"
+    :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
+      #item.icon="{ item }"
+    >
+      <FSIcon>
+        {{ item.icon }}
+      </FSIcon>
+    </template>
+    <template
+      #item.userType="{ item }"
+    >
+      <FSRow
+        align="center-left"
+      >
+        <FSIcon>
+          {{ userTypeIcon(item.userType) }}
+        </FSIcon>
+        <FSText>
+          {{ userTypeLabel(item.userType) }}
+        </FSText>
+      </FSRow>
+    </template>
+    <template
+      #item.tags="{ item }"
+    >
+      <FSTagGroup
+        variant="slide"
+        :editable="false"
+        :tags="item.tags"
+      />
+    </template>
+  </FSDataTable>
+</template>
+  
+<script lang="ts">
+import { defineComponent, type PropType, watch } from "vue";
+import { type RouteLocation } from "vue-router";
+import _ from "lodash";
+
+import { type ServiceAccountRoleOrganisationFilters, type ServiceAccountRoleOrganisationInfos } from "@dative-gpi/foundation-core-domain/models";
+import { useServiceAccountRoleOrganisations } from "@dative-gpi/foundation-core-services/composables";
+import { userTypeIcon, userTypeLabel } from "@dative-gpi/foundation-core-components/utils";
+
+import FSTagGroup from "@dative-gpi/foundation-shared-components/components/FSTagGroup.vue";
+import FSIcon from "@dative-gpi/foundation-shared-components/components/FSIcon.vue";
+import FSText from "@dative-gpi/foundation-shared-components/components/FSText.vue";
+import FSRow from "@dative-gpi/foundation-shared-components/components/FSRow.vue";
+
+import FSDataTable from "../FSDataTable.vue";
+
+export default defineComponent({
+  name: "FSBaseServiceAccountRoleOrganisationsList",
+  components: {
+    FSDataTable,
+    FSTagGroup,
+    FSIcon,
+    FSText,
+    FSRow
+  },
+  props: {
+    tableCode: {
+      type: String as PropType<string | null>,
+      required: false,
+      default: null
+    },
+    serviceAccountRoleOrganisationsFilters: {
+      type: Object as PropType<ServiceAccountRoleOrganisationFilters | null>,
+      required: false,
+      default: null
+    },
+    itemTo: {
+      type: Function as PropType<(item: ServiceAccountRoleOrganisationInfos) => Partial<RouteLocation>>,
+      required: false
+    },
+    editable: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    modelValue: {
+      type: Array as PropType<string[]>,
+      required: false,
+      default: () => []
+    }
+  },
+  emits: ["update:modelValue"],
+  setup(props) {
+    const { getMany: getManyServiceAccountRoleOrganisations, fetching: fetchingServiceAccountRoleOrganisations, entities: serviceAccountRoleOrganisations } = useServiceAccountRoleOrganisations();
+
+    const isSelected = (id: string): boolean => {
+      return props.modelValue.includes(id);
+    };
+
+    watch(() => props.serviceAccountRoleOrganisationsFilters, (next, previous) => {
+      if ((!next && !previous) || !_.isEqual(next, previous)) {
+        getManyServiceAccountRoleOrganisations(props.serviceAccountRoleOrganisationsFilters ?? undefined);
+      }
+    }, { immediate: true });
+
+    return {
+      fetchingServiceAccountRoleOrganisations,
+      serviceAccountRoleOrganisations,
+      userTypeLabel,
+      userTypeIcon,
+      isSelected
+    };
+  }
+});
+</script>

package/components/lists/userOrganisations/FSBaseUserOrganisationsList.vue

@@ -0,0 +1,172 @@
+<template>
+  <FSDataTable
+    defaultMode="iterator"
+    :items="userOrganisations"
+    :itemTo="$props.itemTo"
+    :loading="fetchingUserOrganisations"
+    :showSelect="$props.editable"
+    :tableCode="$props.tableCode"
+    :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
+      #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.allowEmails="{ item }"
+    >
+      <FSIconCheck
+        :value="item.allowEmails"
+      />
+    </template>
+    <template
+      #item.allowSms="{ item }"
+    >
+      <FSIconCheck
+        :value="item.allowSms"
+      />
+    </template>
+    <template
+      #item.tags="{ item }"
+    >
+      <FSTagGroup
+        variant="slide"
+        :editable="false"
+        :tags="item.tags"
+      />
+    </template>
+    <template
+      #item.validity="{ item }"
+    >
+      <FSSpan
+        font="text-overline"
+      >
+        {{ userValidityLabel(item.validity) }}
+      </FSSpan>
+    </template>
+    <template
+      #item.userType="{ item }"
+    >
+      <FSSpan
+        font="text-overline"
+      >
+        {{ userTypeLabel(item.userType) }}
+      </FSSpan>
+    </template>
+    <template
+      #item.tile="{ item, toggleSelect }"
+    >
+      <FSUserOrganisationTileUI
+        :to="$props.itemTo && $props.itemTo(item)"
+        :editable="$props.editable"
+        :modelValue="isSelected(item.id)"
+        @update:modelValue="toggleSelect(item)"
+        v-bind="item"
+      />
+    </template>
+  </FSDataTable>
+</template>
+
+<script lang="ts">
+import { defineComponent, type PropType, watch } from "vue";
+import { type RouteLocation } from "vue-router";
+import _ from "lodash";
+
+import type { UserOrganisationFilters, UserOrganisationInfos } from "@dative-gpi/foundation-core-domain/models";
+import { userTypeLabel, userValidityLabel } from "@dative-gpi/foundation-core-components/utils";
+import { useUserOrganisations } from "@dative-gpi/foundation-core-services/composables";
+
+import FSDataTable from "../FSDataTable.vue";
+
+import FSSpan from "@dative-gpi/foundation-shared-components/components/FSSpan.vue";
+import FSImage from "@dative-gpi/foundation-shared-components/components/FSImage.vue";
+import FSTagGroup from "@dative-gpi/foundation-shared-components/components/FSTagGroup.vue";
+import FSIconCheck from "@dative-gpi/foundation-shared-components/components/FSIconCheck.vue";
+import FSUserOrganisationTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSUserOrganisationTileUI.vue";
+
+export default defineComponent({
+  name: "FSBaseUserOrganisationsList",
+  components: {
+    FSDataTable,
+    FSImage,
+    FSUserOrganisationTileUI,
+    FSSpan,
+    FSTagGroup,
+    FSIconCheck
+
+  },
+  props: {
+    tableCode: {
+      type: String as PropType<string | null>,
+      required: false,
+      default: null
+    },
+    userOrganisationsFilters: {
+      type: Object as PropType<UserOrganisationFilters | null>,
+      required: false,
+      default: null
+    },
+    itemTo: {
+      type: Function as PropType<(item: UserOrganisationInfos) => Partial<RouteLocation>>,
+      required: false
+    },
+    editable: {
+      type: Boolean,
+      required: false,
+      default: true
+    },
+    modelValue: {
+      type: Array as PropType<string[]>,
+      required: false,
+      default: () => []
+    }
+  },
+  emits: ["update:modelValue"],
+  setup(props) {
+    const { getMany: fetchUserOrganisations, entities: userOrganisations, fetching: fetchingUserOrganisations } = useUserOrganisations();
+
+    const isSelected = (id: string): boolean => {
+      return props.modelValue.includes(id);
+    };
+
+    watch(() => props.userOrganisationsFilters, (next, previous) => {
+      if ((!next && !previous) || !_.isEqual(next, previous)) {
+        fetchUserOrganisations(props.userOrganisationsFilters ?? undefined);
+      }
+    }, { immediate: true });
+
+    return {
+      fetchingUserOrganisations,
+      userOrganisations,
+      userValidityLabel,
+      userTypeLabel,
+      isSelected
+    };
+  }
+});
+</script>

package/components/lists/userOrganisations/FSSimpleUserOrganisationsList.vue

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

package/components/tiles/FSDeviceOrganisationTile.vue

@@ -3,7 +3,7 @@
     v-if="getting"
     :editable="$props.editable"
     :modelValue="$props.modelValue"
-    @update:modelValue="(value) => $emit('update:modelValue', value)"
+    @update:modelValue="$emit('update:modelValue', $event)"
   />
   <FSDeviceOrganisationTileUI
     v-else-if="entity"
@@ -16,8 +16,9 @@
     :modelStatuses="entity.modelStatuses"
     :deviceStatuses="entity.status?.statuses"
     :editable="$props.editable"
+    :alertTo="$props.alertTo"
     :modelValue="$props.modelValue"
-    @update:modelValue="(value) => $emit('update:modelValue', value)"
+    @update:modelValue="$emit('update:modelValue', $event)"
     v-bind="$attrs"
   />
 </template>
@@ -50,8 +51,14 @@ export default defineComponent({
       type: Boolean,
       required: false,
       default: true
+    },
+    alertTo: {
+      type: Function,
+      required: false,
+      default: null
     }
   },
+  emits: ["update:modelValue"],
   setup(props) {
     const { get, getting, entity } = useDeviceOrganisation();
 

package/components/tiles/FSLocationTile.vue

@@ -0,0 +1,66 @@
+<template>
+  <FSLoadTile
+    v-if="getting"
+    :editable="$props.editable"
+    :modelValue="modelValue"
+    @update:modelValue="(value) => $emit('update:modelValue', value)"
+  />
+  <FSLocationTileUI
+    v-else-if="entity"
+    :icon="entity.icon"
+    :label="entity.label"
+    :code="entity.code"
+    :color="entity.color"
+    :address="entity.address.placeLabel"
+    :deviceCount="entity.deviceOrganisationsCount"
+    :editable="$props.editable"
+    :modelValue="modelValue"
+    @update:modelValue="(value) => $emit('update:modelValue', value)"
+    v-bind="$attrs"
+  />
+</template>
+
+<script lang="ts">
+import { defineComponent, watch } from "vue";
+
+import { useLocation } from "@dative-gpi/foundation-core-services/composables";
+
+import FSLocationTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSLocationTileUI.vue";
+import FSLoadTile from "@dative-gpi/foundation-shared-components/components/tiles/FSLoadTile.vue";
+
+export default defineComponent({
+  name: "FSLocationTile",
+  components: {
+    FSLocationTileUI,
+    FSLoadTile
+  },
+  props: {
+    locationId: {
+      type: String,
+      required: true
+    },
+    modelValue: {
+      type: Boolean,
+      required: false,
+      default: false
+    },
+    editable: {
+      type: Boolean,
+      required: false,
+      default: true
+    }
+  },
+  setup(props) {
+    const { get, getting, entity } = useLocation();
+
+    watch(() => props.locationId, () => {
+      get(props.locationId);
+    }, { immediate: true });
+
+    return {
+      getting,
+      entity
+    };
+  }
+});
+</script>

package/components/treeviews/FSTreeViewFolder.vue

@@ -20,10 +20,10 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, type PropType } from "vue";
+import { computed, defineComponent, type PropType } from "vue";
 
+import { type FolderFilters, type FolderInfos } from "@dative-gpi/foundation-core-domain/models";
 import { useTreeView } from "@dative-gpi/foundation-shared-components/composables";
-import { type FolderFilters } from "@dative-gpi/foundation-core-domain/models";
 import { useFolders } from "@dative-gpi/foundation-core-services/composables";
 
 import FSTreeViewField from "@dative-gpi/foundation-shared-components/components/fields/FSTreeViewField.vue";
@@ -41,6 +41,11 @@ export default defineComponent({
       required: false,
       default: null
     },
+    exclude: {
+      type: String as PropType<string | null>,
+      required: false,
+      default: null
+    },
     modelValue: {
       type: [Array, String] as PropType<string[] | string | null>,
       required: false,
@@ -54,7 +59,14 @@ export default defineComponent({
   },
   emits: ["update:modelValue"],
   setup(props, { emit }) {
-    const { getMany: getManyFolders, fetching: fetchingFolders, entities: folders } = useFolders();
+    const { getMany: getManyFolders, fetching: fetchingFolders, entities } = useFolders();
+
+    const folders = computed((): FolderInfos[] => {
+      if (!props.exclude) {
+        return entities.value;
+      }
+      return entities.value.filter(g => g.id !== props.exclude && !g.path.some(p => p.id === props.exclude));
+    });
 
     const fetch = () => {
       return getManyFolders({ ...props.folderFilters });

package/components/treeviews/FSTreeViewGroup.vue

@@ -1,5 +1,6 @@
 <template>
   <FSTreeViewField
+    :label="$props.label ?? $tr('ui.common.group', 'Group')"
     :multiple="$props.multiple"
     :loading="fetchingGroups"
     :items="groups"
@@ -20,10 +21,10 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, type PropType } from "vue";
+import { computed, defineComponent, type PropType } from "vue";
 
+import { type GroupFilters, type GroupInfos } from "@dative-gpi/foundation-core-domain/models";
 import { useTreeView } from "@dative-gpi/foundation-shared-components/composables";
-import { type GroupFilters } from "@dative-gpi/foundation-core-domain/models";
 import { useGroups } from "@dative-gpi/foundation-core-services/composables";
 
 import FSTreeViewField from "@dative-gpi/foundation-shared-components/components/fields/FSTreeViewField.vue";
@@ -41,6 +42,11 @@ export default defineComponent({
       required: false,
       default: null
     },
+    exclude: {
+      type: String as PropType<string | null>,
+      required: false,
+      default: null
+    },
     modelValue: {
       type: [Array, String] as PropType<string[] | string | null>,
       required: false,
@@ -50,11 +56,23 @@ export default defineComponent({
       type: Boolean,
       required: false,
       default: false
-    }
+    },
+    label: {
+      type: String as PropType<string | null>,
+      required: false,
+      default: null
+    } 
   },
   emits: ["update:modelValue"],
   setup(props, { emit }) {
-    const { getMany: getManyGroups, fetching: fetchingGroups, entities: groups } = useGroups();
+    const { getMany: getManyGroups, fetching: fetchingGroups, entities } = useGroups();
+
+    const groups = computed((): GroupInfos[] => {
+      if (!props.exclude) {
+        return entities.value;
+      }
+      return entities.value.filter(g => g.id !== props.exclude && !g.path.some(p => p.id === props.exclude));
+    });
 
     const fetch = () => {
       return getManyGroups({ ...props.groupFilters });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-components",
   "sideEffects": false,
-  "version": "1.0.27",
+  "version": "1.0.28-remove-deprecated2",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,21 +10,21 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "1.0.27",
-    "@dative-gpi/foundation-core-services": "1.0.27",
-    "@dative-gpi/foundation-shared-components": "1.0.27",
-    "@dative-gpi/foundation-shared-domain": "1.0.27",
-    "@dative-gpi/foundation-shared-services": "1.0.27"
+    "@dative-gpi/foundation-core-domain": "1.0.28-remove-deprecated2",
+    "@dative-gpi/foundation-core-services": "1.0.28-remove-deprecated2",
+    "@dative-gpi/foundation-shared-components": "1.0.28-remove-deprecated2",
+    "@dative-gpi/foundation-shared-domain": "1.0.28-remove-deprecated2",
+    "@dative-gpi/foundation-shared-services": "1.0.28-remove-deprecated2"
   },
   "peerDependencies": {
-    "@dative-gpi/bones-ui": "^0.0.75",
+    "@dative-gpi/bones-ui": "^1.0.0",
     "color": "^4.2.3",
-    "vue": "^3.4.29"
+    "vue": "^3.4.38"
   },
   "devDependencies": {
     "@types/color": "3.0.6",
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "3410229c1697c7402bf50dde63df3a4d81de9ae8"
+  "gitHead": "65c182fd697939a07ad87c683a2f4c2fb765a7c7"
 }

package/utils/dashboards.ts

@@ -1,15 +1,16 @@
+import type { DashboardOrganisationInfos, DashboardOrganisationTypeInfos, DashboardShallowInfos, FolderInfos } from "@dative-gpi/foundation-core-domain/models";
 import { useTranslations as useTranslationsProvider } from "@dative-gpi/bones-ui/composables";
 import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
-import { DashboardType } from "@dative-gpi/foundation-shared-domain/models"
+import { DashboardType } from "@dative-gpi/foundation-shared-domain/enums";
 
 const { $tr } = useTranslationsProvider();
 
 export const dashboardTypeLabel = (type: DashboardType): string => {
   switch (type) {
-    case DashboardType.None:             return $tr("ui.dashboard-type.none", "None");
+    case DashboardType.None:             return $tr("ui.common.none", "None");
     case DashboardType.Organisation:
-    case DashboardType.Shallow:          return $tr("ui.dashboard-type.organisation", "Custom");
-    case DashboardType.OrganisationType: return $tr("ui.dashboard-type.organisation-type", "Shared");
+    case DashboardType.Shallow:          return $tr("ui.common.custom", "Custom");
+    case DashboardType.OrganisationType: return $tr("ui.common.shared", "Shared");
   }
 };
 
@@ -20,4 +21,31 @@ export const dashboardTypeColor = (type: DashboardType): ColorBase => {
     case DashboardType.Shallow:          return ColorEnum.Primary;
     case DashboardType.OrganisationType: return ColorEnum.Warning;
   }
-};
+};
+
+export interface DashboardShallowListItem extends DashboardShallowInfos {
+  dashboardType: DashboardType.Shallow
+  type: FoldersListType.Dashboard
+}
+
+export interface DashboardOrganisationListItem extends DashboardOrganisationInfos {
+  dashboardType: DashboardType.Organisation
+  type: FoldersListType.Dashboard
+}
+
+export interface OrganisationTypeDashboardListItem extends DashboardOrganisationTypeInfos {
+  dashboardType: DashboardType.OrganisationType
+}
+
+export interface FolderListItem extends FolderInfos {
+  dashboardType: DashboardType.None
+  type: FoldersListType.Folder
+}
+
+export enum FoldersListType {
+  Dashboard = "dashboard",
+  Folder = "folder"
+}
+
+export type DashboardsListItem = DashboardShallowListItem | DashboardOrganisationListItem | OrganisationTypeDashboardListItem;
+export type FoldersListItem = DashboardShallowListItem | DashboardOrganisationListItem | FolderListItem;

package/utils/index.ts

@@ -1,4 +1,4 @@
-export * from "./charts";
 export * from "./dashboards";
 export * from "./roles";
-export * from "./users";
+export * from "./users";
+export * as TABLES from "./tables";