iguazio.dashboard-controls 1.2.5 → 1.2.7

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "iguazio.dashboard-controls",
-    "version": "1.2.5",
+    "version": "1.2.7",
     "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/igz_controls/services/control-panel-logs-data.service.js

@@ -37,6 +37,7 @@
          * @param {Object} queryParams - additional parameters
          * @param {string} queryParams.query - search query text
          * @param {string} queryParams.timeFrame - selected time period to show results for
+         * @param {string} queryParams.filterName - selected function name
          * @param {string} [queryParams.lastEntryTimestamp] - time stamp of the last item in a list, used with auto
          * @param {boolean} withReplicas - determines if replicas should be requested
          *     update
@@ -94,6 +95,14 @@
                 };
             }
 
+            if (queryParams.filterName) {
+                config.body.query.bool.should = [
+                    { term: { name: queryParams.filterName } },
+                    { term: { 'name.keyword': queryParams.filterName } }
+                ];
+                config.body.query.bool.minimum_should_match = 1;
+            }
+
             // If query text was set, add proper items to config
             if (!lodash.isEmpty(queryParams.query)) {
                 config.body.query.bool.must.push({
@@ -306,6 +315,14 @@
                 }
             };
 
+            if (queryParams.filterName) {
+                config.body.query.bool.should = [
+                    { term: { name: queryParams.filterName } },
+                    { term: { 'name.keyword': queryParams.filterName } }
+                ];
+                config.body.query.bool.minimum_should_match = 1;
+            }
+
             return ElasticsearchService.search(config);
         }
 

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

@@ -368,8 +368,7 @@ such restriction.
             if (ctrl.logs.length > 0) {
                 ctrl.lastEntryTimestamp = ctrl.logs[0].time;
 
-                if (ctrl.logs.replicas && (lodash.isEmpty(initialReplicas) ||
-                    initialReplicas.length !== ctrl.replicasList.length)) {
+                if (ctrl.logs.replicas) {
                     ctrl.replicasList = ctrl.logs.replicas.map(function (replica) {
                         return {
                             label: replica,
@@ -392,11 +391,8 @@ such restriction.
         function generateFilterQuery() {
             var levels = lodash.chain(ctrl.filter.level).pickBy().keys().join(' OR ').value();
             var projectName = lodash.get(ctrl.version, ['metadata', 'labels', 'nuclio.io/project-name']);
-            var queries = ['system-id:"' + ConfigService.systemId + '"', '_exists_:nuclio', 'nuclio.project_name.keyword:' + projectName];
-
-            if (!lodash.isEmpty(ctrl.version.metadata.name)) {
-                queries.push('name:' + ctrl.version.metadata.name);
-            }
+            var projectFilter = '(nuclio.project_name.keyword:' + projectName + ' OR nuclio.project_name:' + projectName + ')';
+            var queries = ['system-id:"' + ConfigService.systemId + '"', '_exists_:nuclio', projectFilter];
 
             if (ctrl.selectedReplicas.length && ctrl.selectedReplicas.length !== initialReplicas.length) {
                 var replicas = ctrl.selectedReplicas.join(' OR ');
@@ -416,6 +412,7 @@ such restriction.
             }
 
             ctrl.filterQuery = lodash.join(queries, ' AND ');
+            ctrl.filterName = ctrl.version.metadata.name;
         }
 
         /**
@@ -425,6 +422,7 @@ such restriction.
         function queryParams() {
             return {
                 query: ctrl.filterQuery,
+                filterName: ctrl.filterName,
                 timeFrame: ctrl.datePreset,
                 customTimeFrame: ctrl.timeRange
             };