From 7a5e07b2122970a11c0fc1ff3f5508cfe79bcc7b Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Thu, 25 Jul 2024 21:47:34 -0400 Subject: [PATCH] Import alias additions across the board. --- client/docs/avoid-using-global-Galaxy.md | 6 +- client/docs/querying-the-api.md | 4 +- client/src/app/app.test.js | 3 +- client/src/app/base-mvc.js | 3 +- client/src/app/galaxy.js | 7 +- client/src/app/monitor.js | 9 +- client/src/app/singleton.js | 4 +- client/src/app/user-model.js | 5 +- client/src/bundleEntries.js | 5 +- .../ActivityBar/Items/InteractiveItem.vue | 2 +- .../ActivityBar/Items/NotificationItem.vue | 2 +- .../ActivityBar/Items/UploadItem.vue | 2 +- .../Collections/ListCollectionCreatorModal.js | 3 +- .../Collections/PairCollectionCreatorModal.js | 3 +- .../PairedListCollectionCreator.test.js | 3 +- .../PairedListCollectionCreator.vue | 9 +- .../PairedListCollectionCreatorModal.js | 3 +- .../RuleBasedCollectionCreatorModal.js | 3 +- .../components/Collections/common/modal.js | 6 +- client/src/components/CopyToClipboard.vue | 3 +- .../components/DataDialog/DataDialog.test.js | 2 +- client/src/components/DataDialog/services.js | 3 +- client/src/components/DecodedId.vue | 7 +- client/src/components/DragGhost.vue | 3 +- .../Form/Elements/FormDirectory.test.js | 4 +- .../Form/Elements/FormDirectory.vue | 5 +- .../Form/Elements/FormRulesEdit.vue | 4 +- client/src/components/Form/FormGeneric.vue | 10 +- client/src/components/Form/services.js | 5 +- client/src/components/Grid/Grid.vue | 4 +- .../History/Content/ContentItem.test.js | 2 +- .../History/Content/ExpandedItems.js | 2 +- .../History/Content/GenericItem.vue | 4 +- .../HistoryOperations/SelectionOperations.vue | 12 +- .../components/History/HistoriesFilters.js | 2 +- .../src/components/History/HistoryFilters.js | 5 +- .../components/History/HistoryView.test.js | 7 +- .../History/Layout/DetailsLayout.test.js | 3 +- .../History/Modals/SelectorModal.test.js | 2 +- .../History/Multiple/MultipleView.test.js | 5 +- .../History/adapters/HistoryPanelProxy.js | 9 +- .../History/adapters/buildCollectionModal.js | 9 +- .../src/components/History/model/queries.js | 3 +- .../components/HistoryExport/ExportLink.vue | 5 +- .../components/HistoryExport/ToLink.test.js | 3 +- .../src/components/HistoryExport/ToLink.vue | 11 +- .../HistoryExport/ToRemoteFile.test.js | 3 +- .../components/HistoryExport/ToRemoteFile.vue | 13 ++- client/src/components/HistoryImport.test.js | 3 +- client/src/components/HistoryImport.vue | 12 +- client/src/components/Indices/IndexFilter.vue | 3 +- client/src/components/Indices/filtersMixin.js | 2 +- .../components/InheritanceChain/services.js | 5 +- .../InteractiveTools/InteractiveTools.test.js | 3 +- .../InteractiveTools/InteractiveTools.vue | 4 +- .../components/InteractiveTools/services.js | 5 +- .../src/components/JobInformation/CodeRow.vue | 3 +- .../components/JobInformation/JobDetails.vue | 4 +- .../JobInformation/JobInformation.vue | 10 +- .../components/JobInformation/JobOutputs.vue | 2 +- .../src/components/JobInformation/services.js | 5 +- .../JobParameters/JobParameters.vue | 2 +- .../JobParameters/JobParametersArrayValue.vue | 2 +- client/src/components/JobStates/index.js | 2 +- client/src/components/JobStates/wait.js | 5 +- .../components/Libraries/LibrariesList.vue | 14 +-- .../components/Libraries/LibraryEditField.vue | 3 +- .../FolderDetails/FolderDetails.vue | 9 +- .../Libraries/LibraryFolder/LibraryFolder.vue | 12 +- .../LibraryDataset.test.js | 4 +- .../LibraryFolderDataset/LibraryDataset.vue | 21 ++-- .../LibraryFolderDatasetPermissions.vue | 19 ++-- .../LibraryFolderPermissions.vue | 15 +-- .../Libraries/LibraryFolder/SearchField.vue | 2 +- .../LibraryFolder/TopToolbar/FolderTopBar.vue | 14 +-- .../LibraryFolder/TopToolbar/add-datasets.js | 9 +- .../TopToolbar/delete-selected.js | 7 +- .../LibraryFolder/TopToolbar/download.js | 5 +- .../import-to-history/import-collection.js | 6 +- .../import-to-history/import-dataset.js | 8 +- .../LibraryFolder/TopToolbar/library-model.js | 3 +- .../LibraryFolder/TopToolbar/ui-select.js | 3 +- .../Libraries/LibraryFolder/services.js | 5 +- .../LibraryPermissions/LibraryPermissions.vue | 16 +-- .../LibraryPermissions/PermissionsHeader.vue | 4 +- .../PermissionsInputField.vue | 3 +- .../Libraries/LibraryPermissions/services.js | 5 +- .../src/components/Libraries/library-utils.js | 2 +- client/src/components/Libraries/services.js | 5 +- client/src/components/License/License.vue | 7 +- .../components/License/LicenseSelector.vue | 5 +- .../CollectionDisplay.vue | 6 +- .../Elements/HistoryDatasetDisplay.test.js | 3 +- .../Elements/HistoryDatasetDisplay.vue | 8 +- .../Markdown/Elements/HistoryLink.vue | 5 +- .../Markdown/Elements/Visualization.vue | 5 +- client/src/components/Markdown/Markdown.vue | 4 +- .../Markdown/MarkdownContainer.test.js | 3 +- .../components/Markdown/MarkdownEditor.vue | 3 +- .../components/Markdown/MarkdownToolBox.vue | 5 +- .../Markdown/MarkdownVisualization.vue | 5 +- client/src/components/Markdown/services.js | 5 +- .../src/components/Masthead/Masthead.test.js | 2 +- client/src/components/Masthead/Masthead.vue | 4 +- .../src/components/Masthead/MastheadItem.vue | 3 +- client/src/components/Masthead/_webhooks.js | 4 +- .../Notifications/NotificationsBell.vue | 2 +- .../ObjectStore/ObjectStoreBadge.test.js | 3 +- .../src/components/PageDisplay/PageHtml.vue | 2 +- .../src/components/PageEditor/PageEditor.vue | 9 +- .../PageEditor/PageEditorMarkdown.vue | 5 +- client/src/components/PageEditor/util.js | 9 +- .../Panels/Buttons/FavoritesButton.test.js | 3 +- client/src/components/Panels/Common/Tool.vue | 3 +- .../Panels/Common/ToolSection.test.js | 3 +- client/src/components/Panels/ToolBox.test.js | 7 +- .../src/components/Panels/ToolPanel.test.js | 4 +- .../src/components/Panels/utilities.test.js | 4 +- .../components/RuleBuilder/ColumnSelector.vue | 5 +- .../RuleBuilder/IdentifierDisplay.vue | 2 +- .../RuleBuilder/RegularExpressionInput.vue | 2 +- .../components/RuleBuilder/RuleComponent.vue | 2 +- .../components/RuleBuilder/RuleDisplay.vue | 2 +- .../RuleBuilder/SavedRulesSelector.test.js | 3 +- .../RuleBuilder/SavedRulesSelector.vue | 5 +- .../RuleBuilder/rule-definitions.js | 3 +- .../src/components/RuleCollectionBuilder.vue | 44 ++++---- .../RulesDisplay/IdentifierDisplayPreview.vue | 2 +- .../RulesDisplay/RuleDisplayPreview.vue | 2 +- .../components/RulesDisplay/RulesDisplay.vue | 2 +- client/src/components/SingleItemSelector.vue | 3 +- client/src/components/StsDownloadButton.vue | 6 +- client/src/components/Tags/model.js | 2 +- .../TagsMultiselect/StatelessTags.test.js | 2 +- .../Tool/Buttons/ToolFavoriteButton.vue | 2 +- .../Tool/Buttons/ToolOptionsButton.vue | 4 +- client/src/components/Tool/ToolCard.test.js | 3 +- client/src/components/Tool/ToolCard.vue | 16 +-- client/src/components/Tool/ToolFooter.vue | 11 +- client/src/components/Tool/ToolForm.test.js | 6 +- client/src/components/Tool/ToolForm.vue | 20 ++-- client/src/components/Tool/ToolHelp.vue | 2 +- client/src/components/Tool/ToolSource.vue | 6 +- .../components/Tool/ToolSourceMenuItem.vue | 2 +- .../ToolTargetPreferredObjectStorePopover.vue | 2 +- client/src/components/Tool/services.js | 5 +- client/src/components/Tool/utilities.js | 4 +- .../ToolEntryPoints/ToolEntryPoints.vue | 5 +- client/src/components/ToolRecommendation.vue | 9 +- .../components/ToolsList/ToolsListItem.vue | 5 +- .../components/ToolsList/ToolsListTable.vue | 3 +- client/src/components/ToolsList/services.js | 5 +- .../ToolsView/ToolsSchemaJson/ToolsJson.vue | 3 +- client/src/components/Toolshed/Index.vue | 2 +- .../Toolshed/InstalledList/Details.test.js | 2 +- .../Toolshed/InstalledList/Details.vue | 5 +- .../Toolshed/InstalledList/Index.test.js | 2 +- .../Toolshed/InstalledList/Index.vue | 4 +- .../Toolshed/InstalledList/Monitor.test.js | 2 +- .../Toolshed/RepositoryDetails/Index.test.js | 2 +- .../Toolshed/RepositoryDetails/Index.vue | 2 +- .../Toolshed/SearchList/Categories.vue | 2 +- .../components/Toolshed/SearchList/Index.vue | 2 +- .../Toolshed/SearchList/Repositories.vue | 2 +- client/src/components/Toolshed/services.js | 7 +- client/src/components/Tour/TourList.vue | 8 +- client/src/components/Tour/TourRunner.vue | 2 +- client/src/components/Tour/runTour.js | 5 +- client/src/components/Upload/CompositeRow.vue | 5 +- client/src/components/Upload/DefaultBox.vue | 2 +- client/src/components/Upload/DefaultRow.vue | 3 +- .../components/Upload/DragAndDropModal.vue | 7 +- client/src/components/Upload/RulesInput.vue | 10 +- .../src/components/Upload/UploadContainer.vue | 4 +- .../src/components/Upload/UploadModal.test.js | 4 +- client/src/components/Upload/UploadModal.vue | 7 +- client/src/components/Upload/builders.js | 2 +- client/src/components/Upload/utils.js | 3 +- client/src/components/User/APIKey/APIKey.vue | 5 +- .../src/components/User/APIKey/APIKeyItem.vue | 7 +- .../components/User/APIKey/model/service.js | 3 +- client/src/components/User/CustomBuilds.vue | 3 +- .../Cleanup/CleanupResultDialog.vue | 2 +- .../Quota/ProvidedQuotaSourceUsageBar.vue | 2 +- .../DiskUsage/Quota/QuotaUsageProvider.js | 7 +- .../ExternalIdentities/ExternalIdentities.vue | 9 +- .../User/ExternalIdentities/service.js | 3 +- .../components/User/UserBeaconSettings.vue | 2 +- client/src/components/User/UserDeletion.vue | 5 +- .../src/components/User/UserPreferences.vue | 12 +- .../components/User/UserPreferencesForm.vue | 7 +- .../components/User/UserPreferencesModel.js | 4 +- .../User/UserPreferredObjectStore.vue | 6 +- .../DisplayApplications.test.js | 3 +- .../Visualizations/DisplayApplications.vue | 2 +- .../components/Visualizations/PluginList.vue | 11 +- .../components/Workflow/Editor/Attributes.vue | 9 +- .../Workflow/Editor/Forms/FormTool.vue | 2 +- .../src/components/Workflow/Editor/Index.vue | 2 +- .../src/components/Workflow/Editor/Lint.vue | 4 +- .../Workflow/Editor/Recommendations.vue | 5 +- .../components/Workflow/Editor/ReportHelp.vue | 2 +- .../Workflow/Editor/modules/services.js | 5 +- .../Workflow/Editor/modules/utilities.js | 3 +- .../Invocation/Export/ExportToRemoteModal.vue | 3 +- .../BioComputeObjectExportCard.vue | 5 +- .../Plugins/BioComputeObject/SendForm.vue | 6 +- .../components/Workflow/InvocationReport.vue | 8 +- .../Workflow/List/WorkflowFilters.js | 2 +- .../Workflow/Run/WorkflowRunDefaultStep.vue | 15 +-- .../Workflow/Run/WorkflowRunForm.vue | 10 +- .../Workflow/Run/WorkflowRunFormSimple.vue | 10 +- .../Workflow/Run/WorkflowRunInputStep.vue | 6 +- .../Workflow/Run/WorkflowRunSuccess.vue | 8 +- .../Run/WorkflowStorageConfiguration.test.js | 3 +- ...kflowTargetPreferredObjectStorePopover.vue | 2 +- client/src/components/Workflow/Run/model.js | 5 +- .../src/components/Workflow/Run/services.js | 5 +- .../components/Workflow/WorkflowExport.vue | 7 +- client/src/components/Workflow/services.js | 7 +- .../WorkflowInvocationState/JobStep.vue | 9 +- .../WorkflowInvocationExportOptions.vue | 9 +- .../WorkflowInvocationInputOutputTabs.vue | 2 +- .../WorkflowInvocationStep.vue | 13 ++- .../WorkflowInvocationState/services.js | 3 +- client/src/components/admin/AdminServices.js | 5 +- .../admin/DataManager/DataManager.vue | 5 +- .../admin/DataManager/DataManagerJob.vue | 5 +- .../admin/DataManager/DataManagerJobs.vue | 5 +- .../admin/DataManager/DataManagerTable.vue | 5 +- .../admin/DataManager/DataManagerView.vue | 2 +- client/src/components/admin/DataTables.vue | 3 +- client/src/components/admin/DataTypes.vue | 3 +- .../Dependencies/DependencyIndexMixin.js | 2 +- .../Dependencies/DependencyIndexWrapper.vue | 2 +- client/src/components/admin/Home.vue | 2 +- client/src/components/admin/JobsList.vue | 15 +-- client/src/components/admin/JobsTable.vue | 6 +- client/src/components/admin/SanitizeAllow.vue | 3 +- .../components/plugins/legacyNavigation.js | 2 +- client/src/components/plugins/localization.js | 2 +- .../providers/DatasetCollectionProvider.js | 4 +- .../providers/InvocationStepProvider.js | 8 +- .../providers/InvocationsProvider.test.js | 3 +- .../src/components/providers/JobProvider.js | 7 +- .../providers/SingleQueryProvider.js | 3 +- .../providers/StoredWorkflowsProvider.js | 7 +- .../providers/ToolSourceProvider.js | 8 +- .../components/providers/UrlDataProvider.js | 5 +- .../components/providers/storeProviders.js | 4 +- client/src/components/providers/utils.js | 3 +- client/src/composables/formattedToolHelp.js | 3 +- client/src/composables/markdown.test.js | 2 +- client/src/composables/userHistories.js | 3 +- client/src/entry/analysis/App.vue | 24 ++-- .../entry/analysis/modules/CenterFrame.vue | 2 +- client/src/entry/analysis/modules/Home.vue | 8 +- .../entry/analysis/modules/WorkflowEditor.vue | 6 +- client/src/entry/analysis/router-push.js | 4 +- client/src/entry/analysis/router-push.test.js | 2 +- client/src/entry/analysis/router.js | 104 +++++++++--------- .../src/entry/analysis/routes/admin-routes.js | 58 +++++----- .../entry/analysis/routes/library-routes.js | 14 +-- client/src/entry/generic.js | 2 +- client/src/layout/window-manager.js | 5 +- client/src/legacy/grid/grid-view.js | 8 +- client/src/mvc/dataset/data.js | 7 +- .../mvc/visualization/chart/chart-client.js | 9 +- .../visualization/chart/components/model.js | 5 +- .../mvc/visualization/chart/views/buttons.js | 3 +- .../visualization/chart/views/description.js | 5 +- .../mvc/visualization/chart/views/groups.js | 11 +- .../src/mvc/visualization/chart/views/misc.js | 3 +- .../mvc/visualization/chart/views/portlet.js | 3 +- .../mvc/visualization/chart/views/repeat.js | 5 +- .../mvc/visualization/chart/views/settings.js | 9 +- .../mvc/visualization/chart/views/viewer.js | 5 +- .../mvc/visualization/visualization-model.js | 3 +- client/src/onload/defaultAppFactory.js | 2 +- client/src/onload/globalInits/index.js | 5 +- client/src/onload/globalInits/initModals.js | 2 +- .../src/onload/globalInits/onloadWebhooks.js | 4 +- client/src/onload/index.js | 2 +- client/src/onload/initQueue.js | 2 +- client/src/onload/standardInit.js | 3 +- .../store/historyStore/model/watchHistory.js | 10 +- .../historyStore/model/watchHistory.test.js | 5 +- client/src/stores/datatypeStore.js | 3 +- client/src/stores/dbKeyStore.js | 3 +- .../src/stores/services/history.services.js | 3 +- client/src/stores/users/syncUserToGalaxy.js | 5 +- client/src/utils/clipboard.js | 2 +- client/src/utils/color.js | 3 +- client/src/utils/color.test.js | 2 +- client/src/utils/config.js | 5 +- client/src/utils/data.js | 15 +-- client/src/utils/deferred.js | 3 +- client/src/utils/filterConversion.test.js | 4 +- client/src/utils/installMonitor.js | 2 +- client/src/utils/logout.js | 6 +- client/src/utils/mountVueComponent.js | 3 +- client/src/utils/upload-submit.js | 3 +- client/src/utils/webhooks.js | 5 +- client/src/viz/bbi-data-manager.js | 8 +- client/src/viz/icon-button.js | 3 +- client/src/viz/tools.js | 8 +- client/src/viz/trackster.js | 15 +-- client/src/viz/trackster/filters.js | 5 +- client/src/viz/trackster/tracks.js | 28 ++--- client/src/viz/visualization.js | 14 ++- client/src/viz/viz_views.js | 3 +- client/tests/jest/helpers.js | 8 +- .../paired-collection-creator.data.js | 2 +- doc/source/dev/translating.rst | 2 +- 314 files changed, 999 insertions(+), 819 deletions(-) diff --git a/client/docs/avoid-using-global-Galaxy.md b/client/docs/avoid-using-global-Galaxy.md index 3092190ce586..96422535b35f 100644 --- a/client/docs/avoid-using-global-Galaxy.md +++ b/client/docs/avoid-using-global-Galaxy.md @@ -40,9 +40,9 @@ component inside the old Backbone layout until the application is fully converte ```js static // src/mvc/OldBackboneView.js -import { getGalaxyInstance } from "app"; -import MyComponent from "components/MyComponent"; -import { mountVueComponent } from "utils/mountVueComponent"; +import { getGalaxyInstance } from "@/app"; +import MyComponent from "@/components/MyComponent"; +import { mountVueComponent } from "@/utils/mountVueComponent"; const OldBackboneView = { someInitMethodYouMake() { diff --git a/client/docs/querying-the-api.md b/client/docs/querying-the-api.md index 63dc48b873ea..aeefe6fc6a98 100644 --- a/client/docs/querying-the-api.md +++ b/client/docs/querying-the-api.md @@ -43,8 +43,8 @@ const { data: dataset } = await datasetsFetcher({ id: "testID" }); ```js import axios from "axios"; -import { getAppRoot } from "onload/loadConfig"; -import { rethrowSimple } from "utils/simple-error"; +import { getAppRoot } from "@/onload/loadConfig"; +import { rethrowSimple } from "@/utils/simple-error"; async getDataset(datasetId) { const url = `${getAppRoot()}api/datasets/${datasetId}`; diff --git a/client/src/app/app.test.js b/client/src/app/app.test.js index ff8e25eaa868..1948479bdf2e 100644 --- a/client/src/app/app.test.js +++ b/client/src/app/app.test.js @@ -1,7 +1,8 @@ import galaxyOptions from "@tests/test-data/bootstrapped"; -import { getGalaxyInstance, setGalaxyInstance } from "app"; import Backbone from "backbone"; +import { getGalaxyInstance, setGalaxyInstance } from "./"; + export function setupTestGalaxy(galaxyOptions_ = null) { galaxyOptions_ = galaxyOptions_ || galaxyOptions; setGalaxyInstance((GalaxyApp) => { diff --git a/client/src/app/base-mvc.js b/client/src/app/base-mvc.js index ea1b4180e309..9f67869e635f 100644 --- a/client/src/app/base-mvc.js +++ b/client/src/app/base-mvc.js @@ -1,7 +1,8 @@ import Backbone from "backbone"; import $ from "jquery"; import _ from "underscore"; -import _l from "utils/localization"; + +import _l from "@/utils/localization"; //============================================================================== /** Backbone model that syncs to the browser's sessionStorage API. diff --git a/client/src/app/galaxy.js b/client/src/app/galaxy.js index ec0d1ed5ba21..dce7cbfebb16 100644 --- a/client/src/app/galaxy.js +++ b/client/src/app/galaxy.js @@ -1,10 +1,11 @@ -import { getGalaxyInstance } from "app"; import Backbone from "backbone"; import $ from "jquery"; import _ from "underscore"; -import { create, dialog } from "utils/data"; -import { _getUserLocale, _setUserLocale, localize } from "utils/localization"; +import { create, dialog } from "@/utils/data"; +import { _getUserLocale, _setUserLocale, localize } from "@/utils/localization"; + +import { getGalaxyInstance } from "./"; import userModel from "./user-model"; // ============================================================================ diff --git a/client/src/app/monitor.js b/client/src/app/monitor.js index 3de7d0dfd212..060d769ee31d 100644 --- a/client/src/app/monitor.js +++ b/client/src/app/monitor.js @@ -2,10 +2,11 @@ // pass through the singleton accessors. All future code should access galaxy // through getGalaxyInstance, and rarely with setGalaxyInstance -import { getGalaxyInstance, setGalaxyInstance } from "app"; -import config from "config"; -import { getAppRoot } from "onload/loadConfig"; -import { serverPath } from "utils/serverPath"; +import config from "@/config"; +import { getAppRoot } from "@/onload/loadConfig"; +import { serverPath } from "@/utils/serverPath"; + +import { getGalaxyInstance, setGalaxyInstance } from "./"; const galaxyStub = { root: getAppRoot(), diff --git a/client/src/app/singleton.js b/client/src/app/singleton.js index 1591b3b28e0a..f94b66f21fb9 100644 --- a/client/src/app/singleton.js +++ b/client/src/app/singleton.js @@ -2,8 +2,8 @@ * TODO: Make this part of galaxy.js later, once the global refs are gone */ -import config from "config"; -import { serverPath } from "utils/serverPath"; +import config from "@/config"; +import { serverPath } from "@/utils/serverPath"; import { GalaxyApp } from "./galaxy"; diff --git a/client/src/app/user-model.js b/client/src/app/user-model.js index f4d6de326847..9be37c4e8c2e 100644 --- a/client/src/app/user-model.js +++ b/client/src/app/user-model.js @@ -1,6 +1,7 @@ import Backbone from "backbone"; -import { getAppRoot } from "onload/loadConfig"; -import _l from "utils/localization"; + +import { getAppRoot } from "@/onload/loadConfig"; +import _l from "@/utils/localization"; //============================================================================== /** @class Model for a Galaxy user (including anonymous users). diff --git a/client/src/bundleEntries.js b/client/src/bundleEntries.js index 2eec2a6b77bc..d22e85768615 100644 --- a/client/src/bundleEntries.js +++ b/client/src/bundleEntries.js @@ -9,9 +9,10 @@ /* jquery and _ are exposed via expose-loader while several external plugins rely on these */ import $ from "jquery"; // eslint-disable-line no-unused-vars -import Client from "mvc/visualization/chart/chart-client"; import _ from "underscore"; // eslint-disable-line no-unused-vars -import { TracksterUIView } from "viz/trackster"; + +import Client from "./mvc/visualization/chart/chart-client"; +import { TracksterUIView } from "./viz/trackster"; // Previously "chart" diff --git a/client/src/components/ActivityBar/Items/InteractiveItem.vue b/client/src/components/ActivityBar/Items/InteractiveItem.vue index 31b9324e93a0..52853e78ade9 100644 --- a/client/src/components/ActivityBar/Items/InteractiveItem.vue +++ b/client/src/components/ActivityBar/Items/InteractiveItem.vue @@ -4,7 +4,7 @@ import { computed } from "vue"; import { useEntryPointStore } from "@/stores/entryPointStore"; -import ActivityItem from "components/ActivityBar/ActivityItem.vue"; +import ActivityItem from "@/components/ActivityBar/ActivityItem.vue"; const { entryPoints } = storeToRefs(useEntryPointStore()); diff --git a/client/src/components/ActivityBar/Items/NotificationItem.vue b/client/src/components/ActivityBar/Items/NotificationItem.vue index 84e5a05bceda..604cdf515cff 100644 --- a/client/src/components/ActivityBar/Items/NotificationItem.vue +++ b/client/src/components/ActivityBar/Items/NotificationItem.vue @@ -4,7 +4,7 @@ import { computed } from "vue"; import { useNotificationsStore } from "@/stores/notificationsStore"; -import ActivityItem from "components/ActivityBar/ActivityItem.vue"; +import ActivityItem from "@/components/ActivityBar/ActivityItem.vue"; const { totalUnreadCount } = storeToRefs(useNotificationsStore()); diff --git a/client/src/components/ActivityBar/Items/UploadItem.vue b/client/src/components/ActivityBar/Items/UploadItem.vue index e5c2b357d0e7..cd0b4da0b878 100644 --- a/client/src/components/ActivityBar/Items/UploadItem.vue +++ b/client/src/components/ActivityBar/Items/UploadItem.vue @@ -6,7 +6,7 @@ import { useGlobalUploadModal } from "@/composables/globalUploadModal.js"; import { useUploadStore } from "@/stores/uploadStore"; import Query from "@/utils/query-string-parsing.js"; -import ActivityItem from "components/ActivityBar/ActivityItem.vue"; +import ActivityItem from "@/components/ActivityBar/ActivityItem.vue"; export interface Props { id: string; diff --git a/client/src/components/Collections/ListCollectionCreatorModal.js b/client/src/components/Collections/ListCollectionCreatorModal.js index 9993f240aa0a..07fc1ed8cfb3 100644 --- a/client/src/components/Collections/ListCollectionCreatorModal.js +++ b/client/src/components/Collections/ListCollectionCreatorModal.js @@ -1,6 +1,7 @@ -import _l from "utils/localization"; import Vue from "vue"; +import _l from "@/utils/localization"; + import { collectionCreatorModalSetup } from "./common/modal"; function listCollectionCreatorModal(elements, options) { diff --git a/client/src/components/Collections/PairCollectionCreatorModal.js b/client/src/components/Collections/PairCollectionCreatorModal.js index 1cfa2a64dc71..8b791467ecc4 100644 --- a/client/src/components/Collections/PairCollectionCreatorModal.js +++ b/client/src/components/Collections/PairCollectionCreatorModal.js @@ -1,6 +1,7 @@ -import _l from "utils/localization"; import Vue from "vue"; +import _l from "@/utils/localization"; + import { collectionCreatorModalSetup } from "./common/modal"; function pairCollectionCreatorModal(elements, options) { diff --git a/client/src/components/Collections/PairedListCollectionCreator.test.js b/client/src/components/Collections/PairedListCollectionCreator.test.js index a798ba2f8f17..70381681cbb1 100644 --- a/client/src/components/Collections/PairedListCollectionCreator.test.js +++ b/client/src/components/Collections/PairedListCollectionCreator.test.js @@ -1,6 +1,7 @@ import DATA from "@tests/test-data/paired-collection-creator.data.js"; import { mount, shallowMount } from "@vue/test-utils"; -import PairedListCollectionCreator from "components/Collections/PairedListCollectionCreator"; + +import PairedListCollectionCreator from "./PairedListCollectionCreator"; describe("PairedListCollectionCreator", () => { let wrapper; diff --git a/client/src/components/Collections/PairedListCollectionCreator.vue b/client/src/components/Collections/PairedListCollectionCreator.vue index c699c0de7077..56aeb5583394 100644 --- a/client/src/components/Collections/PairedListCollectionCreator.vue +++ b/client/src/components/Collections/PairedListCollectionCreator.vue @@ -408,13 +408,14 @@