mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-09-24 16:30:27 +08:00
Move current history provider, strip nested directories
This commit is contained in:
guerler
+2
-2
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
@@ -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";
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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";
|
||||
|
||||
|
||||
+1
-1
@@ -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 {
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -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 {
|
||||
|
||||
@@ -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");
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -1,2 +0,0 @@
|
||||
import UserHistories from "./UserHistories";
|
||||
export default UserHistories;
|
||||
@@ -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";
|
||||
Reference in New Issue
Block a user