Improvement alarms widget limit (#2257)

* Add support import label * Add chunk size * Refactoring and add template to max limit * Add max number load alarms

Improvement alarms widget limit (#2257)
* Add support import label * Add chunk size * Refactoring and add template to max limit * Add max number load alarms
Vladyslav · Andrew Shvayka
1 parent c84a8a5e
Showing 8 changed files with 120 additions and 36 deletions
ui/src/app/api/alarm.service.js
ui/src/app/api/subscription.js
ui/src/app/components/widget/widget-config.directive.js
ui/src/app/components/widget/widget-config.tpl.html
ui/src/app/components/widget/widget.controller.js
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/alarm.service.js
View file @88434de
+++ b/ui/src/app/api/alarm.service.js
View file @88434de
@@ -183,7 +183,7 @@ function AlarmService($http, $q, $interval, $filter, $timeout, utils, types) {
         return deferred.promise;
     }
-    function fetchAlarms(alarmsQuery, pageLink, deferred, alarmsList) {
+    function fetchAlarms(alarmsQuery, pageLink, deferred, leftToLoad, alarmsList) {
         getAlarms(alarmsQuery.entityType, alarmsQuery.entityId,
             pageLink, alarmsQuery.alarmSearchStatus, alarmsQuery.alarmStatus,
             alarmsQuery.fetchOriginator, false, {ignoreLoading: true}).then(
@@ -192,8 +192,19 @@ function AlarmService($http, $q, $interval, $filter, $timeout, utils, types) {
                     alarmsList = [];
                 }
                 alarmsList = alarmsList.concat(alarms.data);
+                if (angular.isDefined(leftToLoad)) {
+                    leftToLoad -= pageLink.limit;
+                    if (leftToLoad === 0) {
+                        alarmsList = $filter('orderBy')(alarmsList, ['-createdTime']);
+                        deferred.resolve(alarmsList);
+                        return;
+                    }
+                    if (leftToLoad < pageLink.limit) {
+                        alarms.nextPageLink.limit = leftToLoad;
+                    }
+                }
                 if (alarms.hasNext && !alarmsQuery.limit) {
-                    fetchAlarms(alarmsQuery, alarms.nextPageLink, deferred, alarmsList);
+                    fetchAlarms(alarmsQuery, alarms.nextPageLink, deferred, leftToLoad, alarmsList);
                 } else {
                     alarmsList = $filter('orderBy')(alarmsList, ['-createdTime']);
                     deferred.resolve(alarmsList);
@@ -209,26 +220,34 @@ function AlarmService($http, $q, $interval, $filter, $timeout, utils, types) {
         var deferred = $q.defer();
         var time = Date.now();
         var pageLink;
+        var leftToLoad;
         if (alarmsQuery.limit) {
             pageLink = {
                 limit: alarmsQuery.limit
             };
         } else if (alarmsQuery.interval) {
             pageLink = {
-                limit: 100,
+                limit: alarmsQuery.alarmsFetchSize || 100,
                 startTime: time - alarmsQuery.interval
             };
         } else if (alarmsQuery.startTime) {
             pageLink = {
-                limit: 100,
+                limit: alarmsQuery.alarmsFetchSize || 100,
                 startTime: Math.round(alarmsQuery.startTime)
-            }
+            };
             if (alarmsQuery.endTime) {
                 pageLink.endTime = Math.round(alarmsQuery.endTime);
             }
         }
-        fetchAlarms(alarmsQuery, pageLink, deferred);
+        if (angular.isDefined(alarmsQuery.alarmsMaxCountLoad) && alarmsQuery.alarmsMaxCountLoad !== 0) {
+            leftToLoad = alarmsQuery.alarmsMaxCountLoad;
+            if (leftToLoad < pageLink.limit) {
+                pageLink.limit = leftToLoad;
+            }
+        }
+
+        fetchAlarms(alarmsQuery, pageLink, deferred, leftToLoad);
         return deferred.promise;
     }
@@ -276,8 +295,10 @@ function AlarmService($http, $q, $interval, $filter, $timeout, utils, types) {
                 entityType: alarmSource.entityType,
                 entityId: alarmSource.entityId,
                 alarmSearchStatus: alarmSourceListener.alarmSearchStatus,
-                alarmStatus: null
-            }
+                alarmStatus: null,
+                alarmsMaxCountLoad: alarmSourceListener.alarmsMaxCountLoad,
+                alarmsFetchSize: alarmSourceListener.alarmsFetchSize
+            };
             var originatorKeys = $filter('filter')(alarmSource.dataKeys, {name: 'originator'});
             if (originatorKeys && originatorKeys.length) {
                 alarmSourceListener.alarmsQuery.fetchOriginator = true;
--- a/ui/src/app/api/subscription.js
View file @88434de
+++ b/ui/src/app/api/subscription.js
View file @88434de
@@ -75,6 +75,10 @@ export default class Subscription {
                 options.alarmSearchStatus : this.ctx.types.alarmSearchStatus.any;
             this.alarmsPollingInterval = angular.isDefined(options.alarmsPollingInterval) ?
                 options.alarmsPollingInterval : 5000;
+            this.alarmsMaxCountLoad = angular.isDefined(options.alarmsMaxCountLoad) ?
+                options.alarmsMaxCountLoad : 0;
+            this.alarmsFetchSize = angular.isDefined(options.alarmsFetchSize) ?
+                options.alarmsFetchSize : 100;
             this.alarmSourceListener = null;
             this.alarms = [];
@@ -915,6 +919,8 @@ export default class Subscription {
             alarmSource: this.alarmSource,
             alarmSearchStatus: this.alarmSearchStatus,
             alarmsPollingInterval: this.alarmsPollingInterval,
+            alarmsMaxCountLoad: this.alarmsMaxCountLoad,
+            alarmsFetchSize: this.alarmsFetchSize,
             alarmsUpdated: function(alarms, apply) {
                 subscription.alarmsUpdated(alarms, apply);
             }
--- a/ui/src/app/components/widget/widget-config.directive.js
View file @88434de
+++ b/ui/src/app/components/widget/widget-config.directive.js
View file @88434de
@@ -173,6 +173,10 @@ function WidgetConfig($compile, $templateCache, $rootScope, $translate, $timeout
                             config.alarmSearchStatus : types.alarmSearchStatus.any;
                         scope.alarmsPollingInterval = angular.isDefined(config.alarmsPollingInterval) ?
                             config.alarmsPollingInterval : 5;
+                        scope.alarmsMaxCountLoad = angular.isDefined(config.alarmsMaxCountLoad) ?
+                            config.alarmsMaxCountLoad : 0;
+                        scope.alarmsFetchSize = angular.isDefined(config.alarmsFetchSize) ?
+                            config.alarmsFetchSize : 100;
                         if (config.alarmSource) {
                             scope.alarmSource.value = config.alarmSource;
                         } else {
@@ -243,7 +247,7 @@ function WidgetConfig($compile, $templateCache, $rootScope, $translate, $timeout
         scope.$watch('title + showTitleIcon + titleIcon + iconColor + iconSize + titleTooltip + showTitle + dropShadow + enableFullscreen + backgroundColor + ' +
             'color + padding + margin + widgetStyle + titleStyle + mobileOrder + mobileHeight + units + decimals + useDashboardTimewindow + ' +
-            'displayTimewindow + alarmSearchStatus + alarmsPollingInterval + showLegend', function () {
+            'displayTimewindow + alarmSearchStatus + alarmsPollingInterval + alarmsMaxCountLoad + alarmsFetchSize + showLegend', function () {
             if (ngModelCtrl.$viewValue) {
                 var value = ngModelCtrl.$viewValue;
                 if (value.config) {
@@ -277,6 +281,8 @@ function WidgetConfig($compile, $templateCache, $rootScope, $translate, $timeout
                     config.displayTimewindow = scope.displayTimewindow;
                     config.alarmSearchStatus = scope.alarmSearchStatus;
                     config.alarmsPollingInterval = scope.alarmsPollingInterval;
+                    config.alarmsMaxCountLoad = scope.alarmsMaxCountLoad;
+                    config.alarmsFetchSize = scope.alarmsFetchSize;
                     config.showLegend = scope.showLegend;
                 }
                 if (value.layout) {
--- a/ui/src/app/components/widget/widget-config.tpl.html
View file @88434de
+++ b/ui/src/app/components/widget/widget-config.tpl.html
View file @88434de
@@ -37,29 +37,58 @@
                                    is-edit="true" flex ng-model="timewindow"></tb-timewindow>
                 </section>
             </div>
-            <div ng-show="widgetType === types.widgetType.alarm.value" layout='column' layout-align="center"
-                 layout-gt-sm='row' layout-align-gt-sm="start center">
-                <md-input-container class="md-block" flex>
-                    <label translate>alarm.alarm-status</label>
-                    <md-select ng-model="alarmSearchStatus" style="padding-bottom: 24px;">
-                        <md-option ng-repeat="searchStatus in types.alarmSearchStatus" ng-value="searchStatus">
-                            {{ ('alarm.search-status.' + searchStatus) | translate }}
-                        </md-option>
-                    </md-select>
-                </md-input-container>
-                <md-input-container flex class="md-block">
-                    <label translate>alarm.polling-interval</label>
-                    <input ng-required="widgetType === types.widgetType.alarm.value"
-                           type="number"
-                           step="1"
-                           min="1"
-                           name="alarmsPollingInterval"
-                           ng-model="alarmsPollingInterval"/>
-                    <div ng-messages="theForm.alarmsPollingInterval.$error" multiple md-auto-hide="false">
-                        <div ng-message="required" translate>alarm.polling-interval-required</div>
-                        <div ng-message="min" translate>alarm.min-polling-interval-message</div>
-                    </div>
-                </md-input-container>
+            <div ng-show="widgetType === types.widgetType.alarm.value" layout='column' layout-align="center">
+                <div layout-gt-sm='row' layout-align-gt-sm="start center">
+                    <md-input-container class="md-block" flex>
+                        <label translate>alarm.alarm-status</label>
+                        <md-select ng-model="alarmSearchStatus" style="padding-bottom: 24px;">
+                            <md-option ng-repeat="searchStatus in types.alarmSearchStatus" ng-value="searchStatus">
+                                {{ ('alarm.search-status.' + searchStatus) | translate }}
+                            </md-option>
+                        </md-select>
+                    </md-input-container>
+                    <md-input-container flex class="md-block">
+                        <label translate>alarm.polling-interval</label>
+                        <input ng-required="widgetType === types.widgetType.alarm.value"
+                               type="number"
+                               step="1"
+                               min="1"
+                               name="alarmsPollingInterval"
+                               ng-model="alarmsPollingInterval"/>
+                        <div ng-messages="theForm.alarmsPollingInterval.$error" multiple md-auto-hide="false">
+                            <div ng-message="required" translate>alarm.polling-interval-required</div>
+                            <div ng-message="min" translate>alarm.min-polling-interval-message</div>
+                        </div>
+                    </md-input-container>
+                </div>
+                <div layout-gt-sm='row' layout-align-gt-sm="start center">
+                    <md-input-container flex class="md-block">
+                        <label translate>alarm.max-count-load</label>
+                        <input ng-required="widgetType === types.widgetType.alarm.value"
+                               type="number"
+                               step="1"
+                               min="0"
+                               name="alarmsMaxCountLoad"
+                               ng-model="alarmsMaxCountLoad"/>
+                        <div ng-messages="theForm.alarmsMaxCountLoad.$error" multiple md-auto-hide="false">
+                            <div ng-message="required" translate>alarm.max-count-load-required</div>
+                            <div ng-message="min" translate>alarm.max-count-load-error-min</div>
+                        </div>
+                    </md-input-container>
+                    <md-input-container flex class="md-block">
+                        <label translate>alarm.fetch-size</label>
+                        <input ng-required="widgetType === types.widgetType.alarm.value"
+                               type="number"
+                               step="1"
+                               min="10"
+                               name="alarmsFetchSize"
+                               ng-model="alarmsFetchSize"/>
+                        <div ng-messages="theForm.alarmsFetchSize.$error" multiple md-auto-hide="false">
+                            <div ng-message="required" translate>alarm.fetch-size-required</div>
+                            <div ng-message="min" translate>alarm.fetch-size-error-min</div>
+                        </div>
+                    </md-input-container>
+                </div>
             </div>
             <v-accordion id="datasources-accordion" control="datasourcesAccordion" class="vAccordion--default"
                          ng-show="widgetType !== types.widgetType.rpc.value
--- a/ui/src/app/components/widget/widget.controller.js
View file @88434de
+++ b/ui/src/app/components/widget/widget.controller.js
View file @88434de
@@ -367,6 +367,10 @@ export default function WidgetController($scope, $state, $timeout, $window, $ocL
                     widget.config.alarmSearchStatus : types.alarmSearchStatus.any;
                 options.alarmsPollingInterval = angular.isDefined(widget.config.alarmsPollingInterval) ?
                     widget.config.alarmsPollingInterval * 1000 : 5000;
+                options.alarmsMaxCountLoad = angular.isDefined(widget.config.alarmsMaxCountLoad) ?
+                    widget.config.alarmsMaxCountLoad : 0;
+                options.alarmsFetchSize = angular.isDefined(widget.config.alarmsFetchSize) ?
+                    widget.config.alarmsFetchSize : 100;
             } else {
                 options.datasources = angular.copy(widget.config.datasources)
             }
--- a/ui/src/app/locale/locale.constant-en_US.json
View file @88434de
+++ b/ui/src/app/locale/locale.constant-en_US.json
View file @88434de
@@ -162,7 +162,13 @@
         "clear-alarms-text": "Are you sure you want to clear { count, plural, 1 {1 alarm} other {# alarms} }?",
         "clear-alarm-title": "Clear Alarm",
         "clear-alarm-text": "Are you sure you want to clear Alarm?",
-        "alarm-status-filter": "Alarm Status Filter"
+        "alarm-status-filter": "Alarm Status Filter",
+        "max-count-load": "Maximum number of alarms to load (0 - unlimited)",
+        "max-count-load-required": "Maximum number of alarms to load is required.",
+        "max-count-load-error-min": "Minimum value is 0.",
+        "fetch-size": "Fetch size",
+        "fetch-size-required": "Fetch size is required.",
+        "fetch-size-error-min": "Minimum value is 10."
     },
     "alias": {
         "add": "Add alias",
--- a/ui/src/app/locale/locale.constant-ru_RU.json
View file @88434de
+++ b/ui/src/app/locale/locale.constant-ru_RU.json
View file @88434de
@@ -162,7 +162,13 @@
         "clear-alarms-text": "Вы точно хотите сбросить { count, plural, 1 {1 оповещение} other {# оповещений} }?",
         "clear-alarm-title": "Сбросить оповещение",
         "clear-alarm-text": "Вы точно хотите сбросить оповещение?",
-        "alarm-status-filter": "Фильтр оповещений"
+        "alarm-status-filter": "Фильтр оповещений",
+        "max-count-load": "Максимальное количество оповещений для загрузки (0 - неограниченно)",
+        "max-count-load-required": "Максимальное количество оповещений для загрузки обязателен.",
+        "max-count-load-error-min": "Минимальное значение 0.",
+        "fetch-size": "Размер пакета для загрузки",
+        "fetch-size-required": "Размер пакета для загрузки обязателен.",
+        "fetch-size-error-min": "Минимальное значение 10."
     },
     "alias": {
         "add": "Добавить псевдоним",
--- a/ui/src/app/locale/locale.constant-uk_UA.json
View file @88434de
+++ b/ui/src/app/locale/locale.constant-uk_UA.json
View file @88434de
@@ -178,7 +178,13 @@
         "clear-alarms-text": "Ви впевнені, що хочете деактивувати { count, plural, 1 {1 сигнал тривоги} other {# сигнали тривоги} }?",
         "clear-alarm-title": "Деактивувати сигнал тривоги",
         "clear-alarm-text": "Ви впевнені, що хочете деактивувати сигнал тривоги?",
-        "alarm-status-filter": "Фільтр статусу сигналу тривоги"
+        "alarm-status-filter": "Фільтр статусу сигналу тривоги",
+        "max-count-load": "Максимальна кількість сигналів тривоги для завантаження (0 - необмежено)",
+        "max-count-load-required": "Необхідно задати максимальну кількість сигналів тривоги для завантаження.",
+        "max-count-load-error-min": "Мінімальне значення 0.",
+        "fetch-size": "Розмір пакету для завантаження",
+        "fetch-size-required": "Необхідно задати розмір пакету для завантаження.",
+        "fetch-size-error-min": "Мінімальне значення 10."
     },
     "alias": {
         "add": "Додати псевдонім ",
@@ -2386,4 +2392,4 @@
             "el_GR": "Грецька"
         }
     }
-}
+}