issue #544

CenturyLinkCloud · Nov 1, 2018 · cd2f3ae · cd2f3ae
1 parent 2d5a743
commit cd2f3ae
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 12 deletions.
diff --git a/mdw-hub/web/js/assets.js b/mdw-hub/web/js/assets.js
@@ -302,7 +302,8 @@ assetMod.controller('AssetController', ['$scope', '$cookieStore', '$routeParams'
   $scope.assetName = $routeParams.assetName;
   if ($scope.assetName.endsWith('.proc')) {
     $scope.process = {packageName: $scope.packageName, name: $scope.assetName.substring(0, $scope.assetName.length - 5)};
-  }else if($scope.assetName.endsWith('.task')){
+  }
+  else if($scope.assetName.endsWith('.task')){
     $scope.task = true;
   }
 

diff --git a/mdw-hub/web/js/tests.js b/mdw-hub/web/js/tests.js
@@ -398,7 +398,7 @@ testingMod.filter('assetLinks', function($sce) {
             var slash = path.lastIndexOf('/');
             if (slash < 0)
               path = pkg + '/' + path;
-            if (match[2] == 'process')
+            if (match[2] == 'process' && !path.endsWith('.proc'))
               path += '.proc';
             var quot = regex == regex2 ? '"' : "'";
             output += match[1] + match[2] + '(' + start + quot + '<a href="#/asset/' + path + '">' + match[3] + '</a>' + quot + end + ')';

diff --git a/mdw-hub/web/js/ui/configurator.js b/mdw-hub/web/js/ui/configurator.js
@@ -206,10 +206,6 @@ configMod.factory('Configurator', ['$injector', '$http', 'mdw', 'util', 'Assets'
   };
 
   Configurator.prototype.initSubprocBindings = function(widget, subproc) {
-    var spaceV = subproc.lastIndexOf(' v');
-    if (spaceV > 0)
-      subproc = subproc(0, spaceV);
-
     var configurator = this;
     $http.get(mdw.roots.services + '/services/Workflow/' + subproc + "?app=mdw-admin").then(function(res) {
       if (res.data.variables) {
@@ -292,11 +288,13 @@ configMod.factory('Configurator', ['$injector', '$http', 'mdw', 'util', 'Assets'
       var selectAsset = null;
       if (widget.value) {
         var spaceV = widget.value.lastIndexOf(' v');
-        if (spaceV > 0)
+        if (spaceV > 0 && spaceV < widget.value.length - 2 && !isNaN(parseFloat(widget.value.substring(spaceV + 2)))) {
           selectAsset = widget.value.substring(0, spaceV);
-        else
+        }
+        else {
           selectAsset = widget.value;
-        if (widget.source == 'proc')
+        }
+        if (widget.source == 'proc' && !selectAsset.endsWith('.proc'))
           selectAsset += '.proc';  // process attrs saved without ext
       }
       selectAssets.push(selectAsset);
@@ -584,7 +582,7 @@ configMod.factory('Configurator', ['$injector', '$http', 'mdw', 'util', 'Assets'
       var asset = value;
       var version;
       var spaceV = value.lastIndexOf(' v');
-      if (spaceV > 0) {
+      if (spaceV > 0 && spaceV < value.length - 2 && !isNaN(parseFloat(value.substring(spaceV + 2)))) {
         var minVer = asset.substring(spaceV + 2);
         var dot = minVer.indexOf('.');
         var major = dot > 0 ? parseInt(minVer.substring(0, dot)) : 0;

diff --git a/mdw-hub/web/js/ui/inspector.js b/mdw-hub/web/js/ui/inspector.js
@@ -305,7 +305,7 @@ inspectMod.controller('MdwInspectorController', ['$scope', '$http', '$parse', 'm
               else if (prop == 'processname') {
                 val.name = 'Process';
                 val.asset = {
-                  path: val.value + '.proc', 
+                  path: val.value + (val.value.endsWith('.proc') ? '' : '.proc'),
                   version: 'v' + tabInfo.processversion
                 };
               }

diff --git a/mdw-hub/web/ui/widgets/asset.html b/mdw-hub/web/ui/widgets/asset.html
@@ -2,5 +2,5 @@
   class="mdw-widget-dropdown">
   <option ng-repeat="option in widget.options" value="{{option}}">{{option}}</option>
 </select>
-<a href="{{widget.assetUrl}}" ng-if="widget.value" target="_blank" style="top:0;">{{widget.readonly ? widget.value : 'Open'}}</a>
+<a href="{{widget.assetUrl}}" ng-if="widget.value" target="_blank" style="top:2px;">{{widget.readonly ? widget.value : 'Open'}}</a>
 <a href="" ng-if="!widget.readonly && !widget.value" ng-click="newAsset(widget.source)" target="_blank" style="top:0;">New...</a>