diff --git a/app/src/composables/use-collection-preset/index.ts b/app/src/composables/use-collection-preset/index.ts deleted file mode 100644 index 36a84654a7..0000000000 --- a/app/src/composables/use-collection-preset/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { usePreset } from './use-collection-preset'; - -export { usePreset }; -export default usePreset; diff --git a/app/src/composables/use-preset/index.ts b/app/src/composables/use-preset/index.ts new file mode 100644 index 0000000000..9596abf57b --- /dev/null +++ b/app/src/composables/use-preset/index.ts @@ -0,0 +1,4 @@ +import { usePreset } from './use-preset'; + +export { usePreset }; +export default usePreset; diff --git a/app/src/composables/use-collection-preset/types.ts b/app/src/composables/use-preset/types.ts similarity index 100% rename from app/src/composables/use-collection-preset/types.ts rename to app/src/composables/use-preset/types.ts diff --git a/app/src/composables/use-collection-preset/use-collection-preset.ts b/app/src/composables/use-preset/use-preset.ts similarity index 95% rename from app/src/composables/use-collection-preset/use-collection-preset.ts rename to app/src/composables/use-preset/use-preset.ts index 6f318a2502..709a35f33d 100644 --- a/app/src/composables/use-collection-preset/use-collection-preset.ts +++ b/app/src/composables/use-preset/use-preset.ts @@ -22,9 +22,7 @@ export function usePreset(collection: Ref, bookmark: Ref const savePreset = async (preset?: Partial) => { const updatedValues = await presetsStore.savePreset(preset ? preset : localPreset.value); - localPreset.value.id = updatedValues.id; - return updatedValues; }; @@ -144,8 +142,21 @@ export function usePreset(collection: Ref, bookmark: Ref savePreset, saveCurrentAsBookmark, title, + resetPreset, }; + async function resetPreset() { + localPreset.value = { + view_query: null, + view_options: null, + view_type: 'tabular', + filters: null, + search_query: null, + }; + + await savePreset(); + } + function initLocalPreset() { if (bookmark.value === null) { localPreset.value = { diff --git a/app/src/layouts/tabular/tabular.vue b/app/src/layouts/tabular/tabular.vue index a29ce9b7ed..ecc1fa5f9c 100644 --- a/app/src/layouts/tabular/tabular.vue +++ b/app/src/layouts/tabular/tabular.vue @@ -130,7 +130,9 @@ @@ -203,6 +205,10 @@ export default defineComponent({ type: Boolean, default: false, }, + resetPreset: { + type: Function as PropType<() => Promise>, + default: null, + }, }, setup(props, { emit }) { const table = ref(null); @@ -287,14 +293,11 @@ export default defineComponent({ hideDragImage, activeFilterCount, refresh, - resetPreset, + resetPresetAndRefresh, }; - function resetPreset() { - _viewQuery.value = {}; - _filters.value = []; - _searchQuery.value = null; - + async function resetPresetAndRefresh() { + await props?.resetPreset?.(); refresh(); } @@ -604,4 +607,8 @@ export default defineComponent({ .fade-leave-to { opacity: 0; } + +.reset-preset { + margin-top: 24px; +} diff --git a/app/src/modules/activity/routes/browse.vue b/app/src/modules/activity/routes/browse.vue index 1815458208..7d57878547 100644 --- a/app/src/modules/activity/routes/browse.vue +++ b/app/src/modules/activity/routes/browse.vue @@ -47,7 +47,7 @@ import { defineComponent, computed, ref } from '@vue/composition-api'; import ActivityNavigation from '../components/navigation.vue'; import { i18n } from '@/lang'; import { LayoutComponent } from '@/layouts/types'; -import usePreset from '@/composables/use-collection-preset'; +import usePreset from '@/composables/use-preset'; import marked from 'marked'; import FilterDrawerDetail from '@/views/private/components/filter-drawer-detail'; import LayoutDrawerDetail from '@/views/private/components/layout-drawer-detail'; diff --git a/app/src/modules/collections/routes/browse.vue b/app/src/modules/collections/routes/browse.vue index 47ffe02bae..950abcd9f1 100644 --- a/app/src/modules/collections/routes/browse.vue +++ b/app/src/modules/collections/routes/browse.vue @@ -159,6 +159,7 @@ :view-query.sync="viewQuery" :filters.sync="filters" :search-query.sync="searchQuery" + :reset-preset="resetPreset" >