From 04fa2df35247dce218e05a59b158b0fc30447b98 Mon Sep 17 00:00:00 2001
From: blam <ben@blam.sh>
Date: Mon, 14 Jun 2021 10:18:37 +0200
Subject: [PATCH] chore: wait for the config api to be loaded first before
 registering feature featureFlags

Signed-off-by: blam <ben@blam.sh>
---
 packages/core-app-api/src/app/App.tsx | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/packages/core-app-api/src/app/App.tsx b/packages/core-app-api/src/app/App.tsx
index 1d77282635..ecf06955b0 100644
--- a/packages/core-app-api/src/app/App.tsx
+++ b/packages/core-app-api/src/app/App.tsx
@@ -216,7 +216,12 @@ export class PrivateAppImpl implements BackstageApp {
         [],
       );
 
-      const { routePaths, routeParents, routeObjects } = useMemo(() => {
+      const {
+        routePaths,
+        routeParents,
+        routeObjects,
+        featureFlags,
+      } = useMemo(() => {
         const result = traverseElementTree({
           root: children,
           discoverers: [childDiscoverer, routeElementDiscoverer],
@@ -239,14 +244,7 @@ export class PrivateAppImpl implements BackstageApp {
         this.verifyPlugins(this.plugins);
 
         // Initialize APIs once all plugins are available
-        const apiHolder = this.getApiHolder();
-
-        // Register feature flags that have been discovered
-        const featureFlagApi = apiHolder.get(featureFlagsApiRef)!;
-        for (const name of result.featureFlags) {
-          featureFlagApi.registerFlag({ name, pluginId: '' });
-        }
-
+        this.getApiHolder();
         return result;
       }, [children]);
 
@@ -281,8 +279,14 @@ export class PrivateAppImpl implements BackstageApp {
               }
             }
           }
+
+          // Go through the featureFlags returned from the traversal and
+          // register those now the configApi has been loaded
+          for (const name of featureFlags) {
+            featureFlagsApi.registerFlag({ name, pluginId: '' });
+          }
         }
-      }, [hasConfigApi, loadedConfig]);
+      }, [hasConfigApi, loadedConfig, featureFlags]);
 
       if ('node' in loadedConfig) {
         // Loading or error