Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

fix: load feature flags if default keys have changed #6432

Merged
a-b-r-o-w-n merged 4 commits into from
Mar 16, 2021
Merged

fix: load feature flags if default keys have changed #6432

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a479fe4
handle case when default feature flags change
a-b-r-o-w-n Mar 16, 2021
e9477ac
show app error when feature flags fail to fetch in development
a-b-r-o-w-n Mar 16, 2021
f45f473
Merge branch 'main' into abrown/feature-flags
cwhitten Mar 16, 2021
51308db
Merge branch 'main' into abrown/feature-flags
cwhitten Mar 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion Composer/packages/client/src/recoilModel/dispatchers/storage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import {
import { FileTypes } from '../../constants';
import { getExtension } from '../../utils/fileUtil';

import { logMessage } from './shared';
import { logMessage, setError } from './shared';

const projectFiles = ['bot', 'botproj'];

Expand Down Expand Up @@ -197,6 +197,11 @@ export const storageDispatcher = () => {
set(featureFlagsState, response.data);
} catch (ex) {
logMessage(callbackHelpers, `Error fetching feature flag data: ${ex}`);

if (process.env.NODE_ENV === 'development') {
const err = new Error(`Error fetching feature flag data: ${ex.message}`);
setError(callbackHelpers, err);
}
}
});

Expand Down
6 changes: 3 additions & 3 deletions Composer/packages/server/src/services/featureFlags.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ export class FeatureFlagService {
FeatureFlagService.currentFeatureFlagMap[key] = {
...FeatureFlagService.defaultFeatureFlags[key],
...FeatureFlagService.currentFeatureFlagMap[key],
displayName: FeatureFlagService.defaultFeatureFlags[key].displayName,
description: FeatureFlagService.defaultFeatureFlags[key].description,
documentationLink: FeatureFlagService.defaultFeatureFlags[key].documentationLink,
displayName: FeatureFlagService.defaultFeatureFlags[key]?.displayName,
description: FeatureFlagService.defaultFeatureFlags[key]?.description,
documentationLink: FeatureFlagService.defaultFeatureFlags[key]?.documentationLink,
};
});

Expand Down