fix: rename system settings in initial set

tomzemp · Feb 11, 2021 · bf04217 · bf04217
1 parent b440c72
commit bf04217
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 16 deletions.
diff --git a/src/api/settings.js b/src/api/settings.js
@@ -15,6 +15,21 @@ const SYSTEM_SETTINGS = [
     'keyGatherAnalyticalObjectStatisticsInDashboardViews',
 ]
 
+const SYSTEM_SETTINGS_REMAPPINGS = {
+    keyDashboardContextMenuItemOpenInRelevantApp: 'openInRelevantApp',
+    keyDashboardContextMenuItemShowInterpretationsAndDetails:
+        'showInterpretationsAndDetails',
+    keyDashboardContextMenuItemSwitchViewType: 'switchViewType',
+    keyDashboardContextMenuItemViewFullscreen: 'fullscreenAllowedInSettings',
+}
+
+export const renameSystemSettings = settings => {
+    return Object.keys(settings).reduce((mapped, key) => {
+        mapped[SYSTEM_SETTINGS_REMAPPINGS[key] || key] = settings[key]
+        return mapped
+    }, {})
+}
+
 const query = {
     resource: 'systemSettings',
     params: { key: SYSTEM_SETTINGS },

diff --git a/src/components/Item/VisualizationItem/ItemHeaderButtons.js b/src/components/Item/VisualizationItem/ItemHeaderButtons.js
@@ -42,13 +42,12 @@ const ItemHeaderButtons = props => {
 
     const { item, visualization, onSelectActiveType, activeType } = props
 
-    const { settings } = useSystemSettings()
     const {
-        keyDashboardContextMenuItemOpenInRelevantApp: openInRelevantApp,
-        keyDashboardContextMenuItemShowInterpretationsAndDetails: showInterpretationsAndDetails,
-        keyDashboardContextMenuItemSwitchViewType: switchViewType,
-        keyDashboardContextMenuItemViewFullscreen: fullscreenAllowedInSettings,
-    } = settings
+        openInRelevantApp,
+        showInterpretationsAndDetails,
+        switchViewType,
+        fullscreenAllowedInSettings,
+    } = useSystemSettings().settings
 
     const isTrackerType = isTrackerDomainType(item.type)
 

diff --git a/src/components/Item/VisualizationItem/__tests__/ItemHeaderButtons.spec.js b/src/components/Item/VisualizationItem/__tests__/ItemHeaderButtons.spec.js
@@ -24,10 +24,10 @@ jest.mock('../../../SystemSettingsProvider', () => ({
 
 const mockSystemSettingsDefault = {
     settings: {
-        keyDashboardContextMenuItemOpenInRelevantApp: true,
-        keyDashboardContextMenuItemShowInterpretationsAndDetails: true,
-        keyDashboardContextMenuItemSwitchViewType: true,
-        keyDashboardContextMenuItemViewFullscreen: true,
+        openInRelevantApp: true,
+        showInterpretationsAndDetails: true,
+        switchViewType: true,
+        fullscreenAllowedInSettings: true,
     },
 }
 
@@ -105,7 +105,7 @@ it('does not render ViewAsMenuItems Items if settings do not allow', () => {
         {},
         mockSystemSettingsDefault.settings,
         {
-            keyDashboardContextMenuItemSwitchViewType: false,
+            switchViewType: false,
         }
     )
     useSystemSettings.mockImplementationOnce(() => mockSystemSettings)
@@ -137,7 +137,7 @@ it('does not let you open in relevant app if settings do not allow', () => {
         {},
         mockSystemSettingsDefault.settings,
         {
-            keyDashboardContextMenuItemOpenInRelevantApp: false,
+            openInRelevantApp: false,
         }
     )
     useSystemSettings.mockImplementationOnce(() => mockSystemSettings)
@@ -177,7 +177,7 @@ it('does not let you open in fullscreen if settings do not allow', () => {
         {},
         mockSystemSettingsDefault.settings,
         {
-            keyDashboardContextMenuItemViewFullscreen: false,
+            fullscreenAllowedInSettings: false,
         }
     )
     useSystemSettings.mockImplementationOnce(() => mockSystemSettings)
@@ -217,7 +217,7 @@ it('does not let you open interpretations and details if settings do not allow',
         {},
         mockSystemSettingsDefault.settings,
         {
-            keyDashboardContextMenuItemShowInterpretationsAndDetails: false,
+            showInterpretationsAndDetails: false,
         }
     )
     useSystemSettings.mockImplementationOnce(() => mockSystemSettings)

diff --git a/src/components/SystemSettingsProvider.js b/src/components/SystemSettingsProvider.js
@@ -1,7 +1,10 @@
 import React, { useContext, useState, useEffect, createContext } from 'react'
 import PropTypes from 'prop-types'
 import { useDataEngine } from '@dhis2/app-runtime'
-import settingsQuery, { DEFAULT_SETTINGS } from '../api/settings'
+import settingsQuery, {
+    renameSystemSettings,
+    DEFAULT_SETTINGS,
+} from '../api/settings'
 
 export const SystemSettingsCtx = createContext({})
 
@@ -15,7 +18,13 @@ const SystemSettingsProvider = ({ children }) => {
                 systemSettings: settingsQuery,
             })
 
-            setSettings(Object.assign({}, DEFAULT_SETTINGS, systemSettings))
+            setSettings(
+                Object.assign(
+                    {},
+                    renameSystemSettings(DEFAULT_SETTINGS),
+                    renameSystemSettings(systemSettings)
+                )
+            )
         }
         fetchData()
     }, [])