You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dg...@apache.org on 2020/04/30 11:36:14 UTC
[incubator-dlab] 02/02: [DLAB-1758]: Added columns to audit page
This is an automated email from the ASF dual-hosted git repository.
dgnatyshyn pushed a commit to branch DLAB-1758
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 49008a68c16c1538796cb3471f97163826e47235
Author: Dmytro Gnatyshyn <di...@ukr.net>
AuthorDate: Thu Apr 30 14:35:49 2020 +0300
[DLAB-1758]: Added columns to audit page
---
.../src/main/resources/webapp/src/app/app.module.ts | 2 --
.../resources/webapp/src/app/app.routing.module.ts | 4 ++--
.../reporting-grid/reporting-grid.component.ts | 2 +-
.../src/app/shared/navbar/navbar.component.html | 21 ++++++++++++---------
4 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/services/self-service/src/main/resources/webapp/src/app/app.module.ts b/services/self-service/src/main/resources/webapp/src/app/app.module.ts
index 0498d71..91ec87d 100644
--- a/services/self-service/src/main/resources/webapp/src/app/app.module.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/app.module.ts
@@ -35,8 +35,6 @@ import { LayoutModule } from './layout/layout.module';
import { GuidesModule } from './help';
import { ServicePagesModule } from './service-pages/service-pages.module';
import { ResourcesModule } from './resources/resources.module';
-
-import { ReportingModule } from './reporting/reporting.module';
import { AdministrationModule } from './administration/administration.module';
import { WebterminalModule } from './webterminal';
import { CoreModule } from './core/core.module';
diff --git a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
index 0cc0f4a..b8792e5 100644
--- a/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/app.routing.module.ts
@@ -26,7 +26,7 @@ import { ResourcesComponent } from './resources/resources.component';
import { AccessNotebookGuideComponent, PublicKeyGuideComponent } from './help';
import { NotFoundComponent } from './service-pages/not-found/not-found.component';
import { AccessDeniedComponent } from './service-pages/access-denied/access-denied.component';
-import { ReportingComponent } from './reporting/reporting.component';
+import { ReportingComponent } from './reports/reporting/reporting.component';
import { WebterminalComponent } from './webterminal/webterminal.component';
import { ManagementComponent } from './administration/management/management.component';
import { ProjectComponent } from './administration/project/project.component';
@@ -34,7 +34,7 @@ import { RolesComponent } from './administration/roles/roles.component';
import { SwaggerComponent } from './swagger/swagger.component';
import { AuthorizationGuard, CheckParamsGuard, CloudProviderGuard, AdminGuard } from './core/services';
-import {AuditComponent} from './audit/audit.component';
+import {AuditComponent} from './reports/audit/audit.component';
const routes: Routes = [{
path: 'login',
diff --git a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
index c7bea87..af620cb 100644
--- a/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
+++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts
@@ -24,7 +24,7 @@ import { ReportingConfigModel } from '../../../../dictionary/global.dictionary';
selector: 'dlab-reporting-grid',
templateUrl: './reporting-grid.component.html',
styleUrls: ['./reporting-grid.component.scss',
- '../../resources/resources-grid/resources-grid.component.scss'],
+ '../../../resources/resources-grid/resources-grid.component.scss'],
})
export class ReportingGridComponent implements OnInit {
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 1028d72..419655d 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,15 +95,18 @@
<ng-template #env><i class="material-icons">settings</i></ng-template>
</a>
</a>
- <a *ngIf="healthStatus?.billingEnabled" class="nav-item" [routerLink]="['/billing_report']"
- [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
- <span *ngIf="isExpanded; else billing">Billing Report</span>
- <ng-template #billing><i class="material-icons">account_balance_wallet</i></ng-template>
- </a>
- <a class="nav-item" [routerLink]="['/audit']"
- [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
- <span *ngIf="isExpanded; else audit">Audit Report</span>
- <ng-template #audit><i class="material-icons">library_books</i></ng-template>
+ <a class="nav-item has-children" *ngIf="healthStatus?.billingEnabled || true">
+ <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'"
+ [routerLinkActive]="['active']" [routerLinkActiveOptions]="{exact:true}">
+ <span *ngIf="isExpanded; else audit">Audit</span>
+ <ng-template #audit><i class="material-icons">library_books</i></ng-template>
+ </a>
</a>
</div>
<div>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org