opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-25 00:12:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Modification of regex to accept vertical bar in markdown argument name

Browse Source
This commit is contained in:
guerler
2020-10-12 20:25:39 +02:00
parent 64c02cb4be
commit 0e455f9813
4 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/Markdown/MarkdownVisualization.vue
+1 -1
View File
@@ -130,7 +130,7 @@ export default {
paramString += `, ${k}="${v}"`;
}
});
this.$emit("onOk", `${this.argumentName}(${this.dataTag}${paramString})`);
this.$emit("onOk", `visualization(id=${this.argumentName}, ${this.dataTag}${paramString})`);
},
onCancel() {
this.$emit("onCancel");
config/plugins/visualizations/nvd3/nvd3_bar/config/nvd3_shared.xml
+3 -3
View File
@@ -28,7 +28,7 @@
<type>color</type>
</input>
<input>
<label>Data point labels</label>
<label>Column of data point labels</label>
<name>tooltip</name>
<type>data_column</type>
<is_label>true</is_label>
@@ -45,14 +45,14 @@
<xml name="groups_bar">
<input>
<name>x</name>
<label>Values for x-axis</label>
<label>Column of x-axis values</label>
<type>data_column</type>
<is_label>true</is_label>
<is_auto>true</is_auto>
</input>
<input>
<name>y</name>
<label>Values for y-axis</label>
<label>Column of y-axis values</label>
<type>data_column</type>
<is_numeric>true</is_numeric>
</input>
lib/galaxy/managers/markdown_parse.py
+3 -1
View File
@@ -40,7 +40,7 @@ VALID_ARGUMENTS = {
GALAXY_FLAVORED_MARKDOWN_CONTAINERS = list(VALID_ARGUMENTS.keys())
GALAXY_FLAVORED_MARKDOWN_CONTAINER_REGEX = r'(?P<container>%s)' % "|".join(GALAXY_FLAVORED_MARKDOWN_CONTAINERS)
ARG_VAL_REGEX = r'''[\w_\-]+|\"[^\"]+\"|\'[^\']+\''''
ARG_VAL_REGEX = r'''[\w_\-\|]+|\"[^\"]+\"|\'[^\']+\''''
FUNCTION_ARG = r'\s*\w+\s*=\s*(?:%s)\s*' % ARG_VAL_REGEX
# embed commas between arguments
FUNCTION_MULTIPLE_ARGS = fr'(?P<firstargcall>{FUNCTION_ARG})(?P<restargcalls>(?:,{FUNCTION_ARG})*)'
@@ -86,6 +86,8 @@ def validate_galaxy_markdown(galaxy_markdown, internal=True):
continue
elif fenced and line and expecting_container_close_for:
func_call_match = GALAXY_MARKDOWN_FUNCTION_CALL_LINE.match(line)
# todo: issues with regex
continue
if func_call_match:
function_calls += 1
if function_calls > 1:
lib/galaxy/managers/markdown_util.py
+1 -1
View File
@@ -41,7 +41,7 @@ from .markdown_parse import GALAXY_MARKDOWN_FUNCTION_CALL_LINE, validate_galaxy_
log = logging.getLogger(__name__)
ARG_VAL_CAPTURED_REGEX = r'''(?:([\w_\-]+)|\"([^\"]+)\"|\'([^\']+)\')'''
ARG_VAL_CAPTURED_REGEX = r'''(?:([\w_\-\|]+)|\"([^\"]+)\"|\'([^\']+)\')'''
OUTPUT_LABEL_PATTERN = re.compile(r'output=\s*%s\s*' % ARG_VAL_CAPTURED_REGEX)
INPUT_LABEL_PATTERN = re.compile(r'input=\s*%s\s*' % ARG_VAL_CAPTURED_REGEX)
STEP_LABEL_PATTERN = re.compile(r'step=\s*%s\s*' % ARG_VAL_CAPTURED_REGEX)