@dative-gpi/foundation-core-components 1.0.114-refacto-alert-list → 1.0.115
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/explorers/FSBaseDevicesExplorer.vue +12 -4
- package/components/lists/alerts/FSBaseAlertsList.vue +1 -1
- package/components/lists/chartOrganisationTypes/FSBaseChartOrganisationTypesList.vue +2 -0
- package/components/lists/chartOrganisations/FSBaseChartOrganisationsList.vue +2 -1
- package/package.json +7 -7
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
:itemTo="$props.itemTo"
|
|
10
10
|
:noSearch="true"
|
|
11
11
|
:modelValue="$props.modelValue"
|
|
12
|
-
@update:modelValue="
|
|
12
|
+
@update:modelValue="onUpdate"
|
|
13
13
|
v-model:search="search"
|
|
14
14
|
v-bind="$attrs"
|
|
15
15
|
>
|
|
@@ -227,8 +227,8 @@ export default defineComponent({
|
|
|
227
227
|
required: false
|
|
228
228
|
}
|
|
229
229
|
},
|
|
230
|
-
emits: ["update:modelValue"],
|
|
231
|
-
setup(props) {
|
|
230
|
+
emits: ["update:modelValue", "update:types"],
|
|
231
|
+
setup(props, { emit }) {
|
|
232
232
|
const { entities, fetching: fetchingDeviceExplorerElements, getMany: getManyDeviceExplorerElements } = useDeviceExplorerElements();
|
|
233
233
|
const { debounce } = useDebounce();
|
|
234
234
|
|
|
@@ -248,6 +248,13 @@ export default defineComponent({
|
|
|
248
248
|
return props.modelValue.includes(id);
|
|
249
249
|
};
|
|
250
250
|
|
|
251
|
+
const onUpdate = (value: string[]): void => {
|
|
252
|
+
const types = value.map(id => entities.value.find(dee => dee.id === id)?.type);
|
|
253
|
+
emit("update:types", types);
|
|
254
|
+
|
|
255
|
+
emit("update:modelValue", value);
|
|
256
|
+
}
|
|
257
|
+
|
|
251
258
|
const fetch = () => {
|
|
252
259
|
getManyDeviceExplorerElements({ ...props.deviceExplorerElementFilters, search: search.value });
|
|
253
260
|
}
|
|
@@ -273,7 +280,8 @@ export default defineComponent({
|
|
|
273
280
|
deviceExplorerElements,
|
|
274
281
|
ConnectivityStatus,
|
|
275
282
|
search,
|
|
276
|
-
isSelected
|
|
283
|
+
isSelected,
|
|
284
|
+
onUpdate
|
|
277
285
|
};
|
|
278
286
|
}
|
|
279
287
|
});
|
|
@@ -315,7 +315,7 @@ export default defineComponent({
|
|
|
315
315
|
getManyAlerts({
|
|
316
316
|
...props.alertFilters,
|
|
317
317
|
statuses: props.hidePending ?
|
|
318
|
-
[AlertStatus.Unresolved, AlertStatus.Resolved, AlertStatus.Triggered] : props.alertFilters
|
|
318
|
+
[AlertStatus.Unresolved, AlertStatus.Resolved, AlertStatus.Triggered] : props.alertFilters?.statuses
|
|
319
319
|
}); // TODO, gérer les conditions pour que les alertes s'affichent ici notamment lorsqu'elles sont acquittées
|
|
320
320
|
// la FilterFactory gère pas ces conditions correctement
|
|
321
321
|
}
|
|
@@ -107,6 +107,7 @@ import { useChartOrganisationTypes } from "@dative-gpi/foundation-core-services/
|
|
|
107
107
|
import FSChartTileUI from "@dative-gpi/foundation-shared-components/components/tiles/FSChartTileUI.vue";
|
|
108
108
|
import FSTagGroup from "@dative-gpi/foundation-shared-components/components/FSTagGroup.vue";
|
|
109
109
|
import FSImage from "@dative-gpi/foundation-shared-components/components/FSImage.vue";
|
|
110
|
+
import FSText from "@dative-gpi/foundation-shared-components/components/FSText.vue";
|
|
110
111
|
import FSIcon from "@dative-gpi/foundation-shared-components/components/FSIcon.vue";
|
|
111
112
|
import FSRow from "@dative-gpi/foundation-shared-components/components/FSRow.vue";
|
|
112
113
|
|
|
@@ -120,6 +121,7 @@ export default defineComponent({
|
|
|
120
121
|
FSTagGroup,
|
|
121
122
|
FSImage,
|
|
122
123
|
FSIcon,
|
|
124
|
+
FSText,
|
|
123
125
|
FSRow
|
|
124
126
|
},
|
|
125
127
|
props: {
|
|
@@ -105,6 +105,7 @@ import type { ChartModelLabel, ChartOrganisationFilters, ChartOrganisationInfos
|
|
|
105
105
|
import { useChartOrganisations } from "@dative-gpi/foundation-core-services/composables";
|
|
106
106
|
|
|
107
107
|
import FSRow from "@dative-gpi/foundation-shared-components/components/FSRow.vue";
|
|
108
|
+
import FSText from "@dative-gpi/foundation-shared-components/components/FSText.vue";
|
|
108
109
|
import FSIcon from "@dative-gpi/foundation-shared-components/components/FSIcon.vue";
|
|
109
110
|
import FSImage from "@dative-gpi/foundation-shared-components/components/FSImage.vue";
|
|
110
111
|
import FSTagGroup from "@dative-gpi/foundation-shared-components/components/FSTagGroup.vue";
|
|
@@ -112,7 +113,6 @@ import FSChartTileUI from "@dative-gpi/foundation-shared-components/components/t
|
|
|
112
113
|
|
|
113
114
|
import FSDataTable from "../FSDataTable.vue";
|
|
114
115
|
|
|
115
|
-
|
|
116
116
|
export default defineComponent({
|
|
117
117
|
name: "FSBaseChartOrganisationsList",
|
|
118
118
|
components: {
|
|
@@ -121,6 +121,7 @@ export default defineComponent({
|
|
|
121
121
|
FSTagGroup,
|
|
122
122
|
FSImage,
|
|
123
123
|
FSIcon,
|
|
124
|
+
FSText,
|
|
124
125
|
FSRow,
|
|
125
126
|
},
|
|
126
127
|
props: {
|
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.115",
|
|
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.115",
|
|
14
|
+
"@dative-gpi/foundation-core-services": "1.0.115",
|
|
15
|
+
"@dative-gpi/foundation-shared-components": "1.0.115",
|
|
16
|
+
"@dative-gpi/foundation-shared-domain": "1.0.115",
|
|
17
|
+
"@dative-gpi/foundation-shared-services": "1.0.115"
|
|
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": "0ff354e450d124ae789dcca1d4e08d76b927ed22"
|
|
30
30
|
}
|