DOCK-2533-followup: Fix regex in Register Workflow dialog (#2028)

* fix regex * fix test * added $ * added $
dockstore · Oct 8, 2024 · 88a2a0f · 88a2a0f
1 parent 3683f63
commit 88a2a0f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/src/app/descriptor-languages/CWL.ts b/src/app/descriptor-languages/CWL.ts
@@ -7,7 +7,7 @@ export const extendedCWL: ExtendedDescriptorLanguageBean = {
   shortFriendlyName: 'CWL',
   friendlyName: 'Common Workflow Language',
   defaultDescriptorPath: '/Dockstore.cwl',
-  descriptorPathPattern: '^/([^/?:*|<>]+/)*[^/?:*|<>]+.(cwl|yaml|yml)',
+  descriptorPathPattern: '^\\/([^\\/?:*\\|<>]+\\/)*[^\\/?:*\\|<>]+.(cwl|yaml|yml)$',
   descriptorPathPlaceholder: 'e.g. /Dockstore.cwl',
   toolDescriptorEnum: ToolDescriptor.TypeEnum.CWL,
   workflowDescriptorEnum: Workflow.DescriptorTypeEnum.CWL,

diff --git a/src/app/descriptor-languages/Galaxy.ts b/src/app/descriptor-languages/Galaxy.ts
@@ -7,7 +7,7 @@ export const extendedGalaxy: ExtendedDescriptorLanguageBean = {
   shortFriendlyName: 'Galaxy',
   friendlyName: 'Galaxy Workflow Format',
   defaultDescriptorPath: '/workflow-name.yml',
-  descriptorPathPattern: '^/([^/?:*|<>]+/)*[^/?:*|<>]+.(ga|yaml|yml)',
+  descriptorPathPattern: '^\\/([^\\/?:*\\|<>]+\\/)*[^\\/?:*\\|<>]+.(ga|yaml|yml)$',
   descriptorPathPlaceholder: 'e.g. /workflow-name.yml',
   toolDescriptorEnum: ToolDescriptor.TypeEnum.GALAXY,
   workflowDescriptorEnum: Workflow.DescriptorTypeEnum.Gxformat2,

diff --git a/src/app/descriptor-languages/Jupyter.ts b/src/app/descriptor-languages/Jupyter.ts
@@ -10,7 +10,7 @@ export const extendedJupyter: ExtendedDescriptorLanguageBean = {
   shortFriendlyName: 'Jupyter',
   friendlyName: 'Jupyter notebook',
   defaultDescriptorPath: '/notebook.ipynb',
-  descriptorPathPattern: '^/([^/?:*|<>]+/)*[^/?:*|<>]+.ipynb$',
+  descriptorPathPattern: '^^\\/([^\\/?:*\\|<>]+\\/)*[^\\/?:*\\|<>]+.ipynb$',
   descriptorPathPlaceholder: 'e.g. /notebook.ipynb',
   toolDescriptorEnum: ToolDescriptor.TypeEnum.JUPYTER,
   workflowDescriptorEnum: Workflow.DescriptorTypeEnum.Jupyter,

diff --git a/src/app/descriptor-languages/Nextflow.ts b/src/app/descriptor-languages/Nextflow.ts
@@ -7,7 +7,7 @@ export const extendedNFL: ExtendedDescriptorLanguageBean = {
   shortFriendlyName: 'Nextflow',
   friendlyName: 'Nextflow',
   defaultDescriptorPath: '/nextflow.config',
-  descriptorPathPattern: '^/([^/?:*|<>]+/)*[^/?:*|<>]+.(config)',
+  descriptorPathPattern: '^\\/([^\\/?:*\\|<>]+\\/)*[^\\/?:*\\|<>]+.(config)$',
   descriptorPathPlaceholder: 'e.g. /nextflow.config',
   toolDescriptorEnum: ToolDescriptor.TypeEnum.NFL,
   workflowDescriptorEnum: Workflow.DescriptorTypeEnum.NFL,

diff --git a/src/app/descriptor-languages/Snakemake.ts b/src/app/descriptor-languages/Snakemake.ts
@@ -7,7 +7,7 @@ export const extendedSMK: ExtendedDescriptorLanguageBean = {
   shortFriendlyName: 'Snakemake',
   friendlyName: 'Snakemake',
   defaultDescriptorPath: '/Snakefile',
-  descriptorPathPattern: '^/([^/?:*|<>]++/)*(Snakefile|[^./?:*|<>]++.smk))$',
+  descriptorPathPattern: '^\\/([^\\/?:*\\|<>]+\\/)*(Snakefile|[^.\\/?:*\\|<>]+.smk)$',
   descriptorPathPlaceholder: 'e.g. /Snakefile',
 
   toolDescriptorEnum: ToolDescriptor.TypeEnum.SMK,

diff --git a/src/app/descriptor-languages/WDL.ts b/src/app/descriptor-languages/WDL.ts
@@ -7,7 +7,7 @@ export const extendedWDL: ExtendedDescriptorLanguageBean = {
   shortFriendlyName: 'WDL',
   friendlyName: 'Workflow Description Language',
   defaultDescriptorPath: '/Dockstore.wdl',
-  descriptorPathPattern: '^/([^/?:*|<>]+/)*[^/?:*|<>]+.wdl$',
+  descriptorPathPattern: '^\\/([^\\/?:*\\|<>]+\\/)*[^\\/?:*\\|<>]+.wdl$',
   descriptorPathPlaceholder: 'e.g. /Dockstore.wdl',
   toolDescriptorEnum: ToolDescriptor.TypeEnum.WDL,
   workflowDescriptorEnum: Workflow.DescriptorTypeEnum.WDL,

diff --git a/src/app/shared/entry/descriptor-language.service.spec.ts b/src/app/shared/entry/descriptor-language.service.spec.ts
@@ -106,13 +106,13 @@ describe('Service: DescriptorLanguage', () => {
     metadataServiceSpy.getDescriptorLanguages.and.returnValue(observableOf(descriptorLanguageBeans));
     const descriptorLanguageService = new DescriptorLanguageService(metadataServiceSpy, workflowQuerySpy);
     let placeholder = descriptorLanguageService.getDescriptorPattern(ToolDescriptor.TypeEnum.SMK);
-    expect(placeholder).toEqual('^/([^/?:*|<>]++/)*(Snakefile|[^./?:*|<>]++.smk))$');
+    expect(placeholder).toEqual('^\\/([^\\/?:*\\|<>]+\\/)*(Snakefile|[^.\\/?:*\\|<>]+.smk)$');
     placeholder = descriptorLanguageService.getDescriptorPattern(ToolDescriptor.TypeEnum.CWL);
-    expect(placeholder).toEqual('^/([^/?:*|<>]+/)*[^/?:*|<>]+.(cwl|yaml|yml)');
+    expect(placeholder).toEqual('^\\/([^\\/?:*\\|<>]+\\/)*[^\\/?:*\\|<>]+.(cwl|yaml|yml)$');
     placeholder = descriptorLanguageService.getDescriptorPattern(ToolDescriptor.TypeEnum.WDL);
-    expect(placeholder).toEqual('^/([^/?:*|<>]+/)*[^/?:*|<>]+.wdl$');
+    expect(placeholder).toEqual('^\\/([^\\/?:*\\|<>]+\\/)*[^\\/?:*\\|<>]+.wdl$');
     placeholder = descriptorLanguageService.getDescriptorPattern(ToolDescriptor.TypeEnum.NFL);
-    expect(placeholder).toEqual('^/([^/?:*|<>]+/)*[^/?:*|<>]+.(config)');
+    expect(placeholder).toEqual('^\\/([^\\/?:*\\|<>]+\\/)*[^\\/?:*\\|<>]+.(config)$');
     placeholder = descriptorLanguageService.getDescriptorPattern(ToolDescriptor.TypeEnum.SERVICE);
     expect(placeholder).toEqual('.*');
     placeholder = descriptorLanguageService.getDescriptorPattern(<ToolDescriptor.TypeEnum>'UnrecognizedType');