Skip to content
Snippets Groups Projects
Unverified Commit be2ede48 authored by Júlia Jaeger Foresti's avatar Júlia Jaeger Foresti Committed by GitHub
Browse files

fix: `featuresPreview` wrong DB structure (#34209)

parent 95214638
No related branches found
No related tags found
No related merge requests found
---
'@rocket.chat/ui-client': patch
'@rocket.chat/meteor': patch
---
Fixed the data structure of the features preview
......@@ -56,8 +56,9 @@ const AccountFeaturePreviewPage = () => {
const { featuresPreview } = watch();
const handleSave = async () => {
const featuresToBeSaved = featuresPreview.map((feature) => ({ name: feature.name, value: feature.value }));
try {
await setUserPreferences({ data: { featuresPreview } });
await setUserPreferences({ data: { featuresPreview: featuresToBeSaved } });
dispatchToastMessage({ type: 'success', message: t('Preferences_saved') });
} catch (error) {
dispatchToastMessage({ type: 'error', message: error });
......
......@@ -97,14 +97,20 @@ export const parseSetting = (setting?: FeaturePreviewProps[] | string) => {
return setting;
};
export const useFeaturePreviewList = (featuresList: Pick<FeaturePreviewProps, 'name' | 'value'>[]) => {
export const useFeaturePreviewList = (featuresList: FeaturePreviewProps[]) => {
const unseenFeatures = enabledDefaultFeatures.filter(
(defaultFeature) => !featuresList?.find((feature) => feature.name === defaultFeature.name),
).length;
const mergedFeatures = enabledDefaultFeatures.map((defaultFeature) => {
const features = featuresList?.find((feature) => feature.name === defaultFeature.name);
return { ...defaultFeature, ...features };
const feature = featuresList?.find((feature) => feature.name === defaultFeature.name);
// overwrite enableQuery and disabled with default value to avoid a migration to remove this from the DB
// payload on save now only have `name` and `value`
if (feature) {
feature.enableQuery = defaultFeature.enableQuery;
feature.disabled = defaultFeature.disabled;
}
return { ...defaultFeature, ...feature };
});
return { unseenFeatures, features: mergedFeatures };
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment