Browse Source

Hide timewindow when all options are hidden (#2287)

* Hide timewindow when all options are hidden

* Disable timewindow button when all options hidden
pull/2963/head
Chantsova Ekaterina 7 years ago
committed by Igor Kulikov
parent
commit
a93c8e25ba
  1. 2
      ui/src/app/components/timewindow-button.tpl.html
  2. 7
      ui/src/app/components/timewindow.directive.js
  3. 4
      ui/src/app/components/timewindow.tpl.html

2
ui/src/app/components/timewindow-button.tpl.html

@ -15,7 +15,7 @@
limitations under the License. limitations under the License.
--> -->
<md-button ng-disabled="disabled" class="md-raised md-primary" ng-click="openEditMode($event)"> <md-button ng-disabled="timewindowDisabled" class="md-raised md-primary" ng-click="openEditMode($event)">
<ng-md-icon icon="query_builder"></ng-md-icon> <ng-md-icon icon="query_builder"></ng-md-icon>
<span>{{model.displayValue}}</span> <span>{{model.displayValue}}</span>
</md-button> </md-button>

7
ui/src/app/components/timewindow.directive.js

@ -97,7 +97,7 @@ function Timewindow($compile, $templateCache, $filter, $mdPanel, $document, $mdM
element.html(template); element.html(template);
scope.openEditMode = function (event) { scope.openEditMode = function (event) {
if (scope.disabled) { if (scope.timewindowDisabled) {
return; return;
} }
var position; var position;
@ -212,6 +212,10 @@ function Timewindow($compile, $templateCache, $filter, $mdPanel, $document, $mdM
} }
} }
scope.isTimewindowDisabled = function () {
return scope.disabled || (!scope.isEdit && scope.model.hideInterval && scope.model.hideAggregation && scope.model.hideAggInterval);
}
ngModelCtrl.$render = function () { ngModelCtrl.$render = function () {
scope.model = timeService.defaultTimewindow(); scope.model = timeService.defaultTimewindow();
if (ngModelCtrl.$viewValue) { if (ngModelCtrl.$viewValue) {
@ -243,6 +247,7 @@ function Timewindow($compile, $templateCache, $filter, $mdPanel, $document, $mdM
model.hideAggregation = value.hideAggregation; model.hideAggregation = value.hideAggregation;
model.hideAggInterval = value.hideAggInterval; model.hideAggInterval = value.hideAggInterval;
} }
scope.timewindowDisabled = scope.isTimewindowDisabled();
scope.updateDisplayValue(); scope.updateDisplayValue();
}; };

4
ui/src/app/components/timewindow.tpl.html

@ -16,7 +16,7 @@
--> -->
<section class="tb-timewindow" layout='row' layout-align="start center"> <section class="tb-timewindow" layout='row' layout-align="start center">
<md-button ng-if="direction === 'left'" ng-disabled="disabled" class="md-icon-button tb-md-32" aria-label="{{ 'timewindow.edit' | translate }}" ng-click="openEditMode($event)"> <md-button ng-if="direction === 'left'" ng-disabled="timewindowDisabled" class="md-icon-button tb-md-32" aria-label="{{ 'timewindow.edit' | translate }}" ng-click="openEditMode($event)">
<md-tooltip md-direction="{{tooltipDirection}}"> <md-tooltip md-direction="{{tooltipDirection}}">
{{ 'timewindow.edit' | translate }} {{ 'timewindow.edit' | translate }}
</md-tooltip> </md-tooltip>
@ -28,7 +28,7 @@
</md-tooltip> </md-tooltip>
{{model.displayValue}} {{model.displayValue}}
</span> </span>
<md-button ng-if="direction === 'right'" ng-disabled="disabled" class="md-icon-button tb-md-32" aria-label="{{ 'timewindow.edit' | translate }}" ng-click="openEditMode($event)"> <md-button ng-if="direction === 'right'" ng-disabled="timewindowDisabled" class="md-icon-button tb-md-32" aria-label="{{ 'timewindow.edit' | translate }}" ng-click="openEditMode($event)">
<md-tooltip md-direction="{{tooltipDirection}}"> <md-tooltip md-direction="{{tooltipDirection}}">
{{ 'timewindow.edit' | translate }} {{ 'timewindow.edit' | translate }}
</md-tooltip> </md-tooltip>

Loading…
Cancel
Save