iguazio.dashboard-controls 1.2.14 → 1.2.16

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iguazio.dashboard-controls",
-    "version": "1.2.14",
+    "version": "1.2.16",
     "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

@@ -93,6 +93,7 @@
     "EDIT_FUNCTION_EVENT": "Edit the function event",
     "EDIT_PROJECT": "Edit the project",
     "ENDPOINT": "Endpoint",
+    "ENRICHED_SERVICE_ACCOUNT": "Enriched service account",
     "ENTER_HOST_TO_SEE_ENDPOINT": "Enter host to see endpoint",
     "ERROR_MSG": {
         "COULD_NOT_READ_FILE": "Could not read file",
@@ -169,7 +170,7 @@
     "LOGGER_DESTINATION": "Logger destination",
     "LOGGER_LEVEL": "Logger level",
     "LOGGING": "Logging",
-    "LOGS_LINES_LIMITATION": "Note: Only the last 10,000 rows are displayed. <br> To download up to 100,000 rows, click on the 'Download' button.",
+    "LOGS_LINES_LIMITATION": "Note: Only the last 10,000 rows are displayed. <br> To download up to 100,000 rows, click the 'Download' button.",
     "MAX": "Max",
     "MAX_REPLICAS": "Maximum number of replicas (default: {{default}})",
     "MAX_WORKERS": "Max Workers",
@@ -185,7 +186,7 @@
     "NEW_PROJECT": "New project",
     "NO_FUNCTIONS_AVAILABLE": "No functions available",
     "NO_INTERNET_ACCESS": "No internet access",
-    "NO_LOGS_HAVE_BEEN_FOUND": "No logs have been found...",
+    "NO_LOGS_WERE_FOUND": "No logs were found...",
     "NODE_SELECTORS": "Node selector",
     "NODE_SELECTORS_MORE_INFO": "If there is a conflict with the function node selector you defined or if the pod cannot be scheduled for some reason, check the project/platform configuration Key:Value combinations to see if there is a node selection causing the issue. If, after consulting with the project/general admin, you want to delete a global setting, enter the Key here, but leave the Value empty.",
     "NORMAL": "Normal",
@@ -251,6 +252,7 @@
         "SEARCH_TEMPLATE": "Search by text, tags and keywords",
         "SEC": "Sec",
         "SELECT_CLASS": "Select class",
+        "SELECT_REPLICA": "Select a replica",
         "SELECT_TYPE": "Select type"
     },
     "PODS_PRIORITY": "Pods priority",
@@ -292,6 +294,7 @@
     "SELECT_FUNCTION_CONFIRM": "The function you selected is currently not running. Are you sure you want to use it?",
     "SERVICE_ACCOUNT": "Service Account",
     "SESSION_TOKEN": "Session token",
+    "SHOWN_ONLINE_ONLY": "Show online replicas only",
     "SKIP": "Skip",
     "SKIP_TLS_VERIFICATION": "Skip TLS verification",
     "SMALL": "Small",
@@ -327,6 +330,7 @@
         "DISABLE_CACHE": "Build the function's Docker image from scratch without reusing any previously built Docker image layers.",
         "DISABLED_FUNCTION": "Only running and scaled-to-zero functions can be tested.",
         "DO_NOT_CREATE_HTTP_TRIGGER_BY_DEFAULT": "When not checked, an http trigger will be created for the function by default.",
+        "ENRICHED_SERVICE_ACCOUNT": "The service account is enriched from the platform, project, and function specifications, where the project takes precedence over the platform specification, and the function specification takes precedence over the projects specification.",
         "GIT": {
             "BRANCH": "The Git repository branch from which to download the function code.",
             "BRANCH_TAG_REFERENCE_DISABLED": "Exactly one of Branch, Tag, and Reference fields must be filled. When one is filled, the others are disabled.",
@@ -349,6 +353,7 @@
         },
         "NEW_TEST": "New test",
         "NO_INTERNET_ACCESS": "Use local Docker images rather than pulling from remote",
+        "NO_OFFLINE_REPLICAS": "Only online replicas found",
         "ENRICHED_NODE_SELECTOR": "The node selector of the function, enriched with the project’s and the service’s default node selectors",
         "POD_TOLERATIONS": {
             "ALLOW": "Allow function pods to run on spot nodes. Spot nodes might be tainted, using this option will make sure function pods tolerate these taints.",

package/src/igz_controls/services/execution-logs-data.service.js

@@ -108,7 +108,7 @@
                 'Content-Type': 'application/json',
                 'x-nuclio-project-name': projectId
             };
-            var requestParams = Object.assign(queryParams, {includeOffline: true});
+            var requestParams = Object.assign(queryParams, {includeOffline: queryParams.includeOffline});
 
             if (queryParams.timeFilter) {
                 queryParams.timeFilter = {
@@ -122,7 +122,7 @@
                 .one('replicas')
                 .get(requestParams, headers)
                 .then(function (response) {
-                    return response.replicas.names.concat(response.offlineReplicas.names);
+                    return response.plain();
                 })
                 .catch(function (error) {
                     var errorMessages = {

package/src/nuclio/functions/version/version-code/function-event-pane/test-events-logs/test-events-logs.tpl.html

@@ -52,6 +52,6 @@
     </div>
     <div class="no-logs"
          data-ng-if="$ctrl.logs.length === 0">
-        {{ 'functions:NO_LOGS_HAVE_BEEN_FOUND' | i18next }}
+        {{ 'functions:NO_LOGS_WERE_FOUND' | i18next }}
     </div>
 </div>

package/src/nuclio/functions/version/version-execution-log/version-execution-log.component.js

@@ -33,6 +33,7 @@ such restriction.
         var ctrl = this;
         var lng = i18next.language;
 
+        var allReplicas = [];
         var refreshInterval = null;
         var initialDatePreset = '7d';
         var initialReplicas = [];
@@ -47,7 +48,10 @@ such restriction.
             }
         };
         var projectName = '';
+        var groupedReplicas = {};
 
+        ctrl.excludeOffline = false;
+        ctrl.excludeOfflineIsDisabled = false;
         ctrl.downloadButtonIsDisabled = false;
         ctrl.isSplashShowed = {
             value: false
@@ -168,6 +172,7 @@ such restriction.
         ctrl.applyFilters = applyFilters;
         ctrl.downloadLogFiles = downloadLogFiles;
         ctrl.onCheckboxChange = onCheckboxChange;
+        ctrl.onExcludeOfflineChange = onExcludeOfflineChange;
         ctrl.onRefreshRateChange = onRefreshRateChange;
         ctrl.onTimeRangeChange = onTimeRangeChange;
         ctrl.onQueryChanged = onQueryChanged;
@@ -194,8 +199,16 @@ such restriction.
             ctrl.timeRange = getInitialTimeRange();
 
             ctrl.isSplashShowed.value = true;
-            ExecutionLogsDataService.getReplicasList(projectName, ctrl.version.metadata.name, {timeFilter: ctrl.timeRange}).then(function (replicas) {
-                ctrl.replicasList = replicas.map(function (replica) {
+            ExecutionLogsDataService.getReplicasList(projectName, ctrl.version.metadata.name, {
+                timeFilter: ctrl.timeRange,
+                includeOffline: true
+            }).then(function (replicas) {
+                groupedReplicas = replicas;
+                allReplicas = lodash.get(groupedReplicas, 'replicas.names') ?
+                    groupedReplicas.replicas.names.concat(replicas.offlineReplicas.names) :
+                    lodash.get(groupedReplicas, 'names', []);
+                ctrl.excludeOfflineIsDisabled = lodash.get(groupedReplicas, 'offlineReplicas.names', []).length === 0;
+                ctrl.replicasList = allReplicas.map(function (replica) {
                     return {
                         label: replica,
                         id: replica,
@@ -203,8 +216,8 @@ such restriction.
                         checked: true
                     }
                 });
-                ctrl.selectedReplicas = angular.copy(replicas);
-                initialReplicas = replicas;
+                initialReplicas = allReplicas;
+                ctrl.selectedReplicas = angular.copy(allReplicas);
 
                 applyFilters();
             });
@@ -264,6 +277,33 @@ such restriction.
             ctrl.applyIsDisabled = !ctrl.selectedReplicas;
         }
 
+        /**
+         * Triggered when exclude offline checkbox was changed
+         */
+        function onExcludeOfflineChange() {
+            if (ctrl.excludeOffline) {
+                ctrl.replicasList = groupedReplicas.replicas.names.map(function (replica) {
+                    return {
+                        label: replica,
+                        id: replica,
+                        value: replica,
+                        checked: true
+                    }
+                });
+                ctrl.selectedReplicas = angular.copy(groupedReplicas.replicas.names);
+            } else {
+                ctrl.replicasList = allReplicas.map(function (replica) {
+                    return {
+                        label: replica,
+                        id: replica,
+                        value: replica,
+                        checked: true
+                    }
+                });
+                ctrl.selectedReplicas = angular.copy(allReplicas);
+            }
+        }
+
         /**
          * Handles Refresh Rate dropdown change
          * @param {Object} item - new item
@@ -302,7 +342,12 @@ such restriction.
 
             ExecutionLogsDataService.getReplicasList(projectName, ctrl.version.metadata.name, {timeFilter: ctrl.timeRange})
                 .then(function (replicas) {
-                    ctrl.replicasList = replicas.map(function (replica) {
+                    groupedReplicas = replicas;
+                    allReplicas = lodash.get(groupedReplicas, 'replicas.names') ?
+                        groupedReplicas.replicas.names.concat(replicas.offlineReplicas.names) :
+                        lodash.get(groupedReplicas, 'names', []);
+                    ctrl.excludeOfflineIsDisabled = lodash.get(groupedReplicas, 'offlineReplicas.names', []).length === 0;
+                    ctrl.replicasList = allReplicas.map(function (replica) {
                         return {
                             label: replica,
                             id: replica,
@@ -310,8 +355,7 @@ such restriction.
                             checked: true
                         }
                     });
-
-                    initialReplicas = replicas;
+                    initialReplicas = allReplicas;
 
                     return ExecutionLogsDataService.logsPaginated(ctrl.page.number, ctrl.page.size, queryParams())
                         .then(function (logs) {
@@ -333,6 +377,7 @@ such restriction.
             ctrl.timeRange = getInitialTimeRange();
             ctrl.datePreset = initialDatePreset;
             ctrl.selectedReplicas = initialReplicas;
+            ctrl.excludeOffline = false;
 
             lodash.merge(ctrl.filter, defaultFilter);
             $rootScope.$broadcast('search-input_reset');
@@ -415,7 +460,8 @@ such restriction.
                         .replace(/<|>/g, ''),
                     logLevels: lodash.chain(ctrl.filter.level).pickBy().keys().value(),
                     replicaNames: ctrl.selectedReplicas,
-                    timeFilter: ctrl.timeRange
+                    timeFilter: ctrl.timeRange,
+                    includeOffline: !ctrl.excludeOffline
                 }
             };
         }

package/src/nuclio/functions/version/version-execution-log/version-execution-log.less

@@ -103,9 +103,18 @@
           padding-left: 15px;
           padding-right: 15px;
         }
+
+        .checkboxes-dropdown-title {
+          text-transform: initial;
+          font-size: 14px;
+        }
       }
     }
 
+    .online-replicas__checkbox {
+      margin: 5px 0;
+    }
+
     .igz-multiple-checkboxes {
       .checkboxes-dropdown-container {
         position: unset;

package/src/nuclio/functions/version/version-execution-log/version-execution-log.tpl.html

@@ -94,9 +94,20 @@
                     <span class="filter-label asterisk">
                         {{ 'common:REPLICAS' | i18next }}
                     </span>
+                    <div class="online-replicas__checkbox">
+                        <input type="checkbox"
+                               id="onlineOnly"
+                               data-ng-change="$ctrl.onExcludeOfflineChange()"
+                               data-ng-disabled="$ctrl.excludeOfflineIsDisabled"
+                               data-ng-model="$ctrl.excludeOffline">
+                        <label for="onlineOnly" data-uib-tooltip="{{ $ctrl.excludeOfflineIsDisabled ? 'functions:TOOLTIP.NO_OFFLINE_REPLICAS' : '' | i18next }}">
+                            {{ 'functions:SHOWN_ONLINE_ONLY' | i18next }}
+                        </label>
+                    </div>
                     <igz-multiple-checkboxes data-ng-model="$ctrl.selectedReplicas"
                                              data-options="$ctrl.replicasList"
                                              data-dropdown="true"
+                                             data-title="{{ 'functions:PLACEHOLDER.SELECT_REPLICA' | i18next }}"
                                              data-select-all-none="true"
                                              data-ng-change="$ctrl.onCheckboxChange($event)"
                                              data-ng-required="true"
@@ -152,7 +163,7 @@
                 <div class="control-panel-log-table common-table">
                     <div class="search-input-not-found"
                          data-ng-if="$ctrl.logs.length === 0">
-                        {{ 'functions:NO_LOGS_HAVE_BEEN_FOUND' | i18next }}
+                        {{ 'functions:NO_LOGS_WERE_FOUND' | i18next }}
                     </div>
 
                     <div data-igz-extend-background

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

@@ -30,6 +30,7 @@ such restriction.
         var ctrl = this;
 
         ctrl.enrichedNodeSelectors = [];
+        ctrl.enrichedServiceAccount = '';
         ctrl.scrollConfig = {
             advanced: {
                 updateOnContentResize: true
@@ -62,7 +63,7 @@ such restriction.
         function onInit() {
             ctrl.isFunctionDeploying = lodash.partial(FunctionsService.isFunctionDeploying, ctrl.version);
 
-            initEnrichedNodeSelectors();
+            initEnrichedData();
         }
 
         /**
@@ -71,7 +72,7 @@ such restriction.
          */
         function onChanges(changes) {
             if (lodash.has(changes, 'version')) {
-                initEnrichedNodeSelectors();
+                initEnrichedData();
             }
         }
 
@@ -88,9 +89,10 @@ such restriction.
         }
 
         /**
-         * Generates a node selectors list
+         * Generates enriched content
          */
-        function initEnrichedNodeSelectors() {
+        function initEnrichedData() {
+            ctrl.enrichedServiceAccount = lodash.get(ctrl.version, 'status.enrichedServiceAccount', '');
             ctrl.enrichedNodeSelectors = lodash.chain(ctrl.version)
                 .get('status.enrichedNodeSelector', {})
                 .map(function (key, value) {

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

@@ -60,6 +60,15 @@
                             </ncl-key-value-input>
                         </div>
                     </div>
+                    <div data-ng-if="$ctrl.enrichedServiceAccount">
+                        <span class="title">{{ 'functions:ENRICHED_SERVICE_ACCOUNT' | i18next }}: </span>
+                        <igz-more-info
+                                data-description="{{ 'functions:TOOLTIP.ENRICHED_SERVICE_ACCOUNT' | i18next }}"
+                                data-trigger="click"
+                                data-is-html-enabled="true">
+                        </igz-more-info>
+                        <p>{{$ctrl.enrichedServiceAccount}}</p>
+                    </div>
                 </div>
             </div>
             <div class="row">