@dative-gpi/foundation-core-components 1.0.142 → 1.0.143-onboarding
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.
- package/components/entities/FSEntityField.vue +2 -1
- package/components/entities/FSSelectEntitiesList.vue +2 -1
- package/components/explorers/FSBaseDevicesExplorer.vue +1 -1
- package/components/lists/alerts/FSBaseAlertsList.vue +15 -16
- package/components/lists/chartOrganisationTypes/FSBaseChartOrganisationTypesList.vue +4 -2
- package/components/lists/chartOrganisations/FSBaseChartOrganisationsList.vue +4 -2
- package/components/lists/charts/FSBaseChartsList.vue +3 -2
- package/components/lists/dashboards/FSSimpleDashboardsList.vue +1 -1
- package/components/lists/deviceOrganisations/FSBaseDeviceOrganisationsList.vue +1 -1
- package/components/lists/groups/FSBaseGroupsList.vue +1 -1
- package/components/lists/roleOrganisationTypes/FSBaseRoleOrganisationTypesList.vue +1 -1
- package/components/lists/roleOrganisations/FSBaseRoleOrganisationsList.vue +1 -1
- package/components/lists/scenarioOrganisationTypes/FSBaseScenarioOrganisationTypesList.vue +1 -1
- package/components/lists/scenarioOrganisations/FSBaseScenarioOrganisationsList.vue +1 -1
- package/components/lists/serviceAccountOrganisations/FSBaseServiceAccountOrganisationsList.vue +1 -1
- package/components/lists/serviceAccountRoleOrganisations/FSBaseServiceAccountRoleOrganisationsList.vue +1 -1
- package/components/lists/userOrganisations/FSBaseUserOrganisationsList.vue +1 -1
- package/components/tiles/FSChartTile.vue +1 -0
- package/components/tiles/FSModelTile.vue +64 -0
- package/package.json +7 -7
|
@@ -139,7 +139,8 @@ export default defineComponent({
|
|
|
139
139
|
case EntityType.Dashboard:
|
|
140
140
|
return {
|
|
141
141
|
dashboardOrganisationsIds: props.modelValue,
|
|
142
|
-
dashboardOrganisationTypesIds: props.modelValue
|
|
142
|
+
dashboardOrganisationTypesIds: props.modelValue,
|
|
143
|
+
dashboardShallowsIds: props.modelValue
|
|
143
144
|
} satisfies DashboardOrganisationFilters & DashboardOrganisationTypeFilters;
|
|
144
145
|
case EntityType.Group:
|
|
145
146
|
return {
|
|
@@ -114,7 +114,8 @@ export default defineComponent({
|
|
|
114
114
|
case EntityType.Dashboard:
|
|
115
115
|
return {
|
|
116
116
|
dashboardOrganisationsIds: props.modelValue,
|
|
117
|
-
dashboardOrganisationTypesIds: props.modelValue
|
|
117
|
+
dashboardOrganisationTypesIds: props.modelValue,
|
|
118
|
+
dashboardShallowsIds: props.modelValue
|
|
118
119
|
} satisfies DashboardOrganisationFilters & DashboardOrganisationTypeFilters;
|
|
119
120
|
case EntityType.Group:
|
|
120
121
|
return {
|
|
@@ -196,6 +196,15 @@
|
|
|
196
196
|
{{ epochToShortTimeFormat(item.currentProcessedTimestamp) }}
|
|
197
197
|
</FSSpan>
|
|
198
198
|
</template>
|
|
199
|
+
<template
|
|
200
|
+
#item.currentStatus="{ item }"
|
|
201
|
+
>
|
|
202
|
+
<FSSpan
|
|
203
|
+
font="text-overline"
|
|
204
|
+
>
|
|
205
|
+
{{ AlertTools.statusLabel(item.currentStatus) }}
|
|
206
|
+
</FSSpan>
|
|
207
|
+
</template>
|
|
199
208
|
<template
|
|
200
209
|
#item.tile="{ item, toggleSelect }"
|
|
201
210
|
>
|
|
@@ -316,23 +325,13 @@ export default defineComponent({
|
|
|
316
325
|
});
|
|
317
326
|
});
|
|
318
327
|
|
|
319
|
-
watch(() =>
|
|
328
|
+
watch([() => props.alertFilters, () => props.notAcknowledged, () => props.hidePending], (next, previous) => {
|
|
320
329
|
if (!_.isEqual(next, previous)) {
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
});
|
|
327
|
-
}
|
|
328
|
-
else{
|
|
329
|
-
getManyAlerts({
|
|
330
|
-
...props.alertFilters,
|
|
331
|
-
statuses: props.hidePending ?
|
|
332
|
-
[AlertStatus.Unresolved, AlertStatus.Resolved, AlertStatus.Triggered] : props.alertFilters?.statuses
|
|
333
|
-
}); // TODO, gérer les conditions pour que les alertes s'affichent ici notamment lorsqu'elles sont acquittées
|
|
334
|
-
// la FilterFactory gère pas ces conditions correctement
|
|
335
|
-
}
|
|
330
|
+
getManyAlerts({
|
|
331
|
+
...props.alertFilters,
|
|
332
|
+
acknowledged: props.notAcknowledged ? false : undefined,
|
|
333
|
+
statuses: props.hidePending ? [AlertStatus.Unresolved, AlertStatus.Triggered, AlertStatus.Resolved, AlertStatus.Untriggered, AlertStatus.Abandoned] : undefined
|
|
334
|
+
});
|
|
336
335
|
}
|
|
337
336
|
}, { immediate: true });
|
|
338
337
|
|
|
@@ -51,8 +51,8 @@
|
|
|
51
51
|
>
|
|
52
52
|
<FSTagGroup
|
|
53
53
|
variant="slide"
|
|
54
|
-
:disabled="true"
|
|
55
54
|
:tags="item.tags"
|
|
55
|
+
:showRemove="false"
|
|
56
56
|
/>
|
|
57
57
|
</template>
|
|
58
58
|
<template
|
|
@@ -73,8 +73,9 @@
|
|
|
73
73
|
#item.modelsLabels="{ item }"
|
|
74
74
|
>
|
|
75
75
|
<FSTagGroup
|
|
76
|
-
|
|
76
|
+
variant="slide"
|
|
77
77
|
:tags="item.modelsLabels.map((d: any) => d.label)"
|
|
78
|
+
:showRemove="false"
|
|
78
79
|
/>
|
|
79
80
|
</template>
|
|
80
81
|
<template
|
|
@@ -86,6 +87,7 @@
|
|
|
86
87
|
:singleSelect="$props.singleSelect"
|
|
87
88
|
:selectable="$props.selectable"
|
|
88
89
|
:icon="item.icon"
|
|
90
|
+
:scope="item.scope"
|
|
89
91
|
:imageId="item.imageId"
|
|
90
92
|
:type="item.chartType"
|
|
91
93
|
:modelValue="isSelected(item.id)"
|
|
@@ -51,16 +51,17 @@
|
|
|
51
51
|
>
|
|
52
52
|
<FSTagGroup
|
|
53
53
|
variant="slide"
|
|
54
|
-
:disabled="true"
|
|
55
54
|
:tags="item.tags"
|
|
55
|
+
:showRemove="false"
|
|
56
56
|
/>
|
|
57
57
|
</template>
|
|
58
58
|
<template
|
|
59
59
|
#item.modelsLabels="{ item }"
|
|
60
60
|
>
|
|
61
61
|
<FSTagGroup
|
|
62
|
-
|
|
62
|
+
variant="slide"
|
|
63
63
|
:tags="item.modelsLabels.map((d: any) => d.label)"
|
|
64
|
+
:showRemove="false"
|
|
64
65
|
/>
|
|
65
66
|
</template>
|
|
66
67
|
<template
|
|
@@ -88,6 +89,7 @@
|
|
|
88
89
|
:icon="item.icon"
|
|
89
90
|
:imageId="item.imageId"
|
|
90
91
|
:type="item.chartType"
|
|
92
|
+
:scope="item.scope"
|
|
91
93
|
:modelValue="isSelected(item.id)"
|
|
92
94
|
@update:modelValue="toggleSelect(item)"
|
|
93
95
|
:to="$props.itemTo && $props.itemTo(item)"
|
|
@@ -50,7 +50,7 @@
|
|
|
50
50
|
>
|
|
51
51
|
<FSTagGroup
|
|
52
52
|
variant="slide"
|
|
53
|
-
:
|
|
53
|
+
:showRemove="false"
|
|
54
54
|
:tags="item.tags"
|
|
55
55
|
/>
|
|
56
56
|
</template>
|
|
@@ -72,7 +72,7 @@
|
|
|
72
72
|
#item.modelsLabels="{ item }"
|
|
73
73
|
>
|
|
74
74
|
<FSTagGroup
|
|
75
|
-
:
|
|
75
|
+
:showRemove="false"
|
|
76
76
|
:tags="item.modelsLabels.map((d: any) => d.label)"
|
|
77
77
|
/>
|
|
78
78
|
</template>
|
|
@@ -85,6 +85,7 @@
|
|
|
85
85
|
:icon="item.icon"
|
|
86
86
|
:imageId="item.imageId"
|
|
87
87
|
:type="item.chartType"
|
|
88
|
+
:scope="item.scope"
|
|
88
89
|
:singleSelect="$props.singleSelect"
|
|
89
90
|
:selectable="$props.selectable"
|
|
90
91
|
:modelValue="isSelected(item.id)"
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
<template>
|
|
2
|
+
<FSLoadTile
|
|
3
|
+
v-if="getting"
|
|
4
|
+
:selectable="$props.selectable"
|
|
5
|
+
:modelValue="modelValue"
|
|
6
|
+
@update:modelValue="(value) => $emit('update:modelValue', value)"
|
|
7
|
+
/>
|
|
8
|
+
<FSModelTileUI
|
|
9
|
+
v-else-if="entity"
|
|
10
|
+
:imageId="entity.imageId"
|
|
11
|
+
:label="entity.label"
|
|
12
|
+
:code="entity.code"
|
|
13
|
+
:selectable="$props.selectable"
|
|
14
|
+
:modelValue="modelValue"
|
|
15
|
+
@update:modelValue="(value) => $emit('update:modelValue', value)"
|
|
16
|
+
v-bind="$attrs"
|
|
17
|
+
/>
|
|
18
|
+
</template>
|
|
19
|
+
|
|
20
|
+
<script lang="ts">
|
|
21
|
+
import { defineComponent, watch } from "vue";
|
|
22
|
+
|
|
23
|
+
import { useModel } from "@dative-gpi/foundation-core-services/composables";
|
|
24
|
+
|
|
25
|
+
import FSModelTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSModelTileUI.vue";
|
|
26
|
+
import FSLoadTile from "@dative-gpi/foundation-shared-components/components/tiles/FSLoadTile.vue";
|
|
27
|
+
|
|
28
|
+
export default defineComponent({
|
|
29
|
+
name: "FSModelTile",
|
|
30
|
+
components: {
|
|
31
|
+
FSModelTileUI,
|
|
32
|
+
FSLoadTile
|
|
33
|
+
},
|
|
34
|
+
props: {
|
|
35
|
+
modelId: {
|
|
36
|
+
type: String,
|
|
37
|
+
required: true
|
|
38
|
+
},
|
|
39
|
+
modelValue: {
|
|
40
|
+
type: Boolean,
|
|
41
|
+
required: false,
|
|
42
|
+
default: false
|
|
43
|
+
},
|
|
44
|
+
selectable: {
|
|
45
|
+
type: Boolean,
|
|
46
|
+
required: false,
|
|
47
|
+
default: true
|
|
48
|
+
}
|
|
49
|
+
},
|
|
50
|
+
emits: ['update:modelValue'],
|
|
51
|
+
setup(props) {
|
|
52
|
+
const { get, getting, entity } = useModel();
|
|
53
|
+
|
|
54
|
+
watch(() => props.modelId, () => {
|
|
55
|
+
get(props.modelId);
|
|
56
|
+
}, { immediate: true });
|
|
57
|
+
|
|
58
|
+
return {
|
|
59
|
+
getting,
|
|
60
|
+
entity
|
|
61
|
+
};
|
|
62
|
+
}
|
|
63
|
+
});
|
|
64
|
+
</script>
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dative-gpi/foundation-core-components",
|
|
3
3
|
"sideEffects": false,
|
|
4
|
-
"version": "1.0.
|
|
4
|
+
"version": "1.0.143-onboarding",
|
|
5
5
|
"description": "",
|
|
6
6
|
"publishConfig": {
|
|
7
7
|
"access": "public"
|
|
@@ -10,11 +10,11 @@
|
|
|
10
10
|
"author": "",
|
|
11
11
|
"license": "ISC",
|
|
12
12
|
"dependencies": {
|
|
13
|
-
"@dative-gpi/foundation-core-domain": "1.0.
|
|
14
|
-
"@dative-gpi/foundation-core-services": "1.0.
|
|
15
|
-
"@dative-gpi/foundation-shared-components": "1.0.
|
|
16
|
-
"@dative-gpi/foundation-shared-domain": "1.0.
|
|
17
|
-
"@dative-gpi/foundation-shared-services": "1.0.
|
|
13
|
+
"@dative-gpi/foundation-core-domain": "1.0.143-onboarding",
|
|
14
|
+
"@dative-gpi/foundation-core-services": "1.0.143-onboarding",
|
|
15
|
+
"@dative-gpi/foundation-shared-components": "1.0.143-onboarding",
|
|
16
|
+
"@dative-gpi/foundation-shared-domain": "1.0.143-onboarding",
|
|
17
|
+
"@dative-gpi/foundation-shared-services": "1.0.143-onboarding"
|
|
18
18
|
},
|
|
19
19
|
"peerDependencies": {
|
|
20
20
|
"@dative-gpi/bones-ui": "^1.0.0",
|
|
@@ -26,5 +26,5 @@
|
|
|
26
26
|
"sass": "1.71.1",
|
|
27
27
|
"sass-loader": "13.3.2"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "44c75a707aeddf8826add43b55f4971b91046b70"
|
|
30
30
|
}
|