Fix for basename calculation - this actually works with URLs now.

galaxyproject · Mar 1, 2018 · ca4f6d2 · ca4f6d2
1 parent 8be4642
commit ca4f6d2
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/client/galaxy/scripts/components/RuleCollectionBuilder.vue b/client/galaxy/scripts/components/RuleCollectionBuilder.vue
@@ -490,8 +490,10 @@ const Rules = {
             rule.target_column = component.addColumnBasenameTarget;
         },
         apply: (rule, data, sources) => {
-            // https://github.com/kgryte/regex-basename-posix/blob/master/lib/index.js        
-            const re = /^(?:\/?|)(?:[\s\S]*?)((?:\.{1,2}|[^\/]+?|)(?:\.[^.\/]*|))(?:[\/]*)$/;
+            // https://github.com/kgryte/regex-basename-posix/blob/master/lib/index.js
+            //const re = /^(?:\/?|)(?:[\s\S]*?)((?:\.{1,2}|[^\/]+?|)(?:\.[^.\/]*|))(?:[\/]*)$/;
+            // https://stackoverflow.com/questions/8376525/get-value-of-a-string-after-a-slash-in-javascript
+            const re = /[^/]*$/;
             const target = rule.target_column;
             return applyRegex(re, target, data);
         }