@dative-gpi/foundation-shared-components 1.0.56 → 1.0.58-groupings

package/components/tiles/FSChartTileUI.vue

@@ -1,56 +1,61 @@
 <template>
-  <FSClickable
-    padding="16px"
-    height="124px"
-    width="275px"
+  <FSTile
+    :width="['296px','336px']"
+    :height="['132px', '116px']"
+    :padding="['16px', '12px']"
+    borderRadius="8px"
     v-bind="$attrs"
   >
-    <template
-      #default
+    <FSRow
+      align="center-left"
+      gap="16px"
+      :wrap="false"
     >
-      <FSRow
+      <FSCol
         align="center-left"
-        :wrap="false"
+        :gap="['12px', '8px']"
       >
-        <FSCol
+        <FSSpan
+          font="text-overline"
+          :lineClamp="4"
+        >
+          {{ $props.label }}
+        </FSSpan>
+        <FSRow
           align="center-left"
+          :gap="['12px', '8px']"
         >
-          <FSSpan
-            font="text-button"
-            :lineClamp="2"
-          >
-            {{ $props.label }}
-          </FSSpan>
           <FSIcon
-            :color="ColorEnum.Error"
+            :color="ColorEnum.Primary"
+            :size="['18px', '16px']"
           >
             {{ chartIcon(type) }}
           </FSIcon>
-          <FSSpan
-            font="text-overline"
-          >
-            {{ $props.categoryLabel }}
-          </FSSpan>
-        </FSCol>
-        <FSCol
-          align="center-right"
-          width="hug"
-        >
-          <FSImage
-            v-if="$props.imageId"
-            height="92px"
-            width="92px"          
-            :imageId="$props.imageId"
+          <FSChip
+            v-if="$props.scope === ApplicationScope.OrganisationType"
+            :color="ColorEnum.Light"
+            :label="$tr('ui.chart-origin.organisation-type', 'Shared')"
           />
-          <FSIcon
-            v-else-if="$props.icon"
-            size="92px"
-            :icon="$props.icon"
-          />
-        </FSCol>
-      </FSRow>
-    </template>
-  </FSClickable>
+        </FSRow>
+      </FSCol>
+      <FSCol
+        align="center-right"
+        width="hug"
+      >
+        <FSImage
+          v-if="$props.imageId"
+          :imageId="$props.imageId"
+          :height="['84px', '72px']"
+          :width="['84px', '72px']"  
+        />
+        <FSIconCard
+          v-else-if="$props.icon"
+          :size="['84px', '72px']"
+          :icon="$props.icon"
+        />
+      </FSCol>
+    </FSRow>
+  </FSTile>
 </template>
 
 <script lang="ts">
@@ -58,26 +63,29 @@ import { defineComponent } from "vue";
 import type { PropType } from "vue";
 
 import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
-import type { ChartType } from "@dative-gpi/foundation-shared-domain/enums";
+import { ApplicationScope, ChartType } from "@dative-gpi/foundation-shared-domain/enums";
 
 import { chartIcon } from "@dative-gpi/foundation-shared-components/tools";
 
-import FSClickable from "../FSClickable.vue";
 import FSImage from "../FSImage.vue";
+import FSTile from "./FSTile.vue";
 import FSSpan from "../FSSpan.vue";
-import FSIcon from "../FSIcon.vue";
 import FSRow from "../FSRow.vue";
 import FSCol from "../FSCol.vue";
+import FSIconCard from '../FSIconCard.vue';
+import FSChip from '../FSChip.vue';
+
 
 export default defineComponent({
   name: "FSChartTileUI",
   components: {
-    FSIcon,
     FSImage,
+    FSTile,
     FSRow,
     FSCol,
     FSSpan,
-    FSClickable
+    FSChip,
+    FSIconCard
   },
   props: {
     label: {
@@ -90,11 +98,6 @@ export default defineComponent({
       required: false,
       default: null
     },
-    categoryLabel: {
-      type: String as PropType<string | null>,
-      required: false,
-      default: null
-    },
     icon: {
       type: String as PropType<string | null>,
       required: false,
@@ -103,12 +106,18 @@ export default defineComponent({
     type: {
       type: Number as PropType<ChartType>,
       required: false,
-      default: null
-    }
+      default: ChartType.None
+    },
+    scope: {
+      type: Number as PropType<ApplicationScope>,
+      required: false,
+      default: ApplicationScope.None
+    },
   },
   setup() {
     return {
       ColorEnum,
+      ApplicationScope,
       chartIcon
     };
   }

package/components/tiles/FSCommentTileUI.vue

@@ -26,15 +26,19 @@
             -
             {{ timestamp }}
           </FSText>
-          <v-spacer />
-          <FSButtonEditIcon
-            v-if="canEditRemove"
-            @click="showEditComment = true"
-          />
-          <FSButtonRemoveIcon
-            v-if="canEditRemove"
-            @click="$emit('remove')"
-          />
+          <FSRow
+            align="center-right"
+            :wrap="false"
+          >
+            <FSButtonEditIcon
+              v-if="canEditRemove"
+              @click="showEditComment = true"
+            />
+            <FSButtonRemoveIcon
+              v-if="canEditRemove"
+              @click="removeDialog = true"
+            />
+          </FSRow>
         </FSRow>
       </template>
       <template
@@ -63,18 +67,25 @@
         @submit="updateComment"
       />
     </FSCol>
+    <FSDialogRemove 
+      v-model="removeDialog"
+      :removeTotal="1"
+      :removing="removing"
+      @click:submitButton="$emit('remove')"
+    />
   </FSCol>
 </template>
 
 <script lang="ts">
 import type { PropType} from "vue";
-import { defineComponent, ref } from "vue";
+import { defineComponent, ref, watch } from "vue";
 
 import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 
 import FSButtonRemoveIcon from "../buttons/FSButtonRemoveIcon.vue";
-import FSCommentField from "../fields/FSCommentField.vue";
 import FSButtonEditIcon from "../buttons/FSButtonEditIcon.vue";
+import FSCommentField from "../fields/FSCommentField.vue";
+import FSDialogRemove from "../FSDialogRemove.vue";
 import FSImage from "../FSImage.vue";
 import FSCard from "../FSCard.vue";
 import FSText from "../FSText.vue";
@@ -85,8 +96,9 @@ export default defineComponent({
   name: "FSCommentTileUI",
   components: {
     FSButtonRemoveIcon,
-    FSCommentField,
     FSButtonEditIcon,
+    FSCommentField,
+    FSDialogRemove,
     FSImage,
     FSCard,
     FSText,
@@ -128,20 +140,33 @@ export default defineComponent({
       type: Boolean,
       required: false,
       default: false
+    },
+    removing: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   emits: ["edit", "remove"],
   setup(props, { emit }) {
     const showEditComment = ref(false);
+    const removeDialog = ref(false);
 
     const updateComment = (comment: string) => {      
       emit('edit',{commentId : props.id, comment : comment})
       showEditComment.value = false;
     };
 
+    watch(() => props.removing, () => {
+      if (!props.removing) {
+        removeDialog.value = false;
+      }
+    });
+
     return {
-      ColorEnum,
       showEditComment,
+      removeDialog,
+      ColorEnum,
       updateComment
     };
   }

package/components/tiles/FSDashboardOrganisationTypeTileUI.vue

@@ -3,7 +3,16 @@
     :bottomColor="color"
     :icon="$props.icon"
     v-bind="$attrs"
-  />
+  >
+    <template
+      #append-info
+    >
+      <FSChip
+        :label="$tr('ui.dashboard-type.organisation-type', 'Shared')"
+        :color="ColorEnum.Light"
+      />
+    </template>
+  </FSSimpleTileUI>
 </template>
 
 <script lang="ts">
@@ -12,10 +21,12 @@ import { computed, defineComponent, type PropType } from "vue";
 import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 
 import FSSimpleTileUI from "./FSSimpleTileUI.vue";
+import FSChip from '@dative-gpi/foundation-shared-components/components/FSChip.vue';
 
 export default defineComponent({
   name: "FSDashboardOrganisationTypeTileUI",
   components: {
+    FSChip,
     FSSimpleTileUI
   },
   props: {
@@ -39,7 +50,8 @@ export default defineComponent({
     });
 
     return {
-      color
+      color,
+      ColorEnum
     };
   }
 });

package/components/tiles/FSDashboardShallowTileUI.vue

@@ -3,7 +3,16 @@
     :bottomColor="color"
     :icon="$props.icon"
     v-bind="$attrs"
-  />
+  >
+    <template
+      #append-info
+    >
+      <FSChip
+        :label="$tr('ui.dashboard-type.shallow', 'Shallow copy')"
+        :color="ColorEnum.Light"
+      />
+    </template>
+  </FSSimpleTileUI>
 </template>
 
 <script lang="ts">
@@ -12,10 +21,12 @@ import { computed, defineComponent, type PropType } from "vue";
 import { type ColorBase, ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 
 import FSSimpleTileUI from "./FSSimpleTileUI.vue";
+import FSChip from '@dative-gpi/foundation-shared-components/components/FSChip.vue';
 
 export default defineComponent({
   name: "FSDashboardShallowTileUI",
   components: {
+    FSChip,
     FSSimpleTileUI
   },
   props: {
@@ -39,7 +50,8 @@ export default defineComponent({
     });
 
     return {
-      color
+      color,
+      ColorEnum
     };
   }
 });

package/components/tiles/FSDeviceOrganisationTileUI.vue

@@ -2,7 +2,6 @@
   <FSTile
     :activeColor="ColorEnum.Primary"
     :bottomColor="ColorEnum.Primary"
-    :editable="$props.editable"
     :width="$props.width"
     :modelValue="$props.modelValue"
     v-bind="$attrs"
@@ -43,6 +42,7 @@
             :deviceStatuses="singleDeviceStatuses"
             :modelStatuses="singleModelStatuses"
             :deviceAlerts="$props.deviceAlerts"
+            :alertTo="$props.alertTo"
           />
         </FSCol>
         <FSImage
@@ -132,6 +132,11 @@ export default defineComponent({
       required: true,
       default: () => []
     },
+    alertTo: {
+      type: Function,
+      required: false,
+      default: null
+    },
     width: {
       type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
       required: false,
@@ -141,11 +146,6 @@ export default defineComponent({
       type: Boolean,
       required: false,
       default: false
-    },
-    editable: {
-      type: Boolean,
-      required: false,
-      default: true
     }
   },
   setup(props) {

package/components/tiles/FSGroupTileUI.vue

@@ -1,127 +1,95 @@
 <template>
-  <FSTile
+  <FSSimpleTileUI
     :activeColor="ColorEnum.Primary"
     :bottomColor="ColorEnum.Error"
-    :editable="$props.editable"
     :width="$props.width"
     :modelValue="$props.modelValue"
+    :label="$props.label"
+    :code="$props.code"
+    :imageId="$props.imageId"
+    :icon="$props.icon"
     v-bind="$attrs"
   >
-    <FSCol
-      align="center-center"
-      width="fill"
+    <template
+      #append-info
     >
-      <FSRow
-        align="center-center"
-        gap="24px"
-        :height="imageSize"
-        :wrap="false"
+      <FSCol
+        gap="6px"
       >
-        <FSCol
-          gap="12px"
-          :width="infoWidth"
+        <FSRow
+          align="center-left"
         >
-          <FSCol
-            gap="6px"
-          >
-            <FSSpan
-              font="text-button"
-              :lineClamp="1"
-            >
-              {{ $props.label }}
-            </FSSpan>
-            <FSSpan
-              font="text-overline"
-              variant="soft"
-            >
-              {{ $props.code }}
-            </FSSpan>
-          </FSCol>
-          <FSCol
-            gap="6px"
+          <FSColor
+            height="24px"
+            width="24px"
+            :color="ColorEnum.Primary"
+            :border="false"
           >
             <FSRow
-              align="center-left"
+              align="center-center"
             >
-              <FSColor
-                padding="0 8px"
-                height="24px"
-                :color="ColorEnum.Primary"
-                :border="false"
-              >
-                <FSRow
-                  align="center-center"
-                >
-                  <FSSpan
-                    font="text-overline"
-                  >
-                    {{ groupsLabel }}
-                  </FSSpan>
-                </FSRow>
-              </FSColor>
               <FSSpan
                 font="text-overline"
               >
-                {{ $tr("ui.group-tile.group(s)", "Group(s)") }}
+                {{ groupsBadgeContent }}
               </FSSpan>
             </FSRow>
+          </FSColor>
+          <FSSpan
+            font="text-overline"
+          >
+            {{ $tr("ui.common.groups", "Group(s)") }}
+          </FSSpan>
+        </FSRow>
+        <FSRow
+          align="center-left"
+        >
+          <FSColor
+            height="24px"
+            width="24px"
+            :color="ColorEnum.Success"
+            :border="false"
+          >
             <FSRow
-              align="center-left"
+              align="center-center"
             >
-              <FSColor
-                padding="0 8px"
-                height="24px"
-                :color="ColorEnum.Success"
-                :border="false"
-              >
-                <FSRow
-                  align="center-center"
-                >
-                  <FSSpan
-                    font="text-overline"
-                  >
-                    {{ deviceOrganisationsLabel }}
-                  </FSSpan>
-                </FSRow>
-              </FSColor>
               <FSSpan
                 font="text-overline"
               >
-                {{ $tr("ui.group-tile.device(s)", "Device(s)") }}
+                {{ deviceOrganisationsBadgeContent }}
               </FSSpan>
             </FSRow>
-          </FSCol>
-        </FSCol>
-        <FSImage
-          v-if="$props.imageId"
-          :imageId="$props.imageId"
-          :width="imageSize"
-        />
-      </FSRow>
-    </FSCol>
-  </FSTile>
+          </FSColor>
+          <FSSpan
+            font="text-overline"
+          >
+            {{ $tr("ui.common.devices", "Device(s)") }}
+          </FSSpan>
+        </FSRow>
+      </FSCol>
+    </template>
+  </FSSimpleTileUI>
 </template>
 
 <script lang="ts">
 import { computed, defineComponent, type PropType } from "vue";
 
-import { useBreakpoints } from "@dative-gpi/foundation-shared-components/composables";
+import { capNumberToString } from '@dative-gpi/foundation-shared-components/utils';
+
 import { ColorEnum } from "@dative-gpi/foundation-shared-components/models";
 
-import FSImage from "../FSImage.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: "FSGroupTileUI",
   components: {
-    FSImage,
+    FSSimpleTileUI,
     FSColor,
     FSSpan,
-    FSTile,
     FSCol,
     FSRow
   },
@@ -131,6 +99,10 @@ export default defineComponent({
       required: false,
       default: null
     },
+    icon: {
+      type: String,
+      required: false
+    },
     label: {
       type: String as PropType<string | null>,
       required: false,
@@ -156,11 +128,6 @@ export default defineComponent({
       required: false,
       default: false
     },
-    editable: {
-      type: Boolean,
-      required: false,
-      default: true
-    },
     width: {
       type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
       required: false,
@@ -168,33 +135,14 @@ export default defineComponent({
     },
   },
   setup(props) {
-    const { isMobileSized } = useBreakpoints();
-
-    const groupsLabel = computed((): string => {
-      return props.recursiveGroupsIds.length > 99 ? "99+" : props.recursiveGroupsIds.length.toString();
-    });
-
-    const deviceOrganisationsLabel = computed((): string => {
-      return props.recursiveDeviceOrganisationsIds.length > 99 ? "99+" : props.recursiveDeviceOrganisationsIds.length.toString();
-    });
-
-    const imageSize = computed((): number => {
-      return isMobileSized.value ? 90 : 100;
-    });
+    const groupsBadgeContent = computed(() => capNumberToString(props.recursiveGroupsIds.length));
 
-    const infoWidth = computed((): string => {
-      if (!props.imageId) {
-        return "100%";
-      }
-      return `calc(100% - ${imageSize.value}px - 24px)`;
-    });
+    const deviceOrganisationsBadgeContent = computed(() => capNumberToString(props.recursiveDeviceOrganisationsIds.length));
 
     return {
-      deviceOrganisationsLabel,
-      groupsLabel,
+      deviceOrganisationsBadgeContent,
+      groupsBadgeContent,
       ColorEnum,
-      imageSize,
-      infoWidth
     };
   }
 });