fix(analytics): 14294 - prevent init of analytics with empty features

konturio · Jan 25, 2023 · 98600df · 98600df
1 parent 40335c4
commit 98600df
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/core/app/features.ts b/src/core/app/features.ts
@@ -25,6 +25,5 @@ export function setFeatures(value: BackendFeature[] | null) {
   value?.forEach((ft) => {
     newFeatures[ft.name] = true;
   });
-  featureFlagsAtom.set.dispatch(newFeatures);
   store.dispatch([featureFlagsAtom.set(newFeatures), featuresWereSetAtom.setTrue()]);
 }
diff --git a/src/core/shared_state/featureFlags.ts b/src/core/shared_state/featureFlags.ts
@@ -5,14 +5,14 @@ import { AppFeature } from '~core/auth/types';
 export const FeatureFlag = AppFeature;
 
 export const featureFlagsAtom = createAtom(
-  { set: (state = appConfig.effectiveFeatures) => state },
+  { set: (state = { ...appConfig.effectiveFeatures }) => state },
   ({ onAction }, state = {}) => {
     onAction('set', (f) => {
       if (f) {
         state = f;
       } else {
         // reset to defaults
-        state = appConfig.effectiveFeatures;
+        state = { ...appConfig.effectiveFeatures };
       }
     });
 

diff --git a/src/views/Map/Map.tsx b/src/views/Map/Map.tsx
@@ -99,7 +99,7 @@ export function MapPage() {
           <ConnectedMap className={s.Map} />
         </Suspense>
       </div>
-      {featureFlags && (
+      {Object.keys(featureFlags).length > 0 && (
         <Layout
           analytics={<Analytics featureFlags={featureFlags} />}
           // if EVENTS_LIST is enabled, we always have default feed