Skip to content

Commit 1349566

Browse files
author
Maximilian
committed
refactored Events code in the components that have graphics + make form field use us-required class instead of required, so that only the star turns red and not the placeholders
1 parent 25bb7fe commit 1349566

6 files changed

Lines changed: 134 additions & 142 deletions

File tree

‎opensilex-front/front/src/components/common/forms/FormField.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<template>
2-
<div class="form-field" :class="{ required }">
2+
<div class="form-field" :class="{ 'is-required': required }">
33
<div class="helperAndBlueStar">
44
<FormInputLabelHelper
55
v-if="label"
@@ -55,7 +55,7 @@ onBeforeMount(() => {
5555
color: black;
5656
}
5757
58-
.form-field.required :deep(label.form-label)::after {
58+
.form-field.is-required :deep(label.form-label)::after {
5959
content: ' *';
6060
color: #dc3545;
6161
margin-left: .25rem;

‎opensilex-front/front/src/components/devices/DeviceVisualizationTab.vue‎

Lines changed: 16 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,13 @@
6262
</n-form-item>
6363

6464
<!-- Events -->
65-
<n-form-item :label="t('DataVisualisation.showEvents')" class="compact-form-item">
66-
<n-switch v-model:value="filter.showEvents"></n-switch>
67-
<n-spin v-if="eventsCountLoading" :size="14" class="eventsCount"></n-spin>
68-
<n-badge v-else :value="eventsCount" :show-zero="true" type="info" class="eventsCount"></n-badge>
69-
</n-form-item>
65+
<DataVisuEventsSwitch
66+
ref="eventsSwitch"
67+
v-model="filter.showEvents"
68+
:targets="[device]"
69+
:startDate="filter.start_date"
70+
:endDate="filter.end_date"
71+
></DataVisuEventsSwitch>
7072

7173
<!-- Advanced search -->
7274
<n-collapse :accordion="false" class="advancedFiltersSearch">
@@ -107,9 +109,9 @@
107109
</template>
108110

109111
<script setup lang="ts">
110-
import {computed, ComputedRef, inject, onMounted, ref, Ref, watch} from "vue";
112+
import {computed, ComputedRef, inject, ref, Ref, useTemplateRef} from "vue";
111113
import {useI18n} from "vue-i18n";
112-
import {NBadge, NCollapse, NCollapseItem, NForm, NFormItem, NLayout, NLayoutContent, NSpin, NSwitch} from "naive-ui";
114+
import {NCollapse, NCollapseItem, NForm, NFormItem, NLayout, NLayoutContent, NSpin} from "naive-ui";
113115
import {VariableDetailsDTO} from "opensilex-core/index";
114116
import OpenSilexVuePlugin from "@/models/OpenSilexVuePlugin";
115117
import PageContent from "@/components/layout/PageContent.vue";
@@ -120,6 +122,7 @@ import ModalFormSelector from "@/components/variables/form/ModalFormSelector.vue
120122
import DateTimeForm from "@/components/common/forms/DateTimeForm.vue";
121123
import DataProvenanceSelector from "@/components/data/DataProvenanceSelector.vue";
122124
import DataVisuGraphic from "@/components/visualization/DataVisuGraphic.vue";
125+
import DataVisuEventsSwitch from "@/components/visualization/DataVisuEventsSwitch.vue";
123126
import type {DataVisuEvent, DataVisuSerie} from "@/components/visualization/DataVisuTypes";
124127
import {ScientificObjectFilter} from "@/components/scientificObjects/ScientificObjectList.vue";
125128
import useDataVisualisation, {
@@ -162,7 +165,11 @@ const props = defineProps<{
162165
//#region Plugins & services
163166
const $opensilex: OpenSilexVuePlugin = inject<OpenSilexVuePlugin>("$opensilex")!;
164167
const {t} = useI18n();
165-
const {getNumericVariables, loadDataSeries, loadEvents, countEvents, splitSeriesByTarget} = useDataVisualisation();
168+
const {getNumericVariables, loadDataSeries, loadEvents, splitSeriesByTarget} = useDataVisualisation();
169+
//#endregion
170+
171+
//#region Template refs
172+
const eventsSwitch = useTemplateRef<InstanceType<typeof DataVisuEventsSwitch>>("eventsSwitch");
166173
//#endregion
167174
168175
//#region Data & Computed
@@ -177,9 +184,6 @@ const loading: Ref<boolean> = ref<boolean>(false);
177184
const series: Ref<DataVisuSerie[]> = ref<DataVisuSerie[]>([]);
178185
const yAxisNames: Ref<string[]> = ref<string[]>([]);
179186
const events: Ref<DataVisuEvent[]> = ref<DataVisuEvent[]>([]);
180-
/** Number of events of the device between the selected dates, displayed next to the switch */
181-
const eventsCount: Ref<number> = ref<number>(0);
182-
const eventsCountLoading: Ref<boolean> = ref<boolean>(false);
183187
184188
const activeFiltersCount: ComputedRef<number> = computed<number>(() => {
185189
const f: VisualisationFilter = filter.value;
@@ -189,21 +193,13 @@ const activeFiltersCount: ComputedRef<number> = computed<number>(() => {
189193
});
190194
//#endregion
191195
192-
//#region Hooks & watchers
193-
onMounted(() => {
194-
refreshEventsCount();
195-
});
196-
197-
watch(() => [filter.value.start_date, filter.value.end_date], refreshEventsCount);
198-
//#endregion
199-
200196
//#region Event handlers
201197
/**
202198
* An event was created from the menu of a data point: the count is refreshed, and the graphic too if it displays the
203199
* events
204200
*/
205201
function onGraphicEventCreated(): void {
206-
refreshEventsCount();
202+
eventsSwitch.value?.refresh();
207203
if (filter.value.showEvents) {
208204
onSearch();
209205
}
@@ -302,18 +298,6 @@ async function loadDeviceEvents(): Promise<DataVisuEvent[]> {
302298
seriesName: t("DataVisualisation.events")
303299
}]));
304300
}
305-
306-
async function refreshEventsCount(): Promise<void> {
307-
const f: VisualisationFilter = filter.value;
308-
eventsCountLoading.value = true;
309-
try {
310-
eventsCount.value = await countEvents([props.device], f.start_date, f.end_date);
311-
} catch (error) {
312-
$opensilex.errorHandler(error);
313-
} finally {
314-
eventsCountLoading.value = false;
315-
}
316-
}
317301
//#endregion
318302
//#endregion
319303
</script>
@@ -336,8 +320,4 @@ async function refreshEventsCount(): Promise<void> {
336320
.advancedFiltersSearch {
337321
margin-top: 10px;
338322
}
339-
340-
.eventsCount {
341-
margin-left: 8px;
342-
}
343323
</style>

‎opensilex-front/front/src/components/experiments/views/ExperimentDataVisualisationView.vue‎

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,13 @@
6363
</n-form-item>
6464

6565
<!-- Events -->
66-
<n-form-item :label="t('DataVisualisation.showEvents')" class="compact-form-item">
67-
<n-switch v-model:value="filter.showEvents"></n-switch>
68-
<n-spin v-if="eventsCountLoading" :size="14" class="eventsCount"></n-spin>
69-
<n-badge v-else :value="eventsCount" :show-zero="true" type="info" class="eventsCount"></n-badge>
70-
</n-form-item>
66+
<DataVisuEventsSwitch
67+
ref="eventsSwitch"
68+
v-model="filter.showEvents"
69+
:targets="filter.scientificObjects"
70+
:startDate="filter.start_date"
71+
:endDate="filter.end_date"
72+
></DataVisuEventsSwitch>
7173

7274
<!-- Advanced search -->
7375
<n-collapse :accordion="false" class="advancedFiltersSearch">
@@ -121,10 +123,10 @@
121123
</template>
122124

123125
<script setup lang="ts">
124-
import {computed, ComputedRef, inject, onMounted, ref, Ref, useTemplateRef, watch} from "vue";
126+
import {computed, ComputedRef, inject, onMounted, ref, Ref, useTemplateRef} from "vue";
125127
import {useI18n} from "vue-i18n";
126128
import {useRoute} from "vue-router";
127-
import {NBadge, NCollapse, NCollapseItem, NForm, NFormItem, NLayout, NLayoutContent, NSpin, NSwitch} from "naive-ui";
129+
import {NCollapse, NCollapseItem, NForm, NFormItem, NLayout, NLayoutContent, NSpin} from "naive-ui";
128130
import {ExperimentsService, VariableDetailsDTO} from "opensilex-core/index";
129131
import OpenSilexVuePlugin from "@/models/OpenSilexVuePlugin";
130132
import PageContent from "@/components/layout/PageContent.vue";
@@ -135,6 +137,7 @@ import VariableSelectorWithFilter from "@/components/variables/views/VariableSel
135137
import DateTimeForm from "@/components/common/forms/DateTimeForm.vue";
136138
import DataProvenanceSelector from "@/components/data/DataProvenanceSelector.vue";
137139
import DataVisuGraphic from "@/components/visualization/DataVisuGraphic.vue";
140+
import DataVisuEventsSwitch from "@/components/visualization/DataVisuEventsSwitch.vue";
138141
import type {DataVisuEvent, DataVisuSerie} from "@/components/visualization/DataVisuTypes";
139142
import VisuImagePanel from "@/components/visualization/VisuImagePanel.vue";
140143
import {ScientificObjectFilter} from "@/components/scientificObjects/ScientificObjectList.vue";
@@ -175,12 +178,13 @@ const props = defineProps<{
175178
const $opensilex: OpenSilexVuePlugin = inject<OpenSilexVuePlugin>("$opensilex")!;
176179
const {t} = useI18n();
177180
const route = useRoute();
178-
const {getNumericVariables, loadDataSeries, loadEvents, countEvents} = useDataVisualisation();
181+
const {getNumericVariables, loadDataSeries, loadEvents} = useDataVisualisation();
179182
180183
const experimentsService: ExperimentsService = $opensilex.getService<ExperimentsService>("opensilex.ExperimentsService");
181184
//#endregion
182185
183186
//#region Template refs
187+
const eventsSwitch = useTemplateRef<InstanceType<typeof DataVisuEventsSwitch>>("eventsSwitch");
184188
const imagePanel = useTemplateRef<InstanceType<typeof VisuImagePanel>>("imagePanel");
185189
//#endregion
186190
@@ -210,9 +214,6 @@ const loading: Ref<boolean> = ref<boolean>(false);
210214
const series: Ref<DataVisuSerie[]> = ref<DataVisuSerie[]>([]);
211215
const yAxisNames: Ref<string[]> = ref<string[]>([]);
212216
const events: Ref<DataVisuEvent[]> = ref<DataVisuEvent[]>([]);
213-
/** Number of events of the selected scientific objects between the selected dates, displayed next to the switch */
214-
const eventsCount: Ref<number> = ref<number>(0);
215-
const eventsCountLoading: Ref<boolean> = ref<boolean>(false);
216217
217218
const activeFiltersCount: ComputedRef<number> = computed<number>(() => {
218219
const f: VisualisationFilter = filter.value;
@@ -226,11 +227,6 @@ const activeFiltersCount: ComputedRef<number> = computed<number>(() => {
226227
onMounted(() => {
227228
initDefaultDates();
228229
});
229-
230-
watch(
231-
() => [filter.value.scientificObjects, filter.value.start_date, filter.value.end_date],
232-
refreshEventsCount
233-
);
234230
//#endregion
235231
236232
//#region Event handlers
@@ -239,7 +235,7 @@ watch(
239235
* events
240236
*/
241237
function onGraphicEventCreated(): void {
242-
refreshEventsCount();
238+
eventsSwitch.value?.refresh();
243239
if (filter.value.showEvents) {
244240
onSearch();
245241
}
@@ -365,18 +361,6 @@ function buildEventsRequests(scientificObjects: string[]): EventsRequest[] {
365361
color: getScientificObjectColor(soIndex)
366362
}));
367363
}
368-
369-
async function refreshEventsCount(): Promise<void> {
370-
const f: VisualisationFilter = filter.value;
371-
eventsCountLoading.value = true;
372-
try {
373-
eventsCount.value = await countEvents(f.scientificObjects, f.start_date, f.end_date);
374-
} catch (error) {
375-
$opensilex.errorHandler(error);
376-
} finally {
377-
eventsCountLoading.value = false;
378-
}
379-
}
380364
//#endregion
381365
//#endregion
382366
</script>
@@ -399,8 +383,4 @@ async function refreshEventsCount(): Promise<void> {
399383
.advancedFiltersSearch {
400384
margin-top: 10px;
401385
}
402-
403-
.eventsCount {
404-
margin-left: 8px;
405-
}
406386
</style>

‎opensilex-front/front/src/components/scientificObjects/scientificObjectDetailTabs/ScientificObjectVisualizationTab.vue‎

Lines changed: 13 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,13 @@
4545
</n-form-item>
4646

4747
<!-- Events -->
48-
<n-form-item :label="t('DataVisualisation.showEvents')" class="compact-form-item">
49-
<n-switch v-model:value="filter.showEvents"></n-switch>
50-
<n-spin v-if="eventsCountLoading" :size="14" class="eventsCount"></n-spin>
51-
<n-badge v-else :value="eventsCount" :show-zero="true" type="info" class="eventsCount"></n-badge>
52-
</n-form-item>
48+
<DataVisuEventsSwitch
49+
ref="eventsSwitch"
50+
v-model="filter.showEvents"
51+
:targets="[scientificObject.uri]"
52+
:startDate="filter.start_date"
53+
:endDate="filter.end_date"
54+
></DataVisuEventsSwitch>
5355

5456
<!-- Advanced search -->
5557
<n-collapse :accordion="false" class="advancedFiltersSearch">
@@ -101,9 +103,9 @@
101103
</template>
102104

103105
<script setup lang="ts">
104-
import {computed, ComputedRef, inject, onMounted, ref, Ref, useTemplateRef, watch} from "vue";
106+
import {computed, ComputedRef, inject, ref, Ref, useTemplateRef} from "vue";
105107
import {useI18n} from "vue-i18n";
106-
import {NBadge, NCollapse, NCollapseItem, NForm, NFormItem, NLayout, NLayoutContent, NSpin, NSwitch} from "naive-ui";
108+
import {NCollapse, NCollapseItem, NForm, NFormItem, NLayout, NLayoutContent, NSpin} from "naive-ui";
107109
import {VariableDetailsDTO} from "opensilex-core/index";
108110
import {ScientificObjectDetailByExperimentsDTO} from "opensilex-core/model/scientificObjectDetailByExperimentsDTO";
109111
import OpenSilexVuePlugin from "@/models/OpenSilexVuePlugin";
@@ -114,6 +116,7 @@ import VariableSelectorWithFilter from "@/components/variables/views/VariableSel
114116
import DateTimeForm from "@/components/common/forms/DateTimeForm.vue";
115117
import DataProvenanceSelector from "@/components/data/DataProvenanceSelector.vue";
116118
import DataVisuGraphic from "@/components/visualization/DataVisuGraphic.vue";
119+
import DataVisuEventsSwitch from "@/components/visualization/DataVisuEventsSwitch.vue";
117120
import type {DataVisuEvent, DataVisuSerie} from "@/components/visualization/DataVisuTypes";
118121
import VisuImagePanel from "@/components/visualization/VisuImagePanel.vue";
119122
import useDataVisualisation, {
@@ -152,10 +155,11 @@ const props = defineProps<{
152155
//#region Plugins & services
153156
const $opensilex: OpenSilexVuePlugin = inject<OpenSilexVuePlugin>("$opensilex")!;
154157
const {t} = useI18n();
155-
const {getNumericVariables, loadDataSeries, loadEvents, countEvents} = useDataVisualisation();
158+
const {getNumericVariables, loadDataSeries, loadEvents} = useDataVisualisation();
156159
//#endregion
157160
158161
//#region Template refs
162+
const eventsSwitch = useTemplateRef<InstanceType<typeof DataVisuEventsSwitch>>("eventsSwitch");
159163
const imagePanel = useTemplateRef<InstanceType<typeof VisuImagePanel>>("imagePanel");
160164
//#endregion
161165
@@ -177,9 +181,6 @@ const loading: Ref<boolean> = ref<boolean>(false);
177181
const series: Ref<DataVisuSerie[]> = ref<DataVisuSerie[]>([]);
178182
const yAxisNames: Ref<string[]> = ref<string[]>([]);
179183
const events: Ref<DataVisuEvent[]> = ref<DataVisuEvent[]>([]);
180-
/** Number of events of the scientific object between the selected dates, displayed next to the switch */
181-
const eventsCount: Ref<number> = ref<number>(0);
182-
const eventsCountLoading: Ref<boolean> = ref<boolean>(false);
183184
184185
const activeFiltersCount: ComputedRef<number> = computed<number>(() => {
185186
const f: VisualisationFilter = filter.value;
@@ -189,21 +190,13 @@ const activeFiltersCount: ComputedRef<number> = computed<number>(() => {
189190
});
190191
//#endregion
191192
192-
//#region Hooks & watchers
193-
onMounted(() => {
194-
refreshEventsCount();
195-
});
196-
197-
watch(() => [filter.value.start_date, filter.value.end_date], refreshEventsCount);
198-
//#endregion
199-
200193
//#region Event handlers
201194
/**
202195
* An event was created from the menu of a data point: the count is refreshed, and the graphic too if it displays the
203196
* events
204197
*/
205198
function onGraphicEventCreated(): void {
206-
refreshEventsCount();
199+
eventsSwitch.value?.refresh();
207200
if (filter.value.showEvents) {
208201
onSearch();
209202
}
@@ -289,18 +282,6 @@ async function loadObjectEvents(): Promise<DataVisuEvent[]> {
289282
seriesName: t("DataVisualisation.events")
290283
}]));
291284
}
292-
293-
async function refreshEventsCount(): Promise<void> {
294-
const f: VisualisationFilter = filter.value;
295-
eventsCountLoading.value = true;
296-
try {
297-
eventsCount.value = await countEvents([props.scientificObject.uri], f.start_date, f.end_date);
298-
} catch (error) {
299-
$opensilex.errorHandler(error);
300-
} finally {
301-
eventsCountLoading.value = false;
302-
}
303-
}
304285
//#endregion
305286
//#endregion
306287
</script>
@@ -323,8 +304,4 @@ async function refreshEventsCount(): Promise<void> {
323304
.advancedFiltersSearch {
324305
margin-top: 10px;
325306
}
326-
327-
.eventsCount {
328-
margin-left: 8px;
329-
}
330307
</style>

0 commit comments

Comments
 (0)