@dative-gpi/foundation-shared-components 1.0.124 → 1.0.126-fix-imports

package/components/FSWindow.vue

@@ -1,10 +1,53 @@
 <template>
+  <template 
+    v-if="noMatch"
+  >
+    <slot 
+      name="error" 
+    >
+      <FSRow
+        padding="16px"
+        :width="$props.width"
+      >
+        <FSCol
+          align="center-center"
+          gap="16px"
+        >
+          <FSCol
+            align="center-center"
+          >
+            <FSIcon
+              size="42px"
+              :color="ColorEnum.Error"
+            >
+              mdi-alert-outline
+            </FSIcon>
+            <FSText
+              font="text-h3"
+            >
+              {{ $tr("window.no-access-title", "Nothing to see here") }}
+            </FSText>
+          </FSCol>
+          <FSText
+            :lineClamp="2"
+          >
+            {{ $tr("window.no-access-body", "It seems you either do not have access to this content, or there is nothing to display here") }}
+          </FSText>
+          <FSButton
+            :label="$tr('window.no-access-button', 'Go back')"
+            :color="ColorEnum.Primary"
+            @click="goBack"
+          />
+        </FSCol>
+      </FSRow>
+    </slot>
+  </template>
   <v-window
     class="fs-window"
+    ref="windowRef"
     :touch="false"
     :style="style"
     :modelValue="$props.modelValue"
-    @update:modelValue="$emit('update:modelValue', $event)"
     v-bind="$attrs"
   >
     <template
@@ -35,8 +78,23 @@ import { computed, defineComponent, type PropType, ref, type StyleValue, type VN
 import { useSlots } from "@dative-gpi/foundation-shared-components/composables";
 import { sizeToVar } from "@dative-gpi/foundation-shared-components/utils";
 
+import { ColorEnum } from "../models";
+
+import FSButton from "./FSButton.vue";
+import FSCard from "./FSCard.vue";
+import FSIcon from "./FSIcon.vue";
+import FSText from "./FSText.vue";
+import FSRow from "./FSRow.vue";
+
 export default defineComponent({
   name: "FSWindow",
+  components: {
+    FSButton,
+    FSCard,
+    FSIcon,
+    FSText,
+    FSRow
+  },
   props: {
     width: {
       type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
@@ -54,11 +112,13 @@ export default defineComponent({
       default: 0
     }
   },
-  emits: ["update:modelValue"],
-  setup(props) {
+  emits: ["update:modelValue", "error"],
+  setup(props, { emit }) {
     const { slots, getChildren } = useSlots();
 
     delete slots.default;
+
+    const windowRef = ref<any | null>(null);
     
     const showOverflow = ref(true);
     const overflowTimeout = ref<NodeJS.Timeout | null>(null);
@@ -84,10 +144,39 @@ export default defineComponent({
       }, 560);
     });
 
+    const noMatch = computed(() => {
+      if (!windowRef.value) {
+        return;
+      }
+
+      // https://github.com/vuetifyjs/vuetify/blob/master/packages/vuetify/src/components/VWindow/VWindow.tsx
+      // https://github.com/vuetifyjs/vuetify/blob/master/packages/vuetify/src/composables/group.ts#L161
+      const group = windowRef.value.group;
+      return !group.items.value.find((item: any) => item.value === props.modelValue);
+    });
+
+    const goBack = (): void => {
+      if (!windowRef.value) {
+        emit("error");
+        return;
+      }
+      
+      const group = windowRef.value.group;
+      if (!group.items.value.length) {
+        emit("error");
+        return;
+      }
+      emit("update:modelValue", group.items.value[0].value);
+    };
+
     return {
+      ColorEnum,
+      windowRef,
+      noMatch,
       slots,
       style,
       getChildren,
+      goBack,
       value
     };
   }

package/components/agenda/FSAgendaHorizontalEvent.vue

@@ -44,7 +44,7 @@
       name="default"
       :label="label"
       :icon="icon"
-      :iconBis="iconBis"
+      :iconBis="endToday ? iconBis : null"
       :timeStart="epochToShortTimeOnlyFormat($props.start)"
       :timeEnd="epochToShortTimeOnlyFormat($props.end)"
       :variant="$props.variant"
@@ -120,12 +120,20 @@ export default defineComponent({
       return dayEnd.value - props.dayStart;
     });
 
+    const startToday = computed(() => {
+      return props.start >= props.dayStart;
+    });
+
+    const endToday = computed(() => {
+      return props.end <= dayEnd.value;
+    });
+
     const dayDurationOffset = computed(() => {
       return dayDuration.value - dayToMillisecond(1);
     });
 
     const leftPosition = computed(() => {
-      if (props.start < props.dayStart) {
+      if (!startToday.value) {
         return 0;
       }
       return millisecondToDay(props.start - props.dayStart - dayDurationOffset.value) * 100;
@@ -136,10 +144,10 @@ export default defineComponent({
       let end = props.end - dayDurationOffset.value;
       if(props.variant === 'current' && dayEnd.value > props.now) {
         end = props.now;
-      } else if (props.end > dayEnd.value) {
+      } else if (!endToday.value) {
         end = dayEnd.value - dayDurationOffset.value;
       }
-      if (props.start < props.dayStart) {
+      if (!startToday.value) {
         start = props.dayStart;
       }
       
@@ -150,12 +158,14 @@ export default defineComponent({
     const style = computed((): StyleValue => {
       return {
         '--fs-agenda-event-left': `${leftPosition.value}%`,
+        '--fs-agenda-event-border-width': startToday.value ? '3px' : '0px',
       };
     });
 
     return {
       style,
       width,
+      endToday,
       epochToShortTimeOnlyFormat
     };
   }

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/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.124",
+  "version": "1.0.126-fix-imports",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.124",
-    "@dative-gpi/foundation-shared-services": "1.0.124"
+    "@dative-gpi/foundation-shared-domain": "1.0.126-fix-imports",
+    "@dative-gpi/foundation-shared-services": "1.0.126-fix-imports"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -35,5 +35,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "dbe55d5165ef715e8debfa3e459c0d76da412f2d"
+  "gitHead": "a33ad553014a5e4bec951107b73444080b2d7dd5"
 }

package/styles/components/fs_agenda_event.scss

@@ -8,7 +8,7 @@
   }
 
   >.fs-card {
-    border-left: solid 3px var(--fs-clickable-border-color) !important;
+    border-left: solid var(--fs-agenda-event-border-width) var(--fs-clickable-border-color) !important;
   }
 }
 

package/tools/chartsTools.ts

@@ -112,7 +112,7 @@ 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");
+    case DisplayAs.Points: return $tr("ui.common.points", "Points");
     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 => {