Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Help Mode Switch, Text Box, and Initial Elements #17168

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions client/src/components/Form/FormDisplay.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@
</template>

<script>
import { mapStores } from "pinia";
import Vue from "vue";
import { useHelpModeTextStore } from "@/stores/helpmode/helpModeTextStore";
import FormInputs from "./FormInputs";
import { matchInputs, validateInputs, visitInputs } from "./utilities";
Expand Down Expand Up @@ -99,6 +102,7 @@ export default {
};
},
computed: {
...mapStores(useHelpModeTextStore),
validation() {
return validateInputs(this.formIndex, this.formData, this.allowEmptyValueOnRequiredInput);
},
Expand Down Expand Up @@ -138,6 +142,7 @@ export default {
},
},
created() {
this.callHelpMode();
this.onCloneInputs();
// build flat formData that is ready to be submitted
this.formData = this.buildFormData();
Expand All @@ -149,6 +154,9 @@ export default {
this.onErrors();
},
methods: {
callHelpMode() {
this.helpModeTextStore.addHelpModeText("tool_form_base");
},
buildFormData() {
const params = {};
Object.entries(this.formIndex).forEach(([key, input]) => {
Expand Down
22 changes: 22 additions & 0 deletions client/src/components/Masthead/HelpModeSwitch.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
<script setup lang="ts">
import { computed } from "vue";

import { useHelpModeStatusStore } from "@/stores/helpmode/helpModeStatusStore";

const tooltip = "Enable/Disable Help Mode";
const statusStore = useHelpModeStatusStore();
const enabledStatus = computed({
get() {
return statusStore.helpmodestatus;
},
set(value: boolean) {
statusStore.setHelpModeStatus(value);
},
});
</script>

<template>
<div>
<b-form-checkbox v-model="enabledStatus" class="no-highlight" switch :title="tooltip"> </b-form-checkbox>
</div>
</template>
6 changes: 5 additions & 1 deletion client/src/components/Masthead/Masthead.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script setup>
import { BNavbar, BNavbarBrand, BNavbarNav } from "bootstrap-vue";
import { BNavbar, BNavbarBrand, BNavbarNav, BNavForm } from "bootstrap-vue";
import { storeToRefs } from "pinia";
import { useEntryPointStore } from "stores/entryPointStore";
import { withPrefix } from "utils/redirect";
Expand All @@ -10,6 +10,7 @@ import { useConfig } from "@/composables/config";
import { useUserStore } from "@/stores/userStore";
import { loadWebhookMenuItems } from "./_webhooks";
import HelpModeSwitch from "./HelpModeSwitch";
import MastheadItem from "./MastheadItem";
import QuotaMeter from "./QuotaMeter";
import { getActiveTab } from "./utilities";
Expand Down Expand Up @@ -143,6 +144,9 @@ onMounted(() => {
id="notifications-bell">
<NotificationsBell tooltip-placement="bottom" />
</BNavItem>
<BNavForm>
<HelpModeSwitch />
</BNavForm>
</BNavbarNav>
<QuotaMeter />
</BNavbar>
Expand Down
37 changes: 37 additions & 0 deletions client/src/components/Panels/HelpModeText.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<script setup="ts">
import MarkdownIt from "markdown-it";
import { computed } from "vue";
import { useHelpModeTextStore } from "@/stores/helpmode/helpModeTextStore";
const md = MarkdownIt();
const helpInfo = useHelpModeTextStore();
const helpText = computed({
get() {
return md.render(helpInfo.helpmodetext);
},
});
</script>

<template>
<div class="helptext unified-panel-body d-flex justify-content-between">
<div class="helpModeContainer" v-html="helpText"></div>
</div>
</template>

<style>
.helptext {
position: fixed;
top: 70%;
left: 80%;
width: 20% !important;
height: 30% !important;
z-index: 9999;
background-color: aliceblue;
border-color: black;
border-radius: 5px;
border-width: 2px;
border: solid;
opacity: 90%;
}
</style>
4 changes: 4 additions & 0 deletions client/src/entry/analysis/modules/Analysis.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@ import { onMounted, onUnmounted, ref } from "vue";
import { useRouter } from "vue-router/composables";

import { usePanels } from "@/composables/usePanels";
import { useHelpModeStatusStore } from "@/stores/helpmode/helpModeStatusStore";

import CenterFrame from "./CenterFrame.vue";
import ActivityBar from "@/components/ActivityBar/ActivityBar.vue";
import HistoryIndex from "@/components/History/Index.vue";
import FlexPanel from "@/components/Panels/FlexPanel.vue";
import HelpModeText from "@/components/Panels/HelpModeText.vue";
import ToolPanel from "@/components/Panels/ToolPanel.vue";
import DragAndDropModal from "@/components/Upload/DragAndDropModal.vue";

const router = useRouter();
const showCenter = ref(false);
const { showActivityBar, showToolbox, showPanels } = usePanels();
const status = useHelpModeStatusStore();

// methods
function hideCenter() {
Expand Down Expand Up @@ -50,5 +53,6 @@ onUnmounted(() => {
<HistoryIndex />
</FlexPanel>
<DragAndDropModal />
<HelpModeText v-if="status.helpmodestatus" />
</div>
</template>
15 changes: 15 additions & 0 deletions client/src/stores/helpmode/helpModeStatusStore.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { defineStore } from "pinia";

export const useHelpModeStatusStore = defineStore("helpModeStatusStore", {
state: () => {
return {
helpmodestatus: false,
};
},

actions: {
setHelpModeStatus(status) {
this.helpmodestatus = status;
},
},
});
22 changes: 22 additions & 0 deletions client/src/stores/helpmode/helpModeTextStore.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { defineStore } from "pinia";

import config from "./helpTextConfig.yml";

export const useHelpModeTextStore = defineStore("helpModeText", {
state: () => {
return {
helpmodetext: "Welcome to Galaxy Help Mode!",
};
},

actions: {
addHelpModeText(text) {
const file_path = config[text];
fetch("https://raw.githubusercontent.com/assuntad23/galaxy-help-markdown/main/" + file_path)
.then((response) => response.text())
.then((text) => {
this.helpmodetext = text;
});
},
},
});
20 changes: 20 additions & 0 deletions client/src/stores/helpmode/helpTextConfig.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
quotaMeterHelpString: This is your Quota storage meter. It is an indication of how much storage you are using. To learn more about Quota Storage, check out this GTN tutorial.
unix_terms:
exitCodeHelpString: Some text about exit codes.
stdoutHelpString: Some text about stdout.
stderrHelpString: Some text about stderr.
commandLineHelpString: Some text about command line.
tracebackHelpString: Some text about traceback.

galaxy_terms:
historyIDHelpString: Some text about history ID.
historyContentIDHelpString: Some text about history content ID.
historyDatasetCollectionAssociationHelpString: Some text about history dataset collection association.
historyDatasetAssociationHelpString: Some text about history dataset association.
datasetHelpString: Some text about dataset.
invocationHelpString: Some text about invocation.
datatypeHelpString: Some text about datatype.
dbkeyHelpString: Some text about dbkey.
jobStatesHelpString: Some text about job states.

tool_form_base: tools/tool_form_base.md
4 changes: 4 additions & 0 deletions client/webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,10 @@ module.exports = (env = {}, argv = {}) => {
test: /\.vue$/,
loader: "vue-loader",
},
{
test: /\.ya?ml$/,
loader: "yaml-loader",
},
{
test: /\.tsx?$/,
exclude: /node_modules/,
Expand Down
Loading