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

Commit 7dd398b

Browse files
Courtneyp123Courtneyp123
authored
Merge pull request #124 from Hygieia/revert-123-master
Revert "edit dashboard from main page with deletes"
2 parents 127b6e8 + b22bc03 commit 7dd398b

File tree

66 files changed

+1093
-1177
lines changed

Some content is hidden

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

66 files changed

+1093
-1177
lines changed

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

+20-4
Original file line numberDiff line numberDiff line change
@@ -4,41 +4,55 @@ import { AdminDashboardComponent } from './dashboard/admin-dashboard/admin-dashb
44
import { CommonModule } from '@angular/common';
55
import { GenerateApiTokensComponent } from './dashboard/admin-dashboard/generate-api-tokens/generate-api-tokens.component';
66
import { FormsModule } from '@angular/forms';
7+
import { UserDataService } from './services/user-data.service';
78
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';
812
import { ManageAdminsComponent } from './dashboard/admin-dashboard/manage-admins/manage-admins.component';
913
import { EditTokenModalComponent } from './dashboard/admin-dashboard/modal/edit-token-modal/edit-token-modal.component';
1014
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
1115
// tslint:disable-next-line:max-line-length
1216
import { GenerateApiTokenModalComponent } from './dashboard/admin-dashboard/modal/generate-api-token-modal/generate-api-token-modal.component';
1317
import { ReactiveFormsModule } from '@angular/forms';
18+
import { DashTrashComponent } from './dashboard/admin-dashboard/dash-trash/dash-trash.component';
1419
// tslint:disable-next-line:max-line-length
1520
import {CreateOrUpdateFeatureFlagsComponent} from './dashboard/admin-dashboard/modal/create-or-update-feature-flags/create-or-update-feature-flags.component';
1621
import {FeatureFlagsComponent} from './dashboard/admin-dashboard/feature-flags/feature-flags.component';
1722
import {SharedModule} from '../../shared/shared.module';
1823
import {ServiceAccountsComponent} from './dashboard/admin-dashboard/service-accounts/service-accounts.component';
1924
// tslint:disable-next-line:max-line-length
2025
import {CreateOrUpdateServiceAccountComponent} from './dashboard/admin-dashboard/modal/create-or-update-service-account/create-or-update-service-account.component';
26+
import { DashboardDataService } from './services/dashboard-data.service';
2127
import { PaginationWrapperService } from './services/pagination-wrapper.service';
22-
import { AdminDashboardService } from '../../shared/services/dashboard.service';
28+
import { AdminDashboardService } from './services/dashboard.service';
2329
import { EditDashboardComponent } from './dashboard/admin-dashboard/edit-dashboard/edit-dashboard.component';
2430
import { AuthService } from 'src/app/core/services/auth.service';
2531
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';
2634

2735
@NgModule({
2836
declarations: [
2937
AdminDashboardComponent,
3038
GenerateApiTokensComponent,
39+
AdminFilterPipe,
40+
AdminOrderByPipe,
3141
CreateOrUpdateFeatureFlagsComponent,
3242
CreateOrUpdateServiceAccountComponent,
43+
DashEditComponent,
3344
ManageAdminsComponent,
3445
EditTokenModalComponent,
3546
GenerateApiTokenModalComponent,
47+
DashTrashComponent,
3648
FeatureFlagsComponent,
3749
ServiceAccountsComponent,
38-
EditDashboardComponent
50+
EditDashboardComponent,
51+
EditDashboardModalComponent,
52+
AdminDeleteComponent
3953
],
4054

41-
providers: [PaginationWrapperService, AdminDashboardService,
55+
providers: [UserDataService, DashboardDataService, PaginationWrapperService, AdminDashboardService,
4256
AuthService,
4357
{
4458
provide: HTTP_INTERCEPTORS,
@@ -60,7 +74,9 @@ import { AuthInterceptor } from 'src/app/core/interceptors/auth.interceptor';
6074
CreateOrUpdateFeatureFlagsComponent,
6175
CreateOrUpdateServiceAccountComponent,
6276
EditTokenModalComponent,
63-
GenerateApiTokenModalComponent
77+
GenerateApiTokenModalComponent,
78+
EditDashboardModalComponent,
79+
AdminDeleteComponent
6480
]
6581
})
6682

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

+42-41
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,46 @@
11
<div id="admin">
2-
<div class="col-md-2 dash">
3-
<ul class="nav nav-pills flex-column dash-nav">
4-
<li class="nav-item"><a class="nav-link" [ngClass]="{active:tab === 'editDashboards'}"
5-
(click)="navigateToTab('editDashboards')">Edit
6-
Dashboards</a></li>
7-
<li class="nav-item"><a class="nav-link" [ngClass]="{active:tab === 'users'}"
8-
(click)="navigateToTab('users')">Manage
9-
Admins</a></li>
10-
<li class="nav-item"><a class="nav-link" [ngClass]="{active:tab === 'apitokens'}"
11-
(click)="navigateToTab('apitokens')">Generate
12-
ApiTokens</a></li>
13-
<li class="nav-item"><a class="nav-link" [ngClass]="{active:tab === 'auditconfig'}"
14-
(click)="navigateToTab('auditconfig')">Audit
15-
Configurations</a></li>
16-
<li class="nav-item"><a class="nav-link" [ngClass]="{active:tab === 'featureflags'}"
17-
(click)="navigateToTab('featureflags')">Feature Flags</a></li>
18-
</ul>
2+
<div class="col-md-2 dash">
3+
<ul class="nav nav-pills flex-column dash-nav">
4+
<li class="nav-item"><a class="nav-link" [ngClass]="{active:tab === 'editDashboards'}"
5+
(click)="navigateToTab('editDashboards')">Edit
6+
Dashboards</a></li>
7+
<li class="nav-item"><a class="nav-link" [ngClass]="{active:tab === 'users'}"
8+
(click)="navigateToTab('users')">Manage
9+
Admins</a></li>
10+
<li class="nav-item"><a class="nav-link" [ngClass]="{active:tab === 'apitokens'}"
11+
(click)="navigateToTab('apitokens')">Generate
12+
ApiTokens</a></li>
13+
<li class="nav-item"><a class="nav-link" [ngClass]="{active:tab === 'auditconfig'}"
14+
(click)="navigateToTab('auditconfig')">Audit
15+
Configurations</a></li>
16+
<li class="nav-item"><a class="nav-link" [ngClass]="{active:tab === 'featureflags'}"
17+
(click)="navigateToTab('featureflags')">Feature Flags</a></li>
18+
</ul>
1919

20-
</div>
20+
</div>
21+
22+
<div class="container-fluid">
23+
<div class="col-md-9 dashcon">
24+
<div *ngIf="tab === 'editDashboards'">
25+
<app-edit-dashboard></app-edit-dashboard>
26+
</div>
27+
<div *ngIf="tab === 'templates'">
28+
</div>
29+
<div *ngIf="tab === 'users'">
30+
<app-manage-admins></app-manage-admins>
31+
</div>
32+
<div *ngIf="tab === 'apitokens'">
33+
<app-generate-tokens></app-generate-tokens>
34+
</div>
35+
<div *ngIf="tab === 'configurations'">
36+
</div>
37+
<div *ngIf="tab === 'auditconfig'">
38+
<app-service-accounts></app-service-accounts>
39+
</div>
40+
<div *ngIf="tab === 'featureflags'">
41+
<app-feature-flags></app-feature-flags>
42+
</div>
43+
</div>
44+
</div>
2145

22-
<div class="container-fluid">
23-
<div class="col-md-9 dashcon">
24-
<div *ngIf="tab === 'editDashboards'">
25-
<app-edit-dashboard></app-edit-dashboard>
26-
</div>
27-
<div *ngIf="tab === 'templates'">
28-
</div>
29-
<div *ngIf="tab === 'users'">
30-
<app-manage-admins></app-manage-admins>
31-
</div>
32-
<div *ngIf="tab === 'apitokens'">
33-
<app-generate-tokens></app-generate-tokens>
34-
</div>
35-
<div *ngIf="tab === 'configurations'">
36-
</div>
37-
<div *ngIf="tab === 'auditconfig'">
38-
<app-service-accounts></app-service-accounts>
39-
</div>
40-
<div *ngIf="tab === 'featureflags'">
41-
<app-feature-flags></app-feature-flags>
42-
</div>
43-
</div>
44-
</div>
4546
</div>

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

+33-28
Original file line numberDiff line numberDiff line change
@@ -4,47 +4,52 @@ 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';
711
import {FeatureFlagsComponent} from './feature-flags/feature-flags.component';
812
import {ServiceAccountsComponent} from './service-accounts/service-accounts.component';
13+
import {UserDataService} from '../../services/user-data.service';
914
import { NgbActiveModal} from '@ng-bootstrap/ng-bootstrap';
10-
import { DashboardDataService } from '../../../../shared/services/dashboard-data.service';
11-
import { CmdbDataService } from '../../../../shared/services/cmdb-data.service';
12-
import { AdminDashboardService } from '../../../../shared/services/dashboard.service';
15+
import { EditDashboardComponent } from './edit-dashboard/edit-dashboard.component';
16+
import { DashboardDataService } from '../../services/dashboard-data.service';
17+
import { CmdbDataService } from '../../services/cmdb-data.service';
18+
import { AdminDashboardService } from '../../services/dashboard.service';
1319
import { PaginationWrapperService } from '../../services/pagination-wrapper.service';
1420
import { SharedModule } from 'src/app/shared/shared.module';
1521
import { HttpClientTestingModule } from '@angular/common/http/testing';
1622
import { RouterTestingModule } from '@angular/router/testing';
1723
import {NbThemeModule} from '@nebular/theme';
1824
import {CUSTOM_ELEMENTS_SCHEMA} from '@angular/core';
1925
import {NbEvaIconsModule} from '@nebular/eva-icons';
20-
import {UserDataService} from '../../../../shared/services/user-data.service';
2126

2227
describe('AdminDashboardComponent', () => {
23-
let component: AdminDashboardComponent;
24-
let fixture: ComponentFixture<AdminDashboardComponent>;
25-
beforeEach(async(() => {
26-
TestBed.configureTestingModule({
27-
declarations: [AdminDashboardComponent, GenerateApiTokensComponent, ManageAdminsComponent,
28-
FeatureFlagsComponent,
29-
ServiceAccountsComponent ],
30-
imports: [FormsModule, CommonModule, ReactiveFormsModule, SharedModule, HttpClientTestingModule,
31-
RouterTestingModule.withRoutes([]), NbThemeModule.forRoot(), NbEvaIconsModule],
32-
providers: [DashboardDataService,
33-
CmdbDataService,
34-
AdminDashboardService,
35-
PaginationWrapperService, FormBuilder, NgbActiveModal, UserDataService],
36-
schemas: [CUSTOM_ELEMENTS_SCHEMA]
37-
})
38-
.compileComponents();
28+
let component: AdminDashboardComponent;
29+
let fixture: ComponentFixture<AdminDashboardComponent>;
30+
beforeEach(async(() => {
31+
TestBed.configureTestingModule({
32+
declarations: [AdminDashboardComponent, GenerateApiTokensComponent, ManageAdminsComponent, EditDashboardComponent,
33+
AdminOrderByPipe, AdminFilterPipe, DashTrashComponent, DashEditComponent, FeatureFlagsComponent,
34+
ServiceAccountsComponent ],
35+
imports: [FormsModule, CommonModule, ReactiveFormsModule, SharedModule, HttpClientTestingModule,
36+
RouterTestingModule.withRoutes([]), NbThemeModule.forRoot(), NbEvaIconsModule],
37+
providers: [DashboardDataService,
38+
CmdbDataService,
39+
AdminDashboardService,
40+
PaginationWrapperService, FormBuilder, NgbActiveModal, UserDataService ],
41+
schemas: [CUSTOM_ELEMENTS_SCHEMA]
42+
})
43+
.compileComponents();
3944
}));
4045

41-
beforeEach(() => {
42-
fixture = TestBed.createComponent(AdminDashboardComponent);
43-
component = fixture.componentInstance;
44-
fixture.detectChanges();
45-
});
46+
beforeEach(() => {
47+
fixture = TestBed.createComponent(AdminDashboardComponent);
48+
component = fixture.componentInstance;
49+
fixture.detectChanges();
50+
});
4651

47-
it('should create', () => {
48-
expect(component).toBeTruthy();
49-
});
52+
it('should create', () => {
53+
expect(component).toBeTruthy();
54+
});
5055
});

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

File renamed without changes.

‎src/app/shared/dash-edit/dash-edit.component.scss ‎src/app/admin_modules/admin_dashboard/dashboard/admin-dashboard/dash-edit/dash-edit.component.scss

File renamed without changes.

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

File renamed without changes.

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

File renamed without changes.

‎src/app/shared/dash-trash/dash-trash.component.html ‎src/app/admin_modules/admin_dashboard/dashboard/admin-dashboard/dash-trash/dash-trash.component.html

File renamed without changes.

‎src/app/shared/dash-trash/dash-trash.component.scss ‎src/app/admin_modules/admin_dashboard/dashboard/admin-dashboard/dash-trash/dash-trash.component.scss

File renamed without changes.

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

File renamed without changes.

‎src/app/shared/dash-trash/dash-trash.component.ts ‎src/app/admin_modules/admin_dashboard/dashboard/admin-dashboard/dash-trash/dash-trash.component.ts

File renamed without changes.

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

+21-6
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,39 @@
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';
5+
import { DashboardDataService } from '../../../services/dashboard-data.service';
6+
import { CmdbDataService } from '../../../services/cmdb-data.service';
37
import { AdminDashboardService } from '../../../services/dashboard.service';
48
import { PaginationWrapperService } from '../../../services/pagination-wrapper.service';
59
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
610
import { CommonModule } from '@angular/common';
711
import { HttpClientTestingModule } from '@angular/common/http/testing';
812
import { NgModule } from '@angular/core';
13+
import { DashEditComponent } from '../dash-edit/dash-edit.component';
14+
import { DashTrashComponent } from '../dash-trash/dash-trash.component';
915
import { SharedModule } from 'src/app/shared/shared.module';
1016
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
1117
import { HttpClientModule } from '@angular/common/http';
18+
import { DASHBOARDITEM } from '../../../services/user-data.service.mockdata';
19+
import { DashboardItem } from '../model/dashboard-item';
20+
import { UserDataService } from '../../../services/user-data.service';
1221
import { MockDashboardDataService } from '../../../services/mock-dashboard-data.service';
1322
import { MockPaginationWrapperService } from '../../../services/mock-pagination-wrapper.service';
14-
import {DASHBOARDITEM} from '../../../../../shared/services/user-data.service.mockdata';
15-
import {DashboardItem} from '../../../../../shared/model/dashboard-item';
16-
import {DashboardDataService} from '../../../../../shared/services/dashboard-data.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+
1727

1828
@NgModule({
19-
declarations: [EditDashboardComponent],
29+
declarations: [EditDashboardComponent, AdminFilterPipe, AdminOrderByPipe,
30+
EditDashboardModalComponent, DashTrashComponent, DashEditComponent, AdminDeleteComponent ],
2031
providers: [{ provide: DashboardDataService, useClass: MockDashboardDataService },
21-
AdminDashboardService, { provide: PaginationWrapperService, useClass: MockPaginationWrapperService }],
32+
CmdbDataService, UserDataService, AdminDashboardService, { provide: PaginationWrapperService, useClass: MockPaginationWrapperService }],
2233
imports: [FormsModule, CommonModule, NgbModule, ReactiveFormsModule, HttpClientTestingModule, SharedModule, HttpClientModule],
23-
entryComponents: []
34+
entryComponents: [
35+
EditDashboardModalComponent,
36+
AdminDeleteComponent]
2437
})
2538
class TestModule { }
2639

@@ -58,3 +71,5 @@ describe('EditDashboardComponent', () => {
5871
});
5972

6073
});
74+
75+

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

+11-10
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { Component, OnInit, Input } from '@angular/core';
22
import { PaginationWrapperService } from '../../../services/pagination-wrapper.service';
3-
import { DashboardDataService } from '../../../../../shared/services/dashboard-data.service';
3+
import { DashboardDataService } from '../../../services/dashboard-data.service';
44
import { IPaginationParams } from 'src/app/shared/interfaces';
55
import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
6-
import { DashboardItem } from '../../../../../shared/model/dashboard-item';
7-
import { EditDashboardModalComponent } from '../../../../../shared/modals/edit-dashboard-modal/edit-dashboard-modal.component';
6+
import { DashboardItem } from '../model/dashboard-item';
7+
import { EditDashboardModalComponent } from '../modal/edit-dashboard-modal/edit-dashboard-modal.component';
88
import { forkJoin } from 'rxjs';
9-
import {GeneralDeleteComponent} from '../../../../../shared/modals/general-delete/general-delete.component';
9+
import { AdminDeleteComponent } from '../modal/admin-delete/admin-delete.component';
1010

1111
@Component({
1212
selector: 'app-edit-dashboard',
@@ -19,6 +19,7 @@ export class EditDashboardComponent implements OnInit {
1919
dashboards: any = [];
2020
page: PaginationWrapperService;
2121
@Input() dashboardItem: any;
22+
pageSize = 10;
2223
searchDashboard = '';
2324

2425
constructor(private dashboardData: DashboardDataService, private paginationWrapperService: PaginationWrapperService,
@@ -65,7 +66,6 @@ export class EditDashboardComponent implements OnInit {
6566
this.loadData();
6667
}).catch((error) => {
6768
this.loadData();
68-
console.log('edit error newConfig :' + error);
6969
});
7070

7171
}
@@ -83,8 +83,8 @@ export class EditDashboardComponent implements OnInit {
8383
}
8484

8585
deleteDashboard(item) {
86-
const modalRef = this.modalService.open(GeneralDeleteComponent);
87-
modalRef.componentInstance.title = `Are you sure you want to delete ${item.name}?`;
86+
const modalRef = this.modalService.open(AdminDeleteComponent);
87+
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 => {
9090
this.loadData();
@@ -97,8 +97,9 @@ export class EditDashboardComponent implements OnInit {
9797
filterByTitle(title) {
9898
const promises = this.paginationWrapperService.filterByTitle(title, this.dashboardType);
9999
forkJoin(promises).subscribe((response: any) => {
100-
this.dashboards = this.paginationWrapperService.getDashboards();
101-
this.totalItems = this.paginationWrapperService.getTotalItems();
100+
this.dashboards = this.paginationWrapperService.getDashboards();
101+
this.totalItems = this.paginationWrapperService.getTotalItems();
102102
});
103-
}
103+
}
104+
104105
}

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ import {FormBuilder, FormsModule, ReactiveFormsModule} from '@angular/forms';
44
import {CommonModule} from '@angular/common';
55
import {HttpClientTestingModule} from '@angular/common/http/testing';
66
import {FeatureFlagsComponent} from './feature-flags.component';
7+
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';
710
import {CreateOrUpdateFeatureFlagsComponent} from '../modal/create-or-update-feature-flags/create-or-update-feature-flags.component';
8-
import {DashTrashComponent} from '../../../../../shared/dash-trash/dash-trash.component';
9-
import {DashEditComponent} from '../../../../../shared/dash-edit/dash-edit.component';
10-
import {GeneralDeleteComponent} from '../../../../../shared/modals/general-delete/general-delete.component';
11-
import {UserDataService} from '../../../../../shared/services/user-data.service';
11+
import { AdminDeleteComponent } from '../modal/admin-delete/admin-delete.component';
1212

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

0 commit comments

Comments
 (0)