From fbac502c94834af7c596688d58a88395cbc25200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jarda=20Kot=C4=9B=C5=A1ovec?= Date: Mon, 24 Feb 2025 13:03:38 +0100 Subject: [PATCH] pkp/pkp-lib#10067 Use *Config instead of Configuration consistently for config composables --- src/managers/GalleyManager/galleyManagerStore.js | 6 ++---- ...gerConfiguration.js => useGalleyManagerConfig.js} | 2 +- .../ReviewActivityIndicatorPopover.stories.js | 2 +- ...shboardConfiguration.js => useDashboardConfig.js} | 0 ...ity.js => useDashboardConfigEditorialActivity.js} | 0 ...tivity.js => useDashboardConfigReviewActivity.js} | 0 src/pages/dashboard/dashboardPageStore.js | 12 ++++++------ 7 files changed, 10 insertions(+), 12 deletions(-) rename src/managers/GalleyManager/{useGalleyManagerConfiguration.js => useGalleyManagerConfig.js} (98%) rename src/pages/dashboard/composables/{useDashboardConfiguration.js => useDashboardConfig.js} (100%) rename src/pages/dashboard/composables/{useDashboardConfigurationEditorialActivity.js => useDashboardConfigEditorialActivity.js} (100%) rename src/pages/dashboard/composables/{useDashboardConfigurationReviewActivity.js => useDashboardConfigReviewActivity.js} (100%) diff --git a/src/managers/GalleyManager/galleyManagerStore.js b/src/managers/GalleyManager/galleyManagerStore.js index 526927294..209fab169 100644 --- a/src/managers/GalleyManager/galleyManagerStore.js +++ b/src/managers/GalleyManager/galleyManagerStore.js @@ -4,7 +4,7 @@ import {useFetch, getCSRFToken} from '@/composables/useFetch'; import {useModal} from '@/composables/useModal'; import {useGalleyManagerActions} from './useGalleyManagerActions'; import {useDataChanged} from '@/composables/useDataChanged'; -import {useGalleyManagerConfiguration} from './useGalleyManagerConfiguration'; +import {useGalleyManagerConfig} from './useGalleyManagerConfig'; import {useLegacyGridUrl} from '@/composables/useLegacyGridUrl'; import {useExtender} from '@/composables/useExtender'; @@ -24,9 +24,7 @@ export const useGalleyManagerStore = defineComponentStore( /** Reload files when data on screen changes */ /** Columns */ - const galleyManagerConfig = extender.addFns( - useGalleyManagerConfiguration(), - ); + const galleyManagerConfig = extender.addFns(useGalleyManagerConfig()); const columns = computed(() => galleyManagerConfig.getColumns()); /** diff --git a/src/managers/GalleyManager/useGalleyManagerConfiguration.js b/src/managers/GalleyManager/useGalleyManagerConfig.js similarity index 98% rename from src/managers/GalleyManager/useGalleyManagerConfiguration.js rename to src/managers/GalleyManager/useGalleyManagerConfig.js index f25d2fc85..c2f4d7af1 100644 --- a/src/managers/GalleyManager/useGalleyManagerConfiguration.js +++ b/src/managers/GalleyManager/useGalleyManagerConfig.js @@ -42,7 +42,7 @@ export const GalleyManagerConfiguration = { ], }; -export function useGalleyManagerConfiguration() { +export function useGalleyManagerConfig() { const {t} = useLocalize(); const {hasCurrentUserAtLeastOneAssignedRoleInStage} = useCurrentUser(); diff --git a/src/pages/dashboard/components/ReviewActivityIndicatorPopover/ReviewActivityIndicatorPopover.stories.js b/src/pages/dashboard/components/ReviewActivityIndicatorPopover/ReviewActivityIndicatorPopover.stories.js index 016d3e9a1..37aa76047 100644 --- a/src/pages/dashboard/components/ReviewActivityIndicatorPopover/ReviewActivityIndicatorPopover.stories.js +++ b/src/pages/dashboard/components/ReviewActivityIndicatorPopover/ReviewActivityIndicatorPopover.stories.js @@ -1,7 +1,7 @@ import ReviewActivityIndicatorPopover from './ReviewActivityIndicatorPopover.vue'; import PkpPopover from '@/components/Popover/Popover.vue'; import ReviewActivityIndicator from './ReviewActivityIndicator.vue'; -import {useReviewActivityLogic} from '@/pages/dashboard/composables/useDashboardConfigurationReviewActivity'; +import {useReviewActivityLogic} from '@/pages/dashboard/composables/useDashboardConfigReviewActivity'; export default { title: 'Components/ReviewActivityIndicatorPopup', diff --git a/src/pages/dashboard/composables/useDashboardConfiguration.js b/src/pages/dashboard/composables/useDashboardConfig.js similarity index 100% rename from src/pages/dashboard/composables/useDashboardConfiguration.js rename to src/pages/dashboard/composables/useDashboardConfig.js diff --git a/src/pages/dashboard/composables/useDashboardConfigurationEditorialActivity.js b/src/pages/dashboard/composables/useDashboardConfigEditorialActivity.js similarity index 100% rename from src/pages/dashboard/composables/useDashboardConfigurationEditorialActivity.js rename to src/pages/dashboard/composables/useDashboardConfigEditorialActivity.js diff --git a/src/pages/dashboard/composables/useDashboardConfigurationReviewActivity.js b/src/pages/dashboard/composables/useDashboardConfigReviewActivity.js similarity index 100% rename from src/pages/dashboard/composables/useDashboardConfigurationReviewActivity.js rename to src/pages/dashboard/composables/useDashboardConfigReviewActivity.js diff --git a/src/pages/dashboard/dashboardPageStore.js b/src/pages/dashboard/dashboardPageStore.js index d4b4a5363..66b34c79c 100644 --- a/src/pages/dashboard/dashboardPageStore.js +++ b/src/pages/dashboard/dashboardPageStore.js @@ -16,9 +16,9 @@ import {useDashboardBulkDelete} from './composables/useDashboardBulkDelete'; import {useParticipantManagerActions} from '@/managers/ParticipantManager/useParticipantManagerActions'; import {useFileManagerActions} from '@/managers/FileManager/useFileManagerActions'; -import {useDashboardConfigurationEditorialActivity} from './composables/useDashboardConfigurationEditorialActivity'; -import {useDashboardConfiguration} from './composables/useDashboardConfiguration'; -import {useDashboardConfigurationReviewActivity} from './composables/useDashboardConfigurationReviewActivity'; +import {useDashboardConfigEditorialActivity} from './composables/useDashboardConfigEditorialActivity'; +import {useDashboardConfig} from './composables/useDashboardConfig'; +import {useDashboardConfigReviewActivity} from './composables/useDashboardConfigReviewActivity'; import {useSubmission} from '@/composables/useSubmission'; import DashboardModalFilters from '@/pages/dashboard/modals/DashboardModalFilters.vue'; @@ -75,7 +75,7 @@ export const useDashboardPageStore = defineComponentStore( /** * Config */ - const dashboardConfig = extender.addFns(useDashboardConfiguration()); + const dashboardConfig = extender.addFns(useDashboardConfig()); const leftControlItems = computed(() => dashboardConfig.getLeftControls()); const rightControlItems = computed(() => dashboardConfig.getRightControls(), @@ -414,7 +414,7 @@ export const useDashboardPageStore = defineComponentStore( * Config functions for editorial activity * */ const dashboardConfigEditorialActivity = extender.addFns( - useDashboardConfigurationEditorialActivity(), + useDashboardConfigEditorialActivity(), ); function getEditorialActivityForEditorialDashboard(...args) { @@ -440,7 +440,7 @@ export const useDashboardPageStore = defineComponentStore( * */ const dashboardConfigReviewActivity = extender.addFns( - useDashboardConfigurationReviewActivity(), + useDashboardConfigReviewActivity(), ); function getReviewActivityIndicatorProps(...args) {