Skip to content

Commit 7eff5f6

Browse files
committed
Move loading methods to onMounted method
1 parent ac64d27 commit 7eff5f6

File tree

1 file changed

+34
-29
lines changed

1 file changed

+34
-29
lines changed

src/components/download/DataDownloadDisplayComponent.vue

Lines changed: 34 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
</template>
144144

145145
<script setup lang="ts">
146-
import { ref, computed, watch } from 'vue'
146+
import { ref, computed, watch, onMounted } from 'vue'
147147
import {
148148
DocumentFormat,
149149
Location,
@@ -201,17 +201,40 @@ const parameterQualifiers = ref<ParameterQualifiersHeader[]>([])
201201
const selectedParameterQualifiers = ref<ParameterQualifiersHeader[]>([])
202202
const selectableAttributes = ref<string[][]>([])
203203
const onlyDownloadMetaData = ref(false)
204+
const errors = ref<string[]>([])
204205
205-
getLocations().then((locationsResponse) => {
206+
const selectedAttributes = ref<string[][]>([])
207+
208+
const startDate = ref<Date>(getStartDateValue())
209+
const endDate = ref<Date>(getEndDateValue())
210+
const DATE_FMT = 'yyyy-MM-dd HH:mm'
211+
const startDateString = ref<string>(
212+
DateTime.fromJSDate(getStartDateValue()).toFormat(DATE_FMT),
213+
)
214+
const endDateString = ref<string>(
215+
DateTime.fromJSDate(getEndDateValue()).toFormat(DATE_FMT),
216+
)
217+
218+
const parameterQualifiersHeaders: ParameterQualifiersHeader[] = []
219+
220+
const rules = {
221+
required: (value: string) => (value !== undefined && !!value) || 'Required',
222+
date: (value: string) => {
223+
const date = DateTime.fromFormat(value || '', DATE_FMT)
224+
return !isNaN(date.valueOf()) || 'Invalid date'
225+
},
226+
}
227+
228+
onMounted(async () => {
229+
const locationsResponse = await getLocations()
206230
allLocations.value = locationsResponse
207231
locations.value = locationsResponse
208-
selectedLocations.value = allLocations.value
209-
selectableAttributes.value = getAttributeValues(allLocations.value)
210-
})
232+
selectedLocations.value = locationsResponse
233+
selectableAttributes.value = getAttributeValues(locationsResponse)
211234
212-
allParameters.value = await getParameters()
213-
getTimeSeriesHeaders().then((headersResponse) => {
214-
const parameterQualifiersHeaders: ParameterQualifiersHeader[] = []
235+
allParameters.value = await getParameters()
236+
237+
const headersResponse = await getTimeSeriesHeaders()
215238
headersResponse?.forEach((timeSeriesResult) => {
216239
const parameterQualifiersHeader: ParameterQualifiersHeader = {
217240
parameterId: timeSeriesResult.header?.parameterId,
@@ -221,29 +244,11 @@ getTimeSeriesHeaders().then((headersResponse) => {
221244
})
222245
parameterQualifiers.value = uniqWith(parameterQualifiersHeaders, isEqual)
223246
selectedParameterQualifiers.value = parameterQualifiers.value
247+
if (attributes) {
248+
selectedAttributes.value = attributes.map(() => [])
249+
}
224250
})
225251
226-
let errors = ref<string[]>([])
227-
const startDate = ref<Date>(getStartDateValue())
228-
const endDate = ref<Date>(getEndDateValue())
229-
const selectedAttributes = ref<string[][]>([])
230-
const rules = {
231-
required: (value: string) => (value !== undefined && !!value) || 'Required',
232-
date: (value: string) => {
233-
const date = DateTime.fromFormat(value || '', DATE_FMT)
234-
return !isNaN(date.valueOf()) || 'Invalid date'
235-
},
236-
}
237-
attributes?.forEach((item) => selectedAttributes.value.push([]))
238-
239-
const DATE_FMT = 'yyyy-MM-dd HH:mm'
240-
const startDateString = ref<string>(
241-
DateTime.fromJSDate(getStartDateValue()).toFormat(DATE_FMT),
242-
)
243-
const endDateString = ref<string>(
244-
DateTime.fromJSDate(getEndDateValue()).toFormat(DATE_FMT),
245-
)
246-
247252
watch(startDateString, (newValue) => {
248253
let newDateTime: DateTimeMaybeValid = DateTime.fromFormat(newValue, DATE_FMT)
249254
if (!newDateTime.isValid) {

0 commit comments

Comments
 (0)