@dative-gpi/foundation-shared-components 1.0.142 → 1.0.143-onboarding

package/components/tiles/FSLocationTileUI.vue

@@ -1,132 +1,96 @@
 <template>
-  <FSTile
+  <FSSimpleTileUI
     :activeColor="$props.color"
     :bottomColor="$props.color"
     :modelValue="$props.modelValue"
     :width="$props.width"
+    :label="$props.label"
+    :icon="$props.icon"
+    :code="$props.code"
     v-bind="$attrs"
   >
-    <FSCol
-      align="center-center"
-      width="fill"
+    <template
+      #append-info
     >
-      <FSRow
-        align="center-left"
-        gap="24px"
-        :height="imageSize"
-        :wrap="false"
+      <FSCol
+        gap="8px"
       >
-        <FSCol 
-          gap="12px"
-          :width="infoWidth"
+        <FSRow
+          v-if="$props.deviceCount"
+          :wrap="false"
+          align="center-left"
         >
-          <FSCol
-            gap="4px"
-          >
-            <FSSpan
-              font="text-button"
-              :lineClamp="1"
-            >
-              {{ $props.label }}
-            </FSSpan>
-            <FSSpan
-              v-if="$props.code"
-              font="text-overline"
-              variant="soft"
-            >
-              {{ $props.code }}
-            </FSSpan>
-          </FSCol>
-          <FSCol
-            gap="8px"
+          <FSColor
+            width="24px"
+            height="24px"
+            :color="ColorEnum.Primary"
+            :border="false"
           >
             <FSRow
-              v-if="$props.deviceCount"
-              :wrap="false"
-              align="center-left"
+              align="center-center"
             >
-              <FSColor
-                padding="0 8px"
-                height="24px"
-                :color="ColorEnum.Light"
-                :border="false"
-              >
-                <FSRow
-                  align="center-center"
-                >
-                  <FSSpan
-                    font="text-overline"
-                  >
-                    {{ $props.deviceCount <= 99 ? $props.deviceCount : "99+" }}
-                  </FSSpan>
-                </FSRow>
-              </FSColor>
               <FSSpan
                 font="text-overline"
               >
-                {{ $tr("ui.common.devices", "Equipment(s)") }}
+                {{ capNumberToString($props.deviceCount) }}
               </FSSpan>
             </FSRow>
+          </FSColor>
+          <FSSpan
+            font="text-overline"
+          >
+            {{ $tr("ui.common.devices", "Equipment(s)") }}
+          </FSSpan>
+        </FSRow>
+        <FSRow
+          v-if="$props.address"
+          :wrap="false"
+          align="center-left"
+        >
+          <FSColor
+            width="24px"
+            height="24px"
+            :color="ColorEnum.Primary"
+            :border="false"
+          >
             <FSRow
-              v-if="$props.address"
-              :wrap="false"
-              align="center-left"
+              align="center-center"
             >
-              <FSColor
-                width="24px"
-                height="24px"
-                :color="ColorEnum.Light"
-                :border="false"
-              >
-                <FSRow
-                  align="center-center"
-                >
-                  <FSIcon
-                    icon="mdi-map-marker"
-                    size="16px"
-                  />
-                </FSRow>
-              </FSColor>
-              <FSSpan
-                font="text-overline"
-              >
-                {{ $props.address }}
-              </FSSpan>
+              <FSIcon
+                icon="mdi-map-marker-radius-outline"
+                size="16px"
+              />
             </FSRow>
-          </FSCol>
-        </FSCol>
-        <FSIconCard
-          backgroundVariant="standard"
-          :backgroundColor="ColorEnum.Background"
-          :iconColor="$props.color"
-          :icon="$props.icon"
-          :size="imageSize"
-        />
-      </FSRow>
-    </FSCol>
-  </FSTile>
+          </FSColor>
+          <FSSpan
+            font="text-overline"
+          >
+            {{ $props.address }}
+          </FSSpan>
+        </FSRow>
+      </FSCol>
+    </template>
+  </FSSimpleTileUI>
 </template>
 
 <script lang="ts">
-import { computed, defineComponent, type PropType } from "vue";
+import { defineComponent, type PropType } from "vue";
 
+import { capNumberToString } from '@dative-gpi/foundation-shared-components/utils';
 import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
-import { useBreakpoints } from "@dative-gpi/foundation-shared-components/composables";
 
-import FSIconCard from "../FSIconCard.vue";
+import FSSimpleTileUI from './FSSimpleTileUI.vue';
 import FSColor from "../FSColor.vue";
 import FSSpan from "../FSSpan.vue";
-import FSTile from "./FSTile.vue";
 import FSCol from "../FSCol.vue";
 import FSRow from "../FSRow.vue";
 
 export default defineComponent({
   name: "FSLocationTileUI",
   components: {
-    FSIconCard,
+    FSSimpleTileUI,
     FSColor,
     FSSpan,
-    FSTile,
     FSCol,
     FSRow
   },
@@ -172,20 +136,10 @@ export default defineComponent({
     }
   },
   setup() {
-    const { isMobileSized } = useBreakpoints();
-
-    const imageSize = computed((): number => {
-      return isMobileSized.value ? 90 : 100;
-    });
-
-    const infoWidth = computed((): string => {
-      return `calc(100% - ${imageSize.value}px - 24px)`;
-    });
 
     return {
       ColorEnum,
-      imageSize,
-      infoWidth
+      capNumberToString
     };
   }
 });

package/components/tiles/FSSimpleTileUI.vue

@@ -17,21 +17,29 @@
         :wrap="false"
       >
         <FSCol
-          gap="6px"
+          gap="12px"
           :width="infoWidth"
         >
-          <FSSpan
-            font="text-button"
-            :lineClamp="2"
+          <FSCol
+            gap="4px"
           >
-            {{ $props.label }}
-          </FSSpan>
-          <FSSpan
-            font="text-overline"
-            variant="soft"
-          >
-            {{ $props.code }}
-          </FSSpan>
+            <FSSpan
+              font="text-button"
+              :lineClamp="2"
+            >
+              {{ $props.label }}
+            </FSSpan>
+            <FSSpan
+              font="text-overline"
+              variant="soft"
+            >
+              {{ $props.code }}
+            </FSSpan>
+          </FSCol>
+          <slot
+            name="append-info"
+            v-bind="$attrs"
+          />
         </FSCol>
         <FSImage
           v-if="$props.imageId"
@@ -78,7 +86,7 @@ export default defineComponent({
   },
   props: {
     imageId: {
-      type: String as PropType<string>,
+      type: String as PropType<string | null>,
       required: false,
       default: null
     },
@@ -93,8 +101,9 @@ export default defineComponent({
       default: null
     },
     icon: {
-      type: String as PropType<string>,
+      type: String as PropType<string | null>,
       required: false,
+      default: null
     },
     iconBackgroundVariant: {
       type: String as PropType<"background" | "standard" | "full" | "gradient">,

package/components/tiles/FSTile.vue

@@ -97,6 +97,7 @@ import FSCard from "../FSCard.vue";
 
 export default defineComponent({
   name: "FSTile",
+  inheritAttrs: false,
   components: {
     FSClickable,
     FSCheckbox,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-components",
   "sideEffects": false,
-  "version": "1.0.142",
+  "version": "1.0.143-onboarding",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.142",
-    "@dative-gpi/foundation-shared-services": "1.0.142"
+    "@dative-gpi/foundation-shared-domain": "1.0.143-onboarding",
+    "@dative-gpi/foundation-shared-services": "1.0.143-onboarding"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^1.0.0",
@@ -35,5 +35,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "36eca468f78075f88bb6638dbfdee9bdecf270ce"
+  "gitHead": "44c75a707aeddf8826add43b55f4971b91046b70"
 }

package/styles/components/fs_card.scss

@@ -4,6 +4,7 @@
     padding: var(--fs-card-padding);
     height: var(--fs-card-height);
     width: var(--fs-card-width);
+    position: relative;
     display: flex;
     
     border-color: var(--fs-card-border-color);
@@ -21,4 +22,11 @@
     &-gradient {
         background: var(--fs-card-background-color);
     }
+
+    .fs-card-top-right {
+        position: absolute;
+        line-height: normal;
+        right: var(--fs-card-top-right-padding);
+        top: var(--fs-card-top-right-padding);
+    }
 }

package/tools/alertsTools.ts

@@ -1,6 +1,6 @@
 import { useTranslations as useTranslationsProvider } from "@dative-gpi/bones-ui/composables";
 import { AlertStatus, Criticity } from "@dative-gpi/foundation-shared-domain/enums";
-import { ColorEnum } from "@dative-gpi/foundation-shared-components/models"
+import { ColorEnum } from "../models"
 import { getTimeBestString } from "../utils";
 
 const { $tr } = useTranslationsProvider();
@@ -20,13 +20,40 @@ export const AlertTools = {
   },
   statusLabel(value: AlertStatus): string {
     switch (value) {
-      case AlertStatus.Pending: return $tr("ui.alert-status.pending", "Pending");
-      case AlertStatus.Untriggered: return $tr("ui.alert-status.untriggered", "Untriggered");
-      case AlertStatus.Unresolved: return $tr("ui.alert-status.unresolved", "Unresolved");
-      case AlertStatus.Resolved: return $tr("ui.alert-status.resolved", "Resolved");
-      case AlertStatus.Expired: return $tr("ui.alert-status.expired", "Expired");
-      case AlertStatus.Triggered: return $tr("ui.alert-status.triggered", "Triggered");
-      case AlertStatus.Abandoned: return $tr("ui.alert-status.abandoned", "Abandoned");
+      case AlertStatus.Pending:
+        return $tr('ui.alert-status.pending','Pending');
+      case AlertStatus.Untriggered:
+        return $tr('ui.alert-status.untriggered','Untriggered');
+      case AlertStatus.Unresolved:
+        return $tr('ui.alert-status.unresolved','Unresolved');
+      case AlertStatus.Resolved:
+        return $tr('ui.alert-status.resolved','Resolved');
+      case AlertStatus.Expired:
+        return $tr('ui.alert-status.expired','Expired');
+      case AlertStatus.Triggered:
+        return $tr('ui.alert-status.triggered','Triggered');
+      case AlertStatus.Abandoned:
+        return $tr('ui.alert-status.abandoned','Abandoned');
+      default: return "";
+    }
+  },
+  statusAlternativeColor(value: AlertStatus): string {
+    switch (value) {
+      case AlertStatus.Pending:
+      case AlertStatus.Unresolved:
+      case AlertStatus.Triggered: return "#da2d2d";
+      default: return "#1e56e5";
+    }
+  },
+  statusAlternativeIcon(value: AlertStatus): string {
+    switch (value) {
+      case AlertStatus.Pending: return "timer";
+      case AlertStatus.Untriggered: return "timer_off";
+      case AlertStatus.Unresolved: return "error_outline";
+      case AlertStatus.Resolved: return "check_circle_outline";
+      case AlertStatus.Expired: return "schedule";
+      case AlertStatus.Triggered: return "error_outline";
+      case AlertStatus.Abandoned: return "block"
       default: return "";
     }
   },
@@ -47,23 +74,23 @@ export const AlertTools = {
   },
   criticityLabel(value: Criticity): string {
     switch (value) {
-      case Criticity.Warning: return $tr("ui.common.warning", "Warning");
-      case Criticity.Error: return $tr("ui.common.error", "Error");
-      case Criticity.Information: return $tr("ui.common.information", "Information")
-      default: return $tr("ui.common.none", "None");
+      case Criticity.Warning: return $tr('ui.common.warning','Warning');
+      case Criticity.Error: return $tr('ui.common.error','Error');
+      default: return $tr('ui.common.information','Information');
     }
   }
 }
 
-export const prettyDuration = (n: number) => {
+export const prettyDuration = (n: number | undefined) => {
+  if (n == null) { return "00m 00s"; }
   const day = Math.floor(n / 24 / 60 / 60);
   const hours = Math.floor((n - day * 24 * 60 * 60) / 3600);
   const minutes = Math.floor((n - day * 24 * 60 * 60 - hours * 60 * 60) / 60);
   const seconds = Math.floor(n - day * 24 * 60 * 60 - hours * 60 * 60 - minutes * 60);
 
   return day > 0 ?
-    `${getTimeBestString(day * 24 * 60 * 60)} ${getTimeBestString(hours * 60 * 60)} ${getTimeBestString(minutes * 60)} ${getTimeBestString(seconds)}`
+    `${getTimeBestString(day * 24 * 60 * 60)} ${hours > 0 ? getTimeBestString(hours * 60 * 60) : ''} ${minutes > 0 ? getTimeBestString(minutes * 60) : ''} ${getTimeBestString(seconds)}`
     : hours > 0
-      ? `${getTimeBestString(hours * 60 * 60)} ${getTimeBestString(minutes * 60)} ${getTimeBestString(seconds)}`
-      : `${getTimeBestString(minutes * 60)} ${getTimeBestString(seconds)}`;
+      ? `${getTimeBestString(hours * 60 * 60)} ${minutes > 0 ? getTimeBestString(minutes * 60) : ''} ${getTimeBestString(seconds)}`
+      : `${minutes > 0 ? getTimeBestString(minutes * 60) : ''} ${getTimeBestString(seconds)}`;
 };

package/utils/badge.ts

@@ -1,9 +1,13 @@
-export const getBadgeFromNumber = (value: number, parenthesis: boolean = false): string => {
+export const capNumberToString = (value: number, maximum: number = 99): string => {
+  if (value > maximum) {
+    return `${maximum}+`;
+  }
+  return `${value.toString()}`;
+}
+
+export const getBadgeFromNumber = (value: number, parenthesis: boolean = false, maximum: number = 99): string => {
   if (value < 1) {
     return "";
   }
-  if (value > 99) {
-    return `${parenthesis ? '(' : ''}99+${parenthesis ? ')' : ''}`;
-  }
-  return `${parenthesis ? '(' : ''}${value.toString()}${parenthesis ? ')' : ''}`;
+  return parenthesis ? `(${capNumberToString(value, maximum)})` : capNumberToString(value, maximum);
 }