@dative-gpi/foundation-core-components 1.0.87 → 1.0.89

package/components/autocompletes/FSAutocompleteChart.vue

@@ -58,10 +58,9 @@ import { computed, defineComponent, type PropType } from "vue";
 
 import { type ChartOrganisationFilters, type ChartOrganisationTypeFilters } from "@dative-gpi/foundation-core-domain/models";
 import { useChartOrganisations, useChartOrganisationTypes } from "@dative-gpi/foundation-core-services/composables";
+import { chartOriginColor, chartOriginLabel } from "@dative-gpi/foundation-shared-components/tools";
 import { useAutocomplete } from "@dative-gpi/foundation-shared-components/composables";
 import { useTranslations as useTranslationsProvider } from "@dative-gpi/bones-ui";
-
-import { chartOriginColor, chartOriginLabel } from "../../utils";
 import { ChartOrigin } from "@dative-gpi/foundation-shared-domain/enums";
 
 import FSAutocompleteField from "@dative-gpi/foundation-shared-components/components/fields/FSAutocompleteField.vue";

package/components/lists/FSDataTable.vue

@@ -1,6 +1,6 @@
 <template>
   <FSLoadDataTable
-    v-if="($props.tableCode && !initialized) || gettingUserOrganisationTable"
+    v-if="($props.tableCode && !initialized) || gettingUserOrganisationTable || !table"
   />
   <FSDataTableUI
     v-else
@@ -89,8 +89,8 @@ export default defineComponent({
       }
     }, { immediate: true });
 
-    watch(() => table.value, () => {
-      if (table.value && initialized.value) {
+    watch(() => (table.value ? { ...table.value } : null), (_, former) => {
+      if (table.value && former && initialized.value) {
         debounce(update, props.debounceTime);
       }
     }, { deep: true });

package/components/lists/comments/FSBaseCommentsList.vue

@@ -30,6 +30,7 @@
       :canEditRemove="currentUser?.id === comment.userId"
       :comment="comment.comment"
       :edited="comment.edited"
+      :removing="removing"
       :id="comment.id"
       @edit="updateComment"
       @remove="removeComment(comment.id)"
@@ -39,7 +40,7 @@
 
 <script lang="ts">
 import type { PropType} from "vue";
-import { computed, defineComponent, onMounted, watch } from "vue";
+import { computed, defineComponent, onMounted, ref, watch } from "vue";
 import _ from "lodash";
 
 import { useDateFormat, useCurrentUser } from "@dative-gpi/foundation-shared-services/composables";
@@ -73,13 +74,15 @@ export default defineComponent({
     }
   },
   setup(props) {
-    const {fetch : fetchCurrentUser, entity: currentUser} = useCurrentUser();
+    const { fetch : fetchCurrentUser, entity: currentUser } = useCurrentUser();
     const { create: createComment, creating : creatingComment } = useCreateComment();
     const { getMany: fetchComments, entities: comments } = useComments();
-    const {update  } = useUpdateComment();
-    const {remove  } = useRemoveComment();
+    const { update } = useUpdateComment();
+    const { remove, removing } = useRemoveComment();
     const { epochToLongTimeFormat } = useDateFormat();
 
+    const error = ref<string | null>(null);
+
     const orderedComments = computed(()  => {
       return _.orderBy(comments.value, ['timestamp'], ['desc']);
     });
@@ -101,8 +104,14 @@ export default defineComponent({
       update(payload.commentId, {comment : payload.comment})
     }
 
-    const removeComment = (commentId : string) => {
-      remove(commentId)
+    const removeComment = async (commentId : string) => {
+      try {
+        error.value = null;
+        await remove(commentId);
+      }
+      catch (exception: any) {
+        error.value = exception.response.data;
+      }
     }
 
     watch(() => props.commentFilters, (next, previous) => {
@@ -112,15 +121,18 @@ export default defineComponent({
     }, { immediate: true });
 
     return {
-      comments,
-      ColorEnum,
       creatingComment,
-      currentUser,
       orderedComments,
+      currentUser,
+      ColorEnum,
+      comments,
+      removing,
+      error,
+      epochToLongTimeFormat,
       createNewComment,
       updateComment,
       removeComment,
-      epochToLongTimeFormat
+      
     };
   }
 });

package/components/selects/FSAggregationSelector.vue

@@ -13,7 +13,8 @@ import { computed, defineComponent, type PropType } from "vue";
 
 import { AggregationType } from "@dative-gpi/foundation-shared-domain/enums";
 
-import {aggregationTypeLabel, getEnumEntries} from "../../utils";
+import { getEnumEntries } from "@dative-gpi/foundation-shared-domain/tools";
+import { aggregationTypeLabel } from "@dative-gpi/foundation-shared-components/tools";
 
 import FSAutocompleteField from "@dative-gpi/foundation-shared-components/components/fields/FSAutocompleteField.vue";
 

package/components/selects/FSAxisTypeSelector.vue

@@ -13,7 +13,8 @@ import { computed, defineComponent, type PropType } from "vue";
 
 import  {AxisType} from "@dative-gpi/foundation-shared-domain/enums";
 
-import {axisTypeLabel, getEnumEntries} from "../../utils";
+import { getEnumEntries } from "@dative-gpi/foundation-shared-domain/tools";
+import { axisTypeLabel } from "@dative-gpi/foundation-shared-components/tools";
 
 import FSToggleSet from "@dative-gpi/foundation-shared-components/components/FSToggleSet.vue";
 

package/components/selects/FSDisplayAsSelector.vue

@@ -13,9 +13,10 @@ 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 { getEnumEntries } from "@dative-gpi/foundation-shared-domain/tools";
+import { displayAsLabel } from "@dative-gpi/foundation-shared-components/tools";
 
-import {displayAsLabel, getEnumEntries} from "../../utils";
+import FSAutocompleteField from "@dative-gpi/foundation-shared-components/components/fields/FSAutocompleteField.vue";
 
 export default defineComponent({
   components: {

package/components/selects/FSFilterTypeSelector.vue

@@ -14,9 +14,10 @@ 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 { getEnumEntries } from "@dative-gpi/foundation-shared-domain/tools";
+import { filterTypeLabel } from "@dative-gpi/foundation-shared-components/tools";
 
-import {filterTypeLabel, getEnumEntries} from "../../utils";
+import FSAutocompleteField from "@dative-gpi/foundation-shared-components/components/fields/FSAutocompleteField.vue";
 
 export default defineComponent({
   components: {

package/components/selects/FSHeatmapRuleSelector.vue

@@ -13,9 +13,11 @@ import { computed, defineComponent, type PropType } from "vue";
 
 import {HeatmapRule} from "@dative-gpi/foundation-shared-domain/enums";
 
+import { getEnumEntries } from "@dative-gpi/foundation-shared-domain/tools";
+import { heatmapRuleLabel } from "@dative-gpi/foundation-shared-components/tools";
+
 import FSAutocompleteField from "@dative-gpi/foundation-shared-components/components/fields/FSAutocompleteField.vue";
 
-import {heatmapRuleLabel, getEnumEntries} from "../../utils";
 
 export default defineComponent({
   components: {

package/components/selects/FSOperationOnSelector.vue

@@ -13,9 +13,11 @@ import { computed, defineComponent, type PropType } from "vue";
 
 import {OperationOn} from "@dative-gpi/foundation-shared-domain/enums";
 
+import { getEnumEntries } from "@dative-gpi/foundation-shared-domain/tools";
+import { operationOnLabel} from "@dative-gpi/foundation-shared-components/tools";
+
 import FSAutocompleteField from "@dative-gpi/foundation-shared-components/components/fields/FSAutocompleteField.vue";
 
-import {operationOnLabel, getEnumEntries} from "../../utils";
 
 export default defineComponent({
   components: {

package/components/selects/FSPlanningTypeSelector.vue

@@ -13,9 +13,11 @@ import { computed, defineComponent, type PropType } from "vue";
 
 import {PlanningType} from "@dative-gpi/foundation-shared-domain/enums";
 
+import { getEnumEntries } from "@dative-gpi/foundation-shared-domain/tools";
+import { planningTypeLabel } from "@dative-gpi/foundation-shared-components/tools";
+
 import FSAutocompleteField from "@dative-gpi/foundation-shared-components/components/fields/FSAutocompleteField.vue";
 
-import {planningTypeLabel, getEnumEntries} from "../../utils";
 
 export default defineComponent({
   components: {

package/components/selects/FSPlotPerSelector.vue

@@ -13,9 +13,10 @@ 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 { getEnumEntries } from "@dative-gpi/foundation-shared-domain/tools";
+import { plotPerLabel } from "@dative-gpi/foundation-shared-components/tools";
 
-import {plotPerLabel, getEnumEntries} from "../../utils";
+import FSAutocompleteField from "@dative-gpi/foundation-shared-components/components/fields/FSAutocompleteField.vue";
 
 export default defineComponent({
   components: {

package/components/selects/FSSerieTypeSelector.vue

@@ -13,9 +13,11 @@ import { computed, defineComponent, type PropType } from "vue";
 
 import {SerieType} from "@dative-gpi/foundation-shared-domain/enums";
 
+import { getEnumEntries } from "@dative-gpi/foundation-shared-domain/tools";
+import { serieTypeLabel } from "@dative-gpi/foundation-shared-components/tools";
+
 import FSAutocompleteField from "@dative-gpi/foundation-shared-components/components/fields/FSAutocompleteField.vue";
 
-import {serieTypeLabel, getEnumEntries} from "../../utils";
 
 export default defineComponent({
   components: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-core-components",
   "sideEffects": false,
-  "version": "1.0.87",
+  "version": "1.0.89",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,11 +10,11 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-core-domain": "1.0.87",
-    "@dative-gpi/foundation-core-services": "1.0.87",
-    "@dative-gpi/foundation-shared-components": "1.0.87",
-    "@dative-gpi/foundation-shared-domain": "1.0.87",
-    "@dative-gpi/foundation-shared-services": "1.0.87"
+    "@dative-gpi/foundation-core-domain": "1.0.89",
+    "@dative-gpi/foundation-core-services": "1.0.89",
+    "@dative-gpi/foundation-shared-components": "1.0.89",
+    "@dative-gpi/foundation-shared-domain": "1.0.89",
+    "@dative-gpi/foundation-shared-services": "1.0.89"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -26,5 +26,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "180b62cf6fa6a72b6eff933df6f245c7cdc341db"
+  "gitHead": "9744715fd11929d7cd01e09aebe822283a6214e5"
 }

package/utils/index.ts

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

package/utils/charts.ts

@@ -1,137 +0,0 @@
-import { AggregationType, AxisType, ChartOrigin, DisplayAs, FilterType, HeatmapRule, OperationOn, PlanningType, PlotPer, SerieType } from "@dative-gpi/foundation-shared-domain/enums";
-import { useTranslations as useTranslationsProvider } from "@dative-gpi/bones-ui/composables";
-import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
-
-const { $tr } = useTranslationsProvider();
-
-
-export const chartOriginLabel = (type: ChartOrigin): string => {
-  switch (type) {
-    case ChartOrigin.None:             return $tr("ui.chart-type.none", "None");
-    case ChartOrigin.Organisation:     return $tr("ui.chart-type.organisation", "Custom");
-    case ChartOrigin.OrganisationType: return $tr("ui.chart-type.organisation-type", "Shared");
-  }
-};
-
-export const chartOriginColor = (type: ChartOrigin): ColorBase => {
-  switch (type) {
-    case ChartOrigin.None:             return ColorEnum.Error;
-    case ChartOrigin.Organisation:     return ColorEnum.Primary;
-    case ChartOrigin.OrganisationType: return ColorEnum.Warning;
-  }
-};
-
-export const aggregationTypeLabel = (aggregationType : AggregationType): string => {
-  switch (aggregationType) {
-    case AggregationType.Sum:        return $tr("ui.common.sum", "Sum");
-    case AggregationType.Cardinal:   return $tr("ui.common.cardinal", "Cardinal");
-    case AggregationType.Mean:       return $tr("ui.common.mean", "Mean");
-    case AggregationType.Median:     return $tr("ui.common.median", "Median");
-    case AggregationType.First:      return $tr("ui.common.first", "First");
-    case AggregationType.Last:       return $tr("ui.common.last", "Last");
-    case AggregationType.Difference: return $tr("ui.common.difference", "Difference");
-    case AggregationType.Minimum:    return $tr("ui.common.minimum", "Minimum");
-    case AggregationType.Maximum:    return $tr("ui.common.maximum", "Maximum");
-    case AggregationType.Range:      return $tr("ui.common.range", "Range");
-    default :                        return $tr("ui.common.none", "None");
-  }
-};
-
-export const axisTypeLabel = (axisType: AxisType | number): string => {
-  switch (axisType) {
-    case AxisType.Date:     return $tr("ui.common.date", "Date");
-    case AxisType.Value:    return $tr("ui.common.value", "Value");
-    case AxisType.Category: return $tr("ui.common.category", "Category");
-    default:                return $tr("ui.common.none", "None");
-  }
-};
-
-export const displayAsLabel = (display: DisplayAs | number): string => {
-  switch (display) {
-    case DisplayAs.Bars:   return $tr("ui.common.bars", "Bars");
-    case DisplayAs.Lines:  return $tr("ui.common.lines", "Lines");
-    case DisplayAs.Points: return $tr("ui.common.point", "Points");
-    default:               return $tr("ui.common.none", "None");
-  }
-};
-
-export const filterTypeLabel = (filterType: FilterType | number): string => {
-  switch (filterType) {
-    case FilterType.Contains:    return $tr("ui.common.contains", "contains");
-    case FilterType.Different:   return "≠";
-    case FilterType.EndsWith:    return $tr("ui.common.ends-with", "ends with") ;
-    case FilterType.Equal:       return "=";
-    case FilterType.Less:        return "<";
-    case FilterType.LessOrEqual: return "≤";
-    case FilterType.More:        return ">";
-    case FilterType.MoreOrEqual: return "≥";
-    case FilterType.StartsWith:  return $tr("ui.common.starts-with", "start with");
-    default:                     return $tr("ui.common.none", "None");
-  }
-};
-
-export const heatmapRuleLabel = (heatMap: HeatmapRule | number): string => {
-  switch (heatMap) {
-    case HeatmapRule.Gradient: return $tr("ui.common.gradient", "Gradient");
-    case HeatmapRule.Ranges:   return $tr("ui.common.ranges", "Ranges");
-    case HeatmapRule.Fixed :   return $tr("ui.common.fixed", "Fixed");
-    default:                   return $tr("ui.common.none", "None");
-  }
-};
-
-export const operationOnLabel = (operationOn: OperationOn | number): string => {
-  switch (operationOn) {
-    case OperationOn.SameEntity:         return $tr("ui.common.same-entity", "Same entity");
-    case OperationOn.SameGroup:          return $tr("ui.common.same-group", "Same group");
-    case OperationOn.SameGroupAndEntity: return $tr("ui.common.same-group-entity", "Same group and entity");
-    default:                             return $tr("ui.common.none", "None");
-  }
-};
-
-export const planningTypeLabel = (planningType : PlanningType | number): string => {
-  switch (planningType) {
-    case PlanningType.UntilNext:          return $tr("ui.common.until-next", "Until next");
-    case PlanningType.ElapsedTime:        return $tr("ui.common.elapsed-time", "Elapsed time");
-    case PlanningType.SinglePoint:        return $tr("ui.common.single-point", "Single point");
-    default:                              return $tr("ui.common.none", "None");
-  }
-};
-
-export const plotPerLabel = (plotper: PlotPer | number): string => {
-  switch (plotper) {
-    case PlotPer.SinglePlot: return $tr("ui.common.single-slot", "Single slot");
-    case PlotPer.Model:      return $tr("ui.common.model", "Model");
-    case PlotPer.Group:      return $tr("ui.common.group", "Group");
-    case PlotPer.Location:   return $tr("ui.common.location", "Location");
-    case PlotPer.Device:     return $tr("ui.common.device", "Device");
-    default:                 return $tr("ui.common.none", "None");
-  }
-};
-
-export const serieTypeLabel = (serieType : SerieType): string => {
-  switch (serieType) {
-    case SerieType.Lines:       return $tr("ui.common.lines", "Lines");
-    case SerieType.Area:        return $tr("ui.common.area", "Area");
-    case SerieType.Range:       return $tr("ui.common.range", "Range");
-    case SerieType.Histogram:   return $tr("ui.common.histogram", "Histogram");
-    case SerieType.Operation:   return $tr("ui.common.operation", "Operation");
-    case SerieType.Planning:    return $tr("ui.common.planning", "Planning");
-    case SerieType.ScatterPlot: return $tr("ui.common.scatter-plot", "Scatter plot");
-    case SerieType.Top:         return $tr("ui.common.top", "Top");
-    case SerieType.Bars:        return $tr("ui.common.bars", "Bars");
-    case SerieType.StackedBars: return $tr("ui.common.stacked-bars", "Stacked bars");
-    case SerieType.Pie:         return $tr("ui.common.pie", "Pie");
-    case SerieType.Heatmap:     return $tr('ui.common.heatmap', 'Heatmap');
-    case SerieType.Slider:      return $tr("ui.common.slider", "Slider");
-    case SerieType.Gauge:       return $tr("ui.common.gauge", "Gauge");
-    case SerieType.ScoreCard:   return $tr("ui.common.score-card", "Score card");
-    case SerieType.Table:       return $tr("ui.common.table", "Table");
-    default:                    return "";
-  }
-};
-
-export const getEnumEntries = (e: any) => {
-  return Object.keys(e)
-    .filter(key => isNaN(Number(key)))
-    .map(key => ({key : key, value : e[key]}));
-};