@dative-gpi/foundation-core-components 1.0.57 → 1.0.58-groupings

package/components/tiles/FSUserOrganisationTile.vue

@@ -1,7 +1,7 @@
 <template>
   <FSLoadTile
     v-if="getting"
-    :editable="$props.editable"
+    :selectable="$props.selectable"
     :modelValue="modelValue"
     @update:modelValue="$emit('update:modelValue', $event)"
   />
@@ -12,7 +12,7 @@
     :roleLabel="entity.roleLabel"
     :roleIcon="entity.roleIcon"
     :admin="entity.admin"
-    :editable="$props.editable"
+    :selectable="$props.selectable"
     :modelValue="modelValue"
     @update:modelValue="$emit('update:modelValue', $event)"
     v-bind="$attrs"
@@ -43,7 +43,7 @@ export default defineComponent({
       required: false,
       default: false
     },
-    editable: {
+    selectable: {
       type: Boolean,
       required: false,
       default: true

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.57",
+  "version": "1.0.58-groupings",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,21 +10,21 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "1.0.57",
-    "@dative-gpi/foundation-core-services": "1.0.57",
-    "@dative-gpi/foundation-shared-components": "1.0.57",
-    "@dative-gpi/foundation-shared-domain": "1.0.57",
-    "@dative-gpi/foundation-shared-services": "1.0.57"
+    "@dative-gpi/foundation-core-domain": "1.0.58-groupings",
+    "@dative-gpi/foundation-core-services": "1.0.58-groupings",
+    "@dative-gpi/foundation-shared-components": "1.0.58-groupings",
+    "@dative-gpi/foundation-shared-domain": "1.0.58-groupings",
+    "@dative-gpi/foundation-shared-services": "1.0.58-groupings"
   },
   "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": "4445a164fed7501246674432eba3e8227c8bc827"
+  "gitHead": "563e78c4a0b3e8f73fdf8576e9d8bc0b626bc095"
 }

package/utils/dashboards.ts

@@ -7,10 +7,10 @@ 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");
   }
 };
 

package/utils/index.ts

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

package/utils/roles.ts

@@ -6,9 +6,9 @@ const { $tr } = useTranslationsProvider();
 
 export const roleTypeLabel = (type: RoleType): string => {
   switch (type) {
-    case RoleType.None:             return $tr("ui.role-type.none", "None");
-    case RoleType.Organisation:     return $tr("ui.role-type.organisation", "Custom");
-    case RoleType.OrganisationType: return $tr("ui.role-type.organisation-type", "Shared");
+    case RoleType.None:             return $tr("ui.common.none", "None");
+    case RoleType.Organisation:     return $tr("ui.common.custom", "Custom");
+    case RoleType.OrganisationType: return $tr("ui.common.shared", "Shared");
   }
 };
 

package/utils/users.ts

@@ -5,9 +5,9 @@ const { $tr } = useTranslationsProvider();
 
 export const userTypeLabel = (type: UserType): string => {
   switch (type) {
-    case UserType.User:           return $tr("ui.user-type.user", "User");
-    case UserType.ServiceAccount: return $tr("ui.user-type.service-account", "Service account");
-    case UserType.Extension:      return $tr("ui.user-type.extension", "Extension");
+    case UserType.User:           return $tr("ui.common.user", "User");
+    case UserType.ServiceAccount: return $tr("ui.common.service-account", "Service account");
+    case UserType.Extension:      return $tr("ui.common.extension", "Extension");
     default:                      return "";
   }
 };

package/components/selects/FSAggregationSelector.vue

@@ -1,51 +0,0 @@
-<template>
-  <FSAutocompleteField
-    :label="label ?? $tr('ui.common.aggregation-type','Aggregation')"
-    :items="aggregationTypeItems"
-    :modelValue="modelValue"
-    @update:modelValue="$emit('update:modelValue', $event)"
-    v-bind="$attrs"
-  />
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, type PropType } from "vue";
-
-import { AggregationType } from "@dative-gpi/foundation-shared-domain/enums";
-
-import {aggregationTypeLabel, getEnumEntries} from "../../utils";
-
-import FSAutocompleteField from "@dative-gpi/foundation-shared-components/components/fields/FSAutocompleteField.vue";
-
-export default defineComponent({
-  components: {
-    FSAutocompleteField
-  },
-  props: {
-    modelValue : {
-      type: Number as PropType<AggregationType>,
-      required: false
-    },
-    label : {
-      type: String,
-      required: false
-    }
-  },
-  emits: ['update:modelValue'],
-  setup() {
-
-    const aggregationTypeItems = computed(()=>{
-      return getEnumEntries(AggregationType).filter(f=>f.value != AggregationType.None).map((f)=>{
-        return {
-          id: f.value,
-          label: aggregationTypeLabel(f.value)
-        }
-      })
-    });
-
-    return {
-      aggregationTypeItems
-    }
-  }
-})
-</script>

package/components/selects/FSAxisTypeSelector.vue

@@ -1,48 +0,0 @@
-<template>
-  <FSToggleSet
-    :hideHeader="true"
-    :values="axisTypeItems"
-    :modelValue="modelValue"
-    @update:modelValue="$emit('update:modelValue', $event)"
-    v-bind="$attrs"
-  />
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, type PropType } from "vue";
-
-import  {AxisType} from "@dative-gpi/foundation-shared-domain/enums";
-
-import {axisTypeLabel, getEnumEntries} from "../../utils";
-
-import FSToggleSet from "@dative-gpi/foundation-shared-components/components/FSToggleSet.vue";
-
-
-export default defineComponent({
-  components: {
-    FSToggleSet
-  },
-  props: {
-    modelValue: {
-      type: Number as PropType<AxisType>,
-      required: false
-    }
-  },
-  emits: ['update:modelValue'],
-  setup() {
-
-    const axisTypeItems = computed(()=>{
-      return getEnumEntries(AxisType).map((f)=>{
-        return {
-          id: f.value,
-          label: axisTypeLabel(f.value)
-        }
-      })
-    });
-
-    return {
-      axisTypeItems
-    }
-  }
-})
-</script>

package/components/selects/FSDisplayAsSelector.vue

@@ -1,52 +0,0 @@
-<template>
-  <FSAutocompleteField
-    :label="label ?? $tr('ui.common.display-as','Display as')"
-    :items="displayAsItems"
-    :modelValue="modelValue"
-    @update:modelValue="$emit('update:modelValue', $event)"
-    v-bind="$attrs"
-  />
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, type PropType } from "vue";
-
-import {DisplayAs} from "@dative-gpi/foundation-shared-domain/enums";
-
-import FSAutocompleteField from "@dative-gpi/foundation-shared-components/components/fields/FSAutocompleteField.vue";
-
-import {displayAsLabel, getEnumEntries} from "../../utils";
-
-export default defineComponent({
-  components: {
-    FSAutocompleteField
-  },
-  props: {
-    modelValue: {
-      type: Number as PropType<DisplayAs>,
-      required: false
-    },
-    label: {
-      type: String,
-      required: false
-    }
-    
-  },
-  emits: ['update:modelValue'],
-  setup() {
-    
-    const displayAsItems = computed(()=>{
-      return getEnumEntries(DisplayAs).filter(f=>f.value != DisplayAs.None).map((f)=>{
-        return {
-          id: f.value,
-          label: displayAsLabel(f.value)
-        }
-      })
-    });
-
-    return {
-      displayAsItems,
-    }
-  }
-})
-</script>

package/components/selects/FSFilterTypeSelector.vue

@@ -1,53 +0,0 @@
-<template>
-  <FSAutocompleteField
-    :label="label ?? $tr('ui.common.filter-type','Filter type')"
-    :toggleSet="true"
-    :items="filterTypeItems"
-    :modelValue="modelValue"
-    @update:modelValue="$emit('update:modelValue', $event)"
-    v-bind="$attrs"
-  />
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, type PropType } from "vue";
-
-import {FilterType} from "@dative-gpi/foundation-shared-domain/enums";
-
-import FSAutocompleteField from "@dative-gpi/foundation-shared-components/components/fields/FSAutocompleteField.vue";
-
-import {filterTypeLabel, getEnumEntries} from "../../utils";
-
-export default defineComponent({
-  components: {
-    FSAutocompleteField
-  },
-  props: {
-    modelValue: {
-      type: Number as PropType<FilterType>,
-      required: false,
-      default : FilterType.None
-    },
-    label: {
-      type: String,
-      required: false
-    }
-  },
-  emits: ['update:modelValue'],
-  setup() {
-
-    const filterTypeItems = computed(()=>{
-      return getEnumEntries(FilterType).filter(f=>f.value != FilterType.None).map((f)=>{
-        return {
-          id: f.value,
-          label: filterTypeLabel(f.value)
-        }
-      })
-    });
-
-    return {
-      filterTypeItems
-    }
-  }
-})
-</script>

package/components/selects/FSHeatmapRuleSelector.vue

@@ -1,52 +0,0 @@
-<template>
-  <FSAutocompleteField
-    :label="label ?? $tr('ui.common.heat-rule','Heat rule')"
-    :items="heatmapRuleItems"
-    :modelValue="modelValue"
-    @update:modelValue="$emit('update:modelValue', $event)"
-    v-bind="$attrs"
-  />
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, type PropType } from "vue";
-
-import {HeatmapRule} from "@dative-gpi/foundation-shared-domain/enums";
-
-import FSAutocompleteField from "@dative-gpi/foundation-shared-components/components/fields/FSAutocompleteField.vue";
-
-import {heatmapRuleLabel, getEnumEntries} from "../../utils";
-
-export default defineComponent({
-  components: {
-    FSAutocompleteField
-  },
-  props: {
-    modelValue: {
-      type: Number as PropType<HeatmapRule>,
-      required: false
-    },
-    label: {
-      type: String,
-      required: false
-    }
-    
-  },
-  emits: ['update:modelValue'],
-  setup() {
-    
-    const heatmapRuleItems = computed(()=>{
-      return getEnumEntries(HeatmapRule).filter(f=>f.value != HeatmapRule.None).map((f)=>{
-        return {
-          id: f.value,
-          label: heatmapRuleLabel(f.value)
-        }
-      })
-    });
-
-    return {
-      heatmapRuleItems
-    }
-  }
-})
-</script>

package/components/selects/FSOperationOnSelector.vue

@@ -1,51 +0,0 @@
-<template>
-  <FSAutocompleteField
-    :label="label ?? $tr('ui.common.operation-on','Operation on')"
-    :items="operationOnItems"
-    :modelValue="modelValue"
-    @update:modelValue="$emit('update:modelValue', $event)"
-    v-bind="$attrs"
-  />
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, type PropType } from "vue";
-
-import {OperationOn} from "@dative-gpi/foundation-shared-domain/enums";
-
-import FSAutocompleteField from "@dative-gpi/foundation-shared-components/components/fields/FSAutocompleteField.vue";
-
-import {operationOnLabel, getEnumEntries} from "../../utils";
-
-export default defineComponent({
-  components: {
-    FSAutocompleteField
-  },
-  props: {
-    modelValue: {
-      type: Number as PropType<OperationOn>,
-      required: false
-    },
-    label : {
-      type: String,
-      required: false
-    }
-  },
-  emits: ['update:modelValue'],
-  setup() {
-    
-    const operationOnItems = computed(()=>{
-      return getEnumEntries(OperationOn).filter(f=>f.value != OperationOn.None).map((f)=>{
-        return {
-          id: f.value,
-          label: operationOnLabel(f.value)
-        }
-      })
-    });
-
-    return {
-      operationOnItems
-    }
-  }
-})
-</script>

package/components/selects/FSPlanningTypeSelector.vue

@@ -1,51 +0,0 @@
-<template>
-  <FSAutocompleteField
-    :label="label ?? $tr('ui.common.planning-type','Planning type')"
-    :items="planningTypeItems"
-    :modelValue="modelValue"
-    @update:modelValue="$emit('update:modelValue', $event)"
-    v-bind="$attrs"
-  />
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, type PropType } from "vue";
-
-import {PlanningType} from "@dative-gpi/foundation-shared-domain/enums";
-
-import FSAutocompleteField from "@dative-gpi/foundation-shared-components/components/fields/FSAutocompleteField.vue";
-
-import {planningTypeLabel, getEnumEntries} from "../../utils";
-
-export default defineComponent({
-  components: {
-    FSAutocompleteField
-  },
-  props: {
-    modelValue: {
-      type: Number as PropType<PlanningType>,
-      required: false
-    },
-    label: {
-      type: String,
-      required: false
-    }
-  },
-  emits: ['update:modelValue'],
-  setup() {
-    
-    const planningTypeItems = computed(()=>{
-      return getEnumEntries(PlanningType).filter(f=>f.value != PlanningType.None).map((f)=>{
-        return {
-          id: f.value,
-          label: planningTypeLabel(f.value)
-        }
-      })
-    });
-
-    return {
-      planningTypeItems
-    }
-  }
-})
-</script>

package/components/selects/FSPlotPerSelector.vue

@@ -1,51 +0,0 @@
-<template>
-  <FSAutocompleteField
-    :label="label ?? $tr('ui.common.plot-per','Plot per')"
-    :items="plotPerItems"
-    :modelValue="modelValue"
-    @update:modelValue="$emit('update:modelValue', $event)"
-    v-bind="$attrs"
-  />
-</template>
-
-<script lang="ts">
-import { computed, defineComponent, type PropType } from "vue";
-
-import {PlotPer} from "@dative-gpi/foundation-shared-domain/enums";
-
-import FSAutocompleteField from "@dative-gpi/foundation-shared-components/components/fields/FSAutocompleteField.vue";
-
-import {plotPerLabel, getEnumEntries} from "../../utils";
-
-export default defineComponent({
-  components: {
-    FSAutocompleteField
-  },
-  props: {
-    modelValue: {
-      type: Number as PropType<PlotPer>,
-      required: false
-    },
-    label: {
-      type: String,
-      required: false
-    }
-  },
-  emits: ['update:modelValue'],
-  setup() {
-    
-    const plotPerItems = computed(()=>{
-      return getEnumEntries(PlotPer).filter(f=>f.value != PlotPer.None).map((f)=>{
-        return {
-          id: f.value,
-          label: plotPerLabel(f.value)
-        }
-      })
-    });
-
-    return {
-      plotPerItems
-    }
-  }
-})
-</script>