From 2a5472fc7323a2c888d38f2c73c7be3aa1c11c77 Mon Sep 17 00:00:00 2001 From: Suren Date: Thu, 18 Jan 2024 14:52:05 +0530 Subject: [PATCH] #9889: Fix - Unable to export map configuration in context manager --- web/client/components/contextcreator/ContextCreator.jsx | 4 +--- web/client/epics/__tests__/contextcreator-test.js | 2 +- web/client/epics/contextcreator.js | 2 +- web/client/plugins/ContextExport.jsx | 7 ++++--- web/client/plugins/__tests__/ContextExport-test.jsx | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/web/client/components/contextcreator/ContextCreator.jsx b/web/client/components/contextcreator/ContextCreator.jsx index eca034740e..9a9a3d1369 100644 --- a/web/client/components/contextcreator/ContextCreator.jsx +++ b/web/client/components/contextcreator/ContextCreator.jsx @@ -246,9 +246,7 @@ export default class ContextCreator extends React.Component { editingAllowedRoles: [] } } - }, - "ContextImport", - "ContextExport" + } ], ignoreViewerPlugins: false, allAvailablePlugins: [], diff --git a/web/client/epics/__tests__/contextcreator-test.js b/web/client/epics/__tests__/contextcreator-test.js index 8b2ab5589a..6b5a584cd5 100644 --- a/web/client/epics/__tests__/contextcreator-test.js +++ b/web/client/epics/__tests__/contextcreator-test.js @@ -965,7 +965,7 @@ describe('contextcreator epics', () => { it('exportContextEpic, export context with plugins and themes', (done) => { testEpic(exportContextEpic, 1, onContextExport('file.json'), ([a]) => { expect(a.type).toEqual(TOGGLE_CONTROL); - expect(a.control).toEqual("export"); + expect(a.control).toEqual("export-context"); done(); }, { map: { diff --git a/web/client/epics/contextcreator.js b/web/client/epics/contextcreator.js index 2d975f6a53..deaa1fb7f1 100644 --- a/web/client/epics/contextcreator.js +++ b/web/client/epics/contextcreator.js @@ -922,7 +922,7 @@ export const exportContextEpic = (action$, { getState }) => "application/json" ]) .do((downloadArgs) => download(...downloadArgs)) - .map(() => toggleControl("export")) + .map(() => toggleControl("export-context")) .catch(() => Rx.Observable.of( error({ diff --git a/web/client/plugins/ContextExport.jsx b/web/client/plugins/ContextExport.jsx index c579591058..1f9b4db2a0 100644 --- a/web/client/plugins/ContextExport.jsx +++ b/web/client/plugins/ContextExport.jsx @@ -20,7 +20,8 @@ import { onContextExport } from "../actions/contextcreator"; import { toggleControl } from "../actions/controls"; import Message from "../components/I18N/Message"; import Button from "../components/misc/Button"; -const isEnabled = createControlEnabledSelector("export"); +const EXPORT_CONTROL = "export-context"; +const isEnabled = createControlEnabledSelector(EXPORT_CONTROL); const mapStateToProps = createSelector( isEnabled, @@ -32,7 +33,7 @@ const mapStateToProps = createSelector( ); const actions = { - onClose: () => toggleControl("export"), + onClose: () => toggleControl(EXPORT_CONTROL), onExport: onContextExport }; @@ -58,7 +59,7 @@ const ExportComponent = connect(mapStateToProps, actions)(Component); const ExportButton = connect( createSelector(resourceSelector, (resource) => ({ resource })), { - onExport: () => toggleControl("export") + onExport: () => toggleControl(EXPORT_CONTROL) } )(({ resource, onExport }) => (