-
-
- {{ registration_warning_message }}
+
+
+ {{ registrationWarningMessage }}
-
+
{{ messageText }}
@@ -45,32 +45,32 @@
Your public name is an identifier that will be used to generate addresses for
+
+ Your public name is an identifier that will be used to generate addresses for
information you share publicly. Public names must be at least three characters
in length and contain only lower-case letters, numbers, dots, underscores, and
- dashes ('.', '_', '-').
+ dashes ('.', '_', '-').
+
Create
-
+
Already have an account?
- Log in here.
+
+ Log in here.
+
@@ -79,9 +79,8 @@
import axios from "axios";
import Vue from "vue";
import BootstrapVue from "bootstrap-vue";
-import { getGalaxyInstance } from "app";
-import { getAppRoot } from "onload";
-import ExternalLogin from "components/User/ExternalIdentities/ExternalLogin.vue";
+import { safePath } from "utils/redirect";
+import ExternalLogin from "components/User/ExternalIdentities/ExternalLogin";
Vue.use(BootstrapVue);
@@ -90,29 +89,44 @@ export default {
ExternalLogin,
},
props: {
- registration_warning_message: {
- type: String,
- required: false,
- },
- server_mail_configured: {
+ enableOidc: {
type: Boolean,
- required: false,
+ default: false,
},
- mailing_join_addr: {
+ showLoginLink: {
+ type: Boolean,
+ default: false,
+ },
+ mailingJoinAddr: {
type: String,
- required: false,
+ default: null,
+ },
+ preferCustosLogin: {
+ type: Boolean,
+ default: false,
},
redirect: {
type: String,
- required: false,
+ default: null,
},
- terms_url: {
+ registrationWarningMessage: {
type: String,
- required: false,
+ default: null,
+ },
+ serverMailConfigured: {
+ type: Boolean,
+ default: false,
+ },
+ sessionCsrfToken: {
+ type: String,
+ required: true,
+ },
+ termsUrl: {
+ type: String,
+ default: null,
},
},
data() {
- const galaxy = getGalaxyInstance();
return {
disableCreate: false,
email: null,
@@ -122,37 +136,33 @@ export default {
subscribe: null,
messageText: null,
messageVariant: null,
- session_csrf_token: galaxy.session_csrf_token,
- isAdmin: galaxy.user.isAdmin(),
- enable_oidc: galaxy.config.enable_oidc,
- prefer_custos_login: galaxy.config.prefer_custos_login,
};
},
computed: {
- messageShow() {
- return this.messageText != null;
- },
- showRegistrationWarning() {
- return this.registration_warning_message != null;
- },
custosPreferred() {
- return this.enable_oidc && this.prefer_custos_login;
+ return this.enableOidc && this.preferCustosLogin;
},
},
methods: {
toggleLogin() {
this.$emit("toggle-login");
},
- submit(method) {
+ submit() {
this.disableCreate = true;
- const rootUrl = getAppRoot();
axios
- .post(`${rootUrl}user/create`, this.$data)
+ .post(safePath("/user/create"), {
+ email: this.email,
+ username: this.username,
+ password: this.password,
+ confirm: this.confirm,
+ subscribe: this.subscribe,
+ session_csrf_token: this.sessionCsrfToken,
+ })
.then((response) => {
if (response.data.message && response.data.status) {
alert(response.data.message);
}
- window.location = this.redirect || `${rootUrl}welcome/new`;
+ window.location = this.redirect || safePath("/welcome/new");
})
.catch((error) => {
this.disableCreate = false;
diff --git a/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.test.js b/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.test.js
new file mode 100644
index 00000000000..0dfcd7e506f
--- /dev/null
+++ b/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.test.js
@@ -0,0 +1,43 @@
+import axios from "axios";
+import MockAdapter from "axios-mock-adapter";
+import { mount } from "@vue/test-utils";
+import { getLocalVue } from "jest/helpers";
+import MountTarget from "./WorkflowDisplay";
+
+const localVue = getLocalVue(true);
+
+describe("WorkflowDisplay", () => {
+ let wrapper;
+ let axiosMock;
+
+ beforeEach(() => {
+ axiosMock = new MockAdapter(axios);
+ const data = {};
+ axiosMock.onGet(`/api/workflows/workflow_id/download?style=preview`).reply(200, data);
+ wrapper = mount(MountTarget, {
+ propsData: {
+ args: {
+ workflow_id: "workflow_id",
+ },
+ embedded: false,
+ expanded: false,
+ },
+ localVue,
+ });
+ });
+
+ afterEach(() => {
+ axiosMock.reset();
+ });
+
+ it("basics", async () => {
+ const cardHeader = wrapper.find(".card-header");
+ expect(cardHeader.text()).toBe("Workflow:");
+ const downloadUrl = wrapper.find("[data-description='workflow download']");
+ expect(downloadUrl.attributes("href")).toBe("/api/workflows/workflow_id/download?format=json-download");
+ const importUrl = wrapper.find("[data-description='workflow import']");
+ expect(importUrl.attributes("href")).toBe("/workflow/imp?id=workflow_id");
+ const dataRequest = axiosMock.history.get[0].url;
+ expect(dataRequest).toBe("/api/workflows/workflow_id/download?style=preview");
+ });
+});
diff --git a/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.vue b/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.vue
index f7660676578..154a6ff7171 100644
--- a/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.vue
+++ b/client/src/components/Markdown/Elements/Workflow/WorkflowDisplay.vue
@@ -78,10 +78,10 @@ export default {
return this.itemContent ? this.itemContent.name : "...";
},
downloadUrl() {
- return safePath("/api/workflows/${this.args.workflow_id}/download?format=json-download");
+ return safePath(`/api/workflows/${this.args.workflow_id}/download?format=json-download`);
},
importUrl() {
- return safePath("/workflow/imp?id=${this.args.workflow_id}");
+ return safePath(`/workflow/imp?id=${this.args.workflow_id}`);
},
itemUrl() {
return `/api/workflows/${this.args.workflow_id}/download?style=preview`;
diff --git a/client/src/components/PageDisplay/PageDisplay.vue b/client/src/components/PageDisplay/PageDisplay.vue
index a5dae1998b0..60b9e8134ea 100644
--- a/client/src/components/PageDisplay/PageDisplay.vue
+++ b/client/src/components/PageDisplay/PageDisplay.vue
@@ -1,6 +1,6 @@
-
+
{
- this.page = { ...data };
+ this.page = data;
});
},
methods: {
diff --git a/client/src/components/PageEditor/PageEditor.vue b/client/src/components/PageEditor/PageEditor.vue
index b5f8ca8dc48..82604d98b56 100644
--- a/client/src/components/PageEditor/PageEditor.vue
+++ b/client/src/components/PageEditor/PageEditor.vue
@@ -11,7 +11,7 @@
diff --git a/client/src/components/Panels/Common/ToolBox.test.js b/client/src/components/Panels/Common/ToolBox.test.js
deleted file mode 100644
index dff0b65a812..00000000000
--- a/client/src/components/Panels/Common/ToolBox.test.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import MockAdapter from "axios-mock-adapter";
-import axios from "axios";
-import { filterToolSections, filterTools } from "../utilities";
-
-describe("ToolBox", () => {
- const toolsMock = [
- {
- model_class: "ToolSection",
- id: "group_1",
- name: "Group 1",
- elems: [
- {
- model_class: "Tool1",
- id: "tool1",
- name: "Tool 1",
- link: "/tool_runner?tool_id=tool1",
- panel_section_id: "group_1",
- panel_section_name: "Group 1",
- },
- {
- model_class: "Tool2",
- id: "tool2",
- name: "Tool 2",
- link: "/tool_runner?tool_id=tool2",
- panel_section_id: "group_1",
- panel_section_name: "Group 1",
- },
- ],
- },
- {
- model_class: "ToolSection",
- id: "group_2",
- name: "Group 2",
- elems: [
- {
- model_class: "Tool3",
- id: "tool3",
- name: "Tool 3",
- link: "/tool_runner?tool_id=tool3",
- panel_section_id: "group_2",
- panel_section_name: "Group 2",
- },
- ],
- },
- ];
- const resultsMock = ["tool1", "tool3"];
-
- let axiosMock;
-
- beforeEach(async () => {
- axiosMock = new MockAdapter(axios);
- });
-
- it("test filter functions correctly matching: (1) Tools store array-of-objects with (2) Results array", async () => {
- axiosMock
- .onGet(`/api/tools`)
- .replyOnce(200, toolsMock)
- .onGet(/api\/tools?.*/)
- .replyOnce(200, resultsMock);
- const toolsResults = filterTools(toolsMock, resultsMock);
- const toolsResultsSection = filterToolSections(toolsMock, resultsMock);
- expect(toolsResults.length).toBe(2);
- expect(toolsResultsSection.length).toBe(2);
- });
-});
diff --git a/client/src/components/Panels/Common/ToolSearch.test.js b/client/src/components/Panels/Common/ToolSearch.test.js
index 068f416e2a6..48b92ba47e7 100644
--- a/client/src/components/Panels/Common/ToolSearch.test.js
+++ b/client/src/components/Panels/Common/ToolSearch.test.js
@@ -1,5 +1,6 @@
import { mount } from "@vue/test-utils";
import { getLocalVue } from "jest/helpers";
+import DelayedInput from "components/Common/DelayedInput";
import ToolSearch from "./ToolSearch";
const localVue = getLocalVue();
@@ -8,7 +9,9 @@ describe("ToolSearch", () => {
const wrapper = mount(ToolSearch, {
propsData: {
currentPanelView: "default",
+ enableAdvanced: false,
showAdvanced: false,
+ toolbox: [],
},
localVue,
stubs: {
@@ -16,17 +19,23 @@ describe("ToolSearch", () => {
},
});
+ expect(wrapper.find("[data-description='toggle advanced search']").exists()).toBe(false);
expect(wrapper.find("[description='advanced tool filters']").exists()).toBe(false);
- await wrapper.setProps({ showAdvanced: true });
+ await wrapper.setProps({ enableAdvanced: true, showAdvanced: true });
+ expect(wrapper.find("[data-description='toggle advanced search']").exists()).toBe(true);
expect(wrapper.find("[description='advanced tool filters']").exists()).toBe(true);
+
const filterInputs = {
- "[placeholder='any tool name']": "name-filter",
+ name: "name-filter",
"[placeholder='any section']": "section-filter",
"[placeholder='any id']": "id-filter",
- "[placeholder='any description']": "desc-filter",
+ "[placeholder='any help text']": "help-filter",
};
- // Now add filters in all input fields in the advanced menu
+ // Add name filter (comes from DelayedInput emitting the query prop)
+ wrapper.findComponent(DelayedInput).vm.$emit("change", filterInputs["name"]);
+
+ // Now add remaining filters (other than name) in the advanced menu
Object.entries(filterInputs).forEach(([selector, value]) => {
const filterInput = wrapper.find(selector);
if (filterInput.vm && filterInput.props().type == "text") {
@@ -37,16 +46,17 @@ describe("ToolSearch", () => {
// Test: values are stored in the filterSettings object
expect(Object.values(wrapper.vm.filterSettings)).toEqual(Object.values(filterInputs));
- // Test: clearing the filters
- const clearButton = wrapper.find("[description='clear filters']");
- expect(Object.values(wrapper.vm.filterSettings).length).toBe(4);
- await clearButton.trigger("click");
- expect(Object.values(wrapper.vm.filterSettings).length).toBe(0);
+ // Test: changing panel view should change search by section field to search by ontology
+ expect(wrapper.find("[placeholder='any section']").exists()).toBe(true);
+ await wrapper.setProps({ currentPanelView: "ontology:edam_operations" });
+ expect(wrapper.find("[placeholder='any section']").exists()).toBe(false);
+ expect(wrapper.find("[placeholder='any ontology']").exists()).toBe(true);
+ await wrapper.setProps({ currentPanelView: "default" });
- // Test: keyup.esc (should toggle the view out)
- const nameField = wrapper.find("[placeholder='any tool name']");
+ // Test: keyup.esc (should toggle the view out) --- doesn't work from name (DelayedInput) field
+ const sectionField = wrapper.find("[placeholder='any section']");
expect(wrapper.emitted()["update:show-advanced"]).toBeUndefined();
- await nameField.trigger("keyup.esc");
+ await sectionField.trigger("keyup.esc");
expect(wrapper.emitted()["update:show-advanced"].length - 1).toBeFalsy();
});
});
diff --git a/client/src/components/Panels/Common/ToolSearch.vue b/client/src/components/Panels/Common/ToolSearch.vue
index db7baa7b3ca..dd2a5303020 100644
--- a/client/src/components/Panels/Common/ToolSearch.vue
+++ b/client/src/components/Panels/Common/ToolSearch.vue
@@ -1,36 +1,39 @@
+
Filter by name:
-
Filter by tool name:
-
-
Filter by section:
-
+
Filter by {{ sectionLabel }}:
+
+
Filter by id:
-
Filter by description:
-
+
Filter by help text:
+
{{ "Search" | localize }}
-
+
{{ "Clear" | localize }}
+ {{ "Cancel" | localize }}
@@ -38,10 +41,9 @@
diff --git a/client/src/components/ToolsList/ToolsListTable.vue b/client/src/components/ToolsList/ToolsListTable.vue
new file mode 100644
index 00000000000..f92c94184cd
--- /dev/null
+++ b/client/src/components/ToolsList/ToolsListTable.vue
@@ -0,0 +1,183 @@
+
+
+
+
+
+ {{ row.item.name }} {{ row.item.description }}
+
+
+
+ {{ row.item.name }} {{ row.item.description }}
+
+
+
+
+
+
+
+
+ Click here to open the tool
+
+
+
+
+ {{ row.item.panel_section_name }}
+
+
+
+
+
+
+
+
+
+ All {{ tools.length > 1 ? tools.length : "" }} results loaded
+
+
+
+
diff --git a/client/src/components/Panels/Common/services.js b/client/src/components/ToolsList/services.js
similarity index 100%
rename from client/src/components/Panels/Common/services.js
rename to client/src/components/ToolsList/services.js
diff --git a/client/src/components/User/APIKey/APIKey.vue b/client/src/components/User/APIKey/APIKey.vue
index 557de33be38..073c7172225 100644
--- a/client/src/components/User/APIKey/APIKey.vue
+++ b/client/src/components/User/APIKey/APIKey.vue
@@ -32,7 +32,7 @@ getAPIKey();
- Manage API Key
+ Manage API Key
An API key will allow you to access via web API. Please note that this key acts as an alternate means to
diff --git a/client/src/components/User/CloudAuth/CloudAuth.vue b/client/src/components/User/CloudAuth/CloudAuth.vue
index cb2541c858c..4235458ea8e 100644
--- a/client/src/components/User/CloudAuth/CloudAuth.vue
+++ b/client/src/components/User/CloudAuth/CloudAuth.vue
@@ -6,7 +6,7 @@
- Manage Cloud Authorization
+ Manage Cloud Authorization
diff --git a/client/src/components/User/DiskUsage/Quota/QuotaUsageSummary.vue b/client/src/components/User/DiskUsage/Quota/QuotaUsageSummary.vue
index f77f2c5bedb..f6badcf2414 100644
--- a/client/src/components/User/DiskUsage/Quota/QuotaUsageSummary.vue
+++ b/client/src/components/User/DiskUsage/Quota/QuotaUsageSummary.vue
@@ -3,13 +3,13 @@
You've got unlimited disk quota
- All your storage sources have unlimited disk space. Enjoy!
+ All your storage sources have unlimited disk space. Enjoy!
You've got {{ niceTotalQuota }} of total disk quota
-
+
This is the maximum disk space that you can use across all your storage sources. Unlimited storage
sources are not taken into account
diff --git a/client/src/components/User/UserPreferences.vue b/client/src/components/User/UserPreferences.vue
index 6c156e34fad..aab37c9cac4 100644
--- a/client/src/components/User/UserPreferences.vue
+++ b/client/src/components/User/UserPreferences.vue
@@ -1,6 +1,6 @@
- User preferences
+ User preferences
{{ message }}
diff --git a/client/src/components/Visualizations/VisualizationPublished.vue b/client/src/components/Visualizations/VisualizationPublished.vue
index 199d94d7096..fa9a6590090 100644
--- a/client/src/components/Visualizations/VisualizationPublished.vue
+++ b/client/src/components/Visualizations/VisualizationPublished.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/client/src/components/Workflow/Editor/Forms/FormOutput.vue b/client/src/components/Workflow/Editor/Forms/FormOutput.vue
index 4fc7c5a7129..7d3d87a7944 100644
--- a/client/src/components/Workflow/Editor/Forms/FormOutput.vue
+++ b/client/src/components/Workflow/Editor/Forms/FormOutput.vue
@@ -12,7 +12,7 @@
{
this.onWorkflowMessage("Workflow saved as", "success");
this.hideModal();
- this.onNavigate(`${getAppRoot()}workflow/editor?id=${response.data}`, true);
+ this.onNavigate(`${getAppRoot()}workflows/edit?id=${response.data}`, true);
})
.catch((response) => {
this.onWorkflowError("Saving workflow failed, please contact an administrator.");
diff --git a/client/src/components/Workflow/Editor/modules/connector.js b/client/src/components/Workflow/Editor/modules/connector.js
index 932cbcabb63..54cd59b8623 100644
--- a/client/src/components/Workflow/Editor/modules/connector.js
+++ b/client/src/components/Workflow/Editor/modules/connector.js
@@ -1,5 +1,5 @@
import * as d3 from "d3";
-import { Toast } from "ui/toast";
+import { Toast } from "composables/toast";
// Rendering parameters
const zIndex = 1000;
diff --git a/client/src/components/Workflow/Import/TrsImport.vue b/client/src/components/Workflow/Import/TrsImport.vue
index e5d23d2e108..4be7c270605 100644
--- a/client/src/components/Workflow/Import/TrsImport.vue
+++ b/client/src/components/Workflow/Import/TrsImport.vue
@@ -1,6 +1,6 @@
diff --git a/client/src/components/Workflow/WorkflowPublished.vue b/client/src/components/Workflow/WorkflowPublished.vue
index 5547c9181a0..43506cb194f 100644
--- a/client/src/components/Workflow/WorkflowPublished.vue
+++ b/client/src/components/Workflow/WorkflowPublished.vue
@@ -1,5 +1,5 @@
-
+
diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationDetails.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationDetails.vue
index 6f58c6e89dd..fcf9af8baba 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationDetails.vue
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationDetails.vue
@@ -1,3 +1,44 @@
+
@@ -30,59 +71,9 @@
v-for="step in Object.values(workflow.steps)"
:key="step.id"
:invocation="invocation"
- :ordered-steps="orderedSteps"
:workflow="workflow"
:workflow-step="step" />
-
diff --git a/client/src/components/WorkflowInvocationState/WorkflowInvocationStep.vue b/client/src/components/WorkflowInvocationState/WorkflowInvocationStep.vue
index d76ddaf1a19..67f338450cc 100644
--- a/client/src/components/WorkflowInvocationState/WorkflowInvocationStep.vue
+++ b/client/src/components/WorkflowInvocationState/WorkflowInvocationStep.vue
@@ -84,8 +84,10 @@
diff --git a/client/src/components/login/LoginIndex.vue b/client/src/components/login/LoginIndex.vue
deleted file mode 100644
index 3269a44a86e..00000000000
--- a/client/src/components/login/LoginIndex.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/client/src/components/providers/storeProviders.js b/client/src/components/providers/storeProviders.js
index 441daa77272..f4df9359fd2 100644
--- a/client/src/components/providers/storeProviders.js
+++ b/client/src/components/providers/storeProviders.js
@@ -1,10 +1,13 @@
// Simple dataset provider, looks at api for result, renders to slot prop
import axios from "axios";
import { prependPath } from "utils/redirect";
-import { mapActions, mapGetters } from "vuex";
-import { mapCacheActions } from "vuex-cache";
+import { mapActions as vuexMapActions, mapGetters } from "vuex";
import { HasAttributesMixin } from "./utils";
+import { useDbKeyStore } from "stores/dbKeyStore";
+import { mapActions, mapState } from "pinia";
+import { useDatatypeStore } from "../../stores/datatypeStore";
+
export const SimpleProviderMixin = {
props: {
id: { type: String, required: true },
@@ -57,20 +60,20 @@ export const DbKeyProvider = {
await this.load();
},
methods: {
- ...mapCacheActions(["fetchUploadDbKeys"]),
+ ...mapActions(useDbKeyStore, ["fetchUploadDbKeys"]),
async load() {
this.loading = true;
- let dbKeys = this.getUploadDbKeys();
+ let dbKeys = this.getUploadDbKeys;
if (dbKeys == null || dbKeys.length == 0) {
await this.fetchUploadDbKeys();
- dbKeys = this.getUploadDbKeys();
+ dbKeys = this.getUploadDbKeys;
}
this.item = dbKeys;
this.loading = false;
},
},
computed: {
- ...mapGetters(["getUploadDbKeys"]),
+ ...mapState(useDbKeyStore, ["getUploadDbKeys"]),
},
};
@@ -83,20 +86,20 @@ export const DatatypesProvider = {
await this.load();
},
methods: {
- ...mapCacheActions(["fetchUploadDatatypes"]),
+ ...mapActions(useDatatypeStore, ["fetchUploadDatatypes"]),
async load() {
this.loading = true;
- let datatypes = this.getUploadDatatypes();
+ let datatypes = this.getUploadDatatypes;
if (datatypes == null || datatypes.length == 0) {
await this.fetchUploadDatatypes();
- datatypes = this.getUploadDatatypes();
+ datatypes = this.getUploadDatatypes;
}
this.item = datatypes;
this.loading = false;
},
},
computed: {
- ...mapGetters(["getUploadDatatypes"]),
+ ...mapState(useDatatypeStore, ["getUploadDatatypes"]),
},
};
@@ -171,7 +174,7 @@ export const StoreProvider = (storeAction, storeGetter, storeCountGetter = undef
});
},
methods: {
- ...mapActions([storeAction]),
+ ...vuexMapActions([storeAction]),
async load() {
this.loading = true;
try {
diff --git a/client/src/composables/useConfig.js b/client/src/composables/config.js
similarity index 100%
rename from client/src/composables/useConfig.js
rename to client/src/composables/config.js
diff --git a/client/src/composables/confirmDialog.js b/client/src/composables/confirmDialog.js
new file mode 100644
index 00000000000..f307fb59185
--- /dev/null
+++ b/client/src/composables/confirmDialog.js
@@ -0,0 +1,29 @@
+import { ref } from "vue";
+
+let confirmDialogRef = ref(null);
+
+export const setConfirmDialogComponentRef = (newRef) => {
+ // eslint-disable-next-line vue/no-ref-as-operand
+ confirmDialogRef = newRef;
+};
+
+/**
+ * Direct export to simplify usage in Options API component.
+ * Use 'useConfirmDialog' for the Composition API instead.
+ */
+export const ConfirmDialog = {
+ /**
+ * Displays a simple confirmation message to the user.
+ * For additional options see https://bootstrap-vue.org/docs/components/modal#modal-message-boxes.
+ * @param {String} message The message to display to the user.
+ * @param {Object} options Additional display options to customize the dialog.
+ * @returns A promise with `true` if the user confirms the message.
+ */
+ async confirm(message, options = {}) {
+ return confirmDialogRef.value.confirm(message, options);
+ },
+};
+
+export function useConfirmDialog() {
+ return { ...ConfirmDialog };
+}
diff --git a/client/src/composables/useMarkdown.js b/client/src/composables/markdown.js
similarity index 100%
rename from client/src/composables/useMarkdown.js
rename to client/src/composables/markdown.js
diff --git a/client/src/composables/useMarkdown.test.js b/client/src/composables/markdown.test.js
similarity index 94%
rename from client/src/composables/useMarkdown.test.js
rename to client/src/composables/markdown.test.js
index fbb390313e1..aae29c6f59e 100644
--- a/client/src/composables/useMarkdown.test.js
+++ b/client/src/composables/markdown.test.js
@@ -1,4 +1,4 @@
-import { useMarkdown } from "composables/useMarkdown";
+import { useMarkdown } from "composables/markdown";
describe("useMarkdown", () => {
describe("renderMarkdown", () => {
diff --git a/client/src/composables/useTaskMonitor.js b/client/src/composables/taskMonitor.js
similarity index 100%
rename from client/src/composables/useTaskMonitor.js
rename to client/src/composables/taskMonitor.js
diff --git a/client/src/composables/useTaskMonitor.test.js b/client/src/composables/taskMonitor.test.js
similarity index 97%
rename from client/src/composables/useTaskMonitor.test.js
rename to client/src/composables/taskMonitor.test.js
index b8a5f13b04a..18eabadf983 100644
--- a/client/src/composables/useTaskMonitor.test.js
+++ b/client/src/composables/taskMonitor.test.js
@@ -1,7 +1,7 @@
import axios from "axios";
import MockAdapter from "axios-mock-adapter";
import flushPromises from "flush-promises";
-import { useTaskMonitor } from "composables/useTaskMonitor";
+import { useTaskMonitor } from "composables/taskMonitor";
const PENDING_TASK_ID = "pending-fake-task-id";
const COMPLETED_TASK_ID = "completed-fake-task-id";
diff --git a/client/src/composables/toast.js b/client/src/composables/toast.js
new file mode 100644
index 00000000000..0f19ef6a240
--- /dev/null
+++ b/client/src/composables/toast.js
@@ -0,0 +1,34 @@
+import { ref } from "vue";
+
+let toastRef = ref(null);
+
+export const setToastComponentRef = (newRef) => {
+ // eslint-disable-next-line vue/no-ref-as-operand
+ toastRef = newRef;
+};
+
+/**
+ * Direct export to simplify usage in Options Api component.
+ * Use 'useToast' for the Composition Api instead.
+ */
+export const Toast = {
+ success(message, title = "Success") {
+ toastRef.value.showToast(message, title, "success");
+ },
+
+ info(message, title = "Info") {
+ toastRef.value.showToast(message, title, "info");
+ },
+
+ warning(message, title = "Warning") {
+ toastRef.value.showToast(message, title, "warning");
+ },
+
+ error(message, title = "Error") {
+ toastRef.value.showToast(message, title, "error");
+ },
+};
+
+export function useToast() {
+ return { ...Toast };
+}
diff --git a/client/src/entry/analysis/App.vue b/client/src/entry/analysis/App.vue
index eae6d0994af..18cadcf1cce 100644
--- a/client/src/entry/analysis/App.vue
+++ b/client/src/entry/analysis/App.vue
@@ -35,6 +35,8 @@
+
@@ -47,15 +49,31 @@ import { HistoryPanelProxy } from "components/History/adapters/HistoryPanelProxy
import { fetchMenu } from "entry/analysis/menu";
import { WindowManager } from "layout/window-manager";
import { safePath } from "utils/redirect";
-import { setGlobalUploadModal } from "composables/useGlobalUploadModal";
-import UploadModal from "components/Upload/UploadModal";
+import Toast from "components/Toast";
+import ConfirmDialog from "components/ConfirmDialog";
+import UploadModal from "components/Upload/UploadModal.vue";
import { ref } from "vue";
+import { setToastComponentRef } from "composables/toast";
+import { setConfirmDialogComponentRef } from "composables/confirmDialog";
+import { setGlobalUploadModal } from "composables/useGlobalUploadModal";
export default {
components: {
Masthead,
+ Toast,
+ ConfirmDialog,
UploadModal,
},
+ setup() {
+ const toastRef = ref(null);
+ setToastComponentRef(toastRef);
+ const confirmDialogRef = ref(null);
+ setConfirmDialogComponentRef(confirmDialogRef);
+ const uploadModal = ref(null);
+ setGlobalUploadModal(uploadModal);
+
+ return { toastRef, confirmDialogRef, uploadModal };
+ },
data() {
return {
config: getGalaxyInstance().config,
@@ -64,12 +82,6 @@ export default {
windowManager: new WindowManager(),
};
},
- setup() {
- const uploadModal = ref(null);
- setGlobalUploadModal(uploadModal);
-
- return { uploadModal };
- },
computed: {
tabs() {
return fetchMenu(this.config);
diff --git a/client/src/entry/analysis/index.js b/client/src/entry/analysis/index.js
index 31d03a70596..175a61e15a8 100644
--- a/client/src/entry/analysis/index.js
+++ b/client/src/entry/analysis/index.js
@@ -4,18 +4,23 @@ import Vue, { provide } from "vue";
import App from "./App.vue";
import store from "store";
import { getRouter } from "./router";
+import { createPinia, PiniaVuePlugin } from "pinia";
+
+Vue.use(PiniaVuePlugin);
+const pinia = createPinia();
addInitialization((Galaxy) => {
console.log("App setup");
const router = getRouter(Galaxy);
new Vue({
el: "#app",
- render: (h) => h(App),
setup() {
provide("store", store);
},
+ render: (h) => h(App),
router: router,
store: store,
+ pinia: pinia,
});
});
diff --git a/client/src/entry/analysis/modules/Analysis.vue b/client/src/entry/analysis/modules/Analysis.vue
index 37191a51433..4df9c96048d 100644
--- a/client/src/entry/analysis/modules/Analysis.vue
+++ b/client/src/entry/analysis/modules/Analysis.vue
@@ -9,7 +9,7 @@
diff --git a/client/src/entry/analysis/modules/Login.test.js b/client/src/entry/analysis/modules/Login.test.js
new file mode 100644
index 00000000000..16cab49733a
--- /dev/null
+++ b/client/src/entry/analysis/modules/Login.test.js
@@ -0,0 +1,76 @@
+import { shallowMount } from "@vue/test-utils";
+import { getLocalVue } from "jest/helpers";
+import { getGalaxyInstance } from "app/singleton";
+import MountTarget from "./Login";
+
+// mock Galaxy object
+jest.mock("app/singleton");
+const mockGalaxy = {
+ config: {
+ allow_user_creation: true,
+ enable_oidc: true,
+ mailing_join_addr: "mailing_join_addr",
+ prefer_custos_login: true,
+ registration_warning_message: "registration_warning_message",
+ server_mail_configured: true,
+ show_welcome_with_login: true,
+ terms_url: "terms_url",
+ welcome_url: "welcome_url",
+ },
+ user: {
+ isAdmin() {
+ return true;
+ },
+ },
+ session_csrf_token: "session_csrf_token",
+};
+getGalaxyInstance.mockImplementation(() => mockGalaxy);
+const localVue = getLocalVue(true);
+
+describe("Login", () => {
+ it("login index attribute matching", async () => {
+ const wrapper = shallowMount(MountTarget, {
+ localVue,
+ mocks: {
+ $route: {
+ query: {
+ redirect: "redirect_url",
+ },
+ },
+ },
+ });
+ const attributes = wrapper.find("loginindex-stub").attributes();
+ expect(attributes.redirect).toBe("redirect_url");
+ expect(attributes.allowusercreation).toBe("true");
+ expect(attributes.sessioncsrftoken).toBe("session_csrf_token");
+ expect(attributes.enableoidc).toBe("true");
+ expect(attributes.mailingjoinaddr).toBe("mailing_join_addr");
+ expect(attributes.prefercustoslogin).toBe("true");
+ expect(attributes.servermailconfigured).toBe("true");
+ expect(attributes.showwelcomewithlogin).toBe("true");
+ expect(attributes.registrationwarningmessage).toBe("registration_warning_message");
+ expect(attributes.termsurl).toBe("terms_url");
+ expect(attributes.welcomeurl).toBe("welcome_url");
+ });
+
+ it("change password attribute matching", async () => {
+ const wrapper = shallowMount(MountTarget, {
+ localVue,
+ mocks: {
+ $route: {
+ query: {
+ token: "test_token",
+ status: "test_status",
+ message: "test_message",
+ expired_user: "test_user",
+ },
+ },
+ },
+ });
+ const attributes = wrapper.find("changepassword-stub").attributes();
+ expect(attributes.token).toBe("test_token");
+ expect(attributes.expireduser).toBe("test_user");
+ expect(attributes.messagetext).toBe("test_message");
+ expect(attributes.messagevariant).toBe("test_status");
+ });
+});
diff --git a/client/src/entry/analysis/modules/Login.vue b/client/src/entry/analysis/modules/Login.vue
index 9c3e4f0cc66..cd4e21b7f68 100644
--- a/client/src/entry/analysis/modules/Login.vue
+++ b/client/src/entry/analysis/modules/Login.vue
@@ -3,15 +3,25 @@
-
@@ -20,8 +30,8 @@