@dative-gpi/foundation-shared-components 1.0.61 → 1.0.62

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/components/deviceOrganisations/FSConnectivity.vue +1 -0
  2. package/components/deviceOrganisations/FSConnectivityCard.vue +17 -45
  3. package/components/deviceOrganisations/FSStatus.vue +1 -0
  4. package/components/deviceOrganisations/FSStatusCard.vue +24 -56
  5. package/components/deviceOrganisations/FSWorstAlert.vue +1 -0
  6. package/components/deviceOrganisations/FSWorstAlertCard.vue +21 -42
  7. package/package.json +4 -4
package/components/deviceOrganisations/FSConnectivity.vue CHANGED
@@ -2,6 +2,7 @@
2
2
  <v-menu
3
3
  :closeOnContentClick="false"
4
4
  v-model="menu"
5
+ location="bottom center"
5
6
  >
6
7
  <template
7
8
  #activator="{ props }"
package/components/deviceOrganisations/FSConnectivityCard.vue CHANGED
@@ -1,55 +1,33 @@
1
1
  <template>
2
2
  <FSCard
3
- padding="2px 2px 8px 2px"
3
+ padding="12px 24px"
4
4
  :elevation="true"
5
- :border="false"
6
5
  >
7
6
  <FSCol
8
7
  align="center-center"
8
+ gap="12px"
9
9
  >
10
+ <FSChip
11
+ :prependIcon="$props.deviceConnectivity.icon"
12
+ :color="$props.deviceConnectivity.color"
13
+ :label="connectivityLabel($props.deviceConnectivity.status)"
14
+ />
10
15
  <FSCol
11
16
  align="center-center"
12
17
  gap="0px"
13
18
  >
14
- <FSRow
15
- align="center-right"
16
- >
17
- <FSButton
18
- icon="mdi-close"
19
- variant="icon"
20
- @click="$emit('close')"
21
- />
22
- </FSRow>
23
- <FSCol
24
- align="center-center"
25
- padding="0px 24px"
26
- gap="12px"
27
- >
28
- <FSChip
29
- :prependIcon="$props.deviceConnectivity.icon"
30
- :color="$props.deviceConnectivity.color"
31
- :label="connectivityLabel($props.deviceConnectivity.status)"
32
- />
33
- <FSRow
34
- width="hug"
35
- >
36
- <FSText>
37
- {{ $tr("ui.shared.device-connectivity.last-message", "Last message") }}
38
- </FSText>
39
- </FSRow>
40
- </FSCol>
41
- </FSCol>
42
- <FSRow
43
- v-if="deviceTimestamp"
44
- padding="0px 24px"
45
- width="hug"
46
- >
47
- <FSSpan
48
- font="text-overline"
19
+ <FSText>
20
+ {{ $tr("ui.device.last-message-received", "Last message received") }}
21
+ </FSText>
22
+ <FSText
23
+ v-if="deviceTimestamp"
24
+ font="text-button"
25
+ :color="$props.deviceConnectivity.color"
26
+ variant="soft"
49
27
  >
50
28
  {{ deviceTimestamp }}
51
- </FSSpan>
52
- </FSRow>
29
+ </FSText>
30
+ </FSCol>
53
31
  </FSCol>
54
32
  </FSCard>
55
33
  </template>
@@ -62,24 +40,18 @@ import { useDateFormat } from "@dative-gpi/foundation-shared-services/composable
62
40
 
63
41
  import { connectivityLabel } from "../../utils";
64
42
 
65
- import FSButton from "../FSButton.vue";
66
43
  import FSCard from "../FSCard.vue";
67
44
  import FSChip from "../FSChip.vue";
68
45
  import FSText from "../FSText.vue";
69
- import FSSpan from "../FSSpan.vue";
70
46
  import FSCol from "../FSCol.vue";
71
- import FSRow from "../FSRow.vue";
72
47
 
73
48
  export default defineComponent({
74
49
  name: "FSConnectivityCard",
75
50
  components: {
76
- FSButton,
77
51
  FSCard,
78
52
  FSChip,
79
53
  FSText,
80
- FSSpan,
81
54
  FSCol,
82
- FSRow
83
55
  },
84
56
  props: {
85
57
  deviceConnectivity: {
package/components/deviceOrganisations/FSStatus.vue CHANGED
@@ -2,6 +2,7 @@
2
2
  <v-menu
3
3
  :closeOnContentClick="false"
4
4
  v-model="menu"
5
+ location="bottom center"
5
6
  >
6
7
  <template
7
8
  #activator="{ props }"
package/components/deviceOrganisations/FSStatusCard.vue CHANGED
@@ -1,68 +1,42 @@
1
1
  <template>
2
2
  <FSCard
3
- padding="2px 2px 8px 2px"
3
+ padding="12px 24px"
4
4
  :elevation="true"
5
- :border="false"
6
5
  >
7
6
  <FSCol
8
7
  align="center-center"
8
+ gap="12px"
9
9
  >
10
+ <FSChip
11
+ :prependIcon="$props.statusGroup.icon"
12
+ :color="$props.statusGroup.color"
13
+ :label="statusLabel"
14
+ />
10
15
  <FSCol
16
+ v-if="$props.statusGroup.value"
11
17
  align="center-center"
12
18
  gap="0px"
13
19
  >
14
- <FSRow
15
- v-if="$props.closable"
16
- align="center-right"
20
+ <FSText
21
+ v-if="$props.statusGroup.value && $props.modelStatus.groupById && $props.statusGroup.groupByValue"
17
22
  >
18
- <FSButton
19
- icon="mdi-close"
20
- variant="icon"
21
- @click="$emit('close')"
22
- />
23
- </FSRow>
24
- <FSCol
25
- align="center-center"
26
- padding="0px 24px"
27
- gap="12px"
23
+ {{ $props.modelStatus.groupByLabel }} {{ $props.statusGroup.groupByValue }}
24
+ </FSText>
25
+ <FSText
26
+ v-if="$props.statusGroup.value"
27
+ font="text-button"
28
+ :color="$props.statusGroup.color"
28
29
  >
29
- <FSChip
30
- :prependIcon="$props.statusGroup.icon"
31
- :color="$props.statusGroup.color"
32
- :label="statusLabel"
33
- />
34
- <FSRow
35
- v-if="$props.statusGroup.value"
36
- width="hug"
37
- >
38
- <FSText
39
- font="text-button"
40
- :color="$props.statusGroup.color"
41
- >
42
- {{ statusValue }} {{ $props.statusGroup.unit }}
43
- </FSText>
44
- </FSRow>
45
- <FSRow
46
- v-if="$props.statusGroup.value && $props.modelStatus.groupById && $props.statusGroup.groupByValue"
47
- width="hug"
48
- >
49
- <FSSpan>
50
- {{ $props.modelStatus.groupByLabel }} {{ $props.statusGroup.groupByValue }}
51
- </FSSpan>
52
- </FSRow>
53
- </FSCol>
30
+ {{ statusValue }} {{ $props.statusGroup.unit }}
31
+ </FSText>
54
32
  </FSCol>
55
- <FSRow
33
+ <FSText
56
34
  v-if="deviceTimestamp"
57
- padding="0px 24px"
58
- width="hug"
35
+ font="text-overline"
36
+ variant="soft"
59
37
  >
60
- <FSSpan
61
- font="text-overline"
62
- >
63
- {{ deviceTimestamp }}
64
- </FSSpan>
65
- </FSRow>
38
+ {{ deviceTimestamp }}
39
+ </FSText>
66
40
  </FSCol>
67
41
  </FSCard>
68
42
  </template>
@@ -73,24 +47,18 @@ import { computed, defineComponent, type PropType } from "vue";
73
47
  import type { FSDeviceStatusGroup, FSModelStatus } from "@dative-gpi/foundation-shared-components/models";
74
48
  import { useDateFormat } from "@dative-gpi/foundation-shared-services/composables";
75
49
 
76
- import FSButton from "../FSButton.vue";
77
50
  import FSCard from "../FSCard.vue";
78
51
  import FSChip from "../FSChip.vue";
79
52
  import FSText from "../FSText.vue";
80
- import FSSpan from "../FSSpan.vue";
81
53
  import FSCol from "../FSCol.vue";
82
- import FSRow from "../FSRow.vue";
83
54
 
84
55
  export default defineComponent({
85
56
  name: "FSStatusCard",
86
57
  components: {
87
- FSButton,
88
58
  FSCard,
89
59
  FSChip,
90
60
  FSText,
91
- FSSpan,
92
- FSCol,
93
- FSRow
61
+ FSCol
94
62
  },
95
63
  props: {
96
64
  closable: {
package/components/deviceOrganisations/FSWorstAlert.vue CHANGED
@@ -2,6 +2,7 @@
2
2
  <v-menu
3
3
  :closeOnContentClick="false"
4
4
  v-model="menu"
5
+ location="bottom center"
5
6
  >
6
7
  <template
7
8
  #activator="{ props }"
package/components/deviceOrganisations/FSWorstAlertCard.vue CHANGED
@@ -1,59 +1,42 @@
1
1
  <template>
2
2
  <FSCard
3
- padding="2px 2px 8px 2px"
3
+ padding="12px 24px"
4
4
  :elevation="true"
5
- :border="false"
6
5
  >
7
6
  <FSCol
8
7
  align="center-center"
8
+ gap="12px"
9
9
  >
10
+ <FSChip
11
+ :label="$tr('ui.common.alert', 'Alert')"
12
+ :prependIcon="statusIcon"
13
+ :color="criticityColor"
14
+ />
10
15
  <FSCol
11
16
  align="center-center"
12
17
  gap="0px"
13
18
  >
14
- <FSRow
15
- align="center-right"
16
- >
17
- <FSButton
18
- icon="mdi-close"
19
- variant="icon"
20
- @click="$emit('close')"
21
- />
22
- </FSRow>
23
- <FSCol
24
- align="center-center"
25
- padding="0px 24px"
26
- gap="12px"
19
+ <FSText>
20
+ {{ $tr('ui.alert.status', 'Status') }} : {{ statusLabel }}
21
+ </FSText>
22
+ <FSText
23
+ font="text-button"
24
+ :color="criticityColor"
27
25
  >
28
- <FSChip
29
- :label="$props.deviceAlert.label"
30
- :prependIcon="statusIcon"
31
- :color="criticityColor"
32
- />
33
- <FSRow
34
- width="hug"
35
- >
36
- <FSText>
37
- {{ statusLabel }}
38
- </FSText>
39
- </FSRow>
40
- </FSCol>
26
+ {{ $props.deviceAlert.label }}
27
+ </FSText>
41
28
  </FSCol>
42
- <FSRow
29
+ <FSText
43
30
  v-if="deviceTimestamp"
44
- padding="0px 24px"
45
- width="hug"
31
+ font="text-overline"
32
+ variant="dark"
46
33
  >
47
- <FSSpan
48
- font="text-overline"
49
- >
50
- {{ deviceTimestamp }}
51
- </FSSpan>
52
- </FSRow>
34
+ {{ deviceTimestamp }}
35
+ </FSText>
53
36
  <FSButton
54
37
  v-if="$props.alertTo"
55
38
  icon="mdi-information-outline"
56
- :label="$tr('ui.shared.device-alert.view-alert', 'View alert')"
39
+ :label="$tr('ui.alert.details', 'Alert details')"
57
40
  :to="$props.alertTo($props.deviceAlert.id)"
58
41
  />
59
42
  </FSCol>
@@ -73,9 +56,7 @@ import FSButton from "../FSButton.vue";
73
56
  import FSCard from "../FSCard.vue";
74
57
  import FSChip from "../FSChip.vue";
75
58
  import FSText from "../FSText.vue";
76
- import FSSpan from "../FSSpan.vue";
77
59
  import FSCol from "../FSCol.vue";
78
- import FSRow from "../FSRow.vue";
79
60
 
80
61
  export default defineComponent({
81
62
  name: "FSWorstAlertCard",
@@ -84,9 +65,7 @@ export default defineComponent({
84
65
  FSCard,
85
66
  FSChip,
86
67
  FSText,
87
- FSSpan,
88
68
  FSCol,
89
- FSRow
90
69
  },
91
70
  props: {
92
71
  deviceAlert: {
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@dative-gpi/foundation-shared-components",
3
3
  "sideEffects": false,
4
- "version": "1.0.61",
4
+ "version": "1.0.62",
5
5
  "description": "",
6
6
  "publishConfig": {
7
7
  "access": "public"
@@ -10,8 +10,8 @@
10
10
  "author": "",
11
11
  "license": "ISC",
12
12
  "dependencies": {
13
- "@dative-gpi/foundation-shared-domain": "1.0.61",
14
- "@dative-gpi/foundation-shared-services": "1.0.61"
13
+ "@dative-gpi/foundation-shared-domain": "1.0.62",
14
+ "@dative-gpi/foundation-shared-services": "1.0.62"
15
15
  },
16
16
  "peerDependencies": {
17
17
  "@dative-gpi/bones-ui": "^0.0.75",
@@ -35,5 +35,5 @@
35
35
  "sass": "1.71.1",
36
36
  "sass-loader": "13.3.2"
37
37
  },
38
- "gitHead": "764e769b8eeb942d5028c00c479333be5907f4de"
38
+ "gitHead": "aebca5afe970e1d7117b5515abba742a6c96fa3a"
39
39
  }