iguazio.dashboard-controls 1.2.17 → 1.2.19-vistra-logs

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iguazio.dashboard-controls",
-    "version": "1.2.17",
+    "version": "1.2.19-vistra-logs",
     "main": "dist/js/iguazio.dashboard-controls.js",
     "description": "Collection of resources (such as CSS styles, fonts and images) and AngularJs 1.x components and services to share among different Iguazio repos.",
     "repository": {
@@ -33,7 +33,7 @@
         "bootstrap": "~3.4.1",
         "del": "^6.1.1",
         "eslint-plugin-angular": "^4.0.1",
-        "express": "4.19.2",
+        "express": "4.20.0",
         "gulp": "^4.0.2",
         "gulp-babel": "^8.0.0",
         "gulp-concat": "^2.6.1",

package/src/igz_controls/services/validation.service.js

@@ -684,7 +684,7 @@ such restriction.
             ip: /^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/,
             mask: /^(((255\.){3}(255|254|252|248|240|224|192|128|0+))|((255\.){2}(255|254|252|248|240|224|192|128|0+)\.0)|((255\.)(255|254|252|248|240|224|192|128|0+)(\.0+){2})|((255|254|252|248|240|224|192|128|0+)(\.0+){3}))$/,
             hostName_IpAddress: /(^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$)|(^(([a-zA-Z]|[a-zA-Z][a-zA-Z0-9-]*[a-zA-Z0-9])\.)+([A-Za-z]|[A-Za-z][A-Za-z0-9-]*[A-Za-z0-9])$)/,
-            dockerReference: /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9])(\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9-]*[a-zA-Z0-9]))*(:\d+)?\/)?[a-z0-9]+(([._]|__|[-]*)[a-z0-9]+)*(\/[a-z0-9]+(([._]|__|[-]*)[a-z0-9]+)*)*(:[\w][\w.-]{0,127})?(@[A-Za-z][A-Za-z0-9]*([-_+.][A-Za-z][A-Za-z0-9]*)*:[0-9a-fA-F]{32,})?$/,
+            dockerReference: /^(?!.*\/\/)(?:(?:[A-Za-z0-9](?:-[A-Za-z0-9]|[A-Za-z0-9])*)(?:\.(?:[A-Za-z0-9](?:-[A-Za-z0-9]|[A-Za-z0-9])*))*(?::\d+)?\/)?[a-z0-9]+(?:(?:[._]|__|-+)[a-z0-9]+)*(?:\/[a-z0-9]+(?:(?:[._]|__|-+)[a-z0-9]+)*)*(?::[A-Za-z0-9_][A-Za-z0-9._-]{0,127})?(?:@[A-Za-z][A-Za-z0-9]*(?:[-_+.][A-Za-z][A-Za-z0-9]*)*:[0-9a-fA-F]{32,})?$/,
 
             getMaxLength: getMaxLength,
             getValidationRules: getValidationRules,

package/src/igz_controls/services/yaml.service.js

@@ -82,7 +82,7 @@ such restriction.
          */
         function getValidYaml(data) {
             function replacer(match, captureGroup1, captureGroup2) {
-                return captureGroup1 + captureGroup2.replace(/"/g, '\\"');
+                return captureGroup1 + captureGroup2.replace(/\\/g, '\\\\').replace(/"/g, '\\"');
             }
 
             return data.replace(/(\s*-)\s*\n\s+/g, '$1 ')

package/src/nuclio/functions/version/version-code/version-code.component.js

@@ -433,10 +433,11 @@ such restriction.
          * ```
          */
         function extractFileName(path, includeExtension, onlyExtension) {
-            var start = path.lastIndexOf(lodash.defaultTo(onlyExtension, false) ? '.' : '/') + 1;
-            var end = lodash.defaultTo(includeExtension, true) ? path.length : path.lastIndexOf('.');
+            var pathReplaced = lodash.defaultTo(path, '').replace(/\\/g, '/')
+            var start = pathReplaced.lastIndexOf(lodash.defaultTo(onlyExtension, false) ? '.' : '/') + 1;
+            var end = lodash.defaultTo(includeExtension, true) ? pathReplaced.length : pathReplaced.lastIndexOf('.');
 
-            return lodash.defaultTo(path, '').replace('\\', '/').substring(start, end);
+            return pathReplaced.substring(start, end);
         }
 
         /**

package/src/nuclio/functions/version/version.component.js

@@ -35,12 +35,13 @@ such restriction.
             controller: NclVersionController
         });
 
-    function NclVersionController($i18next, $interval, $rootScope, $scope, $state, $stateParams, $transitions, $timeout,
+    function NclVersionController($i18next, $interval, $injector, $rootScope, $scope, $state, $stateParams, $transitions, $timeout,
                                   i18next, lodash, ngDialog, ConfigService, DialogsService, ExportService,
                                   FunctionsService, GeneralDataService, NuclioHeaderService,
                                   VersionHelperService) {
         var ctrl = this;
         var deregisterFunction = null;
+        var servicesService = null;
         var interval = null;
         var lng = i18next.language;
 
@@ -227,6 +228,10 @@ such restriction.
                 }
             });
 
+            if ($injector.has('ServicesService')) {
+                servicesService = $injector.get('ServicesService')
+            }
+
             setImageNamePrefixTemplate();
             setIngressHost();
             initLogTabs();
@@ -682,11 +687,18 @@ such restriction.
          * Checks if the "Execution log" tab should be shown
          */
         function initLogTabs() {
-            if (lodash.get(ConfigService, 'nuclio.defaultProxyLogsSource', '') === 'elasticsearch') {
-                ctrl.navigationTabsConfig.push({
-                    tabName: $i18next.t('functions:EXECUTION_LOG', { lng: lng }),
-                    id: 'execution-log',
-                    uiRoute: 'app.project.function.edit.execution-log'
+            if (lodash.get(ConfigService, 'url.elasticsearch.path', '') && servicesService) {
+                servicesService.getServices().then(function (result) {
+                    var services = result.services;
+                    var logForwarderService = lodash.find(services, ['spec.name', 'log-forwarder']);
+
+                    if (servicesService.isEnabled(logForwarderService)) {
+                        ctrl.navigationTabsConfig.push({
+                            tabName: $i18next.t('functions:EXECUTION_LOG', { lng: lng }),
+                            id: 'execution-log',
+                            uiRoute: 'app.project.function.edit.execution-log'
+                        });
+                    }
                 });
             }
         }