UI: (#2372)

Added fetchLastLevelOnly checkbox to alias query filter. Updated ENG, RUS, UKR locales. Updated getRelatedEntities and (constructRelatedEntitiesSearchQuery) function(s) by adding fetchLastLevelOnly attribute.

UI: (#2372)
Added fetchLastLevelOnly checkbox to alias query filter. Updated ENG, RUS, UKR locales. Updated getRelatedEntities and (constructRelatedEntitiesSearchQuery) function(s) by adding fetchLastLevelOnly attribute.
DudnikMaksym · GitHub
1 parent 7c9f8d75
Showing 6 changed files with 45 additions and 6 deletions
ui/src/app/api/entity.service.js
ui/src/app/entity/entity-filter.directive.js
ui/src/app/entity/entity-filter.tpl.html
ui/src/app/locale/locale.constant-en_US.json
ui/src/app/locale/locale.constant-ru_RU.json
ui/src/app/locale/locale.constant-uk_UA.json
--- a/ui/src/app/api/entity.service.js
View file @308fa1f
+++ b/ui/src/app/api/entity.service.js
View file @308fa1f
@@ -593,7 +593,8 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
                         parameters: {
                             rootId: relationQueryRootEntityId.id,
                             rootType: relationQueryRootEntityId.entityType,
-                            direction: filter.direction
+                            direction: filter.direction,
+                            fetchLastLevelOnly: filter.fetchLastLevelOnly
                         },
                         filters: filter.filters
                     };
@@ -643,7 +644,8 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
                         parameters: {
                             rootId: searchQueryRootEntityId.id,
                             rootType: searchQueryRootEntityId.entityType,
-                            direction: filter.direction
+                            direction: filter.direction,
+                            fetchLastLevelOnly: filter.fetchLastLevelOnly
                         },
                         relationType: filter.relationType
                     };
@@ -1075,10 +1077,10 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
         }
     }
-    function getRelatedEntities(rootEntityId, entityType, entitySubTypes, maxLevel, keys, typeTranslatePrefix, relationType, direction) {
+    function getRelatedEntities(rootEntityId, entityType, entitySubTypes, maxLevel, keys, typeTranslatePrefix, relationType, direction, fetchLastLevelOnly) {
         var deferred = $q.defer();
-        var entitySearchQuery = constructRelatedEntitiesSearchQuery(rootEntityId, entityType, entitySubTypes, maxLevel, relationType, direction);
+        var entitySearchQuery = constructRelatedEntitiesSearchQuery(rootEntityId, entityType, entitySubTypes, maxLevel, relationType, direction,fetchLastLevelOnly);
         if (!entitySearchQuery) {
             deferred.reject();
         } else {
@@ -1499,13 +1501,14 @@ function EntityService($http, $q, $filter, $translate, $log, userService, device
             );
     }
-    function constructRelatedEntitiesSearchQuery(rootEntityId, entityType, entitySubTypes, maxLevel, relationType, direction) {
+    function constructRelatedEntitiesSearchQuery(rootEntityId, entityType, entitySubTypes, maxLevel, relationType, direction, fetchLastLevelOnly) {
         var searchQuery = {
             parameters: {
                 rootId: rootEntityId.id,
                 rootType: rootEntityId.entityType,
-                direction: direction
+                direction: direction,
+                fetchLastLevelOnly: !!fetchLastLevelOnly
             },
             relationType: relationType
         };
--- a/ui/src/app/entity/entity-filter.directive.js
View file @308fa1f
+++ b/ui/src/app/entity/entity-filter.directive.js
View file @308fa1f
@@ -83,6 +83,7 @@ export default function EntityFilterDirective($compile, $templateCache, $q, $doc
                     filter.rootEntity = null;
                     filter.direction = types.entitySearchDirection.from;
                     filter.maxLevel = 1;
+                    filter.fetchLastLevelOnly = false;
                     if (filter.type === types.aliasFilterType.relationsQuery.value) {
                         filter.filters = [];
                     } else if (filter.type === types.aliasFilterType.assetSearchQuery.value) {
--- a/ui/src/app/entity/entity-filter.tpl.html
View file @308fa1f
+++ b/ui/src/app/entity/entity-filter.tpl.html
View file @308fa1f
@@ -162,6 +162,14 @@
             </div>
         </div>
         <div flex layout="row">
+            <section class="tb-root-state-entity-switch" layout="row" layout-align="start center" style="padding-left: 0px;">
+                <md-switch class="root-state-entity-switch" ng-model="filter.fetchLastLevelOnly"
+                           aria-label="{{ 'alias.last-level-relation' | translate }}">
+                </md-switch>
+                <label class="tb-small root-state-entity-label" translate>alias.last-level-relation</label>
+            </section>
+        </div>
+        <div flex layout="row">
             <md-input-container class="md-block" style="min-width: 100px;">
                 <label translate>relation.direction</label>
                 <md-select required ng-model="filter.direction">
@@ -223,6 +231,14 @@
             </div>
         </div>
         <div flex layout="row">
+            <section class="tb-root-state-entity-switch" layout="row" layout-align="start center" style="padding-left: 0px;">
+                <md-switch class="root-state-entity-switch" ng-model="filter.fetchLastLevelOnly"
+                           aria-label="{{ 'alias.last-level-relation' | translate }}">
+                </md-switch>
+                <label class="tb-small root-state-entity-label" translate>alias.last-level-relation</label>
+            </section>
+        </div>
+        <div flex layout="row">
             <md-input-container class="md-block" style="min-width: 100px;">
                 <label translate>relation.direction</label>
                 <md-select required ng-model="filter.direction">
@@ -292,6 +308,14 @@
             </div>
         </div>
         <div flex layout="row">
+            <section class="tb-root-state-entity-switch" layout="row" layout-align="start center" style="padding-left: 0px;">
+                <md-switch class="root-state-entity-switch" ng-model="filter.fetchLastLevelOnly"
+                           aria-label="{{ 'alias.last-level-relation' | translate }}">
+                </md-switch>
+                <label class="tb-small root-state-entity-label" translate>alias.last-level-relation</label>
+            </section>
+        </div>
+        <div flex layout="row">
             <md-input-container class="md-block" style="min-width: 100px;">
                 <label translate>relation.direction</label>
                 <md-select required ng-model="filter.direction">
@@ -361,6 +385,14 @@
             </div>
         </div>
         <div flex layout="row">
+            <section class="tb-root-state-entity-switch" layout="row" layout-align="start center" style="padding-left: 0px;">
+                <md-switch class="root-state-entity-switch" ng-model="filter.fetchLastLevelOnly"
+                           aria-label="{{ 'alias.last-level-relation' | translate }}">
+                </md-switch>
+                <label class="tb-small root-state-entity-label" translate>alias.last-level-relation</label>
+            </section>
+        </div>
+        <div flex layout="row">
             <md-input-container class="md-block" style="min-width: 100px;">
                 <label translate>relation.direction</label>
                 <md-select required ng-model="filter.direction">
--- a/ui/src/app/locale/locale.constant-en_US.json
View file @308fa1f
+++ b/ui/src/app/locale/locale.constant-en_US.json
View file @308fa1f
@@ -207,6 +207,7 @@
         "entity-filter-no-entity-matched": "No entities matching specified filter were found.",
         "no-entity-filter-specified": "No entity filter specified",
         "root-state-entity": "Use dashboard state entity as root",
+        "last-level-relation": "Fetch last level relation only",
         "root-entity": "Root entity",
         "state-entity-parameter-name": "State entity parameter name",
         "default-state-entity": "Default state entity",
--- a/ui/src/app/locale/locale.constant-ru_RU.json
View file @308fa1f
+++ b/ui/src/app/locale/locale.constant-ru_RU.json
View file @308fa1f
@@ -206,6 +206,7 @@
         "entity-filter-no-entity-matched": "Объекты, соответствующие фильтру, не найдены.",
         "no-entity-filter-specified": "Не указан фильтр объектов",
         "root-state-entity": "Использовать объект, полученный из дашборда, как корневой",
+        "last-level-relation": "Использовать только отношения последнего уровня",
         "root-entity": "Корневой объект",
         "state-entity-parameter-name": "Название объекта состояния",
         "default-state-entity": "Объект состояния по умолчанию",
--- a/ui/src/app/locale/locale.constant-uk_UA.json
View file @308fa1f
+++ b/ui/src/app/locale/locale.constant-uk_UA.json
View file @308fa1f
@@ -225,6 +225,7 @@
         "entity-filter-no-entity-matched": "Не знайдено жодних сутностей, які відповідають вказаному фільтру.",
         "no-entity-filter-specified": "Фільтр обїектів не вказано",
         "root-state-entity": "Використовувати сутінсть стану як кореневу",
+        "last-level-relation": "Використовувати лише відношення останнього рівня",
         "group-state-entity": "Використовувати групу сутностей стану як кореневу",
         "root-entity": "Коренева сутність",
         "state-entity-parameter-name": "Параметр сутності стану",