dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added static time on debugAll=true

Browse Source
This commit is contained in:
mpetrov 2024-11-15 12:19:49 +02:00
parent 075718e956
commit ed6e3f2154
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui-ngx/src/app/modules/home/components/debug-config/debug-config-button.component.html
View File

@ -26,7 +26,9 @@
<mat-icon [color]="disabled ? 'inherit' : 'primary'">bug_report</mat-icon> <mat-icon [color]="disabled ? 'inherit' : 'primary'">bug_report</mat-icon>
<span *ngIf="!debugFailures && !(isDebugAllActive$ | async)" translate>common.disabled</span> <span *ngIf="!debugFailures && !(isDebugAllActive$ | async)" translate>common.disabled</span>
<span *ngIf="(isDebugAllActive$ | async) && debugFailures" translate>debug-config.all</span> <span *ngIf="(isDebugAllActive$ | async) && debugFailures" translate>debug-config.all</span>
<span *ngIf="(isDebugAllActive$ | async) && !debugFailures">{{ debugAllUntil | durationLeft }}</span> <span *ngIf="(isDebugAllActive$ | async) && !debugFailures">
{{ !debugAll ? (debugAllUntil | durationLeft) : ('debug-config.min' | translate: { number: maxDebugModeDurationMinutes }) }}
</span>
<span *ngIf="!(isDebugAllActive$ | async) && debugFailures" translate>debug-config.failures</span> <span *ngIf="!(isDebugAllActive$ | async) && debugFailures" translate>debug-config.failures</span>
</button> </button>
<ng-template #minifiedButton> <ng-template #minifiedButton>

4
ui-ngx/src/app/modules/home/components/debug-config/debug-config-panel.component.html
View File

@ -34,10 +34,10 @@
<div class="flex justify-between align-center"> <div class="flex justify-between align-center">
<mat-slide-toggle class="mat-slide" [formControl]="debugAllControl"> <mat-slide-toggle class="mat-slide" [formControl]="debugAllControl">
<div tb-hint-tooltip-icon="{{ 'debug-config.hint.all-messages' | translate }}"> <div tb-hint-tooltip-icon="{{ 'debug-config.hint.all-messages' | translate }}">
{{ 'debug-config.all-messages' | translate: { time: (isDebugAllActive$ | async) ? (debugAllUntil | durationLeft) : ('debug-config.min' | translate: { number: maxDebugModeDurationMinutes }) } }} {{ 'debug-config.all-messages' | translate: { time: (isDebugAllActive$ | async) && !debugAll ? (debugAllUntil | durationLeft) : ('debug-config.min' | translate: { number: maxDebugModeDurationMinutes }) } }}
</div> </div>
</mat-slide-toggle> </mat-slide-toggle>
<button mat-icon-button *ngIf="(isDebugAllActive$ | async)" <button mat-icon-button *ngIf="(isDebugAllActive$ | async) && !debugAll"
class="tb-mat-20" class="tb-mat-20"
matTooltip="{{ 'action.reset' | translate }}" matTooltip="{{ 'action.reset' | translate }}"
matTooltipPosition="above" matTooltipPosition="above"

2
ui-ngx/src/app/modules/home/components/debug-config/debug-config-panel.component.ts
View File

@ -99,12 +99,14 @@ export class DebugConfigPanelComponent extends PageComponent implements OnInit {
onReset(): void { onReset(): void {
this.debugAll = true; this.debugAll = true;
this.debugAllUntil = new Date().getTime() + this.maxDebugModeDurationMinutes * MINUTE; this.debugAllUntil = new Date().getTime() + this.maxDebugModeDurationMinutes * MINUTE;
this.cd.markForCheck();
} }
private observeDebugAllChange(): void { private observeDebugAllChange(): void {
this.debugAllControl.valueChanges.pipe(takeUntilDestroyed()).subscribe(value => { this.debugAllControl.valueChanges.pipe(takeUntilDestroyed()).subscribe(value => {
this.debugAllUntil = value? new Date().getTime() + this.maxDebugModeDurationMinutes * MINUTE : 0; this.debugAllUntil = value? new Date().getTime() + this.maxDebugModeDurationMinutes * MINUTE : 0;
this.debugAll = value; this.debugAll = value;
this.cd.markForCheck();
}); });
} }
} }