TASK: support unsetting presets (#39)

psmb · Nov 9, 2020 · f8c1639 · f8c1639
1 parent f74bc7f
commit f8c1639
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 11 deletions.
diff --git a/Resources/Private/FlatNav/src/makeFlatNavContainer.js b/Resources/Private/FlatNav/src/makeFlatNavContainer.js
@@ -52,16 +52,20 @@ const makeFlatNavContainer = OriginalPageTree => {
 
         buildDefaultState = props => {
             const state = {};
-            Object.keys(props.options.presets).forEach(preset => {
+            Object.keys(props.options.presets).forEach(presetName => {
+                const preset = props.options.presets[presetName];
+                if (!presetName) {
+                    return null;
+                }
                 let newReferenceNodePath;
                 // If `newReferenceNodePath` is static, append context to it, otherwise set to empty, as it would be fetched later
-                const newReferenceNodePathSetting = $get(['options', 'presets', preset, 'newReferenceNodePath'], props);
+                const newReferenceNodePathSetting = $get(['options', 'presets', presetName, 'newReferenceNodePath'], props);
                 if (typeof newReferenceNodePathSetting === 'string' && newReferenceNodePathSetting.indexOf('/') === 0) {
-                    newReferenceNodePath = props.options.presets[preset].newReferenceNodePath;
+                    newReferenceNodePath = preset.newReferenceNodePath;
                 } else {
                     newReferenceNodePath = '';
                 }
-                state[preset] = {
+                state[presetName] = {
                     page: 1,
                     isLoading: false,
                     isLoadingReferenceNodePath: false,
@@ -234,6 +238,9 @@ const makeFlatNavContainer = OriginalPageTree => {
                 }}>
                     {Object.keys(this.props.options.presets).map(presetName => {
                         const preset = this.props.options.presets[presetName];
+                        if (!preset) {
+                            return null;
+                        }
                         const fetchNodes = this.makeFetchNodes(presetName)
                         const resetNodes = this.makeResetNodes(presetName, fetchNodes)
                         const debouncedFetchNodes = debounce(fetchNodes, 400);
@@ -255,7 +262,7 @@ const makeFlatNavContainer = OriginalPageTree => {
                                 {preset.type === 'tree' && (<OriginalPageTree />)}
                             </Tabs.Panel>
                         );
-                    })}
+                    }).filter(Boolean)}
                 </Tabs>
             );
         }

diff --git a/Resources/Public/JavaScript/FlatNav/Plugin.js b/Resources/Public/JavaScript/FlatNav/Plugin.js
diff --git a/Resources/Public/JavaScript/FlatNav/Plugin.js.map b/Resources/Public/JavaScript/FlatNav/Plugin.js.map