From 178492bb3851ba9609108a7481547df0aacae8a9 Mon Sep 17 00:00:00 2001
From: guerler <aysam.guerler@gmail.com>
Date: Mon, 7 Feb 2022 20:11:24 -0500
Subject: [PATCH] Move current history provider, strip nested directories

---
 .../DatasetCollectionUIWrapper.test.js                 |  4 ++--
 .../GenericContentItem/DatasetUIWrapper.test.js        |  2 +-
 client/src/components/History/CurrentHistoryPanel.vue  |  2 +-
 client/src/components/History/model/Dataset.test.js    |  2 +-
 .../components/History/model/DatasetCollection.test.js | 10 +++++-----
 .../src/components/JobParameters/JobParameters.test.js |  2 +-
 .../HistoryDatasetCollection/CollectionDisplay.vue     |  2 +-
 client/src/components/Tool/ToolForm.test.js            |  2 +-
 client/src/components/Tool/ToolForm.vue                |  2 +-
 client/src/components/Upload/UploadModal.test.js       |  2 +-
 client/src/components/Upload/UploadModal.vue           |  2 +-
 client/src/components/Workflow/Run/WorkflowRunForm.vue |  2 +-
 .../providers/History/UserHistories/index.js           |  2 --
 client/src/components/providers/History/index.js       |  7 -------
 .../{History/UserHistories => }/MockCurrentHistory.js  |  0
 .../{History/UserHistories => }/UserHistories.js       |  0
 .../{History/UserHistories => }/UserHistories.test.js  |  0
 .../providers/{History => }/test/json/Dataset.json     |  0
 .../test/json/DatasetCollection.error.json             |  0
 .../test/json/DatasetCollection.heterogeneous.json     |  0
 .../test/json/DatasetCollection.homogeneous.json       |  0
 .../{History => }/test/json/DatasetCollection.json     |  0
 .../test/json/DatasetCollection.nested.json            |  0
 .../test/json/DatasetCollection.processing.json        |  0
 24 files changed, 17 insertions(+), 26 deletions(-)
 delete mode 100644 client/src/components/providers/History/UserHistories/index.js
 delete mode 100644 client/src/components/providers/History/index.js
 rename client/src/components/providers/{History/UserHistories => }/MockCurrentHistory.js (100%)
 rename client/src/components/providers/{History/UserHistories => }/UserHistories.js (100%)
 rename client/src/components/providers/{History/UserHistories => }/UserHistories.test.js (100%)
 rename client/src/components/providers/{History => }/test/json/Dataset.json (100%)
 rename client/src/components/providers/{History => }/test/json/DatasetCollection.error.json (100%)
 rename client/src/components/providers/{History => }/test/json/DatasetCollection.heterogeneous.json (100%)
 rename client/src/components/providers/{History => }/test/json/DatasetCollection.homogeneous.json (100%)
 rename client/src/components/providers/{History => }/test/json/DatasetCollection.json (100%)
 rename client/src/components/providers/{History => }/test/json/DatasetCollection.nested.json (100%)
 rename client/src/components/providers/{History => }/test/json/DatasetCollection.processing.json (100%)

diff --git a/client/src/components/History/ContentItem/GenericContentItem/DatasetCollectionUIWrapper.test.js b/client/src/components/History/ContentItem/GenericContentItem/DatasetCollectionUIWrapper.test.js
index a990dd10193..d61f9c4988e 100644
--- a/client/src/components/History/ContentItem/GenericContentItem/DatasetCollectionUIWrapper.test.js
+++ b/client/src/components/History/ContentItem/GenericContentItem/DatasetCollectionUIWrapper.test.js
@@ -2,8 +2,8 @@ import DatasetCollectionUIWrapper from "./DatasetCollectionUIWrapper";
 import DscUI from "components/History/ContentItem/DatasetCollection/DscUI";
 import { shallowMount } from "@vue/test-utils";
 import flushPromises from "flush-promises";
-import datasetCollectionRaw from "components/providers/History/test/json/DatasetCollection.json";
-import datasetCollectionContent from "components/providers/History/test/json/DatasetCollection.nested.json";
+import datasetCollectionRaw from "components/providers/test/json/DatasetCollection.json";
+import datasetCollectionContent from "components/providers/test/json/DatasetCollection.nested.json";
 
 describe("DatasetUIWrapper.vue with Dataset", () => {
     let wrapper;
diff --git a/client/src/components/History/ContentItem/GenericContentItem/DatasetUIWrapper.test.js b/client/src/components/History/ContentItem/GenericContentItem/DatasetUIWrapper.test.js
index 52aa4cd0e64..c5700394c5e 100644
--- a/client/src/components/History/ContentItem/GenericContentItem/DatasetUIWrapper.test.js
+++ b/client/src/components/History/ContentItem/GenericContentItem/DatasetUIWrapper.test.js
@@ -1,7 +1,7 @@
 import DatasetUIWrapper from "./DatasetUIWrapper";
 import DatasetUI from "components/History/ContentItem/Dataset/DatasetUI";
 import { shallowMount } from "@vue/test-utils";
-import raw from "components/providers/History/test/json/Dataset.json";
+import raw from "components/providers/test/json/Dataset.json";
 
 describe("DatasetUIWrapper.vue with Dataset", () => {
     let wrapper;
diff --git a/client/src/components/History/CurrentHistoryPanel.vue b/client/src/components/History/CurrentHistoryPanel.vue
index b1d2fc69c96..33bad0f7e18 100644
--- a/client/src/components/History/CurrentHistoryPanel.vue
+++ b/client/src/components/History/CurrentHistoryPanel.vue
@@ -20,7 +20,7 @@
 
 <script>
 import CurrentUser from "components/providers/CurrentUser";
-import UserHistories from "components/providers/History/UserHistories";
+import UserHistories from "components/providers/UserHistories";
 import HistoryPanel from "./HistoryPanel";
 import HistoriesMenu from "./HistoriesMenu";
 
diff --git a/client/src/components/History/model/Dataset.test.js b/client/src/components/History/model/Dataset.test.js
index 68ab03cc4ab..5a5c7891ef2 100644
--- a/client/src/components/History/model/Dataset.test.js
+++ b/client/src/components/History/model/Dataset.test.js
@@ -1,7 +1,7 @@
 import { Content } from "./Content";
 import { Dataset } from "./Dataset";
 
-import raw from "components/providers/History/test/json/Dataset.json";
+import raw from "components/providers/test/json/Dataset.json";
 
 const elementIdentifier = "collection_element1";
 
diff --git a/client/src/components/History/model/DatasetCollection.test.js b/client/src/components/History/model/DatasetCollection.test.js
index e339c89f52c..e9df257c261 100644
--- a/client/src/components/History/model/DatasetCollection.test.js
+++ b/client/src/components/History/model/DatasetCollection.test.js
@@ -3,15 +3,15 @@ import { DatasetCollection } from "./DatasetCollection";
 import { STATES } from "./states";
 
 // test data
-import raw from "components/providers/History/test/json/DatasetCollection.json";
+import raw from "components/providers/test/json/DatasetCollection.json";
 
 // error on load
-import rawError from "components/providers/History/test/json/DatasetCollection.error.json";
+import rawError from "components/providers/test/json/DatasetCollection.error.json";
 
 // mixed bag
-import rawProcessing from "components/providers/History/test/json/DatasetCollection.processing.json";
-import rawHomogeneous from "components/providers/History/test/json/DatasetCollection.homogeneous.json";
-import rawHeterogeneous from "components/providers/History/test/json/DatasetCollection.heterogeneous.json";
+import rawProcessing from "components/providers/test/json/DatasetCollection.processing.json";
+import rawHomogeneous from "components/providers/test/json/DatasetCollection.homogeneous.json";
+import rawHeterogeneous from "components/providers/test/json/DatasetCollection.heterogeneous.json";
 
 describe("DatasetCollection", () => {
     const model = new DatasetCollection(raw);
diff --git a/client/src/components/JobParameters/JobParameters.test.js b/client/src/components/JobParameters/JobParameters.test.js
index 876c174231e..9939561c4cc 100644
--- a/client/src/components/JobParameters/JobParameters.test.js
+++ b/client/src/components/JobParameters/JobParameters.test.js
@@ -5,7 +5,7 @@ import { mount, createLocalVue } from "@vue/test-utils";
 import flushPromises from "flush-promises";
 import JobParameters from "./JobParameters";
 import paramResponse from "./parameters-response.json";
-import raw from "components/providers/History/test/json/Dataset.json";
+import raw from "components/providers/test/json/Dataset.json";
 import { userStore } from "store/userStore";
 import { configStore } from "store/configStore";
 
diff --git a/client/src/components/Markdown/Elements/HistoryDatasetCollection/CollectionDisplay.vue b/client/src/components/Markdown/Elements/HistoryDatasetCollection/CollectionDisplay.vue
index 644f93857bb..9f1ab0b3a7d 100644
--- a/client/src/components/Markdown/Elements/HistoryDatasetCollection/CollectionDisplay.vue
+++ b/client/src/components/Markdown/Elements/HistoryDatasetCollection/CollectionDisplay.vue
@@ -53,7 +53,7 @@ import { getAppRoot } from "onload/loadConfig";
 import CollectionTree from "./CollectionTree";
 import LoadingSpan from "components/LoadingSpan";
 import CurrentUser from "components/providers/CurrentUser";
-import UserHistories from "components/providers/History/UserHistories";
+import UserHistories from "components/providers/UserHistories";
 import { copyCollection } from "components/Markdown/services";
 
 export default {
diff --git a/client/src/components/Tool/ToolForm.test.js b/client/src/components/Tool/ToolForm.test.js
index 69e119399fa..d2f67a5e3da 100644
--- a/client/src/components/Tool/ToolForm.test.js
+++ b/client/src/components/Tool/ToolForm.test.js
@@ -5,7 +5,7 @@ import { getLocalVue } from "jest/helpers";
 import ToolForm from "./ToolForm";
 import MockCurrentUser from "../providers/MockCurrentUser";
 import MockConfigProvider from "../providers/MockConfigProvider";
-import MockCurrentHistory from "components/providers/History/UserHistories/MockCurrentHistory";
+import MockCurrentHistory from "components/providers/MockCurrentHistory";
 import Vue from "vue";
 
 const localVue = getLocalVue();
diff --git a/client/src/components/Tool/ToolForm.vue b/client/src/components/Tool/ToolForm.vue
index 1bdcf6e9da4..fa6ce8a075b 100644
--- a/client/src/components/Tool/ToolForm.vue
+++ b/client/src/components/Tool/ToolForm.vue
@@ -97,7 +97,7 @@ import FormDisplay from "components/Form/FormDisplay";
 import FormElement from "components/Form/FormElement";
 import ToolEntryPoints from "components/ToolEntryPoints/ToolEntryPoints";
 import ToolSuccess from "./ToolSuccess";
-import UserHistories from "components/providers/History/UserHistories";
+import UserHistories from "components/providers/UserHistories";
 import Webhook from "components/Common/Webhook";
 
 export default {
diff --git a/client/src/components/Upload/UploadModal.test.js b/client/src/components/Upload/UploadModal.test.js
index bd119d78cc1..8c2317b1f88 100644
--- a/client/src/components/Upload/UploadModal.test.js
+++ b/client/src/components/Upload/UploadModal.test.js
@@ -7,7 +7,7 @@ import { mount } from "@vue/test-utils";
 import { getLocalVue } from "jest/helpers";
 
 import MockCurrentUser from "../providers/MockCurrentUser";
-import MockCurrentHistory from "components/providers/History/UserHistories/MockCurrentHistory";
+import MockCurrentHistory from "../providers/MockCurrentHistory";
 
 jest.mock("app");
 
diff --git a/client/src/components/Upload/UploadModal.vue b/client/src/components/Upload/UploadModal.vue
index c38c6912e5c..459ce168cbe 100644
--- a/client/src/components/Upload/UploadModal.vue
+++ b/client/src/components/Upload/UploadModal.vue
@@ -32,7 +32,7 @@ Provides user and current history to modal because it currently has initializati
 
 <script>
 import CurrentUser from "../providers/CurrentUser";
-import UserHistories from "components/providers/History/UserHistories";
+import UserHistories from "components/providers/UserHistories";
 import UploadModalContent from "./UploadModalContent";
 import { commonProps } from "./helpers";
 
diff --git a/client/src/components/Workflow/Run/WorkflowRunForm.vue b/client/src/components/Workflow/Run/WorkflowRunForm.vue
index 8b63094e327..ab82d994138 100644
--- a/client/src/components/Workflow/Run/WorkflowRunForm.vue
+++ b/client/src/components/Workflow/Run/WorkflowRunForm.vue
@@ -63,7 +63,7 @@ import CurrentUser from "components/providers/CurrentUser";
 import FormDisplay from "components/Form/FormDisplay";
 import FormCard from "components/Form/FormCard";
 import FormElement from "components/Form/FormElement";
-import UserHistories from "components/providers/History/UserHistories";
+import UserHistories from "components/providers/UserHistories";
 import WorkflowRunDefaultStep from "./WorkflowRunDefaultStep";
 import WorkflowRunToolStep from "./WorkflowRunToolStep";
 import { invokeWorkflow } from "./services";
diff --git a/client/src/components/providers/History/UserHistories/index.js b/client/src/components/providers/History/UserHistories/index.js
deleted file mode 100644
index ab5a8643022..00000000000
--- a/client/src/components/providers/History/UserHistories/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import UserHistories from "./UserHistories";
-export default UserHistories;
diff --git a/client/src/components/providers/History/index.js b/client/src/components/providers/History/index.js
deleted file mode 100644
index e95469dd61c..00000000000
--- a/client/src/components/providers/History/index.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * Providers are renderless components that take raw inputs and monitor the
- * cache or other observables to emit end results as slot props.
- */
-
-// Management for current user's histories. Largely a passthrough of store methods
-export { default as UserHistories } from "./UserHistories";
diff --git a/client/src/components/providers/History/UserHistories/MockCurrentHistory.js b/client/src/components/providers/MockCurrentHistory.js
similarity index 100%
rename from client/src/components/providers/History/UserHistories/MockCurrentHistory.js
rename to client/src/components/providers/MockCurrentHistory.js
diff --git a/client/src/components/providers/History/UserHistories/UserHistories.js b/client/src/components/providers/UserHistories.js
similarity index 100%
rename from client/src/components/providers/History/UserHistories/UserHistories.js
rename to client/src/components/providers/UserHistories.js
diff --git a/client/src/components/providers/History/UserHistories/UserHistories.test.js b/client/src/components/providers/UserHistories.test.js
similarity index 100%
rename from client/src/components/providers/History/UserHistories/UserHistories.test.js
rename to client/src/components/providers/UserHistories.test.js
diff --git a/client/src/components/providers/History/test/json/Dataset.json b/client/src/components/providers/test/json/Dataset.json
similarity index 100%
rename from client/src/components/providers/History/test/json/Dataset.json
rename to client/src/components/providers/test/json/Dataset.json
diff --git a/client/src/components/providers/History/test/json/DatasetCollection.error.json b/client/src/components/providers/test/json/DatasetCollection.error.json
similarity index 100%
rename from client/src/components/providers/History/test/json/DatasetCollection.error.json
rename to client/src/components/providers/test/json/DatasetCollection.error.json
diff --git a/client/src/components/providers/History/test/json/DatasetCollection.heterogeneous.json b/client/src/components/providers/test/json/DatasetCollection.heterogeneous.json
similarity index 100%
rename from client/src/components/providers/History/test/json/DatasetCollection.heterogeneous.json
rename to client/src/components/providers/test/json/DatasetCollection.heterogeneous.json
diff --git a/client/src/components/providers/History/test/json/DatasetCollection.homogeneous.json b/client/src/components/providers/test/json/DatasetCollection.homogeneous.json
similarity index 100%
rename from client/src/components/providers/History/test/json/DatasetCollection.homogeneous.json
rename to client/src/components/providers/test/json/DatasetCollection.homogeneous.json
diff --git a/client/src/components/providers/History/test/json/DatasetCollection.json b/client/src/components/providers/test/json/DatasetCollection.json
similarity index 100%
rename from client/src/components/providers/History/test/json/DatasetCollection.json
rename to client/src/components/providers/test/json/DatasetCollection.json
diff --git a/client/src/components/providers/History/test/json/DatasetCollection.nested.json b/client/src/components/providers/test/json/DatasetCollection.nested.json
similarity index 100%
rename from client/src/components/providers/History/test/json/DatasetCollection.nested.json
rename to client/src/components/providers/test/json/DatasetCollection.nested.json
diff --git a/client/src/components/providers/History/test/json/DatasetCollection.processing.json b/client/src/components/providers/test/json/DatasetCollection.processing.json
similarity index 100%
rename from client/src/components/providers/History/test/json/DatasetCollection.processing.json
rename to client/src/components/providers/test/json/DatasetCollection.processing.json