From ebd4d4ba06c3f215c17b4c71e3fee3fddbd56c72 Mon Sep 17 00:00:00 2001 From: guerler Date: Wed, 21 Sep 2022 20:16:38 -0400 Subject: [PATCH] Move job state model out of mvc/history to utils --- client/src/components/JobInformation/JobInformation.vue | 2 +- client/src/components/JobStates/wait.js | 2 +- client/src/components/RuleCollectionBuilder.vue | 2 +- .../WorkflowInvocationState/WorkflowInvocationState.vue | 2 +- client/src/components/admin/Jobs.vue | 2 +- client/src/components/providers/utils.js | 2 +- client/src/{mvc/history => utils}/job-states-model.js | 0 7 files changed, 6 insertions(+), 6 deletions(-) rename client/src/{mvc/history => utils}/job-states-model.js (100%) diff --git a/client/src/components/JobInformation/JobInformation.vue b/client/src/components/JobInformation/JobInformation.vue index 2a31f707a1f..9c520be436b 100644 --- a/client/src/components/JobInformation/JobInformation.vue +++ b/client/src/components/JobInformation/JobInformation.vue @@ -79,7 +79,7 @@ import CodeRow from "./CodeRow.vue"; import { JobDetailsProvider } from "components/providers/JobProvider"; import UtcDate from "components/UtcDate"; import CopyToClipboard from "components/CopyToClipboard"; -import JOB_STATES_MODEL from "mvc/history/job-states-model"; +import JOB_STATES_MODEL from "utils/job-states-model"; import { formatDuration, intervalToDuration } from "date-fns"; export default { diff --git a/client/src/components/JobStates/wait.js b/client/src/components/JobStates/wait.js index 880edd3afff..0c5621cc219 100644 --- a/client/src/components/JobStates/wait.js +++ b/client/src/components/JobStates/wait.js @@ -1,5 +1,5 @@ import { getAppRoot } from "onload/loadConfig"; -import JOB_STATES_MODEL from "mvc/history/job-states-model"; +import JOB_STATES_MODEL from "utils/job-states-model"; import axios from "axios"; export function waitOnJob(jobId, onStateUpdate = null, interval = 1000) { diff --git a/client/src/components/RuleCollectionBuilder.vue b/client/src/components/RuleCollectionBuilder.vue index ab4ae62bf69..1a2f50e2093 100644 --- a/client/src/components/RuleCollectionBuilder.vue +++ b/client/src/components/RuleCollectionBuilder.vue @@ -574,7 +574,7 @@ import _l from "utils/localization"; import { refreshContentsWrapper } from "utils/data"; import HotTable from "@handsontable/vue"; import UploadUtils from "mvc/upload/upload-utils"; -import JobStatesModel from "mvc/history/job-states-model"; +import JobStatesModel from "utils/job-states-model"; import RuleDefs from "mvc/rules/rule-definitions"; import Vue from "vue"; import BootstrapVue from "bootstrap-vue"; diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue index c4da850d742..b8186244d4c 100644 --- a/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue +++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue @@ -36,7 +36,7 @@ import WorkflowInvocationSummary from "./WorkflowInvocationSummary.vue"; import WorkflowInvocationDetails from "./WorkflowInvocationDetails.vue"; import WorkflowInvocationExportOptions from "./WorkflowInvocationExportOptions.vue"; -import JOB_STATES_MODEL from "mvc/history/job-states-model"; +import JOB_STATES_MODEL from "utils/job-states-model"; import mixin from "components/JobStates/mixin"; import { mapGetters, mapActions } from "vuex"; diff --git a/client/src/components/admin/Jobs.vue b/client/src/components/admin/Jobs.vue index 2ff17dee792..feef58d091b 100644 --- a/client/src/components/admin/Jobs.vue +++ b/client/src/components/admin/Jobs.vue @@ -106,7 +106,7 @@ import { getAppRoot } from "onload/loadConfig"; import axios from "axios"; import JobsTable from "components/admin/JobsTable"; import JobLock from "./JobLock"; -import JOB_STATES_MODEL from "mvc/history/job-states-model"; +import JOB_STATES_MODEL from "utils/job-states-model"; import { commonJobFields } from "./JobFields"; import { errorMessageAsString } from "utils/simple-error"; import { jobsProvider } from "components/providers/JobProvider"; diff --git a/client/src/components/providers/utils.js b/client/src/components/providers/utils.js index 56d3bf6bd9c..cfa2aa90610 100644 --- a/client/src/components/providers/utils.js +++ b/client/src/components/providers/utils.js @@ -1,4 +1,4 @@ -import JOB_STATES_MODEL from "mvc/history/job-states-model"; +import JOB_STATES_MODEL from "utils/job-states-model"; import { snakeCase } from "snake-case"; export function stateIsTerminal(result) { diff --git a/client/src/mvc/history/job-states-model.js b/client/src/utils/job-states-model.js similarity index 100% rename from client/src/mvc/history/job-states-model.js rename to client/src/utils/job-states-model.js