Skip to content

Enable ESLint rule vue/no-use-v-if-with-v-for #396

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
brianhelba wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Enable ESLint rule vue/no-use-v-if-with-v-for #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion web/eslint.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export default defineConfigWithVueTs(
// Temporary ignores until rules can be fixed
"vue/require-v-for-key": "off",
"vue/valid-v-for": "off",
"vue/no-use-v-if-with-v-for": "off",
},
},
skipFormatting,
Expand Down
140 changes: 69 additions & 71 deletions web/src/components/sidebars/LayerStyle.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type {
Colormap,
Layer,
LayerStyle,
StyleFilter,
StyleSpec,
} from "@/types";
import {
Expand Down Expand Up @@ -470,6 +471,11 @@ function removeFilter(filterId: number | undefined) {
);
}

function findVectorProperty(filter: StyleFilter) {
if (!filter.filter_by || !vectorProperties.value) return undefined;
return vectorProperties.value.find((p) => p.name === filter.filter_by);
}

function updateFilterBy(filterId: number | undefined, propertyName: string) {
if (!currentStyleSpec.value || !filterId || !vectorProperties.value) return;
const property = vectorProperties.value.find((p) => p.name === propertyName);
Expand Down Expand Up @@ -1930,81 +1936,73 @@ onMounted(resetCurrentStyle);
v-if="focusedFilterId === filter.id"
>
<tbody :class="filter.apply ? '' : 'helper-text'">
<template
v-if="filter.filter_by && vectorProperties"
v-for="property in [
vectorProperties.find(
(f: any) => f.name === filter.filter_by,
),
]"
>
<tr v-if="property?.range">
<td>Value type</td>
<td>
<v-btn-toggle
:model-value="filter.range ? 'range' : 'single'"
:disabled="!filter.apply"
density="compact"
variant="outlined"
divided
mandatory
@update:model-value="
(value: string) => {
if (!property.range) return;
if (value === 'range') {
filter.range = property.range;
filter.list = undefined;
} else {
filter.range = undefined;
filter.list = [property.range[0]];
}
<tr v-if="findVectorProperty(filter)?.range">
<td>Value type</td>
<td>
<v-btn-toggle
:model-value="filter.range ? 'range' : 'single'"
:disabled="!filter.apply"
density="compact"
variant="outlined"
divided
mandatory
@update:model-value="
(value: string) => {
const property = findVectorProperty(filter);
if (!property?.range) return;
if (value === 'range') {
filter.range = property.range;
filter.list = undefined;
} else {
filter.range = undefined;
filter.list = [property.range[0]];
}
}
"
>
<v-btn :value="'single'">Single</v-btn>
<v-btn :value="'range'">Range</v-btn>
</v-btn-toggle>
</td>
</tr>
<tr v-if="findVectorProperty(filter)">
<td>Values</td>
<td>
<template v-if="findVectorProperty(filter)?.range">
<SliderNumericInput
v-if="filter.range"
:disabled="!filter.apply"
:rangeModel="filter.range"
:min="findVectorProperty(filter)!.range![0]"
:max="findVectorProperty(filter)!.range![1]"
@update="
(v: [number, number]) => (filter.range = v)
"
>
<v-btn :value="'single'">Single</v-btn>
<v-btn :value="'range'">Range</v-btn>
</v-btn-toggle>
</td>
</tr>
<tr v-if="property">
<td>Values</td>
<td>
<template v-if="property.range">
<SliderNumericInput
v-if="filter.range"
:disabled="!filter.apply"
:rangeModel="filter.range"
:min="property.range[0]"
:max="property.range[1]"
@update="
(v: [number, number]) => (filter.range = v)
"
/>
<SliderNumericInput
v-else-if="filter.list"
:disabled="!filter.apply"
:model="filter.list[0]"
:min="property.range[0]"
:max="property.range[1]"
@update="(v: number) => (filter.list = [v])"
/>
</template>
<v-select
v-else
v-model="filter.list"
:items="property.value_set"
/>
<SliderNumericInput
v-else-if="filter.list"
:disabled="!filter.apply"
placeholder="Select values"
density="compact"
variant="outlined"
multiple
chips
closable-chips
hide-details
:model="filter.list[0]"
:min="findVectorProperty(filter)!.range![0]"
:max="findVectorProperty(filter)!.range![1]"
@update="(v: number) => (filter.list = [v])"
/>
</td>
</tr>
</template>
</template>
<v-select
v-else
v-model="filter.list"
:items="findVectorProperty(filter)?.value_set"
:disabled="!filter.apply"
placeholder="Select values"
density="compact"
variant="outlined"
multiple
chips
closable-chips
hide-details
/>
</td>
</tr>
<tr>
<td>Filter Mode</td>
<td>
Expand Down