Merge branch 'develop' into fix-conf

cloudera · Dec 31, 2024 · 76e8bc3 · 76e8bc3
2 parents 8f71306 + e1f289b
commit 76e8bc3
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/...arser-chains-client/src/app/chain-add-parser-page/chain-add-parser-page.component.spec.ts b/...arser-chains-client/src/app/chain-add-parser-page/chain-add-parser-page.component.spec.ts
@@ -96,7 +96,7 @@ describe('ChainAddParserPageComponent', () => {
             ]
           }),
         {provide: ActivatedRoute, useValue: {params: of({id: testChain.id, chainId: testChain.name})}},
-        {provide: Router, useValue: jasmine.createSpyObj('Router', ['navigateByUrl'])}
+        {provide: Router, useValue: jasmine.createSpyObj('Router', ['navigate'])}
       ]
     })
       .compileComponents();
@@ -122,7 +122,7 @@ describe('ChainAddParserPageComponent', () => {
 
   it('should dispatch AddParserAction with subchain if exist', fakeAsync(() => {
     const dispatchSpy = spyOn(store, 'dispatch').and.callThrough();
-    routerSpy.navigateByUrl = jasmine.createSpy('navigateByUrl').and.callThrough();
+    routerSpy.navigate = jasmine.createSpy('navigate').and.callThrough();
     const expectChainId = 'fooTestChain';
     const expectSubchainId = "testSubchainId";
 
@@ -151,7 +151,7 @@ describe('ChainAddParserPageComponent', () => {
         parser: expectedParser
       })
     );
-    expect(routerSpy.navigateByUrl).toHaveBeenCalledWith(`/parserconfig/chains/${expectChainId}`);
+    expect(routerSpy.navigate).toHaveBeenCalledWith([`/parserconfig/chains/${expectChainId}`, {}], {queryParams: {pipeline: undefined}});
     flush();
   }));
 });
diff --git a/...end/parser-chains-client/src/app/chain-add-parser-page/chain-add-parser-page.component.ts b/...end/parser-chains-client/src/app/chain-add-parser-page/chain-add-parser-page.component.ts
@@ -70,7 +70,8 @@ export class ChainAddParserPageComponent implements OnInit, OnDestroy {
       parser
     }));
 
-    this._router.navigateByUrl(`/parserconfig/chains/${this.chainId}`);
+    const queryParams = {pipeline: this.currentPipeline}
+    this._router.navigate([`/parserconfig/chains/${this.chainId}`, {}], {queryParams});
   }
 
   ngOnInit() {

diff --git a/...s-config-service/frontend/parser-chains-client/src/app/chain-page/chain-page.component.ts b/...s-config-service/frontend/parser-chains-client/src/app/chain-page/chain-page.component.ts
@@ -238,9 +238,10 @@ export class ChainPageComponent implements OnInit, OnDestroy, DeactivatePrevente
 
   onAddParserClick(event: Event) {
     event.preventDefault();
-    const routeParams = this.breadcrumbs.length > 1
+    const routeParams: {subchain?: string, pipeline?: string} = this.breadcrumbs.length > 1
       ? { subchain: this.breadcrumbs[this.breadcrumbs.length - 1].id }
       : {};
+    routeParams.pipeline = this.currentPipeline
     this._router.navigate([`/parserconfig/chains/${this.chainId}/new`, routeParams]);
   }
 

diff --git a/...fig-service/src/main/java/com/cloudera/parserchains/queryservice/service/OcsfService.java b/...fig-service/src/main/java/com/cloudera/parserchains/queryservice/service/OcsfService.java
@@ -39,7 +39,11 @@ private byte[] readLocalFilePath(String fileName) {
                 String[] parts = uri.toString().split("!");
                 URI jarUri = URI.create(parts[0]);
                 try (FileSystem fs = FileSystems.newFileSystem(jarUri, Collections.emptyMap())) {
-                    return Files.readAllBytes(fs.getPath(parts[1]));
+                    StringBuilder filePathInsideJarBuilder = new StringBuilder();
+                    for (int i = 1; i < parts.length; i++) {
+                        filePathInsideJarBuilder.append(parts[i]);
+                    }
+                    return Files.readAllBytes(fs.getPath(filePathInsideJarBuilder.toString()));
                 } catch (IOException e) {
                     throw new RuntimeException(e);
                 }