Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions web/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"vue-maplibre-compare": "1.0.26",
"vue-router": "5.0.6",
"vuedraggable": "4.1.0",
"vuetify": "3.12.6"
"vuetify": "4.0.7"
},
"devDependencies": {
"@sentry/vite-plugin": "5.2.1",
Expand Down
4 changes: 2 additions & 2 deletions web/src/components/map/ToggleCompareMap.vue
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@ watch(

const swiperColor = computed(() => {
return {
swiper: theme.global.current.value.colors.primary,
arrow: theme.global.current.value.colors["button-text"],
swiper: theme.global.current.value.colors.primary as string,
arrow: theme.global.current.value.colors["button-text"] as string,
};
});
</script>
Expand Down
8 changes: 4 additions & 4 deletions web/src/components/projects/AccessControl.vue
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,11 @@ onMounted(() => {
<v-list-item
v-bind="props"
:title="
item.raw.first_name && item.raw.last_name
? item.raw.first_name + ' ' + item.raw.last_name
: item.raw.username
item.first_name && item.last_name
? item.first_name + ' ' + item.last_name
: item.username
"
:subtitle="item.raw.email"
:subtitle="item.email"
></v-list-item>
</template>
</v-select>
Expand Down
14 changes: 10 additions & 4 deletions web/src/components/sidebars/AnalyticsPanel.vue
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ watch(
style="height: 100%; overflow: auto"
>
<v-card-title class="analysis-title">
{{ analysisStore.currentAnalysisType.name }}
<span>{{ analysisStore.currentAnalysisType.name }}</span>
<v-tooltip text="Close" location="bottom">
<template v-slot:activator="{ props }">
<v-btn
Expand Down Expand Up @@ -368,10 +368,10 @@ watch(
hide-details="auto"
class="my-1"
>
<template #item="{ item, props: itemProps }">
<template v-slot:item="{ props, item }">
<v-list-item
v-bind="itemProps"
v-tooltip="item.title"
v-bind="props"
v-tooltip="(item as any).name"
style="max-width: 400px"
/>
</template>
Expand Down Expand Up @@ -568,4 +568,10 @@ watch(
justify-content: space-between;
align-items: center;
}
.analysis-title > span:first-child {
flex-shrink: 1;
min-width: 100px;
overflow-x: hidden;
text-overflow: ellipsis;
}
</style>
46 changes: 21 additions & 25 deletions web/src/components/sidebars/LayerStyle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -902,31 +902,29 @@ onMounted(resetCurrentStyle);
<template v-slot:append>
<v-icon
v-if="
item.raw.project &&
item.project &&
['owner', 'collaborator'].includes(
projectPermission,
)
"
icon="mdi-pencil"
class="ml-2"
@click="
openColormapEditor(group.name, item.raw)
"
@click="openColormapEditor(group.name, item)"
/>
<v-icon
v-if="
item.raw.project &&
item.project &&
['owner', 'collaborator'].includes(
projectPermission,
)
"
icon="mdi-trash-can"
class="ml-2"
@click="delColormap = item.raw"
@click="delColormap = item"
/>
<div style="width: 300px" class="ml-2">
<colormap-preview
:colormap="item.raw"
:colormap="item"
:discrete="
group.colormap?.discrete || false
"
Expand All @@ -940,7 +938,7 @@ onMounted(resetCurrentStyle);
<span
class="pr-15"
v-if="getColormap(group.colormap)?.markers"
>{{ item.title }}</span
>{{ item.name }}</span
>
<div
style="width: 300px"
Expand All @@ -951,7 +949,7 @@ onMounted(resetCurrentStyle);
"
>
<colormap-preview
:colormap="item.raw"
:colormap="item"
:discrete="group.colormap.discrete || false"
:nColors="group.colormap.n_colors || -1"
/>
Expand Down Expand Up @@ -1307,10 +1305,8 @@ onMounted(resetCurrentStyle);
<template v-slot:append>
<v-chip
size="small"
v-if="(item.raw as any).sample_label"
>{{
(item.raw as any).sample_label
}}</v-chip
v-if="(item as any).sample_label"
>{{ (item as any).sample_label }}</v-chip
>
</template>
</v-list-item>
Expand Down Expand Up @@ -1350,31 +1346,31 @@ onMounted(resetCurrentStyle);
<template v-slot:append>
<v-icon
v-if="
item.raw.project &&
item.project &&
['owner', 'collaborator'].includes(
projectPermission,
)
"
icon="mdi-pencil"
class="ml-2"
@click="
openColormapEditor(group.name, item.raw)
openColormapEditor(group.name, item)
"
/>
<v-icon
v-if="
item.raw.project &&
item.project &&
['owner', 'collaborator'].includes(
projectPermission,
)
"
icon="mdi-trash-can"
class="ml-2"
@click="delColormap = item.raw"
@click="delColormap = item"
/>
<div style="width: 300px" class="ml-2">
<colormap-preview
:colormap="item.raw"
:colormap="item"
:discrete="
group.colormap.discrete || false
"
Expand All @@ -1388,15 +1384,15 @@ onMounted(resetCurrentStyle);
<span
class="pr-15"
v-if="getColormap(group.colormap)?.markers"
>{{ item.title }}</span
>{{ item.name }}</span
>
<div
style="width: 300px"
class="ml-2"
v-if="getColormap(group.colormap)?.markers"
>
<colormap-preview
:colormap="item.raw"
:colormap="item"
:discrete="group.colormap.discrete || false"
:nColors="group.colormap.n_colors || -1"
/>
Expand Down Expand Up @@ -1700,13 +1696,13 @@ onMounted(resetCurrentStyle);
<template v-slot:item="{ props, item }">
<v-list-item
v-bind="props"
:disabled="!(item.raw as any).range"
:disabled="!(item as any).range"
>
<template v-slot:append>
<v-chip
size="small"
v-if="(item.raw as any).sample_label"
>{{ (item.raw as any).sample_label }}</v-chip
v-if="(item as any).sample_label"
>{{ (item as any).sample_label }}</v-chip
>
</template>
</v-list-item>
Expand Down Expand Up @@ -1887,8 +1883,8 @@ onMounted(resetCurrentStyle);
<template v-slot:append>
<v-chip
size="small"
v-if="(item.raw as any).sample_label"
>{{ (item.raw as any).sample_label }}</v-chip
v-if="(item as any).sample_label"
>{{ (item as any).sample_label }}</v-chip
>
</template>
</v-list-item>
Expand Down