Import alias additions across the board.

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() {

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}`;

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) => {

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.

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";
 
 // ============================================================================

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(),

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";
 

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).

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"
 

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());
 

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());
 

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;

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) {

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) {

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;

client/src/components/Collections/PairedListCollectionCreator.vue

@@ -408,13 +408,14 @@
 </template>
 <script>
 import BootstrapVue from "bootstrap-vue";
-import STATES from "mvc/dataset/states";
-import levenshteinDistance from "utils/levenshtein";
-import _l from "utils/localization";
-import naturalSort from "utils/natural-sort";
 import Vue from "vue";
 import draggable from "vuedraggable";
 
+import STATES from "@/mvc/dataset/states";
+import levenshteinDistance from "@/utils/levenshtein";
+import _l from "@/utils/localization";
+import naturalSort from "@/utils/natural-sort";
+
 import mixin from "./common/mixin";
 import PairedElementView from "./PairedElementView";
 import UnpairedDatasetElementView from "./UnpairedDatasetElementView";

client/src/components/Collections/PairedListCollectionCreatorModal.js

@@ -1,6 +1,7 @@
-import _l from "utils/localization";
 import Vue from "vue";
 
+import _l from "@/utils/localization";
+
 import { collectionCreatorModalSetup } from "./common/modal";
 
 import PairedListCollectionCreator from "./PairedListCollectionCreator.vue";

client/src/components/Collections/RuleBasedCollectionCreatorModal.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 ruleBasedCollectionCreatorModal(elements, elementsType, importType, options) {

client/src/components/Collections/common/modal.js

@@ -1,6 +1,6 @@
-import { getGalaxyInstance } from "app";
-import UI_MODAL from "mvc/ui/ui-modal";
-import _l from "utils/localization";
+import { getGalaxyInstance } from "@/app";
+import UI_MODAL from "@/mvc/ui/ui-modal";
+import _l from "@/utils/localization";
 
 export function collectionCreatorModalSetup(options, Galaxy = null) {
     Galaxy = Galaxy || getGalaxyInstance();

client/src/components/CopyToClipboard.vue

@@ -6,7 +6,8 @@
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { faCopy } from "@fortawesome/free-regular-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
-import { copy } from "utils/clipboard";
+
+import { copy } from "@/utils/clipboard";
 
 library.add(faCopy);
 

client/src/components/DataDialog/DataDialog.test.js

@@ -5,7 +5,7 @@ import { Services } from "./services";
 import { UrlTracker } from "./utilities";
 
 import DataDialog from "./DataDialog.vue";
-import SelectionDialog from "components/SelectionDialog/SelectionDialog.vue";
+import SelectionDialog from "@/components/SelectionDialog/SelectionDialog.vue";
 
 jest.mock("app");
 

client/src/components/DataDialog/services.js

@@ -1,5 +1,6 @@
 import axios from "axios";
-import { getAppRoot } from "onload/loadConfig";
+
+import { getAppRoot } from "@/onload/loadConfig";
 
 /** Data populator traverses raw server responses **/
 export class Services {

client/src/components/DecodedId.vue

@@ -2,10 +2,11 @@
     <span v-if="decoded_id">({{ decoded_id }})</span>
 </template>
 <script>
-import { getGalaxyInstance } from "app";
 import axios from "axios";
-import { getAppRoot } from "onload/loadConfig";
-import { rethrowSimple } from "utils/simple-error";
+
+import { getGalaxyInstance } from "@/app";
+import { getAppRoot } from "@/onload/loadConfig";
+import { rethrowSimple } from "@/utils/simple-error";
 
 export default {
     props: {

client/src/components/DragGhost.vue

@@ -3,9 +3,10 @@ import { library } from "@fortawesome/fontawesome-svg-core";
 import { faPaperPlane } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
 import { storeToRefs } from "pinia";
-import { useEventStore } from "stores/eventStore";
 import { computed } from "vue";
 
+import { useEventStore } from "@/stores/eventStore";
+
 import TextShort from "./Common/TextShort.vue";
 
 library.add(faPaperPlane);

client/src/components/Form/Elements/FormDirectory.test.js

@@ -1,11 +1,11 @@
 import { mount } from "@vue/test-utils";
-import FilesDialog from "components/FilesDialog/FilesDialog";
-import { rootResponse } from "components/FilesDialog/testingData";
 import flushPromises from "flush-promises";
 import { createPinia } from "pinia";
 import { getLocalVue } from "tests/jest/helpers";
 
 import { mockFetcher } from "@/api/schema/__mocks__";
+import FilesDialog from "@/components/FilesDialog/FilesDialog";
+import { rootResponse } from "@/components/FilesDialog/testingData";
 
 import FormDirectory from "./FormDirectory";
 

client/src/components/Form/Elements/FormDirectory.vue

@@ -40,8 +40,9 @@
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { faFolder, faFolderOpen } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
-import { FilesDialog } from "components/FilesDialog";
-import _l from "utils/localization";
+
+import { FilesDialog } from "@/components/FilesDialog";
+import _l from "@/utils/localization";
 
 library.add(faFolder, faFolderOpen);
 

client/src/components/Form/Elements/FormRulesEdit.vue

@@ -2,11 +2,11 @@
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { faEdit } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
-import RuleCollectionBuilder from "components/RuleCollectionBuilder";
-import RulesDisplay from "components/RulesDisplay/RulesDisplay";
 import { computed, ref } from "vue";
 
 import { fetchCollectionDetails } from "@/api/datasetCollections";
+import RuleCollectionBuilder from "@/components/RuleCollectionBuilder";
+import RulesDisplay from "@/components/RulesDisplay/RulesDisplay";
 
 library.add(faEdit);
 

client/src/components/Form/FormGeneric.vue

@@ -25,13 +25,13 @@
 </template>
 
 <script>
-import FormCard from "components/Form/FormCard";
-import FormDisplay from "components/Form/FormDisplay";
-import { visitInputs } from "components/Form/utilities";
-import { UrlDataProvider } from "components/providers/UrlDataProvider";
-import { withPrefix } from "utils/redirect";
+import { UrlDataProvider } from "@/components/providers/UrlDataProvider";
+import { withPrefix } from "@/utils/redirect";
 
+import FormCard from "./FormCard";
+import FormDisplay from "./FormDisplay";
 import { submitData } from "./services";
+import { visitInputs } from "./utilities";
 
 export default {
     components: {

client/src/components/Form/services.js

@@ -1,6 +1,7 @@
 import axios from "axios";
-import { withPrefix } from "utils/redirect";
-import { rethrowSimple } from "utils/simple-error";
+
+import { withPrefix } from "@/utils/redirect";
+import { rethrowSimple } from "@/utils/simple-error";
 
 export async function submitData(url, payload) {
     try {

client/src/components/Grid/Grid.vue

@@ -3,8 +3,8 @@
 </template>
 
 <script>
-import GridView from "mvc/grid/grid-view";
-import { getAppRoot } from "onload";
+import GridView from "@/mvc/grid/grid-view";
+import { getAppRoot } from "@/onload";
 
 export default {
     props: {

client/src/components/History/Content/ContentItem.test.js

@@ -1,11 +1,11 @@
 import { createTestingPinia } from "@pinia/testing";
 import { mount } from "@vue/test-utils";
-import { updateContentFields } from "components/History/model/queries";
 import { PiniaVuePlugin } from "pinia";
 import { getLocalVue } from "tests/jest/helpers";
 import VueRouter from "vue-router";
 
 import { mockFetcher } from "@/api/schema/__mocks__";
+import { updateContentFields } from "@/components/History/model/queries";
 
 import ContentItem from "./ContentItem";
 

client/src/components/History/Content/ExpandedItems.js

@@ -1,4 +1,4 @@
-import { loadSet, saveSet } from "utils/setCache";
+import { loadSet, saveSet } from "@/utils/setCache";
 
 export default {
     props: {

client/src/components/History/Content/GenericItem.vue

@@ -24,13 +24,13 @@
 </template>
 
 <script>
-import LoadingSpan from "components/LoadingSpan";
-import { Toast } from "composables/toast";
 import { mapActions } from "pinia";
 
 import { deleteContent, updateContentFields } from "@/components/History/model/queries";
+import LoadingSpan from "@/components/LoadingSpan";
 import { DatasetCollectionProvider, DatasetProvider } from "@/components/providers";
 import { DatasetCollectionElementProvider } from "@/components/providers/storeProviders";
+import { Toast } from "@/composables/toast";
 import { useHistoryStore } from "@/stores/historyStore";
 import { errorMessageAsString } from "@/utils/simple-error";