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 9b53ffd442cbdfbf683532227ecdc20d6dcb11a3 Author: Dmytro Gnatyshyn <[email protected]> AuthorDate: Thu Apr 30 13:56:42 2020 +0300 [DLAB-1758]: Created reports module --- .../main/resources/webapp/src/app/app.module.ts | 8 ++-- .../webapp/src/app/core/services/audit.service.ts | 14 +++---- .../audit/audit-grid/audit-grid.component.html | 47 +++++++++++++++++++++- .../audit/audit-grid/audit-grid.component.scss | 10 ++++- .../audit/audit-grid/audit-grid.component.ts | 8 ++-- .../audit-toolbar/audit-toolbar.component.html | 0 .../audit-toolbar/audit-toolbar.component.scss | 0 .../audit/audit-toolbar/audit-toolbar.component.ts | 6 +-- .../src/app/{ => reports}/audit/audit.component.ts | 6 +-- .../src/app/{ => reports}/audit/audit.module.ts | 6 +-- .../app/{ => reports}/audit/filter-audit.model.ts | 6 ++- .../reporting-grid/reporting-grid.component.html | 0 .../reporting-grid/reporting-grid.component.scss | 0 .../reporting-grid/reporting-grid.component.ts | 2 +- .../{ => reports}/reporting/reporting.component.ts | 8 ++-- .../{ => reports}/reporting/reporting.module.ts | 6 +-- .../reporting/toolbar/toolbar.component.html | 0 .../reporting/toolbar/toolbar.component.scss | 0 .../reporting/toolbar/toolbar.component.ts | 6 +-- .../audit.module.ts => reports/reports.module.ts} | 31 ++++---------- 20 files changed, 102 insertions(+), 62 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 767eba1..0498d71 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 @@ -41,7 +41,8 @@ import { AdministrationModule } from './administration/administration.module'; import { WebterminalModule } from './webterminal'; import { CoreModule } from './core/core.module'; import { SwaggerAPIModule } from './swagger'; -import {AuditModule} from './audit/audit.module'; +import {ReportsModule} from './reports/reports.module'; + @NgModule({ declarations: [AppComponent], @@ -56,9 +57,10 @@ import {AuditModule} from './audit/audit.module'; ResourcesModule, GuidesModule, ServicePagesModule, - ReportingModule, - AuditModule, + // ReportingModule, + AdministrationModule, + ReportsModule, WebterminalModule, SwaggerAPIModule, RouterModule, diff --git a/services/self-service/src/main/resources/webapp/src/app/core/services/audit.service.ts b/services/self-service/src/main/resources/webapp/src/app/core/services/audit.service.ts index 87f970f..faebecf 100644 --- a/services/self-service/src/main/resources/webapp/src/app/core/services/audit.service.ts +++ b/services/self-service/src/main/resources/webapp/src/app/core/services/audit.service.ts @@ -10,13 +10,13 @@ export class AuditService { public getAuditData() { return [ - {user: 'Dlab-test-user1', action: 'Created project ProjectA', date: new Date().toLocaleString()}, - {user: 'Dlab-test-user2', action: 'Created notebook Rstudio', date: new Date().toLocaleString()}, - {user: 'Dlab-test-user1', action: 'Stopped notebook Rstudio', date: new Date().toLocaleString()}, - {user: 'Dlab-test-user1', action: 'Started notebook Rstudio', date: new Date().toLocaleString()}, - {user: 'Dlab-test-user3', action: 'Created EMR Emr1', date: new Date().toLocaleString()}, - {user: 'Dlab-test-user1', action: 'Created notebook Rstudio2', date: new Date().toLocaleString()}, - {user: 'Dlab-test-user2', action: 'Terminated notebook Rstudio', date: new Date().toLocaleString()}, + {user: 'Dlab-test-user1', action: 'Created project', project: 'ProjectA', date: new Date().toLocaleString()}, + {user: 'Dlab-test-user2', action: 'Created notebook ', project: 'ProjectA', resource: 'Rstudio', date: new Date().toLocaleString()}, + {user: 'Dlab-test-user1', action: 'Stopped notebook', project: 'ProjectA', resource: 'Rstudio', date: new Date().toLocaleString()}, + {user: 'Dlab-test-user1', action: 'Started notebook', project: 'ProjectA', resource: 'Rstudio', date: new Date().toLocaleString()}, + {user: 'Dlab-test-user3', action: 'Created EMR', project: 'ProjectA', resource: 'Rstudio:Emr1', date: new Date().toLocaleString()}, + {user: 'Dlab-test-user1', action: 'Created notebook', project: 'ProjectA', resource: 'Rstudio', date: new Date().toLocaleString()}, + {user: 'Dlab-test-user2', action: 'Terminated notebook', project: 'ProjectA', resource: 'Rstudio', date: new Date().toLocaleString()}, ]; } diff --git a/services/self-service/src/main/resources/webapp/src/app/audit/audit-grid/audit-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html similarity index 66% rename from services/self-service/src/main/resources/webapp/src/app/audit/audit-grid/audit-grid.component.html rename to services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html index c8d33e8..db3f6f0 100644 --- a/services/self-service/src/main/resources/webapp/src/app/audit/audit-grid/audit-grid.component.html +++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.html @@ -34,6 +34,34 @@ <td mat-footer-cell *matFooterCellDef class="table-footer"></td> </ng-container> + <ng-container matColumnDef="project"> + <th mat-header-cell *matHeaderCellDef class="th_project label-header"> + <div class="label"><span class="text">Project</span></div> + <button mat-icon-button aria-label="More" class="ar" (click)="toggleFilterRow()"> + <i class="material-icons"> + <span *ngIf="filterAuditData.users.length > 0; else user_filtered">filter_list</span> + <ng-template #user_filtered>more_vert</ng-template> + </i> + </button> + </th> + <td mat-cell *matCellDef="let element"><span class="table-item">{{element.project}}</span></td> + <td mat-footer-cell *matFooterCellDef class="table-footer"></td> + </ng-container> + + <ng-container matColumnDef="resource"> + <th mat-header-cell *matHeaderCellDef class="th_resource label-header"> + <div class="label"><span class="text">Resource</span></div> + <button mat-icon-button aria-label="More" class="ar" (click)="toggleFilterRow()"> + <i class="material-icons"> + <span *ngIf="filterAuditData.users.length > 0; else user_filtered">filter_list</span> + <ng-template #user_filtered>more_vert</ng-template> + </i> + </button> + </th> + <td mat-cell *matCellDef="let element"><span class="table-item">{{element.resource}}</span></td> + <td mat-footer-cell *matFooterCellDef class="table-footer"></td> + </ng-container> + <ng-container matColumnDef="action"> <th mat-header-cell *matHeaderCellDef class="th_action label-header"> <!-- <div class="sort">--> @@ -72,10 +100,25 @@ [items]="filterConfiguration.users" [model]="filterAuditData.users"></multi-select-dropdown> </th> </ng-container> + + <ng-container matColumnDef="project-filter"> + <th mat-header-cell *matHeaderCellDef class="filter-row-item"> + <multi-select-dropdown *ngIf="filterConfiguration" (selectionChange)="onUpdate($event)" [type]="'projects'" + [items]="filterConfiguration.users" [model]="filterAuditData.users"></multi-select-dropdown> + </th> + </ng-container> + + <ng-container matColumnDef="resource-filter"> + <th mat-header-cell *matHeaderCellDef class="filter-row-item"> + <multi-select-dropdown *ngIf="filterConfiguration" (selectionChange)="onUpdate($event)" [type]="'resources'" + [items]="filterConfiguration.users" [model]="filterAuditData.users"></multi-select-dropdown> + </th> + </ng-container> + <ng-container matColumnDef="action-filter"> <th mat-header-cell *matHeaderCellDef class="filter-row-item"> - <multi-select-dropdown *ngIf="filterConfiguration" (selectionChange)="onUpdate($event)" [type]="'actions'" - [items]="filterConfiguration.actions" [model]="filterAuditData.actions"></multi-select-dropdown> +<!-- <multi-select-dropdown *ngIf="filterConfiguration" (selectionChange)="onUpdate($event)" [type]="'actions'"--> +<!-- [items]="filterConfiguration.actions" [model]="filterAuditData.actions"></multi-select-dropdown>--> </th> </ng-container> <ng-container matColumnDef="date-filter"> diff --git a/services/self-service/src/main/resources/webapp/src/app/audit/audit-grid/audit-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss similarity index 97% rename from services/self-service/src/main/resources/webapp/src/app/audit/audit-grid/audit-grid.component.scss rename to services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss index 352384a..e9e44bc 100644 --- a/services/self-service/src/main/resources/webapp/src/app/audit/audit-grid/audit-grid.component.scss +++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.scss @@ -36,13 +36,21 @@ } .th_action { - width: 50%; + width: 20%; } .th_date { width: 20%; } + .th_project{ + width: 15%; + } + + .th_resource{ + width: 20%; + } + th { padding-right: 5px; z-index: 2 !important; diff --git a/services/self-service/src/main/resources/webapp/src/app/audit/audit-grid/audit-grid.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts similarity index 85% rename from services/self-service/src/main/resources/webapp/src/app/audit/audit-grid/audit-grid.component.ts rename to services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts index 7e8b575..34454ef 100644 --- a/services/self-service/src/main/resources/webapp/src/app/audit/audit-grid/audit-grid.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts @@ -28,11 +28,11 @@ import {FilterAuditModel} from '../filter-audit.model'; }) export class AuditGridComponent implements OnInit { public auditData: Array<object>; - public displayedColumns: string[] = ['user', 'action', 'date']; - public displayedFilterColumns: string[] = ['user-filter', 'action-filter', 'date-filter']; + public displayedColumns: string[] = ['user', 'project', 'resource', 'action', 'date']; + public displayedFilterColumns: string[] = ['user-filter', 'project-filter', 'resource-filter', 'action-filter', 'date-filter']; public collapseFilterRow: boolean = true; - public filterConfiguration: FilterAuditModel = new FilterAuditModel([], [], '', ''); - public filterAuditData: FilterAuditModel = new FilterAuditModel([], [], '', ''); + public filterConfiguration: FilterAuditModel = new FilterAuditModel([], [], [], [],'', ''); + public filterAuditData: FilterAuditModel = new FilterAuditModel([], [], [], [],'', ''); ngOnInit() {} diff --git a/services/self-service/src/main/resources/webapp/src/app/audit/audit-toolbar/audit-toolbar.component.html b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.html similarity index 100% rename from services/self-service/src/main/resources/webapp/src/app/audit/audit-toolbar/audit-toolbar.component.html rename to services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.html diff --git a/services/self-service/src/main/resources/webapp/src/app/audit/audit-toolbar/audit-toolbar.component.scss b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.scss similarity index 100% rename from services/self-service/src/main/resources/webapp/src/app/audit/audit-toolbar/audit-toolbar.component.scss rename to services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.scss diff --git a/services/self-service/src/main/resources/webapp/src/app/audit/audit-toolbar/audit-toolbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.ts similarity index 94% rename from services/self-service/src/main/resources/webapp/src/app/audit/audit-toolbar/audit-toolbar.component.ts rename to services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.ts index 3de049f..87daf36 100644 --- a/services/self-service/src/main/resources/webapp/src/app/audit/audit-toolbar/audit-toolbar.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-toolbar/audit-toolbar.component.ts @@ -19,11 +19,11 @@ import { Component, OnInit, AfterViewInit, Output, EventEmitter, ViewEncapsulation, ViewChild } from '@angular/core'; import { NgDateRangePickerOptions } from 'ng-daterangepicker'; -import { DICTIONARY } from '../../../dictionary/global.dictionary'; +import { DICTIONARY } from '../../../../dictionary/global.dictionary'; import {skip} from 'rxjs/operators'; import {Subscription} from 'rxjs'; -import {HealthStatusService} from '../../core/services'; -import {GeneralEnvironmentStatus} from '../../administration/management/management.model'; +import {HealthStatusService} from '../../../core/services'; +import {GeneralEnvironmentStatus} from '../../../administration/management/management.model'; @Component({ selector: 'audit-toolbar', diff --git a/services/self-service/src/main/resources/webapp/src/app/audit/audit.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.component.ts similarity index 93% rename from services/self-service/src/main/resources/webapp/src/app/audit/audit.component.ts rename to services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.component.ts index 92ca006..b468141 100644 --- a/services/self-service/src/main/resources/webapp/src/app/audit/audit.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.component.ts @@ -20,11 +20,11 @@ import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core'; import { ToastrService } from 'ngx-toastr'; -import {HealthStatusService} from '../core/services'; -import { DICTIONARY} from '../../dictionary/global.dictionary'; +import {HealthStatusService} from '../../core/services'; +import { DICTIONARY} from '../../../dictionary/global.dictionary'; import {AuditToolbarComponent} from './audit-toolbar/audit-toolbar.component'; import {AuditGridComponent} from './audit-grid/audit-grid.component'; -import {AuditService} from '../core/services/audit.service'; +import {AuditService} from '../../core/services/audit.service'; @Component({ diff --git a/services/self-service/src/main/resources/webapp/src/app/audit/audit.module.ts b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.module.ts similarity index 88% copy from services/self-service/src/main/resources/webapp/src/app/audit/audit.module.ts copy to services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.module.ts index c799d23..abe259d 100644 --- a/services/self-service/src/main/resources/webapp/src/app/audit/audit.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit.module.ts @@ -21,9 +21,9 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { NgDateRangePickerModule } from 'ng-daterangepicker'; -import { MaterialModule } from '../shared/material.module'; -import { FormControlsModule } from '../shared/form-controls'; -import { KeysPipeModule, LineBreaksPipeModule } from '../core/pipes'; +import { MaterialModule } from '../../shared/material.module'; +import { FormControlsModule } from '../../shared/form-controls'; +import { KeysPipeModule, LineBreaksPipeModule } from '../../core/pipes'; import {AuditComponent} from './audit.component'; import {AuditGridComponent} from './audit-grid/audit-grid.component'; import {AuditToolbarComponent} from './audit-toolbar/audit-toolbar.component'; diff --git a/services/self-service/src/main/resources/webapp/src/app/audit/filter-audit.model.ts b/services/self-service/src/main/resources/webapp/src/app/reports/audit/filter-audit.model.ts similarity index 67% rename from services/self-service/src/main/resources/webapp/src/app/audit/filter-audit.model.ts rename to services/self-service/src/main/resources/webapp/src/app/reports/audit/filter-audit.model.ts index 37f07f9..c26fdf7 100644 --- a/services/self-service/src/main/resources/webapp/src/app/audit/filter-audit.model.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reports/audit/filter-audit.model.ts @@ -1,11 +1,13 @@ export class FilterAuditModel { static getDefault(): FilterAuditModel { - return new FilterAuditModel([], [], '', ''); + return new FilterAuditModel([], [],[],[], '', ''); } constructor( public users: Array<string>, + public resource: Array<string>, + public project: Array<string>, public actions: Array<string>, public date_start: string, public date_end: string, @@ -13,6 +15,8 @@ export class FilterAuditModel { defaultConfigurations(): void { this.users = []; + this.project = []; + this.resource = []; this.actions = []; this.date_start = ''; this.date_end = ''; diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html similarity index 100% rename from services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.html rename to services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.html diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.scss similarity index 100% rename from services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.scss rename to services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.scss diff --git a/services/self-service/src/main/resources/webapp/src/app/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 similarity index 97% rename from services/self-service/src/main/resources/webapp/src/app/reporting/reporting-grid/reporting-grid.component.ts rename to services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting-grid/reporting-grid.component.ts index d4e0076..c7bea87 100644 --- a/services/self-service/src/main/resources/webapp/src/app/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 @@ -18,7 +18,7 @@ */ import {Component, OnInit, Output, EventEmitter, ViewChild, Input} from '@angular/core'; -import { ReportingConfigModel } from '../../../dictionary/global.dictionary'; +import { ReportingConfigModel } from '../../../../dictionary/global.dictionary'; @Component({ selector: 'dlab-reporting-grid', diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting.component.ts similarity index 96% rename from services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts rename to services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting.component.ts index 1692ef1..a3e7fa2 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting.component.ts @@ -20,13 +20,13 @@ import { Component, OnInit, OnDestroy, ViewChild } from '@angular/core'; import { ToastrService } from 'ngx-toastr'; -import {ApplicationSecurityService, BillingReportService, HealthStatusService} from '../core/services'; +import {ApplicationSecurityService, BillingReportService, HealthStatusService} from '../../core/services'; import { ReportingGridComponent } from './reporting-grid/reporting-grid.component'; import { ToolbarComponent } from './toolbar/toolbar.component'; -import { FileUtils } from '../core/util'; -import { DICTIONARY, ReportingConfigModel } from '../../dictionary/global.dictionary'; -import {ProgressBarService} from '../core/services/progress-bar.service'; +import { FileUtils } from '../../core/util'; +import { DICTIONARY, ReportingConfigModel } from '../../../dictionary/global.dictionary'; +import {ProgressBarService} from '../../core/services/progress-bar.service'; @Component({ selector: 'dlab-reporting', diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.module.ts b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting.module.ts similarity index 88% rename from services/self-service/src/main/resources/webapp/src/app/reporting/reporting.module.ts rename to services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting.module.ts index 3067e9a..2e3ccb6 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/reporting.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/reporting.module.ts @@ -22,10 +22,10 @@ import { CommonModule } from '@angular/common'; import { FormsModule } from '@angular/forms'; import { NgDateRangePickerModule } from 'ng-daterangepicker'; -import { MaterialModule } from '../shared/material.module'; -import { FormControlsModule } from '../shared/form-controls'; +import { MaterialModule } from '../../shared/material.module'; +import { FormControlsModule } from '../../shared/form-controls'; import { ReportingComponent } from './reporting.component'; -import { KeysPipeModule, LineBreaksPipeModule } from '../core/pipes'; +import { KeysPipeModule, LineBreaksPipeModule } from '../../core/pipes'; import { ReportingGridComponent } from './reporting-grid/reporting-grid.component'; import { ToolbarComponent } from './toolbar/toolbar.component'; diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.html b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/toolbar/toolbar.component.html similarity index 100% rename from services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.html rename to services/self-service/src/main/resources/webapp/src/app/reports/reporting/toolbar/toolbar.component.html diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.scss b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/toolbar/toolbar.component.scss similarity index 100% rename from services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.scss rename to services/self-service/src/main/resources/webapp/src/app/reports/reporting/toolbar/toolbar.component.scss diff --git a/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.ts b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/toolbar/toolbar.component.ts similarity index 94% rename from services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.ts rename to services/self-service/src/main/resources/webapp/src/app/reports/reporting/toolbar/toolbar.component.ts index 5272e37..be5d117 100644 --- a/services/self-service/src/main/resources/webapp/src/app/reporting/toolbar/toolbar.component.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reports/reporting/toolbar/toolbar.component.ts @@ -19,11 +19,11 @@ import { Component, OnInit, AfterViewInit, Output, EventEmitter, ViewEncapsulation, ViewChild } from '@angular/core'; import { NgDateRangePickerOptions } from 'ng-daterangepicker'; -import { DICTIONARY } from '../../../dictionary/global.dictionary'; +import { DICTIONARY } from '../../../../dictionary/global.dictionary'; import {skip} from 'rxjs/operators'; import {Subscription} from 'rxjs'; -import {HealthStatusService} from '../../core/services'; -import {GeneralEnvironmentStatus} from '../../administration/management/management.model'; +import {HealthStatusService} from '../../../core/services'; +import {GeneralEnvironmentStatus} from '../../../administration/management/management.model'; @Component({ selector: 'dlab-toolbar', diff --git a/services/self-service/src/main/resources/webapp/src/app/audit/audit.module.ts b/services/self-service/src/main/resources/webapp/src/app/reports/reports.module.ts similarity index 52% rename from services/self-service/src/main/resources/webapp/src/app/audit/audit.module.ts rename to services/self-service/src/main/resources/webapp/src/app/reports/reports.module.ts index c799d23..f6b1bf9 100644 --- a/services/self-service/src/main/resources/webapp/src/app/audit/audit.module.ts +++ b/services/self-service/src/main/resources/webapp/src/app/reports/reports.module.ts @@ -19,30 +19,13 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { NgDateRangePickerModule } from 'ng-daterangepicker'; -import { MaterialModule } from '../shared/material.module'; -import { FormControlsModule } from '../shared/form-controls'; -import { KeysPipeModule, LineBreaksPipeModule } from '../core/pipes'; -import {AuditComponent} from './audit.component'; -import {AuditGridComponent} from './audit-grid/audit-grid.component'; -import {AuditToolbarComponent} from './audit-toolbar/audit-toolbar.component'; +import {AuditModule} from './audit/audit.module'; +import {ReportingModule} from './reporting/reporting.module'; + @NgModule({ - imports: [ - CommonModule, - FormsModule, - FormControlsModule, - KeysPipeModule, - LineBreaksPipeModule, - NgDateRangePickerModule, - MaterialModule - ], - declarations: [ - AuditGridComponent, - AuditToolbarComponent, - AuditComponent - ], - exports: [AuditComponent] + imports: [CommonModule, AuditModule, ReportingModule], + declarations: [], + exports: [AuditModule, ReportingModule] }) -export class AuditModule { } +export class ReportsModule { } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
