Skip to content

Commit

Permalink
#210 upgrade webuniversum, fix tests (#211)
Browse files Browse the repository at this point in the history
* #210 upgrade webuniversum, fix tests
  • Loading branch information
yannickkuypers authored Feb 6, 2024
1 parent 27150a3 commit 54f9a35
Show file tree
Hide file tree
Showing 7 changed files with 2,084 additions and 3,381 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
"@fortawesome/free-solid-svg-icons": "^6.4.0",
"@fortawesome/vue-fontawesome": "^3.0.3",
"@govflanders/vl-ui-autocomplete": "^18.1.1",
"@govflanders/vl-ui-design-system-style": "^1.0.0-alpha.3",
"@govflanders/vl-ui-design-system-vue3": "^1.0.0-alpha.3",
"@govflanders/vl-ui-design-system-style": "^1.0.1-alpha.0",
"@govflanders/vl-ui-design-system-vue3": "^1.0.2-alpha.0",
"@govflanders/vl-ui-select": "^20.0.10",
"@soerenmartius/vue3-clipboard": "^0.1.2",
"@tinymce/tinymce-vue": "^4",
Expand Down
2 changes: 1 addition & 1 deletion src/__tests__/FilterInput.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ describe('FilterInput', () => {
<filter-datepicker v-if="selectedOption.key === 'datum_goedkeuring_van'" :value="value" @update:value="setValue($event, $event[0])"></filter-datepicker>
<filter-gemeente v-if="selectedOption.key === 'gemeente'" :value="value" @update:value="setValue($event, $event.naam)"></filter-gemeente>
<filter-radio v-if="selectedOption.key === 'beheerscommissie' || selectedOption.key === 'beheersplan_verlopen'" :options="radioOptions" :value="value" @update:value="setValue($event, $event)"></filter-radio>
<filter-select v-if="selectedOption.key === 'plantype'" placeholder="Type plan" :value="value" @update:value="setValue($event, $event)">
<filter-select v-if="selectedOption.key === 'plantype'" placeholder="Type plan" :model-value="value" @update:model-value="setValue($event, $event)">
<optgroup label="Niet Actief">
<option value="klad">Klad</option>
<option value="kladzonderfoto">Klad zonder foto</option>
Expand Down
5 changes: 3 additions & 2 deletions src/__tests__/FilterSelect.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ describe('FilterSelect', () => {
];
return { selectValue, options };
},
template: '<filter-select :options="options" :value="selectValue" @update:value="$event => selectValue=$event"/>',
template:
'<filter-select :options="options" :value="selectValue" @update:model-value="$event => selectValue=$event"/>',
});

it('renders a select option for each option', () => {
Expand Down Expand Up @@ -71,7 +72,7 @@ describe('FilterSelect', () => {
const selectValue = ref('');
return { selectValue };
},
template: `<filter-select :value="selectValue" @update:value="$event => selectValue=$event">
template: `<filter-select :model-value="selectValue" @update:model-value="$event => selectValue=$event">
<optgroup label="Niet Actief">
<option value="klad">Klad</option>
<option id="option-kladzonderfoto" value="kladzonderfoto">Klad zonder foto</option>
Expand Down
4 changes: 2 additions & 2 deletions src/components/dumb/FilterInput.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
>
<template v-else>
<vl-select
v-model:value="selectedOption"
v-model="selectedOption"
data-cy="filter-select"
class="vl-col--5-12"
mod-block
mod-inline
@update:value="clearInputs"
@update:model-value="clearInputs"
>
<option v-for="option in props.options" :key="option.key" :value="option">
{{ option.label }}
Expand Down
4 changes: 2 additions & 2 deletions src/components/dumb/FilterSelect.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
data-cy="filter-select"
:placeholder-text="props.placeholder"
mod-block
:value="props.value"
@update:value="updateValue"
:model-value="props.value"
@update:model-value="updateValue"
>
<slot>
<option
Expand Down
6 changes: 3 additions & 3 deletions src/components/smart/OeAdres.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</VlPropertiesLabel>
<VlPropertiesData>
<VlSelect
v-model:value="land"
v-model="land"
data-cy="select-land"
:mod-error="!!v$.land.$errors.length"
mod-block
Expand Down Expand Up @@ -336,10 +336,10 @@ import { helpers } from '@vuelidate/validators';
import { AxiosError } from 'axios';
import { pick, sortBy, uniqBy } from 'lodash';
import { computed, onMounted, ref, watch } from 'vue';
import type { IAdresProps } from '@models/adres';
import type { IAdres, IGemeente, ILand, ILocatieAdres, IPostinfo, IStraat } from '@models/locatie';
import { CrabApiService } from '@services/crab-api.service';
import { requiredIf } from '@utils/i18n-validators';
import type { IAdresProps } from '@models/adres';
import type { IAdres, IGemeente, ILand, ILocatieAdres, IPostinfo, IStraat } from '@models/locatie';
const props = withDefaults(defineProps<IAdresProps>(), {
hideTitle: false,
Expand Down
Loading

0 comments on commit 54f9a35

Please sign in to comment.