Skip to content

Commit b8be254

Browse files
Fix for UI new parser pipeline persistence (#93)
* fix for new parser pipeline persistence * tests fix
1 parent 635bafa commit b8be254

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-add-parser-page/chain-add-parser-page.component.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ describe('ChainAddParserPageComponent', () => {
9696
]
9797
}),
9898
{provide: ActivatedRoute, useValue: {params: of({id: testChain.id, chainId: testChain.name})}},
99-
{provide: Router, useValue: jasmine.createSpyObj('Router', ['navigateByUrl'])}
99+
{provide: Router, useValue: jasmine.createSpyObj('Router', ['navigate'])}
100100
]
101101
})
102102
.compileComponents();
@@ -122,7 +122,7 @@ describe('ChainAddParserPageComponent', () => {
122122

123123
it('should dispatch AddParserAction with subchain if exist', fakeAsync(() => {
124124
const dispatchSpy = spyOn(store, 'dispatch').and.callThrough();
125-
routerSpy.navigateByUrl = jasmine.createSpy('navigateByUrl').and.callThrough();
125+
routerSpy.navigate = jasmine.createSpy('navigate').and.callThrough();
126126
const expectChainId = 'fooTestChain';
127127
const expectSubchainId = "testSubchainId";
128128

@@ -151,7 +151,7 @@ describe('ChainAddParserPageComponent', () => {
151151
parser: expectedParser
152152
})
153153
);
154-
expect(routerSpy.navigateByUrl).toHaveBeenCalledWith(`/parserconfig/chains/${expectChainId}`);
154+
expect(routerSpy.navigate).toHaveBeenCalledWith([`/parserconfig/chains/${expectChainId}`, {}], {queryParams: {pipeline: undefined}});
155155
flush();
156156
}));
157157
});

flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-add-parser-page/chain-add-parser-page.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ export class ChainAddParserPageComponent implements OnInit, OnDestroy {
7070
parser
7171
}));
7272

73-
this._router.navigateByUrl(`/parserconfig/chains/${this.chainId}`);
73+
const queryParams = {pipeline: this.currentPipeline}
74+
this._router.navigate([`/parserconfig/chains/${this.chainId}`, {}], {queryParams});
7475
}
7576

7677
ngOnInit() {

flink-cyber/metron-parser-chain/parser-chains-config-service/frontend/parser-chains-client/src/app/chain-page/chain-page.component.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,9 +238,10 @@ export class ChainPageComponent implements OnInit, OnDestroy, DeactivatePrevente
238238

239239
onAddParserClick(event: Event) {
240240
event.preventDefault();
241-
const routeParams = this.breadcrumbs.length > 1
241+
const routeParams: {subchain?: string, pipeline?: string} = this.breadcrumbs.length > 1
242242
? { subchain: this.breadcrumbs[this.breadcrumbs.length - 1].id }
243243
: {};
244+
routeParams.pipeline = this.currentPipeline
244245
this._router.navigate([`/parserconfig/chains/${this.chainId}/new`, routeParams]);
245246
}
246247

0 commit comments

Comments
 (0)