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

package/components/explorers/FSBaseFoldersExplorer.vue

@@ -80,7 +80,7 @@
     >
       <FSChip
         v-if="item.type === FoldersListType.Dashboard"
-        :color="dashboardTypeColor(item.dashboardType)"
+        :color="ColorEnum.Light"
         :label="dashboardTypeLabel(item.dashboardType)"
       />
       <FSChip
@@ -132,7 +132,7 @@ 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 { dashboardTypeColor, dashboardTypeLabel, FoldersListType, type FoldersListItem } from "@dative-gpi/foundation-core-components/utils";
+import { 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";
@@ -250,10 +250,6 @@ export default defineComponent({
             value: DashboardType.Shallow,
             text: dashboardTypeLabel(DashboardType.Shallow)
           },
-          {
-            value: DashboardType.OrganisationType,
-            text: dashboardTypeLabel(DashboardType.OrganisationType)
-          },
           {
             value: 10,
             text: $tr("ui.common.folder", "Folder")
@@ -331,7 +327,6 @@ export default defineComponent({
       isSelected,
       FoldersListType,
       DashboardType,
-      dashboardTypeColor,
       dashboardTypeLabel
     };
   }

package/components/lists/charts/FSBaseChartsList.vue

@@ -77,11 +77,11 @@
       />
     </template>
     <template
-      #item.origin="{ item }"
+      #item.scope="{ item }"
     >
       <FSChip
-        :label="chartOriginLabel(item.origin)"
-        :color="chartOriginColor(item.origin)"
+        :label="applicationScopeLabel(item.scope)"
+        :color="ColorEnum.Light"
       />
     </template>
     <template
@@ -107,10 +107,10 @@
 import { defineComponent, type PropType, watch, computed } from "vue";
 import _ from "lodash";
 
+import { chartTypeLabel, chartIcon, applicationScopeLabel } from "@dative-gpi/foundation-shared-components/tools";
 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, 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";
@@ -198,8 +198,7 @@ export default defineComponent({
         tags: c.tags,
         multiple: c.multiple,
         chartType: c.chartType,
-        modelsLabels: c.modelsLabels,
-        origin: ChartOrigin.Organisation
+        modelsLabels: c.modelsLabels
       })).concat(chartOrganisationTypes.value.map(c => ({
         id: c.id,
         imageId: c.imageId,
@@ -214,8 +213,7 @@ export default defineComponent({
         tags: c.tags,
         multiple: c.multiple,
         chartType: c.chartType,
-        modelsLabels: c.modelsLabels,
-        origin: ChartOrigin.OrganisationType
+        modelsLabels: c.modelsLabels
       })));
     });
 
@@ -244,10 +242,10 @@ export default defineComponent({
         })),
         methodFilter: (value: ChartType, item: ChartType) => value == item
       },
-      origin: {
+      scope: {
         fixedFilters: getEnumEntries(ChartOrigin).filter(e => e.value != ChartOrigin.None).map(e => ({
           value: e.value,
-          text: chartOriginLabel(e.value)
+          text: applicationScopeLabel(e.value)
         })),
         methodFilter: (value: ChartOrigin, item: ChartOrigin) => value == item
       }
@@ -296,8 +294,7 @@ export default defineComponent({
       headersOptions,
       ColorEnum,
       charts,
-      chartOriginLabel,
-      chartOriginColor,
+      applicationScopeLabel,
       chartTypeLabel,
       isSelected,
       chartIcon,

package/components/lists/dashboards/FSBaseDashboardsList.vue

@@ -32,7 +32,7 @@
       #item.dashboardType="{ item }"
     >
       <FSChip
-        :color="dashboardTypeColor(item.dashboardType)"
+        :color="ColorEnum.Light"
         :label="dashboardTypeLabel(item.dashboardType)"
       />
     </template>
@@ -105,7 +105,8 @@ 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 { dashboardTypeColor, dashboardTypeLabel, type DashboardsListItem } from "@dative-gpi/foundation-core-components/utils";
+import { dashboardTypeLabel, type DashboardsListItem } from "@dative-gpi/foundation-core-components/utils";
+import { ColorEnum } from '@dative-gpi/foundation-shared-components/models';
 import { DashboardType } from "@dative-gpi/foundation-shared-domain/enums";
 import { getEnumEntries } from '@dative-gpi/foundation-shared-domain';
 
@@ -264,13 +265,13 @@ export default defineComponent({
       fetchingDashboardShallows,
       headersOptions,
       selecteds,
+      ColorEnum,
       items,
       mainUserDashboardId,
       mainOrganisationDashboardId,
       onSelect,
       isSelected,
       DashboardType,
-      dashboardTypeColor,
       dashboardTypeLabel
     };
   }

package/package.json

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