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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iguazio.dashboard-controls",
-    "version": "1.2.19-vistra-logs",
+    "version": "1.3.0",
     "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": {

package/src/i18n/en/functions.json

@@ -153,6 +153,7 @@
     "HUGE": "Huge",
     "HTTP_TRIGGER_MSG": "A Nuclio function must have a single HTTP trigger. You can define such a trigger&nbsp;<a class=\"link\" data-ng-click=\"$ctrl.addDefaultHttpTrigger($event)\">here</a>. Otherwise, when deploying the function a default HTTP trigger named \"default-http\" is defined and deployed automatically unless there is a custom HTTP trigger configuration in the <a class=\"link\" data-ui-sref=\"app.project.function.edit.code\">external source code</a>.",
     "HTTP_TRIGGER_NAME_DESCRIPTION": "If the name of the HTTP trigger is <b>default-http</b> it might get overridden by a remote function specification configured in <b>Code Entry Type.</b>",
+    "IGUAZIO":"Iguazio",
     "IMAGE_NAME": "Image name",
     "IMAGE_NAME_DESCRIPTION": "The name of the built container image (default for this function: <b>{{defaultImageName}}</b>)",
     "IMPORT": "Import",

package/src/igz_controls/components/log-table-row/log-table-row.component.spec.js

@@ -37,13 +37,36 @@ describe('igzElasticLogTableRow component: ', function () {
     });
 
     describe('getLogName():', function () {
-        it('should return the log name display value with free space in the end', function () {
-            expect(ctrl.getLogName()).toBe('cron           ');
+        it('should return the full log name display value', function () {
+            ctrl.entryItem.name = '012345678901234567890123456789';
+            expect(ctrl.getLogName()).toBe('012345678901234567890123456789');
         });
 
-        it('should return the cropped log name display value', function () {
-            ctrl.entryItem.name = '012345678901234567890123456789';
-            expect(ctrl.getLogName()).toBe('012345678901234');
+        it('should return the kubernetes pod name', function () {
+            ctrl.entryItem.kubernetes = { pod: { name: 'kubName' } }
+            expect(ctrl.getLogName()).toBe('kubName');
+        });
+
+        it('should return the empty string', function () {
+            ctrl.entryItem.name = undefined
+            expect(ctrl.getLogName()).toBe('');
+        });
+
+        it('should return the empty sting', function () {
+            ctrl.entryItem.kubernetes = { pod: {} }
+            ctrl.entryItem.name = undefined
+            expect(ctrl.getLogName()).toBe('');
+        });
+    });
+
+    describe('getLogTrimmedName():', function () {
+        it('should return the log name display value with free space in the end, 25 symbols in total', function () {
+            expect(ctrl.getLogTrimmedName()).toBe('cron                     ');
+        });
+
+        it('should return the cropped log name display value to 25 symbols', function () {
+            ctrl.entryItem.name = '012345678901234567890123456789123456789';
+            expect(ctrl.getLogTrimmedName()).toBe('0123456789012345678901234');
         });
     });
 });

package/src/igz_controls/components/toast-status-panel/toast-status-panel.component.spec.js

@@ -39,7 +39,7 @@ describe('igzToastStatusPanel component:', function () {
             panelStatus: null
         };
 
-        ctrl = $componentController('igzToastStatusPanel', {$element: element}, bindings);
+        ctrl = $componentController('igzToastStatusPanel', {$element: element, $transclude: angular.noop}, bindings);
     });
 
     afterEach(function () {

package/src/nuclio/api-gateways/api-gateways.service.js

@@ -40,6 +40,11 @@ such restriction.
                 id: 'oauth2',
                 name: $i18next.t('functions:OAUTH2', { lng: lng }),
                 tooltip: $i18next.t('functions:OAUTH2', { lng: lng })
+            },
+            {
+                id: 'iguazio',
+                name: $i18next.t('functions:IGUAZIO', { lng: lng }),
+                tooltip: $i18next.t('functions:IGUAZIO', { lng: lng })
             }
         ];
 

package/src/nuclio/common/screens/create-function/function-from-scratch/function-from-scratch.component.spec.js

@@ -46,20 +46,6 @@ describe('nclFunctionFromScratch Component:', function () {
                 '0sIGVycm9yKSB7DQogICAgcmV0dXJuIG5pbCwgbmlsDQp9', // source code in base64
                 visible: true
             },
-            {
-                id: 'python:3.7',
-                name: 'Python 3.7 ' + $i18next.t('functions:DEPRECATED_SOON_LABEL', {lng: lng}),
-                sourceCode: 'ZGVmIGhhbmRsZXIoY29udGV4dCwgZXZlbnQpOg0KICAgIHJldHVybiAiIg==', // source code in base64
-                nameTemplate: 'Python 3.7 ' + '<b>' + $i18next.t('functions:DEPRECATED_SOON_LABEL', {lng: lng}) + '</b>',
-                visible: true
-            },
-            {
-                id: 'python:3.8',
-                name: 'Python 3.8 ' + $i18next.t('functions:DEPRECATED_SOON_LABEL', {lng: lng}),
-                sourceCode: 'ZGVmIGhhbmRsZXIoY29udGV4dCwgZXZlbnQpOg0KICAgIHJldHVybiAiIg==', // source code in base64
-                nameTemplate: 'Python 3.8 ' + '<b>' + $i18next.t('functions:DEPRECATED_SOON_LABEL', {lng: lng}) + '</b>',
-                visible: true
-            },
             {
                 id: 'python:3.9',
                 name: 'Python 3.9',
@@ -78,6 +64,12 @@ describe('nclFunctionFromScratch Component:', function () {
                 sourceCode: 'ZGVmIGhhbmRsZXIoY29udGV4dCwgZXZlbnQpOg0KICAgIHJldHVybiAiIg==', // source code in base64
                 visible: true
             },
+            {
+                id: 'python:3.12',
+                name: 'Python 3.12',
+                sourceCode: 'ZGVmIGhhbmRsZXIoY29udGV4dCwgZXZlbnQpOg0KICAgIHJldHVybiAiIg==', // source code in base64
+                visible: true
+            },
             {
                 id: 'dotnetcore',
                 name: '.NET Core ' + $i18next.t('functions:TECH_PREVIEW_LABEL', { lng: lng }),

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

@@ -718,8 +718,9 @@ such restriction.
             var projectName = '{project_name="' + ctrl.project.metadata.name + '"}';
             var gpuUtilizationMetric = ' * on (pod) group_left(function_name)(nuclio_function_pod_labels{project_name="' +
                 ctrl.project.metadata.name + '"})';
+            var invocationMetricQuery = 'increase(' + ctrl.functionEventsMetric + functionEventsProjectName + '[24h])';
             var args = {
-                metric: ctrl.functionEventsMetric + functionEventsProjectName,
+                metric: invocationMetricQuery,
                 from: from,
                 until: until,
                 interval: '5m'

package/src/nuclio/functions/functions.service.js

@@ -53,9 +53,10 @@ such restriction.
          * Returns classes list by type.
          * @param {string} type - Determines which class list to return (e.g. `'volume'`, `'trigger'`).
          * @param {Object} [additionalData] - May include additional data for populating the list.
+         * @param {boolean} isEnterpriseVersion - Determines if Nuclio is part of dashboard
          * @returns {Object[]} - array of classes
          */
-        function getClassesList(type, additionalData) {
+        function getClassesList(type, additionalData, isEnterpriseVersion) {
             var lng = i18next.language;
             var defaultFunctionConfig = lodash.get(ConfigService, 'nuclio.defaultFunctionConfig.attributes', {});
             var classesList = {
@@ -527,6 +528,7 @@ such restriction.
                     },
                     {
                         id: 'v3ioStream',
+                        visible: lodash.defaultTo(isEnterpriseVersion, false),
                         name: 'V3IO stream',
                         tooltip: 'V3IO stream',
                         tooltipOriginal: 'V3IO stream',

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

@@ -44,6 +44,7 @@ such restriction.
                 autoScrollOnFocus: false
             }
         };
+        ctrl.isEnterpriseVersion = false;
         ctrl.scrollConfigHorizontal = {
             axis: 'x',
             advanced: {
@@ -209,6 +210,8 @@ such restriction.
             $scope.$on('ui.layout.loaded', resizeScrollBar);
 
             angular.element($window).bind('resize', resizeScrollBar);
+
+            ctrl.isEnterpriseVersion = ConfigService.nuclio.isEnterpriseVersion;
         }
 
         /**
@@ -501,19 +504,25 @@ such restriction.
                 },
                 {
                     id: 'python:3.10',
+                    ext: 'py',
                     name: 'Python 3.10',
+                    language: 'python',
                     sourceCode: 'ZGVmIGhhbmRsZXIoY29udGV4dCwgZXZlbnQpOg0KICAgIHJldHVybiAiIg==', // source code in base64
                     visible: true
                 },
                 {
                     id: 'python:3.11',
+                    ext: 'py',
                     name: 'Python 3.11',
+                    language: 'python',
                     sourceCode: 'ZGVmIGhhbmRsZXIoY29udGV4dCwgZXZlbnQpOg0KICAgIHJldHVybiAiIg==', // source code in base64
                     visible: true
                 },
                 {
                     id: 'python:3.12',
+                    ext: 'py',
                     name: 'Python 3.12',
+                    language: 'python',
                     sourceCode: 'ZGVmIGhhbmRsZXIoY29udGV4dCwgZXZlbnQpOg0KICAgIHJldHVybiAiIg==', // source code in base64
                     visible: true
                 },

package/src/nuclio/functions/version/version-code/version-code.tpl.html

@@ -148,22 +148,23 @@
 
                     <div data-ng-if="$ctrl.selectedEntryType.id === 'archive'"
                          class="ncl-code-entry-url">
-                        <div class="field-label">
-                            <span>{{ 'functions:ACCESS_KEY_V3IO_ONLY' | i18next }}</span>
-                            <igz-more-info data-description="{{ 'functions:TOOLTIP.V3IO_ACCESS_KEY' | i18next }}"></igz-more-info>
+                        <div data-ng-if="$ctrl.isEnterpriseVersion">
+                            <div class="field-label">
+                                <span>{{ 'functions:ACCESS_KEY_V3IO_ONLY' | i18next }}</span>
+                                <igz-more-info data-description="{{ 'functions:TOOLTIP.V3IO_ACCESS_KEY' | i18next }}"></igz-more-info>
+                            </div>
+                            <igz-validating-input-field data-field-type="password"
+                                                        data-input-name="sessionKey"
+                                                        data-input-value="$ctrl.version.spec.build.codeEntryAttributes.headers['X-V3io-Session-Key']"
+                                                        data-is-focused="false"
+                                                        data-form-object="$ctrl.versionCodeForm"
+                                                        data-validation-is-required="false"
+                                                        data-read-only="$ctrl.isFunctionDeploying()"
+                                                        data-placeholder-text="{{ 'functions:PLACEHOLDER.ENTER_ACCESS_KEY' | i18next }}"
+                                                        data-update-data-callback="$ctrl.inputValueCallback(newData, field)"
+                                                        data-update-data-field="spec.build.codeEntryAttributes.headers['X-V3io-Session-Key']">
+                            </igz-validating-input-field>
                         </div>
-                        <igz-validating-input-field data-field-type="password"
-                                                    data-input-name="sessionKey"
-                                                    data-input-value="$ctrl.version.spec.build.codeEntryAttributes.headers['X-V3io-Session-Key']"
-                                                    data-is-focused="false"
-                                                    data-form-object="$ctrl.versionCodeForm"
-                                                    data-validation-is-required="false"
-                                                    data-read-only="$ctrl.isFunctionDeploying()"
-                                                    data-placeholder-text="{{ 'functions:PLACEHOLDER.ENTER_ACCESS_KEY' | i18next }}"
-                                                    data-update-data-callback="$ctrl.inputValueCallback(newData, field)"
-                                                    data-update-data-field="spec.build.codeEntryAttributes.headers['X-V3io-Session-Key']">
-                        </igz-validating-input-field>
-
                         <div class="field-label">
                             <span>{{ 'functions:WORK_DIRECTORY' | i18next }}</span>
                             <igz-more-info data-description="{{ 'functions:TOOLTIP.WORK_DIR' | i18next }}"></igz-more-info>

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

@@ -95,6 +95,7 @@ such restriction.
          */
         function onInit() {
             var additionalData = {};
+            var isEnterpriseVersion = ConfigService.nuclio.isEnterpriseVersion;
             if (lodash.isArray(ctrl.containers) && !lodash.isEmpty(ctrl.containers)) {
                 additionalData.containers = lodash.chain(ctrl.containers)
                     .cloneDeep()
@@ -102,7 +103,7 @@ such restriction.
                     .value();
             }
 
-            ctrl.classList = FunctionsService.getClassesList('trigger', additionalData);
+            ctrl.classList = FunctionsService.getClassesList('trigger', additionalData, isEnterpriseVersion);
 
             $scope.$on('edit-item-has-been-changed', updateTriggersChangesState);
 

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

@@ -35,13 +35,12 @@ such restriction.
             controller: NclVersionController
         });
 
-    function NclVersionController($i18next, $interval, $injector, $rootScope, $scope, $state, $stateParams, $transitions, $timeout,
+    function NclVersionController($i18next, $interval, $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;
 
@@ -228,10 +227,6 @@ such restriction.
                 }
             });
 
-            if ($injector.has('ServicesService')) {
-                servicesService = $injector.get('ServicesService')
-            }
-
             setImageNamePrefixTemplate();
             setIngressHost();
             initLogTabs();
@@ -687,18 +682,11 @@ such restriction.
          * Checks if the "Execution log" tab should be shown
          */
         function initLogTabs() {
-            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'
-                        });
-                    }
+            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'
                 });
             }
         }