Imports, rebase

dannon · Aug 30, 2024 · bdd2b18 · bdd2b18
1 parent a3eedbf
commit bdd2b18
Show file tree

Hide file tree

Showing 24 changed files with 53 additions and 57 deletions.
diff --git a/client/src/components/History/Content/ContentItem.test.js b/client/src/components/History/Content/ContentItem.test.js
@@ -9,7 +9,7 @@ import { updateContentFields } from "@/components/History/model/queries";
 
 import ContentItem from "./ContentItem.vue";
 
-jest.mock("components/History/model/queries");
+jest.mock("@/components/History/model/queries");
 
 const { server, http } = useServerMock();
 

diff --git a/client/src/components/History/Content/GenericElement.test.js b/client/src/components/History/Content/GenericElement.test.js
@@ -5,7 +5,7 @@ import VueRouter from "vue-router";
 
 import GenericElement from "./GenericElement";
 
-jest.mock("components/History/model/queries");
+jest.mock("@/components/History/model/queries");
 
 const localVue = getLocalVue();
 localVue.use(VueRouter);

diff --git a/client/src/components/History/HistoriesFilters.js b/client/src/components/History/HistoriesFilters.js
@@ -1,4 +1,4 @@
-import Filtering, { compare, contains, expandNameTag, toDate } from "utils/filtering";
+import Filtering, { compare, contains, expandNameTag, toDate } from "@/utils/filtering";
 
 const validFilters = {
     name: { placeholder: "name", type: String, handler: contains("name"), menuItem: true },

diff --git a/client/src/components/History/HistoryFilters.js b/client/src/components/History/HistoryFilters.js
@@ -1,3 +1,4 @@
+import { STATES } from "@/components/History/Content/model/states";
 import Filtering, {
     compare,
     contains,
@@ -6,9 +7,7 @@ import Filtering, {
     quotaSourceFilter,
     toBool,
     toDate,
-} from "utils/filtering";
-
-import { STATES } from "@/components/History/Content/model/states";
+} from "@/utils/filtering";
 
 import StatesInfo from "@/components/History/Content/model/StatesInfo.vue";
 

diff --git a/client/src/components/HistoryExport/ToLink.test.js b/client/src/components/HistoryExport/ToLink.test.js
@@ -13,7 +13,7 @@ const TEST_HISTORY_ID = "hist1235";
 const TEST_EXPORTS_URL = `/api/histories/${TEST_HISTORY_ID}/exports`;
 const TEST_JOB_ID = "test1234job";
 
-jest.mock("components/JobStates/wait");
+jest.mock("@/components/JobStates/wait");
 
 describe("ToLink.vue", () => {
     let axiosMock;

diff --git a/client/src/components/HistoryExport/ToRemoteFile.test.js b/client/src/components/HistoryExport/ToRemoteFile.test.js
@@ -13,7 +13,7 @@ const TEST_HISTORY_ID = "hist1235";
 const TEST_JOB_ID = "job123789";
 const TEST_EXPORTS_URL = `/api/histories/${TEST_HISTORY_ID}/exports`;
 
-jest.mock("components/JobStates/wait");
+jest.mock("@/components/JobStates/wait");
 
 describe("ToRemoteFile.vue", () => {
     let axiosMock;

diff --git a/client/src/components/JobInformation/CodeRow.vue b/client/src/components/JobInformation/CodeRow.vue
@@ -30,7 +30,8 @@
 import { library } from "@fortawesome/fontawesome-svg-core";
 import { faCompressAlt, faExpandAlt } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
-import HelpText from "components/Help/HelpText";
+
+import HelpText from "@/components/Help/HelpText";
 
 library.add(faCompressAlt, faExpandAlt);
 export default {

diff --git a/client/src/components/JobInformation/JobInformation.vue b/client/src/components/JobInformation/JobInformation.vue
@@ -1,9 +1,4 @@
 <script setup>
-import CopyToClipboard from "components/CopyToClipboard";
-import HelpText from "components/Help/HelpText";
-import { JobDetailsProvider } from "components/providers/JobProvider";
-import UtcDate from "components/UtcDate";
-import { NON_TERMINAL_STATES } from "components/WorkflowInvocationState/util";
 import { formatDuration, intervalToDuration } from "date-fns";
 import { computed, ref } from "vue";
 

diff --git a/client/src/components/JobInformation/JobOutputs.test.js b/client/src/components/JobInformation/JobOutputs.test.js
@@ -2,7 +2,7 @@ import { shallowMount } from "@vue/test-utils";
 
 import JobOutputs from "./JobOutputs";
 
-jest.mock("components/providers/DatasetCollectionProvider");
+jest.mock("@/components/providers/DatasetCollectionProvider");
 
 describe("JobInformation/JobOutputs.vue", () => {
     let wrapper;

diff --git a/client/src/components/JobStates/wait.js b/client/src/components/JobStates/wait.js
@@ -1,6 +1,7 @@
 import axios from "axios";
-import { ERROR_STATES, NON_TERMINAL_STATES } from "components/WorkflowInvocationState/util";
-import { getAppRoot } from "onload/loadConfig";
+
+import { ERROR_STATES, NON_TERMINAL_STATES } from "@/components/WorkflowInvocationState/util";
+import { getAppRoot } from "@/onload/loadConfig";
 
 export function waitOnJob(jobId, onStateUpdate = null, interval = 1000) {
     // full=true to capture standard error on last iteration for building

diff --git a/client/src/components/Libraries/LibraryFolder/LibraryFolderDataset/LibraryDataset.test.js b/client/src/components/Libraries/LibraryFolder/LibraryFolderDataset/LibraryDataset.test.js
@@ -14,7 +14,7 @@ import restrictedDatasetResponse from "./testData/restrictedDataset.json";
 import unrestrictedDatasetResponse from "./testData/unrestrictedDataset.json";
 
 jest.mock("app");
-jest.mock("onload/loadConfig");
+jest.mock("@/onload/loadConfig");
 getAppRoot.mockImplementation(() => "/");
 jest.mock("../services");
 

diff --git a/client/src/components/Login/ChangePassword.test.ts b/client/src/components/Login/ChangePassword.test.ts
@@ -7,7 +7,7 @@ import { withPrefix } from "@/utils/redirect";
 
 import MountTarget from "./ChangePassword.vue";
 
-jest.mock("utils/redirect");
+jest.mock("@/utils/redirect");
 
 const mockSafePath = jest.fn();
 (withPrefix as jest.Mock).mockImplementation(mockSafePath);

diff --git a/client/src/components/Markdown/MarkdownContainer.test.js b/client/src/components/Markdown/MarkdownContainer.test.js
@@ -9,7 +9,7 @@ import { withPrefix } from "@/utils/redirect";
 import MountTarget from "./MarkdownContainer.vue";
 
 // mock routes
-jest.mock("utils/redirect");
+jest.mock("@/utils/redirect");
 withPrefix.mockImplementation((url) => url);
 
 jest.mock("@/composables/config", () => ({

diff --git a/client/src/components/RuleCollectionBuilder.vue b/client/src/components/RuleCollectionBuilder.vue
@@ -569,29 +569,30 @@
 import HotTable from "@handsontable/vue";
 import axios from "axios";
 import BootstrapVue from "bootstrap-vue";
-import ColumnSelector from "components/RuleBuilder/ColumnSelector";
-import IdentifierDisplay from "components/RuleBuilder/IdentifierDisplay";
-import RegularExpressionInput from "components/RuleBuilder/RegularExpressionInput";
-import RuleDefs from "components/RuleBuilder/rule-definitions";
-import RuleComponent from "components/RuleBuilder/RuleComponent";
-import RuleDisplay from "components/RuleBuilder/RuleDisplay";
-import RuleModalFooter from "components/RuleBuilder/RuleModalFooter";
-import RuleModalHeader from "components/RuleBuilder/RuleModalHeader";
-import RuleModalMiddle from "components/RuleBuilder/RuleModalMiddle";
-import RuleTargetComponent from "components/RuleBuilder/RuleTargetComponent";
-import SavedRulesSelector from "components/RuleBuilder/SavedRulesSelector";
-import SaveRules from "components/RuleBuilder/SaveRules";
-import StateDiv from "components/RuleBuilder/StateDiv";
-import Select2 from "components/Select2";
-import UploadUtils from "components/Upload/utils";
-import { ERROR_STATES, NON_TERMINAL_STATES } from "components/WorkflowInvocationState/util";
 import $ from "jquery";
 import _ from "underscore";
-import { refreshContentsWrapper } from "utils/data";
-import _l from "utils/localization";
 import Vue from "vue";
 
+import { getGalaxyInstance } from "@/app";
+import ColumnSelector from "@/components/RuleBuilder/ColumnSelector";
+import IdentifierDisplay from "@/components/RuleBuilder/IdentifierDisplay";
+import RegularExpressionInput from "@/components/RuleBuilder/RegularExpressionInput";
+import RuleDefs from "@/components/RuleBuilder/rule-definitions";
+import RuleComponent from "@/components/RuleBuilder/RuleComponent";
+import RuleDisplay from "@/components/RuleBuilder/RuleDisplay";
+import RuleModalFooter from "@/components/RuleBuilder/RuleModalFooter";
+import RuleModalHeader from "@/components/RuleBuilder/RuleModalHeader";
+import RuleModalMiddle from "@/components/RuleBuilder/RuleModalMiddle";
+import RuleTargetComponent from "@/components/RuleBuilder/RuleTargetComponent";
+import SavedRulesSelector from "@/components/RuleBuilder/SavedRulesSelector";
+import SaveRules from "@/components/RuleBuilder/SaveRules";
+import StateDiv from "@/components/RuleBuilder/StateDiv";
+import Select2 from "@/components/Select2";
+import UploadUtils from "@/components/Upload/utils";
+import { ERROR_STATES, NON_TERMINAL_STATES } from "@/components/WorkflowInvocationState/util";
 import { getAppRoot } from "@/onload/loadConfig";
+import { refreshContentsWrapper } from "@/utils/data";
+import _l from "@/utils/localization";
 
 import TooltipOnHover from "@/components/TooltipOnHover.vue";
 

diff --git a/client/src/components/ToolRecommendation.vue b/client/src/components/ToolRecommendation.vue
@@ -22,7 +22,6 @@ import { getDatatypesMapper } from "@/components/Datatypes";
 import { getToolPredictions } from "@/components/Workflow/Editor/modules/services";
 import { getCompatibleRecommendations } from "@/components/Workflow/Editor/modules/utilities";
 import { getAppRoot } from "@/onload/loadConfig";
-
 import { getShortToolId } from "@/utils/tool";
 
 export default {

diff --git a/client/src/components/Toolshed/InstalledList/Details.test.js b/client/src/components/Toolshed/InstalledList/Details.test.js
@@ -6,7 +6,7 @@ import { Services } from "../services";
 import Details from "./Details";
 
 jest.mock("app");
-jest.mock("onload/loadConfig");
+jest.mock("@/onload/loadConfig");
 getAppRoot.mockImplementation(() => "/");
 jest.mock("../services");
 

diff --git a/client/src/components/Toolshed/InstalledList/Index.test.js b/client/src/components/Toolshed/InstalledList/Index.test.js
@@ -7,7 +7,7 @@ import { Services } from "../services";
 import Index from "./Index";
 
 jest.mock("app");
-jest.mock("onload/loadConfig");
+jest.mock("@/onload/loadConfig");
 getAppRoot.mockImplementation(() => "/");
 jest.mock("../services");
 

diff --git a/client/src/components/Toolshed/InstalledList/Monitor.test.js b/client/src/components/Toolshed/InstalledList/Monitor.test.js
@@ -7,7 +7,7 @@ import { Services } from "../services";
 import Monitor from "./Monitor";
 
 jest.mock("app");
-jest.mock("onload/loadConfig");
+jest.mock("@/onload/loadConfig");
 getAppRoot.mockImplementation(() => "/");
 jest.mock("../services");
 

diff --git a/client/src/components/Visualizations/PluginList.vue b/client/src/components/Visualizations/PluginList.vue
@@ -60,13 +60,12 @@
 </template>
 <script>
 import axios from "axios";
-import { absPath } from "utils/redirect";
 
 import { getGalaxyInstance } from "@/app";
 import DelayedInput from "@/components/Common/DelayedInput";
 import { getAppRoot } from "@/onload/loadConfig";
 import _l from "@/utils/localization";
-
+import { absPath } from "@/utils/redirect";
 
 export default {
     components: {

diff --git a/client/src/components/Workflow/Editor/Index.test.ts b/client/src/components/Workflow/Editor/Index.test.ts
@@ -16,10 +16,10 @@ import Index from "./Index.vue";
 const localVue = getLocalVue();
 localVue.use(PiniaVuePlugin);
 
-jest.mock("components/Datatypes/factory");
+jest.mock("@/components/Datatypes/factory");
 jest.mock("./modules/services");
 jest.mock("layout/modal");
-jest.mock("onload/loadConfig");
+jest.mock("@/onload/loadConfig");
 jest.mock("./modules/utilities");
 
 jest.mock("app");

diff --git a/client/src/components/admin/JobsList.vue b/client/src/components/admin/JobsList.vue
@@ -97,11 +97,12 @@
 
 <script>
 import axios from "axios";
-import filtersMixin from "components/Indices/filtersMixin";
-import { jobsProvider } from "components/providers/JobProvider";
-import { NON_TERMINAL_STATES } from "components/WorkflowInvocationState/util";
-import { getAppRoot } from "onload/loadConfig";
-import { errorMessageAsString } from "utils/simple-error";
+
+import filtersMixin from "@/components/Indices/filtersMixin";
+import { jobsProvider } from "@/components/providers/JobProvider";
+import { NON_TERMINAL_STATES } from "@/components/WorkflowInvocationState/util";
+import { getAppRoot } from "@/onload/loadConfig";
+import { errorMessageAsString } from "@/utils/simple-error";
 
 import { commonJobFields } from "./JobFields";
 

diff --git a/client/src/components/providers/utils.js b/client/src/components/providers/utils.js
@@ -1,6 +1,7 @@
-import { NON_TERMINAL_STATES } from "components/WorkflowInvocationState/util";
 import { snakeCase } from "lodash";
 
+import { NON_TERMINAL_STATES } from "@/components/WorkflowInvocationState/util";
+
 export function stateIsTerminal(result) {
     return !NON_TERMINAL_STATES.includes(result.state);
 }

diff --git a/client/tests/jest/helpers.js b/client/tests/jest/helpers.js
@@ -3,13 +3,13 @@
  */
 import { createLocalVue, shallowMount } from "@vue/test-utils";
 import BootstrapVue from "bootstrap-vue";
-import { iconPlugin } from "components/plugins/icons";
-import { localizationPlugin } from "components/plugins/localization";
-import { vueRxShortcutPlugin } from "components/plugins/vueRxShortcuts";
+import { iconPlugin } from "@/components/plugins/icons";
+import { localizationPlugin } from "@/components/plugins/localization";
+import { vueRxShortcutPlugin } from "@/components/plugins/vueRxShortcuts";
 import { PiniaVuePlugin } from "pinia";
 import { fromEventPattern, timer } from "rxjs";
 import { debounceTime, take, takeUntil } from "rxjs/operators";
-import _l from "utils/localization";
+import _l from "@/utils/localization";
 
 import _short from "@/components/plugins/short";
 import VueRouter from "vue-router";

diff --git a/client/vite.config.js b/client/vite.config.js
@@ -11,7 +11,6 @@ const scriptsBase = path.resolve(__dirname, "./src");
 const styleBase = path.join(scriptsBase, "style");
 const buildDate = new Date();
 
-
 console.debug(license);
 export default defineConfig({
     define: {