diff --git a/client/src/components/Common/FilterMenu.test.ts b/client/src/components/Common/FilterMenu.test.ts index 8474981948dc..ee14d18a73d3 100644 --- a/client/src/components/Common/FilterMenu.test.ts +++ b/client/src/components/Common/FilterMenu.test.ts @@ -3,7 +3,7 @@ import { getLocalVue } from "@tests/jest/helpers"; import { mount, Wrapper } from "@vue/test-utils"; import { HistoryFilters } from "@/components/History/HistoryFilters"; -import { WorkflowFilters } from "@/components/Workflow/WorkflowFilters"; +import { WorkflowFilters } from "@/components/Workflow/List/WorkflowFilters"; import Filtering, { compare, contains, equals, toBool, toDate } from "@/utils/filtering"; import FilterMenu from "./FilterMenu.vue"; diff --git a/client/src/components/Workflow/WorkflowActions.vue b/client/src/components/Workflow/List/WorkflowActions.vue similarity index 100% rename from client/src/components/Workflow/WorkflowActions.vue rename to client/src/components/Workflow/List/WorkflowActions.vue diff --git a/client/src/components/Workflow/WorkflowActionsExtend.vue b/client/src/components/Workflow/List/WorkflowActionsExtend.vue similarity index 100% rename from client/src/components/Workflow/WorkflowActionsExtend.vue rename to client/src/components/Workflow/List/WorkflowActionsExtend.vue diff --git a/client/src/components/Workflow/WorkflowCard.vue b/client/src/components/Workflow/List/WorkflowCard.vue similarity index 97% rename from client/src/components/Workflow/WorkflowCard.vue rename to client/src/components/Workflow/List/WorkflowCard.vue index ca7e1af9ef95..076ec2c271e6 100644 --- a/client/src/components/Workflow/WorkflowCard.vue +++ b/client/src/components/Workflow/List/WorkflowCard.vue @@ -13,12 +13,12 @@ import { useUserStore } from "@/stores/userStore"; import AsyncButton from "@/components/Common/AsyncButton.vue"; import TextSummary from "@/components/Common/TextSummary.vue"; import StatelessTags from "@/components/TagsMultiselect/StatelessTags.vue"; +import WorkflowActions from "@/components/Workflow/List/WorkflowActions.vue"; +import WorkflowActionsExtend from "@/components/Workflow/List/WorkflowActionsExtend.vue"; +import WorkflowIndicators from "@/components/Workflow/List/WorkflowIndicators.vue"; +import WorkflowRename from "@/components/Workflow/List/WorkflowRename.vue"; import WorkflowPublished from "@/components/Workflow/Published/WorkflowPublished.vue"; -import WorkflowActions from "@/components/Workflow/WorkflowActions.vue"; -import WorkflowActionsExtend from "@/components/Workflow/WorkflowActionsExtend.vue"; -import WorkflowIndicators from "@/components/Workflow/WorkflowIndicators.vue"; import WorkflowInvocationsCount from "@/components/Workflow/WorkflowInvocationsCount.vue"; -import WorkflowRename from "@/components/Workflow/WorkflowRename.vue"; import WorkflowRunButton from "@/components/Workflow/WorkflowRunButton.vue"; library.add(faEdit, faEye, faPen, faUpload); diff --git a/client/src/components/Workflow/WorkflowFilters.js b/client/src/components/Workflow/List/WorkflowFilters.js similarity index 100% rename from client/src/components/Workflow/WorkflowFilters.js rename to client/src/components/Workflow/List/WorkflowFilters.js diff --git a/client/src/components/Workflow/WorkflowIndicators.vue b/client/src/components/Workflow/List/WorkflowIndicators.vue similarity index 100% rename from client/src/components/Workflow/WorkflowIndicators.vue rename to client/src/components/Workflow/List/WorkflowIndicators.vue diff --git a/client/src/components/Workflow/WorkflowList.test.ts b/client/src/components/Workflow/List/WorkflowList.test.ts similarity index 98% rename from client/src/components/Workflow/WorkflowList.test.ts rename to client/src/components/Workflow/List/WorkflowList.test.ts index 6d98ef33714d..b4b71d02f185 100644 --- a/client/src/components/Workflow/WorkflowList.test.ts +++ b/client/src/components/Workflow/List/WorkflowList.test.ts @@ -7,7 +7,7 @@ import { setActivePinia } from "pinia"; import { mockFetcher } from "@/api/schema/__mocks__"; import { useUserStore } from "@/stores/userStore"; -import { generateRandomWorkflowList } from "./testUtils"; +import { generateRandomWorkflowList } from "../testUtils"; import WorkflowList from "./WorkflowList.vue"; diff --git a/client/src/components/Workflow/WorkflowList.vue b/client/src/components/Workflow/List/WorkflowList.vue similarity index 98% rename from client/src/components/Workflow/WorkflowList.vue rename to client/src/components/Workflow/List/WorkflowList.vue index 3cbda017cc01..b730a12f002c 100644 --- a/client/src/components/Workflow/WorkflowList.vue +++ b/client/src/components/Workflow/List/WorkflowList.vue @@ -7,19 +7,18 @@ import { filter } from "underscore"; import { computed, onMounted, ref, watch } from "vue"; import { useRouter } from "vue-router/composables"; +import { helpHtml, WorkflowFilters } from "@/components/Workflow/List/WorkflowFilters"; import { loadWorkflows } from "@/components/Workflow/workflows.services"; import { Toast } from "@/composables/toast"; import { useUserStore } from "@/stores/userStore"; -import { helpHtml, WorkflowFilters } from "./WorkflowFilters"; - import FilterMenu from "@/components/Common/FilterMenu.vue"; import Heading from "@/components/Common/Heading.vue"; import ListHeader from "@/components/Common/ListHeader.vue"; import LoginRequired from "@/components/Common/LoginRequired.vue"; import LoadingSpan from "@/components/LoadingSpan.vue"; -import WorkflowCard from "@/components/Workflow/WorkflowCard.vue"; -import WorkflowListActions from "@/components/Workflow/WorkflowListActions.vue"; +import WorkflowCard from "@/components/Workflow/List/WorkflowCard.vue"; +import WorkflowListActions from "@/components/Workflow/List/WorkflowListActions.vue"; library.add(faStar, faTrash); diff --git a/client/src/components/Workflow/WorkflowListActions.vue b/client/src/components/Workflow/List/WorkflowListActions.vue similarity index 100% rename from client/src/components/Workflow/WorkflowListActions.vue rename to client/src/components/Workflow/List/WorkflowListActions.vue diff --git a/client/src/components/Workflow/WorkflowRename.vue b/client/src/components/Workflow/List/WorkflowRename.vue similarity index 100% rename from client/src/components/Workflow/WorkflowRename.vue rename to client/src/components/Workflow/List/WorkflowRename.vue diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue index c71970e3691c..603c51236c34 100644 --- a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue +++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue @@ -18,13 +18,13 @@ import { isTerminal, jobCount, runningCount } from "./util"; import Heading from "../Common/Heading.vue"; import SwitchToHistoryLink from "../History/SwitchToHistoryLink.vue"; import UtcDate from "../UtcDate.vue"; -import InvocationReport from "../Workflow/InvocationReport.vue"; -import WorkflowInvocationsCount from "../Workflow/WorkflowInvocationsCount.vue"; -import WorkflowRunButton from "../Workflow/WorkflowRunButton.vue"; import WorkflowInvocationExportOptions from "./WorkflowInvocationExportOptions.vue"; import WorkflowInvocationInputOutputTabs from "./WorkflowInvocationInputOutputTabs.vue"; import WorkflowInvocationOverview from "./WorkflowInvocationOverview.vue"; import LoadingSpan from "@/components/LoadingSpan.vue"; +import InvocationReport from "@/components/Workflow/InvocationReport.vue"; +import WorkflowInvocationsCount from "@/components/Workflow/WorkflowInvocationsCount.vue"; +import WorkflowRunButton from "@/components/Workflow/WorkflowRunButton.vue"; library.add(faArrowLeft, faClock, faEdit, faEye, faHdd, faPlay, faSitemap); diff --git a/client/src/entry/analysis/router.js b/client/src/entry/analysis/router.js index 43a38292efa2..811544520bd9 100644 --- a/client/src/entry/analysis/router.js +++ b/client/src/entry/analysis/router.js @@ -36,11 +36,11 @@ import HistoryInvocations from "components/Workflow/HistoryInvocations"; import TrsImport from "components/Workflow/Import/TrsImport"; import TrsSearch from "components/Workflow/Import/TrsSearch"; import InvocationReport from "components/Workflow/InvocationReport"; +import WorkflowList from "components/Workflow/List/WorkflowList"; import StoredWorkflowInvocations from "components/Workflow/StoredWorkflowInvocations"; import WorkflowCreate from "components/Workflow/WorkflowCreate"; import WorkflowExport from "components/Workflow/WorkflowExport"; import WorkflowImport from "components/Workflow/WorkflowImport"; -import WorkflowList from "components/Workflow/WorkflowList"; import Analysis from "entry/analysis/modules/Analysis"; import CenterFrame from "entry/analysis/modules/CenterFrame"; import Home from "entry/analysis/modules/Home"; diff --git a/client/src/utils/filterConversion.test.js b/client/src/utils/filterConversion.test.js index cf3230e4d13d..6867c20c23f0 100644 --- a/client/src/utils/filterConversion.test.js +++ b/client/src/utils/filterConversion.test.js @@ -1,5 +1,5 @@ import { HistoryFilters } from "components/History/HistoryFilters"; -import { WorkflowFilters } from "components/Workflow/WorkflowFilters"; +import { WorkflowFilters } from "components/Workflow/List/WorkflowFilters"; describe("test filtering helpers to convert filters to filter text", () => { const MyWorkflowFilters = WorkflowFilters("my");