This is an automated email from the ASF dual-hosted git repository. dgnatyshyn pushed a commit to branch DLAB-1896 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 8bc89c57a1c532d757b19d834d608e19858c4817 Author: Dmytro_Gnatyshyn <di1...@ukr.net> AuthorDate: Fri Jun 26 15:55:30 2020 +0300 [DLAB-1896]: Hide audit in navbar if value of 'auditEnabled' is false --- .../webapp/src/app/administration/management/management.model.ts | 1 + .../src/app/resources/bucket-browser/bucket-browser.component.html | 2 -- .../src/main/resources/webapp/src/app/shared/navbar/index.ts | 2 +- .../main/resources/webapp/src/app/shared/navbar/navbar.component.html | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts index 6b0f600..4387884 100644 --- a/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts +++ b/services/self-service/src/main/resources/webapp/src/app/administration/management/management.model.ts @@ -71,6 +71,7 @@ export class BackupOptionsModel { export interface GeneralEnvironmentStatus { admin: boolean; + auditEnabled: boolean; projectAdmin: boolean; billingEnabled: boolean; billingQuoteUsed: number; diff --git a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html index 9dfa1fb..449445f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/resources/bucket-browser/bucket-browser.component.html @@ -190,7 +190,6 @@ </div> <div class="size">{{file.object?.size | convertFileSize}}</div> <div class="date" *ngIf="!file.isDownloading">{{convertDate(file.object?.lastModifiedDate) | date: 'dd/MM/yyyy hh:mm:ss aa' }}</div> -<!-- <div class="date" *ngIf="!file.isDownloading">{{file.object?.lastModifiedDate }}</div>--> <div class="progress-wrapper" *ngIf="file.isDownloading"> <div class="progres"> <span class="progress-bar-text">{{file.progress || 0}}% Downloading...</span> @@ -215,7 +214,6 @@ <span class="close" matTooltip="Upload is still in progress, please wait." matTooltipPosition="above" [ngClass]="{'not-allow': isFileUploading}" [matTooltipDisabled]="!isFileUploading"> <button type="button" class="close" (click)="closeUploadWindow()" [disabled]="isFileUploading" [ngClass]="{'not-allow': isFileUploading}" >×</button> </span> - </header> <ul class="upload-files"> <li class="file upload-table-header" *ngIf="addedFiles.length"> diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/index.ts b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/index.ts index 7a6f2d4..65cf645 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/index.ts +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/index.ts @@ -25,7 +25,7 @@ import { ProgressDialogModule, BubbleModule } from '../index'; import { NavbarComponent } from './navbar.component'; import { NotificationDialogModule } from '../modal-dialog/notification-dialog'; -import {EdgeActionDialogModule} from "../modal-dialog/edge-action-dialog"; +import {EdgeActionDialogModule} from '../modal-dialog/edge-action-dialog'; export * from './navbar.component'; diff --git a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html index 8f6a8ca..f24a29f 100644 --- a/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/shared/navbar/navbar.component.html @@ -95,14 +95,14 @@ <ng-template #env><i class="material-icons">settings</i></ng-template> </a> </a> - <a class="nav-item has-children" *ngIf="healthStatus?.billingEnabled || true"> + <a class="nav-item has-children" *ngIf="healthStatus?.billingEnabled || healthStatus?.auditEnabled"> <span *ngIf="isExpanded">Reports</span> <a *ngIf="healthStatus?.billingEnabled" class="sub-nav-item" [routerLink]="['/billing_report']" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}" [style.margin-left.px]="isExpanded ? '30' : '0'"> <span *ngIf="isExpanded; else billing">Billing</span> <ng-template #billing><i class="material-icons">account_balance_wallet</i></ng-template> </a> - <a class="sub-nav-item" [routerLink]="['/audit']" [style.margin-left.px]="isExpanded ? '30' : '0'" + <a *ngIf="healthStatus?.auditEnabled" class="sub-nav-item" [routerLink]="['/audit']" [style.margin-left.px]="isExpanded ? '30' : '0'" [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}"> <span *ngIf="isExpanded; else audit">Audit</span> <ng-template #audit><i class="material-icons">library_books</i></ng-template> --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org