@dative-gpi/foundation-core-components 1.0.159-sankey → 1.0.159-tes

package/components/explorers/FSBaseFoldersExplorer.vue

@@ -5,6 +5,7 @@
     :item-to="$props.itemTo"
     :loading="fetchingFolders || fetchingDashboardOrganisations || fetchingDashboardShallows"
     :tableCode="$props.tableCode"
+    :headersOptions="headersOptions"
     :modelValue="selecteds"
     :selectable="$props.selectable"
     @update:modelValue="onSelect"
@@ -74,6 +75,20 @@
         :tags="item.tags"
       />
     </template>
+    <template
+      #item.dashboardType="{ item }"
+    >
+      <FSChip
+        v-if="item.type === FoldersListType.Dashboard"
+        :color="dashboardTypeColor(item.dashboardType)"
+        :label="dashboardTypeLabel(item.dashboardType)"
+      />
+      <FSChip
+        v-else-if="item.type === FoldersListType.Folder"
+        :color="ColorEnum.Light"
+        :label="$tr('ui.common.folder', 'Folder')"
+      />
+    </template>
     <template
       #item.tile="{ item, toggleSelect }"
     >
@@ -117,10 +132,11 @@ import { useOrganisation } from "@dative-gpi/foundation-shared-services/composab
 import { useDashboardOrganisations, useFolders, useDashboardShallows, useAppOrganisationId, useCurrentUserOrganisation } from "@dative-gpi/foundation-core-services/composables";
 
 import { DashboardType } from "@dative-gpi/foundation-shared-domain/enums";
-import { FoldersListType, type FoldersListItem } from "@dative-gpi/foundation-core-components/utils";
+import { dashboardTypeColor, dashboardTypeLabel, FoldersListType, type FoldersListItem } from "@dative-gpi/foundation-core-components/utils";
 import type { FolderFilters, DashboardOrganisationFilters, DashboardShallowFilters, DashboardInfos } from "@dative-gpi/foundation-core-domain/models";
 
 import FSIcon from "@dative-gpi/foundation-shared-components/components/FSIcon.vue";
+import FSChip from '@dative-gpi/foundation-shared-components/components/FSChip.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";
@@ -129,6 +145,8 @@ import FSDashboardShallowTileUI from "@dative-gpi/foundation-shared-components/c
 import FSDashboardOrganisationTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSDashboardOrganisationTileUI.vue";
 
 import FSDataTable from "../lists/FSDataTable.vue";
+import { ColorEnum } from '@dative-gpi/foundation-shared-components/models';
+import { useTranslations } from '@dative-gpi/bones-ui';
 
 export default defineComponent({
   name: "FSBaseFoldersExplorer",
@@ -140,6 +158,7 @@ export default defineComponent({
     FSIconCheck,
     FSTagGroup,
     FSImage,
+    FSChip,
     FSIcon
   },
   props: {
@@ -179,7 +198,7 @@ export default defineComponent({
   },
   emits: ["update", "update:modelValue", "update:type", "update:dashboard-type"],
   setup(props, { emit }) {
-
+    const { $tr } = useTranslations();
     const { fetch: fetchUserOrganisation, entity: userOrganisation } = useCurrentUserOrganisation();
     const { entity: organisation, get: getOrganisation } = useOrganisation();
     const { organisationId } = useAppOrganisationId();
@@ -218,7 +237,37 @@ export default defineComponent({
           })) as FoldersListItem[]
         ], d => d.label)
       ]
-    })
+    });
+
+    const headersOptions = computed(() => ({
+      dashboardType: {
+        fixedFilters: [
+          {
+            value: DashboardType.Organisation,
+            text: dashboardTypeLabel(DashboardType.Organisation)
+          },
+          {
+            value: DashboardType.Shallow,
+            text: dashboardTypeLabel(DashboardType.Shallow)
+          },
+          {
+            value: DashboardType.OrganisationType,
+            text: dashboardTypeLabel(DashboardType.OrganisationType)
+          },
+          {
+            value: 10,
+            text: $tr("ui.common.folder", "Folder")
+          },
+        ],
+        methodFilter: (value: number, dashboardType: DashboardType) => {
+          if(dashboardType !== DashboardType.None) {
+            return value === dashboardType;
+          } else {
+            return value === 10;
+          }
+        }
+      }
+    }));
 
     const onSelect = (values: string[]) => {
       selecteds.value = values;
@@ -274,12 +323,16 @@ export default defineComponent({
       fetchingFolders,
       mainOrganisationDashboardId,
       mainUserDashboardId,
+      headersOptions,
+      ColorEnum,
       selecteds,
       items,
       onSelect,
       isSelected,
       FoldersListType,
-      DashboardType
+      DashboardType,
+      dashboardTypeColor,
+      dashboardTypeLabel
     };
   }
 });

package/components/lists/charts/FSBaseChartsList.vue

@@ -76,6 +76,14 @@
         :tags="item.modelsLabels.map((d: any) => d.label)"
       />
     </template>
+    <template
+      #item.origin="{ item }"
+    >
+      <FSChip
+        :label="chartOriginLabel(item.origin)"
+        :color="chartOriginColor(item.origin)"
+      />
+    </template>
     <template
       #item.tile="{ item }"
     >
@@ -99,10 +107,10 @@
 import { defineComponent, type PropType, watch, computed } from "vue";
 import _ from "lodash";
 
-import { ChartType } from "@dative-gpi/foundation-shared-domain/enums";
+import { ChartOrigin, ChartType } from "@dative-gpi/foundation-shared-domain/enums";
 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 { chartTypeLabel, chartIcon, chartOriginLabel, chartOriginColor } from "@dative-gpi/foundation-shared-components/tools";
 
 import type { ChartModelLabel, ChartOrganisationFilters, ChartOrganisationTypeFilters } from "@dative-gpi/foundation-core-domain/models";
 import { useChartOrganisations, useChartOrganisationTypes } from "@dative-gpi/foundation-core-services/composables";
@@ -111,6 +119,8 @@ import FSChartTileUI from "@dative-gpi/foundation-shared-components/components/t
 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 FSChip from '@dative-gpi/foundation-shared-components/components/FSChip.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";
@@ -122,6 +132,8 @@ export default defineComponent({
     FSDataTable,
     FSTagGroup,
     FSImage,
+    FSText,
+    FSChip,
     FSIcon,
     FSRow
   },
@@ -186,7 +198,8 @@ export default defineComponent({
         tags: c.tags,
         multiple: c.multiple,
         chartType: c.chartType,
-        modelsLabels: c.modelsLabels
+        modelsLabels: c.modelsLabels,
+        origin: ChartOrigin.Organisation
       })).concat(chartOrganisationTypes.value.map(c => ({
         id: c.id,
         imageId: c.imageId,
@@ -201,7 +214,8 @@ export default defineComponent({
         tags: c.tags,
         multiple: c.multiple,
         chartType: c.chartType,
-        modelsLabels: c.modelsLabels
+        modelsLabels: c.modelsLabels,
+        origin: ChartOrigin.OrganisationType
       })));
     });
 
@@ -229,7 +243,15 @@ export default defineComponent({
           text: chartTypeLabel(e.value)
         })),
         methodFilter: (value: ChartType, item: ChartType) => value == item
+      },
+      origin: {
+        fixedFilters: getEnumEntries(ChartOrigin).filter(e => e.value != ChartOrigin.None).map(e => ({
+          value: e.value,
+          text: chartOriginLabel(e.value)
+        })),
+        methodFilter: (value: ChartOrigin, item: ChartOrigin) => value == item
       }
+
     }));
 
     const update = (value : string) => {
@@ -274,6 +296,8 @@ export default defineComponent({
       headersOptions,
       ColorEnum,
       charts,
+      chartOriginLabel,
+      chartOriginColor,
       chartTypeLabel,
       isSelected,
       chartIcon,

package/components/lists/dashboards/FSBaseDashboardsList.vue

@@ -3,6 +3,7 @@
     defaultMode="iterator"
     :items="items"
     :itemTo="$props.itemTo"
+    :headersOptions="headersOptions"
     :loading="fetchingDashboardOrganisationTypes || fetchingDashboardOrganisations || fetchingDashboardShallows"
     :tableCode="$props.tableCode"
     :selectable="$props.selectable"
@@ -27,6 +28,14 @@
         {{ item.icon }}
       </FSIcon>
     </template>
+    <template
+      #item.dashboardType="{ item }"
+    >
+      <FSChip
+        :color="dashboardTypeColor(item.dashboardType)"
+        :label="dashboardTypeLabel(item.dashboardType)"
+      />
+    </template>
     <template
       #item.main="{ item }"
     >
@@ -96,8 +105,9 @@ import { useAppOrganisationId, useCurrentUserOrganisation, useDashboardOrganisat
 import type { DashboardOrganisationTypeFilters, DashboardOrganisationFilters, DashboardShallowFilters, DashboardInfos } from "@dative-gpi/foundation-core-domain/models";
 import { useOrganisation } from "@dative-gpi/foundation-shared-services/composables";
 
-import type { DashboardsListItem } from "@/core/foundation-core-components/utils";
+import { dashboardTypeColor, dashboardTypeLabel, type DashboardsListItem } from "@dative-gpi/foundation-core-components/utils";
 import { DashboardType } from "@dative-gpi/foundation-shared-domain/enums";
+import { getEnumEntries } from '@dative-gpi/foundation-shared-domain';
 
 import FSTagGroup from "@dative-gpi/foundation-shared-components/components/FSTagGroup.vue";
 import FSIcon from "@dative-gpi/foundation-shared-components/components/FSIcon.vue";
@@ -106,12 +116,14 @@ import FSDashboardOrganisationTileUI from "@dative-gpi/foundation-shared-compone
 import FSDashboardOrganisationTypeTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSDashboardOrganisationTypeTileUI.vue";
 
 import FSDataTable from "../FSDataTable.vue";
+import FSChip from '@dative-gpi/foundation-shared-components/components/FSChip.vue';
 
 export default defineComponent({
   name: "FSBaseDashboardsList",
   components: {
     FSDataTable,
     FSTagGroup,
+    FSChip,
     FSIcon,
     FSDashboardOrganisationTileUI,
     FSDashboardOrganisationTypeTileUI,
@@ -186,6 +198,16 @@ export default defineComponent({
       ], d => d.label);
     });
 
+    const headersOptions = computed(() => ({
+      dashboardType: {
+        fixedFilters: getEnumEntries(DashboardType).filter(e => e.value != DashboardType.None).map(e => ({
+          value: e.value,
+          text: dashboardTypeLabel(e.value)
+        })),
+        methodFilter: (value: DashboardType, item: DashboardType) => value == item
+      }
+    }));
+
     const mainUserDashboardId = computed(() => {
       return userOrganisation.value?.mainDashboardId;
     });
@@ -240,13 +262,16 @@ export default defineComponent({
       fetchingDashboardOrganisationTypes,
       fetchingDashboardOrganisations,
       fetchingDashboardShallows,
+      headersOptions,
       selecteds,
       items,
       mainUserDashboardId,
       mainOrganisationDashboardId,
       onSelect,
       isSelected,
-      DashboardType
+      DashboardType,
+      dashboardTypeColor,
+      dashboardTypeLabel
     };
   }
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-components",
   "sideEffects": false,
-  "version": "1.0.159-sankey",
+  "version": "1.0.159-tes",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,11 +10,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "1.0.159-sankey",
-    "@dative-gpi/foundation-core-services": "1.0.159-sankey",
-    "@dative-gpi/foundation-shared-components": "1.0.159-sankey",
-    "@dative-gpi/foundation-shared-domain": "1.0.159-sankey",
-    "@dative-gpi/foundation-shared-services": "1.0.159-sankey"
+    "@dative-gpi/foundation-core-domain": "1.0.159-tes",
+    "@dative-gpi/foundation-core-services": "1.0.159-tes",
+    "@dative-gpi/foundation-shared-components": "1.0.159-tes",
+    "@dative-gpi/foundation-shared-domain": "1.0.159-tes",
+    "@dative-gpi/foundation-shared-services": "1.0.159-tes"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -26,5 +26,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "2e082499c169cb28d4480d2fb76993f1240d9c87"
+  "gitHead": "57055768c17ce0eac0db91d72cef3992d542e189"
 }

package/utils/dashboards.ts

@@ -8,7 +8,7 @@ const { $tr } = useTranslationsProvider();
 export const dashboardTypeLabel = (type: DashboardType): string => {
   switch (type) {
     case DashboardType.None:             return $tr("ui.common.none", "None");
-    case DashboardType.Organisation:
+    case DashboardType.Organisation:     return $tr('ui.dashboard-type.shallow', 'Shallow copy');
     case DashboardType.Shallow:          return $tr("ui.common.custom", "Custom");
     case DashboardType.OrganisationType: return $tr("ui.common.shared", "Shared");
   }