fix(app-module): faiilover when meta.id is not set. vite proxy handle…

…s manifest only
equinor · Nov 19, 2024 · 9b8fa59 · 9b8fa59
1 parent b763e9b
commit 9b8fa59
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/packages/cli/src/lib/plugins/app-proxy/app-proxy-plugin.ts b/packages/cli/src/lib/plugins/app-proxy/app-proxy-plugin.ts
@@ -160,19 +160,18 @@ export const appProxyPlugin = (options: AppProxyPluginOptions): Plugin => {
                 res.end(JSON.stringify(await app.generateConfig()));
             });
 
-            // TODO: AppSettings should be saved in memory localy
             // serve app manifest if request matches the current app
             const manifestPath = join(proxyPath, app.manifestPath ?? `apps/${app.key}`);
             server.middlewares.use(async (req, res, next) => {
                 // We only want to match the exact path
-                console.log(req.url);
                 const [requestPath] = (req.url ?? '').split('?');
                 if (requestPath === manifestPath) {
                     res.setHeader('content-type', 'application/json');
                     res.end(JSON.stringify(await app.generateManifest()));
-                } else {
-                    next();
+                    return;
                 }
+
+                next();
             });
 
             // serve local bundles if request matches the current app and version

diff --git a/packages/modules/app/src/app/App.ts b/packages/modules/app/src/app/App.ts
@@ -687,7 +687,7 @@ export class App<
         const updateActions$ = this.#state.action$.pipe(
             // eslint-disable-next-line @typescript-eslint/ban-ts-comment
             // @ts-ignore
-            filter((a) => action.meta.id === a.meta.id),
+            filter((a) => action.meta.id === a.meta?.id),
         );
 
         return new Observable((subscriber) => {