Skip to content
This repository was archived by the owner on Jun 3, 2021. It is now read-only.

Commit 48b0e49

Browse files
codeprccodeprc
authored
Merge branch 'master' into docker-widget
2 parents 4f92224 + 346fff7 commit 48b0e49

File tree

78 files changed

+792
-463
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+792
-463
lines changed

‎angular.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
{
5757
"type": "initial",
5858
"maximumWarning": "2mb",
59-
"maximumError": "5mb"
59+
"maximumError": "6mb"
6060
}
6161
]
6262
}

‎package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,12 @@
55
"ng": "ng",
66
"start": "ng serve",
77
"build": "ng build",
8+
"build-prod": "ng build --prod --aot=true",
89
"test": "ng test",
910
"lint": "ng lint",
1011
"e2e": "ng e2e",
11-
"test-headless": "ng test --watch=false --browsers=ChromeHeadless"
12+
"test-headless": "ng test --watch=false --browsers=ChromeHeadless",
13+
"stats": "ng build --prod --stats-json && npx webpack-bundle-analyzer dist/hygieia-ui/stats.json"
1214
},
1315
"private": true,
1416
"dependencies": {

‎pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,13 @@
8686
</configuration>
8787
</execution>
8888
<execution>
89-
<id>npm run-script build</id>
89+
<id>npm run-script build-prod</id>
9090
<goals>
9191
<goal>npm</goal>
9292
</goals>
9393
<!-- Optional configuration which provides for running any npm command -->
9494
<configuration>
95-
<arguments>run-script build</arguments>
95+
<arguments>run-script build-prod</arguments>
9696
</configuration>
9797
</execution>
9898
</executions>

‎src/app/admin_modules/admin_dashboard/admin-dashboard-modules.ts

+3-18
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,12 @@ import { GenerateApiTokensComponent } from './dashboard/admin-dashboard/generate
66
import { FormsModule } from '@angular/forms';
77
import { UserDataService } from './services/user-data.service';
88
import { HttpClientModule, HTTP_INTERCEPTORS } from '@angular/common/http';
9-
import { AdminFilterPipe } from './pipes/filter.pipe';
10-
import { AdminOrderByPipe } from './pipes/order-by.pipe';
11-
import { DashEditComponent } from './dashboard/admin-dashboard/dash-edit/dash-edit.component';
129
import { ManageAdminsComponent } from './dashboard/admin-dashboard/manage-admins/manage-admins.component';
1310
import { EditTokenModalComponent } from './dashboard/admin-dashboard/modal/edit-token-modal/edit-token-modal.component';
1411
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
1512
// tslint:disable-next-line:max-line-length
1613
import { GenerateApiTokenModalComponent } from './dashboard/admin-dashboard/modal/generate-api-token-modal/generate-api-token-modal.component';
1714
import { ReactiveFormsModule } from '@angular/forms';
18-
import { DashTrashComponent } from './dashboard/admin-dashboard/dash-trash/dash-trash.component';
1915
// tslint:disable-next-line:max-line-length
2016
import {CreateOrUpdateFeatureFlagsComponent} from './dashboard/admin-dashboard/modal/create-or-update-feature-flags/create-or-update-feature-flags.component';
2117
import {FeatureFlagsComponent} from './dashboard/admin-dashboard/feature-flags/feature-flags.component';
@@ -29,27 +25,19 @@ import { AdminDashboardService } from './services/dashboard.service';
2925
import { EditDashboardComponent } from './dashboard/admin-dashboard/edit-dashboard/edit-dashboard.component';
3026
import { AuthService } from 'src/app/core/services/auth.service';
3127
import { AuthInterceptor } from 'src/app/core/interceptors/auth.interceptor';
32-
import { EditDashboardModalComponent } from './dashboard/admin-dashboard/modal/edit-dashboard-modal/edit-dashboard-modal.component';
33-
import { AdminDeleteComponent } from './dashboard/admin-dashboard/modal/admin-delete/admin-delete.component';
3428

3529
@NgModule({
3630
declarations: [
3731
AdminDashboardComponent,
3832
GenerateApiTokensComponent,
39-
AdminFilterPipe,
40-
AdminOrderByPipe,
4133
CreateOrUpdateFeatureFlagsComponent,
4234
CreateOrUpdateServiceAccountComponent,
43-
DashEditComponent,
4435
ManageAdminsComponent,
4536
EditTokenModalComponent,
4637
GenerateApiTokenModalComponent,
47-
DashTrashComponent,
4838
FeatureFlagsComponent,
4939
ServiceAccountsComponent,
50-
EditDashboardComponent,
51-
EditDashboardModalComponent,
52-
AdminDeleteComponent
40+
EditDashboardComponent
5341
],
5442

5543
providers: [UserDataService, DashboardDataService, PaginationWrapperService, AdminDashboardService,
@@ -59,25 +47,22 @@ import { AdminDeleteComponent } from './dashboard/admin-dashboard/modal/admin-de
5947
useClass: AuthInterceptor,
6048
multi: true,
6149
}],
62-
6350
imports: [
6451
AdminDashboardRoutingModule,
65-
SharedModule,
6652
CommonModule,
6753
FormsModule,
6854
ReactiveFormsModule,
6955
HttpClientModule,
7056
NgbModule,
7157
ReactiveFormsModule,
58+
SharedModule
7259
],
7360
entryComponents: [
7461
CreateOrUpdateFeatureFlagsComponent,
7562
CreateOrUpdateServiceAccountComponent,
7663
EditTokenModalComponent,
7764
GenerateApiTokenModalComponent,
78-
EditDashboardModalComponent,
79-
AdminDeleteComponent
80-
]
65+
],
8166
})
8267

8368
export class AdminDashboardModule { }

‎src/app/admin_modules/admin_dashboard/dashboard/admin-dashboard/admin-dashboard.component.spec.ts

+1-5
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ import { GenerateApiTokensComponent } from './generate-api-tokens/generate-api-t
44
import { ManageAdminsComponent } from './manage-admins/manage-admins.component';
55
import { FormsModule, ReactiveFormsModule, FormBuilder } from '@angular/forms';
66
import { CommonModule } from '@angular/common';
7-
import { AdminFilterPipe } from '../../pipes/filter.pipe';
8-
import { DashEditComponent } from './dash-edit/dash-edit.component';
9-
import { DashTrashComponent } from './dash-trash/dash-trash.component';
10-
import { AdminOrderByPipe } from '../../pipes/order-by.pipe';
117
import {FeatureFlagsComponent} from './feature-flags/feature-flags.component';
128
import {ServiceAccountsComponent} from './service-accounts/service-accounts.component';
139
import {UserDataService} from '../../services/user-data.service';
@@ -30,7 +26,7 @@ describe('AdminDashboardComponent', () => {
3026
beforeEach(async(() => {
3127
TestBed.configureTestingModule({
3228
declarations: [AdminDashboardComponent, GenerateApiTokensComponent, ManageAdminsComponent, EditDashboardComponent,
33-
AdminOrderByPipe, AdminFilterPipe, DashTrashComponent, DashEditComponent, FeatureFlagsComponent,
29+
FeatureFlagsComponent,
3430
ServiceAccountsComponent ],
3531
imports: [FormsModule, CommonModule, ReactiveFormsModule, SharedModule, HttpClientTestingModule,
3632
RouterTestingModule.withRoutes([]), NbThemeModule.forRoot(), NbEvaIconsModule],

‎src/app/admin_modules/admin_dashboard/dashboard/admin-dashboard/edit-dashboard/edit-dashboard.component.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<div>
22
<div class="widget-modal">
33
<div class="widget-modal-heading">
4-
Rename/Delete Dashboard
4+
Rename/Delete<br><br>Dashboard
55
</div>
66
<div class="widget-modal-body">
77
<div class="row">
@@ -14,7 +14,7 @@
1414

1515
<div class="list-animate">
1616
<div class="dash-modal-row delete-dashboard-row clearfix"
17-
*ngFor="let item of dashboards | adminfilter:{name:searchDashboard} | adminOrderBy: 'name' as filteredDashboards ">
17+
*ngFor="let item of dashboards | generalFilter:{name:searchDashboard} | generalOrderBy: 'name' as filteredDashboards ">
1818
<div title="{{item.name}}" class="btn-block">{{item.name }}
1919
<a (click)="deleteDashboard(item)">
2020
<app-dash-trash class="clickable pull-right"></app-dash-trash>

‎src/app/admin_modules/admin_dashboard/dashboard/admin-dashboard/edit-dashboard/edit-dashboard.component.spec.ts

+4-11
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
22
import { EditDashboardComponent } from './edit-dashboard.component';
3-
import { AdminOrderByPipe } from '../../../pipes/order-by.pipe';
4-
import { AdminFilterPipe } from '../../../pipes/filter.pipe';
53
import { DashboardDataService } from '../../../services/dashboard-data.service';
64
import { CmdbDataService } from '../../../services/cmdb-data.service';
75
import { AdminDashboardService } from '../../../services/dashboard.service';
@@ -10,8 +8,6 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
108
import { CommonModule } from '@angular/common';
119
import { HttpClientTestingModule } from '@angular/common/http/testing';
1210
import { NgModule } from '@angular/core';
13-
import { DashEditComponent } from '../dash-edit/dash-edit.component';
14-
import { DashTrashComponent } from '../dash-trash/dash-trash.component';
1511
import { SharedModule } from 'src/app/shared/shared.module';
1612
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
1713
import { HttpClientModule } from '@angular/common/http';
@@ -20,20 +16,17 @@ import { DashboardItem } from '../model/dashboard-item';
2016
import { UserDataService } from '../../../services/user-data.service';
2117
import { MockDashboardDataService } from '../../../services/mock-dashboard-data.service';
2218
import { MockPaginationWrapperService } from '../../../services/mock-pagination-wrapper.service';
23-
import { EditDashboardModalComponent } from '../modal/edit-dashboard-modal/edit-dashboard-modal.component';
24-
import { AdminDeleteComponent } from '../modal/admin-delete/admin-delete.component';
25-
26-
19+
import { EditDashboardModalComponent } from '../../../../../shared/modals/edit-dashboard-modal/edit-dashboard-modal.component';
20+
import {GeneralDashboardDeleteComponent} from '../../../../../shared/modals/general-dashboard-delete/general-dashboard-delete.component';
2721

2822
@NgModule({
29-
declarations: [EditDashboardComponent, AdminFilterPipe, AdminOrderByPipe,
30-
EditDashboardModalComponent, DashTrashComponent, DashEditComponent, AdminDeleteComponent ],
23+
declarations: [EditDashboardComponent ],
3124
providers: [{ provide: DashboardDataService, useClass: MockDashboardDataService },
3225
CmdbDataService, UserDataService, AdminDashboardService, { provide: PaginationWrapperService, useClass: MockPaginationWrapperService }],
3326
imports: [FormsModule, CommonModule, NgbModule, ReactiveFormsModule, HttpClientTestingModule, SharedModule, HttpClientModule],
3427
entryComponents: [
3528
EditDashboardModalComponent,
36-
AdminDeleteComponent]
29+
GeneralDashboardDeleteComponent]
3730
})
3831
class TestModule { }
3932

‎src/app/admin_modules/admin_dashboard/dashboard/admin-dashboard/edit-dashboard/edit-dashboard.component.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ import { DashboardDataService } from '../../../services/dashboard-data.service';
44
import { IPaginationParams } from 'src/app/shared/interfaces';
55
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
66
import { DashboardItem } from '../model/dashboard-item';
7-
import { EditDashboardModalComponent } from '../modal/edit-dashboard-modal/edit-dashboard-modal.component';
7+
import { EditDashboardModalComponent } from '../../../../../shared/modals/edit-dashboard-modal/edit-dashboard-modal.component';
88
import { forkJoin } from 'rxjs';
9-
import { AdminDeleteComponent } from '../modal/admin-delete/admin-delete.component';
9+
import {GeneralDashboardDeleteComponent} from '../../../../../shared/modals/general-dashboard-delete/general-dashboard-delete.component';
1010

1111
@Component({
1212
selector: 'app-edit-dashboard',
@@ -83,7 +83,7 @@ export class EditDashboardComponent implements OnInit {
8383
}
8484

8585
deleteDashboard(item) {
86-
const modalRef = this.modalService.open(AdminDeleteComponent);
86+
const modalRef = this.modalService.open(GeneralDashboardDeleteComponent);
8787
modalRef.componentInstance.message = `Are you sure you want to delete ${item.name}?`;
8888
modalRef.result.then((newConfig) => {
8989
this.dashboardData.deleteDashboard(item.id).subscribe(response => {

‎src/app/admin_modules/admin_dashboard/dashboard/admin-dashboard/feature-flags/feature-flags.component.html

+24-19
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
1-
<div class = "table-content">
2-
<span class="col-xs-6"><button type="button" class="btn btn-primary btn-wide pull-right" (click)="addNewFeatureFlag()">New</button></span>
3-
<div class="table-heading" *ngFor="let item of this.featureFlags">
4-
<div class="each-result">
5-
<div ng-hide="!ctrl.featureFlags">
6-
<a (click)="deleteFeatureFlag(item?.id)">
7-
<app-dash-trash class="clickable pull-right"></app-dash-trash>
8-
</a>
9-
<app-dash-edit class="clickable pull-right" (click)="editFeatureFlag(item)"></app-dash-edit>
10-
</div>
11-
<h6>Name: {{item?.name}}</h6>
12-
<h6>Description: {{item?.description}}</h6>
13-
<div class="flags">
14-
<h6>Flags: </h6>
15-
<div class="table-row" *ngFor="let currFlag of flagKeys(item?.flags)">
16-
<div class="individual">
17-
<p>{{currFlag}}: {{item?.flags[currFlag]}}</p>
1+
<div>
2+
<div class="widget-modal">
3+
<div class="widget-modal-heading">
4+
Feature Flags
5+
</div>
6+
<div class = "table-content">
7+
<span class="col-xs-6"><button type="button" class="btn btn-primary btn-wide pull-right" (click)="addNewFeatureFlag()">New</button></span>
8+
<div class="table-heading" *ngFor="let item of this.featureFlags">
9+
<div class="each-result">
10+
<div ng-hide="!ctrl.featureFlags">
11+
<a (click)="deleteFeatureFlag(item?.id)">
12+
<app-dash-trash class="clickable pull-right"></app-dash-trash>
13+
</a>
14+
<app-dash-edit class="clickable pull-right" (click)="editFeatureFlag(item)"></app-dash-edit>
15+
</div>
16+
<h6>Name: {{item?.name}}</h6>
17+
<h6>Description: {{item?.description}}</h6>
18+
<div class="flags">
19+
<h6>Flags: </h6>
20+
<div class="table-row" *ngFor="let currFlag of flagKeys(item?.flags)">
21+
<div class="individual">
22+
<p>{{currFlag}}: {{item?.flags[currFlag]}}</p>
23+
</div>
24+
</div>
1825
</div>
1926
</div>
2027
</div>
2128
</div>
22-
</div>
23-
</div>

‎src/app/admin_modules/admin_dashboard/dashboard/admin-dashboard/feature-flags/feature-flags.component.spec.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import {CommonModule} from '@angular/common';
55
import {HttpClientTestingModule} from '@angular/common/http/testing';
66
import {FeatureFlagsComponent} from './feature-flags.component';
77
import {UserDataService} from '../../../services/user-data.service';
8-
import {DashTrashComponent} from '../dash-trash/dash-trash.component';
9-
import {DashEditComponent} from '../dash-edit/dash-edit.component';
8+
import {DashTrashComponent} from '../../../../../shared/dash-trash/dash-trash.component';
9+
import {DashEditComponent} from '../../../../../shared/dash-edit/dash-edit.component';
1010
import {CreateOrUpdateFeatureFlagsComponent} from '../modal/create-or-update-feature-flags/create-or-update-feature-flags.component';
11-
import { AdminDeleteComponent } from '../modal/admin-delete/admin-delete.component';
11+
import {GeneralDashboardDeleteComponent} from '../../../../../shared/modals/general-dashboard-delete/general-dashboard-delete.component';
1212

1313
/*@NgModule({
1414
declarations: [FeatureFlagsComponent, DashEditComponent, DashTrashComponent, AdminDeleteComponent],
@@ -43,7 +43,7 @@ describe('FeatureFlagsComponent', () => {
4343
beforeEach(async(() => {
4444
TestBed.configureTestingModule({
4545
declarations: [ FeatureFlagsComponent, DashTrashComponent, DashEditComponent, CreateOrUpdateFeatureFlagsComponent,
46-
AdminDeleteComponent],
46+
GeneralDashboardDeleteComponent],
4747
providers: [UserDataService, FormBuilder, NgbActiveModal],
4848
imports: [ReactiveFormsModule, NgbModule, FormsModule, CommonModule, HttpClientTestingModule]
4949
})

‎src/app/admin_modules/admin_dashboard/dashboard/admin-dashboard/feature-flags/feature-flags.component.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
22
import { UserDataService } from '../../../services/user-data.service';
33
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
44
import { CreateOrUpdateFeatureFlagsComponent } from '../modal/create-or-update-feature-flags/create-or-update-feature-flags.component';
5-
import { AdminDeleteComponent } from '../modal/admin-delete/admin-delete.component';
5+
import {GeneralDashboardDeleteComponent} from '../../../../../shared/modals/general-dashboard-delete/general-dashboard-delete.component';
66

77
@Component({
88
selector: 'app-feature-flags',
@@ -61,7 +61,7 @@ export class FeatureFlagsComponent implements OnInit {
6161
}
6262

6363
deleteFeatureFlag(id) {
64-
const modalRef = this.modalService.open(AdminDeleteComponent);
64+
const modalRef = this.modalService.open(GeneralDashboardDeleteComponent);
6565
modalRef.componentInstance.title = 'Are you sure you want to delete?';
6666
modalRef.result.then((newConfig) => {
6767
this.userData.deleteFeatureFlags(id).subscribe(response => {

‎src/app/admin_modules/admin_dashboard/dashboard/admin-dashboard/generate-api-tokens/generate-api-tokens.component.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div class="widget-modal">
22
<div class="widget-modal-heading">
3-
Generate Api Tokens
3+
Generate<br><br>Api Tokens
44
</div>
55
<div class="widget-modal-body">
66
<div class="row">
@@ -26,7 +26,7 @@ <h3>Expiration Date</h3>
2626
<input type="text" class="form-control" id="tokenSearch" placeholder="Filter Api Users"
2727
[(ngModel)]="tokenSearch">
2828
<div class="dash-modal-row delete-dashboard-row clearfix" style="font-size: 20px;"
29-
*ngFor="let apitoken of apitokens | adminfilter:{apiUser:tokenSearch} | adminOrderBy:'apiUser'">
29+
*ngFor="let apitoken of apitokens | generalFilter:{apiUser:tokenSearch} | generalOrderBy:'apiUser'">
3030
<div class="btn-block1 row">
3131
<span class="col-md-3">{{apitoken.apiUser}}</span>
3232
<span class="col-md-3">{{apitoken.expirationDt | date:'MM/dd/yyyy HH:mm:ss'}}</span>
@@ -47,4 +47,4 @@ <h3>Expiration Date</h3>
4747
</div>
4848
</div>
4949
</div>
50-
</div>
50+
</div>

‎src/app/admin_modules/admin_dashboard/dashboard/admin-dashboard/generate-api-tokens/generate-api-tokens.component.spec.ts

+9-9
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,31 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
22

33
import { GenerateApiTokensComponent } from './generate-api-tokens.component';
44
import { EditTokenModalComponent } from '../modal/edit-token-modal/edit-token-modal.component';
5-
import { DashEditComponent } from '../dash-edit/dash-edit.component';
6-
import { DashTrashComponent } from '../dash-trash/dash-trash.component';
5+
import { DashEditComponent } from '../../../../../shared/dash-edit/dash-edit.component';
6+
import { DashTrashComponent } from '../../../../../shared/dash-trash/dash-trash.component';
77
import { GenerateApiTokenModalComponent } from '../modal/generate-api-token-modal/generate-api-token-modal.component';
88
import { UserDataService } from '../../../services/user-data.service';
99
import { NgbModal, NgbModule } from '@ng-bootstrap/ng-bootstrap';
1010
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
1111
import { CommonModule } from '@angular/common';
12-
import { AdminFilterPipe } from '../../../pipes/filter.pipe';
1312
import { HttpClientTestingModule } from '@angular/common/http/testing';
1413
import { API_TOKEN_LIST } from '../../../services/user-data.service.mockdata';
1514
import { NgModule } from '@angular/core';
16-
import { AdminOrderByPipe } from '../../../pipes/order-by.pipe';
17-
import { AdminDeleteComponent } from '../modal/admin-delete/admin-delete.component';
15+
import {GeneralOrderByPipe} from '../../../../../shared/pipes/order-by.pipe';
16+
import {GeneralFilterPipe} from '../../../../../shared/pipes/filter.pipe';
17+
import {GeneralDashboardDeleteComponent} from '../../../../../shared/modals/general-dashboard-delete/general-dashboard-delete.component';
1818

1919
@NgModule({
20-
declarations: [GenerateApiTokensComponent, DashEditComponent, DashTrashComponent, AdminFilterPipe,
21-
AdminOrderByPipe, EditTokenModalComponent,
20+
declarations: [GenerateApiTokensComponent, DashEditComponent, DashTrashComponent, GeneralFilterPipe,
21+
GeneralOrderByPipe, EditTokenModalComponent,
2222
GenerateApiTokenModalComponent,
23-
AdminDeleteComponent],
23+
GeneralDashboardDeleteComponent],
2424
providers: [UserDataService, NgbModal],
2525
imports: [FormsModule, CommonModule, ReactiveFormsModule, NgbModule, HttpClientTestingModule],
2626
entryComponents: [
2727
EditTokenModalComponent,
2828
GenerateApiTokenModalComponent,
29-
AdminDeleteComponent
29+
GeneralDashboardDeleteComponent
3030
]
3131
})
3232
class TestModule { }

0 commit comments

Comments
 (0)