Pick settings from multiplying architecture at init for the catalog

url part of KaotoIO#1204 Signed-off-by: Aurélien Pupier <apupier@redhat.com>
igarashitm · Jul 4, 2024 · d9986e8 · d9986e8
1 parent 5a8598c
commit d9986e8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/packages/ui/src/multiplying-architecture/KaotoEditorApp.tsx b/packages/ui/src/multiplying-architecture/KaotoEditorApp.tsx
@@ -13,21 +13,19 @@ import { SourceCodeProvider } from '../providers/source-code.provider';
 import { KaotoBridge } from './KaotoBridge';
 import { KaotoEditor } from './KaotoEditor';
 import { KaotoEditorChannelApi } from './KaotoEditorChannelApi';
-import { CatalogSchemaLoader } from '../utils';
 
 export class KaotoEditorApp implements Editor {
   private readonly editorRef: RefObject<EditorApi>;
-  private readonly catalogUrl: string;
   af_isReact = true;
   af_componentId = 'kaoto-editor';
   af_componentTitle = 'Kaoto Editor';
 
   constructor(
     private readonly envelopeContext: KogitoEditorEnvelopeContextType<KaotoEditorChannelApi>,
     private readonly initArgs: EditorInitArgs,
+    private readonly catalogUrl: string,
   ) {
     this.editorRef = createRef<EditorApi>();
-    this.catalogUrl = `${this.initArgs.resourcesPathPrefix}${CatalogSchemaLoader.DEFAULT_CATALOG_PATH.replace('.', '')}`;
   }
 
   async getElementPosition() {

diff --git a/packages/ui/src/multiplying-architecture/KaotoEditorFactory.ts b/packages/ui/src/multiplying-architecture/KaotoEditorFactory.ts
@@ -6,12 +6,20 @@ import {
   KogitoEditorEnvelopeContextType,
 } from '@kie-tools-core/editor/dist/api';
 import { KaotoEditorChannelApi } from './KaotoEditorChannelApi';
+import { CatalogSchemaLoader, isDefined } from '../utils';
 
 export class KaotoEditorFactory implements EditorFactory<Editor, KaotoEditorChannelApi> {
-  public createEditor(
+  public async createEditor(
     envelopeContext: KogitoEditorEnvelopeContextType<KaotoEditorChannelApi>,
     initArgs: EditorInitArgs,
   ): Promise<Editor> {
-    return Promise.resolve(new KaotoEditorApp(envelopeContext, initArgs));
+    let catalogUrl;
+    const catalogUrlFromChannelApi = await envelopeContext.channelApi.requests.getCatalogURL();
+    if (isDefined(catalogUrlFromChannelApi)) {
+      catalogUrl = catalogUrlFromChannelApi;
+    } else {
+      catalogUrl = `${initArgs.resourcesPathPrefix}${CatalogSchemaLoader.DEFAULT_CATALOG_PATH.replace('.', '')}`;
+    }
+    return Promise.resolve(new KaotoEditorApp(envelopeContext, initArgs, catalogUrl));
   }
 }