Skip to content

Commit 67d5ef9

Browse files
authored
FOGL-7291: Wizard flow for adding plugins based on groups (#245)
* show group based config in add or update service, task notification, filter pages * Revamp show configuration on different pages * Different property files upload fix for script
1 parent f8f0264 commit 67d5ef9

File tree

44 files changed

+2278
-1987
lines changed

Some content is hidden

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

44 files changed

+2278
-1987
lines changed

src/app/app.module.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ import { SharedModule } from './shared.module';
4545
import { ProgressBarComponent } from './components/common/progress-bar/progress-bar.component';
4646
import { ProgressBarService } from './services/progress-bar.service';
4747
import { DashboardModule } from './components/core/dashboard/dashboard.module';
48-
import { ValidateFormService } from './services/validate-form.service';
4948
import { Router } from '@angular/router';
5049
import { LogsModule } from './components/core/logs/logs.module';
5150

@@ -133,7 +132,6 @@ export function pingServiceFactory(ping: PingService, sharedService: SharedServi
133132
NorthService,
134133
SchedulesService,
135134
ProgressBarService,
136-
ValidateFormService,
137135
UserService,
138136
{
139137
provide: HTTP_INTERCEPTORS,

src/app/components/core/configuration-manager/config-children/config-children.component.html

Lines changed: 0 additions & 45 deletions
This file was deleted.

src/app/components/core/configuration-manager/config-children/config-children.component.spec.ts

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/app/components/core/configuration-manager/config-children/config-children.component.ts

Lines changed: 0 additions & 116 deletions
This file was deleted.
File renamed without changes.
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
<div class="tabs is-boxed" *ngIf="from !== 'config-manager'">
2+
<ul>
3+
<li *ngFor="let g of groups" [ngClass]="{'is-active': selectedGroup == g.group}">
4+
<h6 class="is-6 has-text-weight-semibold">
5+
<a (click)="selectTab(g.group)">
6+
{{g.group}}
7+
</a>
8+
</h6>
9+
</li>
10+
<ng-container *ngIf="from !== 'notification'">
11+
<li [ngClass]="{'is-active': selectedGroup == 'developer'}"
12+
*ngIf="developerFeaturesService.getDeveloperFeatureControl() && pages.includes(from) && rolesService.hasEditPermissions()">
13+
<h6 class="is-6 has-text-weight-semibold">
14+
<a (click)="selectedGroup = 'developer'">Developer</a>
15+
</h6>
16+
</li>
17+
</ng-container>
18+
</ul>
19+
</div>
20+
<div [ngClass]="{'highlight': from !== 'config-manager'}">
21+
<ng-container *ngFor="let g of groups">
22+
<ng-container *ngIf="g.category == category?.name+'Advanced'; else SecurityGroup">
23+
<app-show-configuration [hidden]="selectedGroup !== g.group" [groupConfiguration]="g.config" [group]="g.group"
24+
[selectedGroup]="selectedGroup" [fullConfiguration]="g.config" (event)="getChangedAdvanceConfiguration($event)"
25+
(formStatusEvent)="formStatus($event)"></app-show-configuration>
26+
</ng-container>
27+
<ng-template #SecurityGroup>
28+
<ng-container *ngIf="g.category == category?.name+'Security'; else pluginGroup">
29+
<app-show-configuration [hidden]="selectedGroup !== g.group" [groupConfiguration]="g.config" [group]="g.group"
30+
[selectedGroup]="selectedGroup" [fullConfiguration]="g.config"
31+
(event)="getChangedSecurityConfiguration($event)"
32+
(formStatusEvent)="formStatus($event)"></app-show-configuration>
33+
</ng-container>
34+
</ng-template>
35+
<ng-template #pluginGroup>
36+
<app-show-configuration [hidden]="selectedGroup !== g.group" [groupConfiguration]="g.config" [group]="g.group"
37+
[selectedGroup]="selectedGroup" [fullConfiguration]="category.config" (event)="getChangedConfiguration($event)"
38+
(formStatusEvent)="formStatus($event)"></app-show-configuration>
39+
</ng-template>
40+
</ng-container>
41+
<ng-container *ngIf="from !== 'notification'">
42+
<app-plugin-persist-data *ngIf="selectedGroup == 'developer' && pages.includes(from)" [serviceStaus]="serviceStatus"
43+
[serviceName]="category?.name" [pluginName]="plugin">
44+
</app-plugin-persist-data>
45+
</ng-container>
46+
47+
</div>
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import { ComponentFixture, TestBed } from '@angular/core/testing';
2+
3+
import { ConfigurationGroupComponent } from './configuration-group.component';
4+
5+
describe('ConfigurationGroupComponent', () => {
6+
let component: ConfigurationGroupComponent;
7+
let fixture: ComponentFixture<ConfigurationGroupComponent>;
8+
9+
beforeEach(async () => {
10+
await TestBed.configureTestingModule({
11+
declarations: [ ConfigurationGroupComponent ]
12+
})
13+
.compileComponents();
14+
});
15+
16+
beforeEach(() => {
17+
fixture = TestBed.createComponent(ConfigurationGroupComponent);
18+
component = fixture.componentInstance;
19+
fixture.detectChanges();
20+
});
21+
22+
it('should create', () => {
23+
expect(component).toBeTruthy();
24+
});
25+
});

0 commit comments

Comments
 (0)