Skip to content

[6.x] Fix the actions dropdown separator and refresh listings after item actions #15629

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
jasonvarga merged 2 commits into from
Oct 16, 2026
Merged

[6.x] Fix the actions dropdown separator and refresh listings after item actions #15629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c31b19
only show the actions separator when there are items on both sides
duncanmcclean Oct 12, 2026
ba5e292
refresh the listing, calendar or tree after an item action completes
duncanmcclean Oct 12, 2026
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
2 changes: 1 addition & 1 deletion resources/js/components/assets/Browser/Browser.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
:text="__('Edit Blueprint')"
:href="container.blueprint_url"
/>
<DropdownSeparator v-if="actions.length" />
<DropdownSeparator v-if="(canCreateContainers || container.can_edit || container.can_edit_blueprint) && actions.length" />
<DropdownItem
v-for="action in actions"
:key="action.handle"
Expand Down
2 changes: 1 addition & 1 deletion resources/js/components/collections/Listing.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<DropdownItem v-if="collection.editable" :text="__('Configure')" icon="cog" :href="collection.edit_url" />
<DropdownItem v-if="collection.blueprint_editable" :text="__('Edit Blueprints')" icon="blueprint-edit" :href="collection.blueprints_url" />
<DropdownItem v-if="collection.editable" :text="__('Scaffold Views')" icon="scaffold" :href="collection.scaffold_url" />
<DropdownSeparator v-if="shouldShowSkeleton || actions.length" />
<DropdownSeparator v-if="(collection.available_in_selected_site || collection.editable || collection.blueprint_editable) && (shouldShowSkeleton || actions.length)" />
<template v-if="shouldShowSkeleton">
<div v-for="index in 3" :key="index" class="contents">
<ui-skeleton class="m-1 size-5" />
Expand Down
4 changes: 4 additions & 0 deletions resources/js/components/entries/Listing.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,10 @@ export default {
this.items = items;
},

refresh() {
this.$refs.listing.refresh();
},

setSiteFilter(site) {
this.$refs.listing.setFilter('site', site ? { site } : null);
},
Expand Down
2 changes: 2 additions & 0 deletions resources/js/components/entries/calendar/Calendar.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ function shouldFetchEntries(

return false;
}

defineExpose({ refresh: fetchEntries });
</script>

<template>
Expand Down
10 changes: 8 additions & 2 deletions resources/js/pages/collections/Show.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<DropdownItem v-if="canEdit" :text="__('Configure Collection')" icon="cog" :href="editUrl" />
<DropdownItem v-if="canEditBlueprints" :text="__('Edit Blueprints')" icon="blueprint-edit" :href="blueprintsUrl" />
<DropdownItem v-if="canEdit" :text="__('Scaffold Views')" icon="scaffold" :href="scaffoldUrl" />
<DropdownSeparator v-if="canEdit || canEditBlueprints || actions.length" />
<DropdownSeparator v-if="(canEdit || canEditBlueprints) && actions.length" />
<DropdownItem
v-for="action in actions"
:key="action.handle"
Expand Down Expand Up @@ -536,7 +536,13 @@ export default {
Statamic.$toast.success(response.message || __('Action completed'));
}

if (!response.redirect) router.reload();
if (!response.redirect) router.reload({ onSuccess: () => this.refreshCurrentView() });
},

refreshCurrentView() {
if (this.view === 'list') this.$refs.list?.refresh();
if (this.view === 'calendar') this.$refs.calendar?.refresh();
if (this.view === 'tree' && !this.treeIsDirty) this.$refs.tree?.refresh();
},

addToCommandPalette() {
Expand Down
4 changes: 4 additions & 0 deletions resources/js/pages/navigation/Show.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,10 @@ export default {
},

methods: {
afterActionSuccessfullyCompleted() {
if (!this.isDirty) this.$refs.tree?.refresh();
},

addLink() {
if (!this.hasCollections) this.linkPage();
},
Expand Down
Loading