move components to workflow invocation folder

client/src/components/DatasetInformation/DatasetInformation.vue

@@ -1,5 +1,10 @@
 <template>
     <div>
+        
+        <!-- why not this?
+        <DatasetProvider :id="hda_id" v-slot="{ dataset }">
+        </DatasetProvider> -->
+
         <h3>Dataset Information</h3>
         <table id="dataset-details" class="tabletip info_data_table">
             <tbody>

client/src/components/WorkflowInvocationState/DatasetCollectionContents.vue

@@ -33,16 +33,15 @@
     </div>
 </template>
 <script>
-import { DatasetProvider } from "components/History/providers/DatasetProvider";
-import DatasetUIWrapper from "components/History/ContentItem/Dataset/DatasetUIWrapper";
-
+import { DatasetProvider } from "./providers";
+import DatasetUIWrapper from "./DatasetUIWrapper";
+import DatasetCollectionUIWrapper from "./DatasetCollectionUIWrapper";
 import LoadingSpan from "components/LoadingSpan";
 
 export default {
     components: {
         DatasetProvider,
-        DatasetCollectionUIWrapper: () =>
-            import("components/History/ContentItem/DatasetCollection/DatasetCollectionUIWrapper"),
+        DatasetCollectionUIWrapper,
         DatasetUIWrapper,
         LoadingSpan,
     },

client/src/components/WorkflowInvocationState/DatasetCollectionUIWrapper.vue

@@ -24,12 +24,12 @@
     </div>
 </template>
 <script>
-import DscUI from "./DscUI";
-import { DatasetCollection } from "../../model/DatasetCollection";
-import { DatasetCollectionContentProvider } from "components/History/providers/DatasetProvider";
-import DatasetCollectionContents from "components/History/ContentItem/DatasetCollection/DatasetCollectionContents";
-import { cacheContent } from "../../caching";
-import { deleteDatasetCollection, updateContentFields } from "../../model/queries";
+import { deleteDatasetCollection, updateContentFields } from "../History/model/queries";
+import { cacheContent } from "../History/caching";
+import { DatasetCollection } from "../History/model/DatasetCollection";
+import DscUI from "../History/ContentItem/DatasetCollection/DscUI";
+import { DatasetCollectionContentProvider } from "./providers";
+import DatasetCollectionContents from "./DatasetCollectionContents";
 
 export default {
     components: {

client/src/components/WorkflowInvocationState/DatasetUIWrapper.vue

@@ -3,10 +3,10 @@
         v-if="dataset"
         v-bind="$attrs"
         v-on="$listeners"
-        v-on:update:expanded="expand"
+        @update:expanded="expand"
         :expanded="expanded"
         :dataset="dataset"
-        :showTags="true"
+        :show-tags="true"
         @deleteDataset="onDelete(dataset, $event)"
         @undeleteDataset="onUndelete(dataset, $event)"
         @unhideDataset="onUnhide(dataset, $event)"
@@ -15,10 +15,10 @@
     </DatasetUI>
 </template>
 <script>
-import DatasetUI from "./DatasetUI";
-import { Dataset } from "../../model/Dataset";
-import { deleteContent, updateContentFields } from "../../model/queries";
-import { cacheContent } from "../../caching";
+import DatasetUI from "../History/ContentItem/Dataset/DatasetUI";
+import { Dataset } from "../History/model";
+import { deleteContent, updateContentFields } from "../History/model/queries";
+import { cacheContent } from "../History/caching";
 
 export default {
     components: {

client/src/components/WorkflowInvocationState/JobStep.vue

@@ -36,7 +36,7 @@
 <script>
 import Vue from "vue";
 import BootstrapVue from "bootstrap-vue";
-import { JobProvider } from "components/History/providers/DatasetProvider";
+import { JobProvider } from "./providers";
 import JobInformation from "components/JobInformation/JobInformation";
 import JobParameters from "components/JobParameters/JobParameters";
 import UtcDate from "components/UtcDate";

client/src/components/WorkflowInvocationState/WorkflowInvocationDataContents.vue

@@ -18,10 +18,10 @@
 import BootstrapVue from "bootstrap-vue";
 import Vue from "vue";
 
-import { DatasetProvider, DatasetCollectionProvider } from "components/History/providers/DatasetProvider";
-import HistoryContentItem from "components/History/ContentItem/HistoryContentItem";
-import DatasetCollectionUIWrapper from "components/History/ContentItem/DatasetCollection/DatasetCollectionUIWrapper";
-import DatasetUIWrapper from "components/History/ContentItem/Dataset/DatasetUIWrapper";
+import { DatasetProvider, DatasetCollectionProvider } from "./providers";
+import HistoryContentItem from "components/History/ContentItem";
+import DatasetCollectionUIWrapper from "./DatasetCollectionUIWrapper";
+import DatasetUIWrapper from "./DatasetUIWrapper";
 import { STATES } from "components/History/model";
 import LoadingSpan from "components/LoadingSpan";
 

client/src/components/WorkflowInvocationState/WorkflowInvocationState.vue

@@ -48,8 +48,6 @@
     </div>
 </template>
 <script>
-import BootstrapVue from "bootstrap-vue";
-import Vue from "vue";
 
 import { cancelWorkflowScheduling } from "./services";
 import { getRootFromIndexLink } from "onload";
@@ -63,7 +61,6 @@ import { mapGetters, mapActions } from "vuex";
 
 const getUrl = (path) => getRootFromIndexLink() + path;
 
-Vue.use(BootstrapVue);
 
 export default {
     components: {

client/src/components/WorkflowInvocationState/providers.js

@@ -48,11 +48,16 @@ export const SimpleProviderMixin = {
 };
 
 export const StoreProviderMixin = {
+    computed: {
+        storeItem() {
+            throw new Error("define me");
+        },
+    },
     watch: {
         storeItem: {
-            handler(newState, oldState) {
-                console.log("Updating item to", newState);
-                this.item = newState;
+            handler(newItem, oldItem) {
+                console.log("Updating item to", newItem);
+                this.item = newItem;
             },
         },
     },

client/src/store/datasetCollectionsStore.js

@@ -21,8 +21,8 @@ const actions = {
         // we could skip the fetch.
 
         const { data } = await axios.get(`${getAppRoot()}api/dataset_collections/${hdca_id}?instance_type=history`);
-        await cacheContent(data);
-        commit("saveCollectionForHDCAId", { hdca_id, dataset_collection: data });
+        const cachedData = await cacheContent(data, true);
+        commit("saveCollectionForHDCAId", { hdca_id, dataset_collection: cachedData });
         return state.datasetCollectionByHDCAId[hdca_id];
     },
     async $init({ dispatch }, { store }) {

client/src/store/datasetsStore.js

@@ -21,8 +21,8 @@ const actions = {
         // if we're certain that the store is always up to date
         // we could skip the fetch.
         const { data } = await axios.get(`${getAppRoot()}api/datasets/${hda_id}`);
-        await cacheContent(data);
-        commit("saveDatasetForHDAId", { hda_id, dataset: data });
+        const cachedData = await cacheContent(data, true);
+        commit("saveDatasetForHDAId", { hda_id, dataset: cachedData });
         return state.datasetByHDAId[hda_id];
     },
     async $init({ dispatch }, { store }) {