Skip to content

Commit aa70507

Browse files
annehaleyannehaley
authored
Merge pull request #349 from OpenGeoscience/renovate/vuetify-4.x
Update dependency vuetify to v4
2 parents e019668 + a052be2 commit aa70507

6 files changed

Lines changed: 42 additions & 40 deletions

File tree

‎web/package-lock.json‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎web/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
"vue-maplibre-compare": "1.0.26",
3838
"vue-router": "5.0.6",
3939
"vuedraggable": "4.1.0",
40-
"vuetify": "3.12.6"
40+
"vuetify": "4.0.7"
4141
},
4242
"devDependencies": {
4343
"@sentry/vite-plugin": "5.2.1",

‎web/src/components/map/ToggleCompareMap.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@ watch(
242242
243243
const swiperColor = computed(() => {
244244
return {
245-
swiper: theme.global.current.value.colors.primary,
246-
arrow: theme.global.current.value.colors["button-text"],
245+
swiper: theme.global.current.value.colors.primary as string,
246+
arrow: theme.global.current.value.colors["button-text"] as string,
247247
};
248248
});
249249
</script>

‎web/src/components/projects/AccessControl.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,11 +276,11 @@ onMounted(() => {
276276
<v-list-item
277277
v-bind="props"
278278
:title="
279-
item.raw.first_name && item.raw.last_name
280-
? item.raw.first_name + ' ' + item.raw.last_name
281-
: item.raw.username
279+
item.first_name && item.last_name
280+
? item.first_name + ' ' + item.last_name
281+
: item.username
282282
"
283-
:subtitle="item.raw.email"
283+
:subtitle="item.email"
284284
></v-list-item>
285285
</template>
286286
</v-select>

‎web/src/components/sidebars/AnalyticsPanel.vue‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ watch(
280280
style="height: 100%; overflow: auto"
281281
>
282282
<v-card-title class="analysis-title">
283-
{{ analysisStore.currentAnalysisType.name }}
283+
<span>{{ analysisStore.currentAnalysisType.name }}</span>
284284
<v-tooltip text="Close" location="bottom">
285285
<template v-slot:activator="{ props }">
286286
<v-btn
@@ -368,10 +368,10 @@ watch(
368368
hide-details="auto"
369369
class="my-1"
370370
>
371-
<template #item="{ item, props: itemProps }">
371+
<template v-slot:item="{ props, item }">
372372
<v-list-item
373-
v-bind="itemProps"
374-
v-tooltip="item.title"
373+
v-bind="props"
374+
v-tooltip="(item as any).name"
375375
style="max-width: 400px"
376376
/>
377377
</template>
@@ -568,4 +568,10 @@ watch(
568568
justify-content: space-between;
569569
align-items: center;
570570
}
571+
.analysis-title > span:first-child {
572+
flex-shrink: 1;
573+
min-width: 100px;
574+
overflow-x: hidden;
575+
text-overflow: ellipsis;
576+
}
571577
</style>

‎web/src/components/sidebars/LayerStyle.vue‎

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -902,31 +902,29 @@ onMounted(resetCurrentStyle);
902902
<template v-slot:append>
903903
<v-icon
904904
v-if="
905-
item.raw.project &&
905+
item.project &&
906906
['owner', 'collaborator'].includes(
907907
projectPermission,
908908
)
909909
"
910910
icon="mdi-pencil"
911911
class="ml-2"
912-
@click="
913-
openColormapEditor(group.name, item.raw)
914-
"
912+
@click="openColormapEditor(group.name, item)"
915913
/>
916914
<v-icon
917915
v-if="
918-
item.raw.project &&
916+
item.project &&
919917
['owner', 'collaborator'].includes(
920918
projectPermission,
921919
)
922920
"
923921
icon="mdi-trash-can"
924922
class="ml-2"
925-
@click="delColormap = item.raw"
923+
@click="delColormap = item"
926924
/>
927925
<div style="width: 300px" class="ml-2">
928926
<colormap-preview
929-
:colormap="item.raw"
927+
:colormap="item"
930928
:discrete="
931929
group.colormap?.discrete || false
932930
"
@@ -940,7 +938,7 @@ onMounted(resetCurrentStyle);
940938
<span
941939
class="pr-15"
942940
v-if="getColormap(group.colormap)?.markers"
943-
>{{ item.title }}</span
941+
>{{ item.name }}</span
944942
>
945943
<div
946944
style="width: 300px"
@@ -951,7 +949,7 @@ onMounted(resetCurrentStyle);
951949
"
952950
>
953951
<colormap-preview
954-
:colormap="item.raw"
952+
:colormap="item"
955953
:discrete="group.colormap.discrete || false"
956954
:nColors="group.colormap.n_colors || -1"
957955
/>
@@ -1307,10 +1305,8 @@ onMounted(resetCurrentStyle);
13071305
<template v-slot:append>
13081306
<v-chip
13091307
size="small"
1310-
v-if="(item.raw as any).sample_label"
1311-
>{{
1312-
(item.raw as any).sample_label
1313-
}}</v-chip
1308+
v-if="(item as any).sample_label"
1309+
>{{ (item as any).sample_label }}</v-chip
13141310
>
13151311
</template>
13161312
</v-list-item>
@@ -1350,31 +1346,31 @@ onMounted(resetCurrentStyle);
13501346
<template v-slot:append>
13511347
<v-icon
13521348
v-if="
1353-
item.raw.project &&
1349+
item.project &&
13541350
['owner', 'collaborator'].includes(
13551351
projectPermission,
13561352
)
13571353
"
13581354
icon="mdi-pencil"
13591355
class="ml-2"
13601356
@click="
1361-
openColormapEditor(group.name, item.raw)
1357+
openColormapEditor(group.name, item)
13621358
"
13631359
/>
13641360
<v-icon
13651361
v-if="
1366-
item.raw.project &&
1362+
item.project &&
13671363
['owner', 'collaborator'].includes(
13681364
projectPermission,
13691365
)
13701366
"
13711367
icon="mdi-trash-can"
13721368
class="ml-2"
1373-
@click="delColormap = item.raw"
1369+
@click="delColormap = item"
13741370
/>
13751371
<div style="width: 300px" class="ml-2">
13761372
<colormap-preview
1377-
:colormap="item.raw"
1373+
:colormap="item"
13781374
:discrete="
13791375
group.colormap.discrete || false
13801376
"
@@ -1388,15 +1384,15 @@ onMounted(resetCurrentStyle);
13881384
<span
13891385
class="pr-15"
13901386
v-if="getColormap(group.colormap)?.markers"
1391-
>{{ item.title }}</span
1387+
>{{ item.name }}</span
13921388
>
13931389
<div
13941390
style="width: 300px"
13951391
class="ml-2"
13961392
v-if="getColormap(group.colormap)?.markers"
13971393
>
13981394
<colormap-preview
1399-
:colormap="item.raw"
1395+
:colormap="item"
14001396
:discrete="group.colormap.discrete || false"
14011397
:nColors="group.colormap.n_colors || -1"
14021398
/>
@@ -1700,13 +1696,13 @@ onMounted(resetCurrentStyle);
17001696
<template v-slot:item="{ props, item }">
17011697
<v-list-item
17021698
v-bind="props"
1703-
:disabled="!(item.raw as any).range"
1699+
:disabled="!(item as any).range"
17041700
>
17051701
<template v-slot:append>
17061702
<v-chip
17071703
size="small"
1708-
v-if="(item.raw as any).sample_label"
1709-
>{{ (item.raw as any).sample_label }}</v-chip
1704+
v-if="(item as any).sample_label"
1705+
>{{ (item as any).sample_label }}</v-chip
17101706
>
17111707
</template>
17121708
</v-list-item>
@@ -1887,8 +1883,8 @@ onMounted(resetCurrentStyle);
18871883
<template v-slot:append>
18881884
<v-chip
18891885
size="small"
1890-
v-if="(item.raw as any).sample_label"
1891-
>{{ (item.raw as any).sample_label }}</v-chip
1886+
v-if="(item as any).sample_label"
1887+
>{{ (item as any).sample_label }}</v-chip
18921888
>
18931889
</template>
18941890
</v-list-item>

0 commit comments

Comments
 (0)