fix: componentType can be undefined (onecx#208)

* fix: ocxSrc directive with external image url, ocx slots * fix: loading remote component * fix: lint issues * fix: componentType may be undefined --------- Co-authored-by: kim.tran <[email protected]>
markuczy · Apr 8, 2024 · eb80995 · eb80995
1 parent eb5294d
commit eb80995
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 11 deletions.
diff --git a/libs/angular-remote-components/src/lib/components/slot/slot.component.ts b/libs/angular-remote-components/src/lib/components/slot/slot.component.ts
@@ -29,7 +29,9 @@ export class SlotComponent implements OnInit, OnDestroy {
 
   subscription: Subscription | undefined
   components$:
-    | Observable<{ componentType: Type<unknown>; remoteComponent: RemoteComponentInfo; permissions: string[] }[]>
+    | Observable<
+        { componentType: Type<unknown> | undefined; remoteComponent: RemoteComponentInfo; permissions: string[] }[]
+      >
     | undefined
 
   constructor(@Inject(SLOT_SERVICE) private slotService: SlotService) {}
@@ -40,16 +42,18 @@ export class SlotComponent implements OnInit, OnDestroy {
       ([viewContainers, components]) => {
         if (viewContainers && viewContainers.length === components.length) {
           components.forEach((componentInfo, i) => {
-            const componentRef = viewContainers.get(i)?.createComponent<any>(componentInfo.componentType)
-            if (componentRef && 'ocxInitRemoteComponent' in componentRef.instance) {
-              ;(componentRef.instance as ocxRemoteComponent).ocxInitRemoteComponent({
-                appId: componentInfo.remoteComponent.appId,
-                productName: componentInfo.remoteComponent.productName,
-                baseUrl: componentInfo.remoteComponent.baseUrl,
-                permissions: componentInfo.permissions,
-              })
+            if (componentInfo.componentType) {
+              const componentRef = viewContainers.get(i)?.createComponent<any>(componentInfo.componentType)
+              if (componentRef && 'ocxInitRemoteComponent' in componentRef.instance) {
+                ;(componentRef.instance as ocxRemoteComponent).ocxInitRemoteComponent({
+                  appId: componentInfo.remoteComponent.appId,
+                  productName: componentInfo.remoteComponent.productName,
+                  baseUrl: componentInfo.remoteComponent.baseUrl,
+                  permissions: componentInfo.permissions,
+                })
+              }
+              componentRef?.changeDetectorRef.detectChanges()
             }
-            componentRef?.changeDetectorRef.detectChanges()
           })
         }
       }

diff --git a/libs/angular-remote-components/src/lib/services/slot.service.ts b/libs/angular-remote-components/src/lib/services/slot.service.ts
@@ -9,5 +9,7 @@ export interface SlotService {
   init(): Promise<void>
   getComponentsForSlot(
     slotName: string
-  ): Observable<{ componentType: Type<unknown>; remoteComponent: RemoteComponentInfo; permissions: string[] }[]>
+  ): Observable<
+    { componentType: Type<unknown> | undefined; remoteComponent: RemoteComponentInfo; permissions: string[] }[]
+  >
 }