@dative-gpi/foundation-shared-components 1.0.123 → 1.0.125

package/components/FSCalendar.vue

@@ -13,7 +13,7 @@
         align="center-right"
       >
         <FSButton
-          :label="$tr('ui.calendar.today', 'Today')"
+          :label="$tr('ui.common.today', 'Today')"
           @click="onClickToday"
         />
       </FSRow>

package/components/buttons/FSButtonCopyLabel.vue

@@ -1,6 +1,6 @@
 <template>
   <FSButton
-    :label="$tr('button.copy', 'Copy')"
+    :label="$tr('ui.common.copy', 'Copy')"
     :color="ColorEnum.Light"
     v-bind="$attrs"
   />

package/components/fields/FSEntityFieldUI.vue

@@ -205,31 +205,31 @@ export default defineComponent({
       const items = [
         {
           id: EntityType.Model,
-          label: $tr("ui.entity-type.models", "Models")
+          label: $tr("ui.common.models", "Models")
         },
         {
           id: EntityType.Group,
-          label: $tr("ui.entity-type.groups", "Groups")
+          label: $tr("ui.common.groups", "Groups")
         },
         {
           id: EntityType.Location,
-          label: $tr("ui.entity-type.locations", "Locations")
+          label: $tr("ui.common.locations", "Locations")
         },
         {
           id: EntityType.Device,
-          label: $tr("ui.entity-type.devices", "Devices")
+          label: $tr("ui.common.devices", "Devices")
         },
         {
           id: EntityType.User,
-          label: $tr("ui.entity-type.users", "Users")
+          label: $tr("ui.common.users", "Users")
         },
         {
           id: EntityType.Dashboard,
-          label: $tr("ui.entity-type.dashboards", "Dashboards")
+          label: $tr("ui.common.dashboards", "Dashboards")
         },
         {
           id: EntityType.Folder,
-          label: $tr("ui.entity-type.folders", "Folders")
+          label: $tr("ui.common.folders", "Folders")
         }
       ];
 

package/components/selects/FSSelectListMode.vue

@@ -40,7 +40,7 @@ export default defineComponent({
   
     const items = [
       { id: ListModes.Table, label: $tr("ui.common.table", "Table"), icon: "mdi-format-list-bulleted" },
-      { id: ListModes.Iterator, label: $tr("ui.common.iterator", "Tuile"), icon: "mdi-view-grid-outline" },
+      { id: ListModes.Iterator, label: $tr("ui.common.iterator", "Tile"), icon: "mdi-view-grid-outline" },
     ];
   
     return {

package/components/selects/chartSelectors/FSDisplayAsSelector.vue

@@ -1,6 +1,6 @@
 <template>
   <FSAutocompleteField
-    :label="label ?? $tr('autcomplete.display-as.label','Display as')"
+    :label="label ?? $tr('autocomplete.display-as.label','Display as')"
     :items="displayAsItems"
     :modelValue="modelValue"
     @update:modelValue="$emit('update:modelValue', $event)"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-components",
   "sideEffects": false,
-  "version": "1.0.123",
+  "version": "1.0.125",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.123",
-    "@dative-gpi/foundation-shared-services": "1.0.123"
+    "@dative-gpi/foundation-shared-domain": "1.0.125",
+    "@dative-gpi/foundation-shared-services": "1.0.125"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -35,5 +35,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "04157720c6327851c1867bd7133a0cebf945d5b6"
+  "gitHead": "fe376a2d6846d6830925a36d0d7a54ec6e71a141"
 }

package/tools/chartsTools.ts

@@ -9,8 +9,8 @@ const { $tr } = useTranslationsProvider();
 export const chartOriginLabel = (type: ChartOrigin): string => {
   switch (type) {
     case ChartOrigin.None: return $tr("ui.common.none", "None");
-    case ChartOrigin.Organisation: return $tr("ui.chart-origin.custom", "Custom");
-    case ChartOrigin.OrganisationType: return $tr("ui.chart-origin.shared", "Shared");
+    case ChartOrigin.Organisation: return $tr("ui.common.custom", "Custom");
+    case ChartOrigin.OrganisationType: return $tr("ui.common.shared", "Shared");
   }
 };
 
@@ -43,7 +43,7 @@ export const colorSetLabel = (value: ColorSets | number): string => {
     case ColorSets.Hash: return $tr("ui.color-sets.hash", "Hash");
     case ColorSets.Kelly: return $tr("ui.color-sets.material", "Kelly");
     case ColorSets.ZeileisHornikMurrell: return $tr("ui.color-sets.material", "ZeileisHornikMurrell");
-    default: return $tr("ui.color-sets.none", "None");
+    default: return $tr("ui.common.none", "None");
   }
 }
 
@@ -95,7 +95,7 @@ export const aggregationTypeLabel = (aggregationType: AggregationType): string =
     case AggregationType.Minimum: return $tr("ui.common.minimum", "Minimum");
     case AggregationType.Maximum: return $tr("ui.common.maximum", "Maximum");
     case AggregationType.Range: return $tr("ui.aggregation-type.range", "Range");
-    default: return $tr("ui.aggregation-type.none", "None");
+    default: return $tr("ui.common.none", "None");
   }
 };
 
@@ -110,16 +110,16 @@ export const axisTypeLabel = (axisType: AxisType | number): string => {
 
 export const displayAsLabel = (display: DisplayAs | number): string => {
   switch (display) {
-    case DisplayAs.Bars: return $tr("ui.display-as.bars", "Bars");
-    case DisplayAs.Lines: return $tr("ui.display-as.lines", "Lines");
-    case DisplayAs.Points: return $tr("ui.display-as.point", "Points");
-    default: return $tr("ui.display-as.none", "None");
+    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.points", "Points");
+    default: return $tr("ui.common.none", "None");
   }
 };
 
 export const filterTypeLabel = (filterType: FilterType | number): string => {
   switch (filterType) {
-    case FilterType.Contains: return $tr("ui.filter-type.contains", "contains");
+    case FilterType.Contains: return $tr("ui.common.contains", "contains");
     case FilterType.Different: return "≠";
     case FilterType.EndsWith: return $tr("ui.filter-type.ends-with", "ends with");
     case FilterType.Equal: return "=";
@@ -128,7 +128,7 @@ export const filterTypeLabel = (filterType: FilterType | number): string => {
     case FilterType.More: return ">";
     case FilterType.MoreOrEqual: return "≥";
     case FilterType.StartsWith: return $tr("ui.filter-type.starts-with", "start with");
-    default: return $tr("ui.filter-type.none", "None");
+    default: return $tr("ui.common.none", "None");
   }
 };
 
@@ -179,7 +179,7 @@ export const serieTypeLabel = (serieType: SerieType): string => {
     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.Top: return $tr("ui.serie-type.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");
@@ -187,7 +187,7 @@ export const serieTypeLabel = (serieType: SerieType): string => {
     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");
+    case SerieType.Table: return $tr("ui.serie-type.table", "Table");
     default: return "";
   }
 };

package/utils/sort.ts

@@ -23,7 +23,7 @@ export const alphanumericSort = (a: any, b: any) => {
   if (b == null) {
     return 1;
   }
-  a = asString(a);
-  b = asString(b);
+  a = asString(a).trim();
+  b = asString(b).trim();
   return a.localeCompare(b, undefined, { numeric: true });
 };

package/utils/time.ts

@@ -5,13 +5,13 @@ import { TimeUnit } from "@dative-gpi/foundation-shared-domain/enums"
 const { $tr } = useTranslationsProvider();
 
 export const timeSteps = [
-  { id: TimeUnit.Second,      label: $tr("ui.time-step.second.singular", "Second"), plural: $tr("ui.time-step.second.plural", "Seconds") },
-  { id: TimeUnit.Minute,      label: $tr("ui.time-step.minute.singular", "Minute"), plural: $tr("ui.time-step.minute.plural", "Minutes") },
-  { id: TimeUnit.Hour,        label: $tr("ui.time-step.hour.singular", "Hour"),     plural: $tr("ui.time-step.hour.plural", "Hours") },
-  { id: TimeUnit.Day,         label: $tr("ui.time-step.day.singular", "Day"),       plural: $tr("ui.time-step.day.plural", "Days") },
-  { id: TimeUnit.Week,        label: $tr("ui.time-step.week.singular", "Week"),     plural: $tr("ui.time-step.week.plural", "Weeks") },
-  { id: TimeUnit.Month,       label: $tr("ui.time-step.month.singular", "Month"),   plural: $tr("ui.time-step.month.plural", "Months") },
-  { id: TimeUnit.Year,        label: $tr("ui.time-step.year.singular", "Year"),     plural: $tr("ui.time-step.year.plural", "Years") },
+  { id: TimeUnit.Second,      label: $tr("ui.common.second", "Second"), plural: $tr("ui.common.seconds", "Seconds") },
+  { id: TimeUnit.Minute,      label: $tr("ui.common.minute", "Minute"), plural: $tr("ui.common.minutes", "Minutes") },
+  { id: TimeUnit.Hour,        label: $tr("ui.common.hour", "Hour"),     plural: $tr("ui.common.hours", "Hours") },
+  { id: TimeUnit.Day,         label: $tr("ui.common.day", "Day"),       plural: $tr("ui.common.days", "Days") },
+  { id: TimeUnit.Week,        label: $tr("ui.common.week", "Week"),     plural: $tr("ui.common.weeks", "Weeks") },
+  { id: TimeUnit.Month,       label: $tr("ui.common.month", "Month"),   plural: $tr("ui.common.months", "Months") },
+  { id: TimeUnit.Year,        label: $tr("ui.common.year", "Year"),     plural: $tr("ui.common.years", "Years") },
 ];
 
 export const timeStepToString = (value: { value: number, unit: TimeUnit } | null): string => {
@@ -29,11 +29,11 @@ export const timeStepToString = (value: { value: number, unit: TimeUnit } | null
 
 // TODO : remove everything below this line
 export const timeScale: any[] = [
-  { id: 1,      label: $tr("ui.time-field.second.singular", "Second"), plural: $tr("ui.time-field.second.plural", "Seconds") },
-  { id: 60,     label: $tr("ui.time-field.minute.singular", "Minute"), plural: $tr("ui.time-field.minute.plural", "Minutes") },
-  { id: 3600,   label: $tr("ui.time-field.hour.singular", "Hour"),     plural: $tr("ui.time-field.hour.plural", "Hours") },
-  { id: 86400,  label: $tr("ui.time-field.day.singular", "Day"),       plural: $tr("ui.time-field.day.plural", "Days") },
-  { id: 604800, label: $tr("ui.time-field.week.singular", "Week"),     plural: $tr("ui.time-field.week.plural", "Weeks") },
+  { id: 1,      label: $tr("ui.common.second", "Second"), plural: $tr("ui.common.seconds", "Seconds") },
+  { id: 60,     label: $tr("ui.common.minute", "Minute"), plural: $tr("ui.common.minutes", "Minutes") },
+  { id: 3600,   label: $tr("ui.common.hour", "Hour"),     plural: $tr("ui.common.hours", "Hours") },
+  { id: 86400,  label: $tr("ui.common.day", "Day"),       plural: $tr("ui.common.days", "Days") },
+  { id: 604800, label: $tr("ui.common.week", "Week"),     plural: $tr("ui.common.weeks", "Weeks") },
 ];
 
 export const getTimeScaleIndex = (value: number): number => {