Skip to content

Fix bug in 'scroll into view' for storage form #5401

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

Merged
merged 3 commits into from
Sep 19, 2025
Merged

Fix bug in 'scroll into view' for storage form #5401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
844ad12
Fix bug in 'scroll into view' for storage form
marcellamaki Sep 18, 2025
9426091
Streamlines usages of the MultiSelect component
akolson Sep 19, 2025
3ec8083
Adds back the previous value implementation
akolson Sep 19, 2025
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
10 changes: 5 additions & 5 deletions ...tcuration/contentcuration/frontend/channelEdit/views/ImportFromChannels/SearchFilters.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@
v-model="channel_id__in"
:label="$tr('channelSourceLabel')"
:items="channelOptions"
item-text="name"
item-value="id"
:disabled="loadingChannels"
notranslate
useEllipsis
Expand Down Expand Up @@ -64,7 +62,6 @@
v-model="kinds"
:items="kindFilterOptions"
:label="$tr('kindLabel')"
item-text="text"
/>

<!-- Language -->
Expand All @@ -78,7 +75,6 @@
v-model="licenses"
:items="licenseOptions"
:label="$tr('licensesLabel')"
item-text="text"
/>

<!-- Created after -->
Expand Down Expand Up @@ -210,7 +206,11 @@
this.channel_id__in = [];
}

this.channelOptions = channels.filter(c => c.id !== this.currentChannelId);
const filteredChannels = channels.filter(c => c.id !== this.currentChannelId);
this.channelOptions = filteredChannels.map(channel => ({
value: channel.id,
text: channel.name,
}));
this.loadingChannels = false;
});
},
Expand Down
2 changes: 0 additions & 2 deletions contentcuration/contentcuration/frontend/channelList/views/Channel/CatalogFilters.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,13 @@
v-model="licenses"
:items="licenseOptions"
:label="$tr('licenseLabel')"
item-text="text"
/>

<!-- Formats (attach to self to keep in notranslate class) -->
<MultiSelect
v-model="kinds"
:items="kindOptions"
:label="$tr('formatLabel')"
item-text="text"
/>

<!-- Starred -->
Expand Down
8 changes: 5 additions & 3 deletions contentcuration/contentcuration/frontend/settings/pages/Storage/RequestForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,6 @@
v-model="publicChannels"
:label="$tr('selectAllThatApplyPlaceholder')"
:items="publicChannelOptions"
:item-value="channelName"
item-text="name"
notranslate
:box="false"
/>
Expand Down Expand Up @@ -365,7 +363,11 @@
];
},
publicChannelOptions() {
return sortBy(this.channels, c => c.name.toLowerCase()).filter(c => !c.public);
const options = sortBy(this.channels, c => c.name.toLowerCase()).filter(c => !c.public);
return options.map(option => ({
text: option.name,
value: this.channelName(option),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bjester we should be good now I think?

}));
},
},
methods: {
Expand Down
12 changes: 6 additions & 6 deletions contentcuration/contentcuration/frontend/settings/pages/Storage/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@
<KTransition kind="component-vertical-slide-out-in">
<RequestForm
v-show="showRequestForm"
ref="requestform"
@submitted="showRequestForm = false"
/>
</KTransition>
Expand Down Expand Up @@ -156,12 +157,11 @@
this.showRequestForm = !this.showRequestForm;
if (this.showRequestForm) {
this.$nextTick(() => {
if (window.scroll) {
window.scroll({
top: this.$refs.requestheader.offsetTop - 24,
behavior: 'smooth',
});
}
this.$nextTick(() => {
// Wait for the form to be visible
// then scroll to the top of the form
this.$refs.requestform.$el.scrollIntoView({ behavior: 'smooth', block: 'start' });
});
});
}
},
Expand Down
16 changes: 2 additions & 14 deletions contentcuration/contentcuration/frontend/shared/views/form/MultiSelect.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
>
<template #selection="{ item }">
<VChip :class="{ notranslate }">
{{ getText(item) }}
{{ item.text }}
</VChip>
</template>
<template #item="{ item }">
Expand All @@ -33,7 +33,7 @@
:style="getEllipsisStyle()"
dir="auto"
>
{{ getText(item) }}
{{ item.text }}
</span>
</Checkbox>
</template>
Expand Down Expand Up @@ -67,10 +67,6 @@
return [];
},
},
itemText: {
type: [String, Function],
required: true,
},
notranslate: {
type: Boolean,
default: false,
Expand Down Expand Up @@ -109,14 +105,6 @@
}
: {};
},
getText(item) {
if (typeof this.itemText === 'string') {
return item[this.itemText];
} else if (typeof this.itemText === 'function') {
return this.itemText(item);
}
return item.text || item;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see any usages of this fallback behavior || item, so the template changes seem good.

},
resetScroll() {
const [{ value: firstItemValue } = {}] = this.items || [];
if (!firstItemValue) {
Expand Down