No need for connected user preferences when header can contain info

This commit is contained in:
dannyrb committed 2019-06-06 14:41:31 -04:00
1 parent 2d6f9c1a05
commit e0cbc8ef4d
6 files changed
+58 -87

No files matched your search

+1 -13
View File
@@ -1,6 +1,5 @@
import Header from '../components/Header/Header.js';
import { connect } from 'react-redux';
import { setUserPreferencesModalOpen } from '../store/layout/actions.js';
const mapStateToProps = state => {
return {
@@ -8,17 +7,6 @@ const mapStateToProps = state => {
};
};
const mapDispatchToProps = dispatch => {
return {
openUserPreferencesModal: () => {
dispatch(setUserPreferencesModalOpen(true));
},
};
};
const ConnectedHeader = connect(
mapStateToProps,
mapDispatchToProps
)(Header);
const ConnectedHeader = connect(mapStateToProps)(Header);
export default ConnectedHeader;
@@ -1,48 +0,0 @@
import OHIF from 'ohif-core';
import { UserPreferencesModal } from 'react-viewerbase';
import cloneDeep from 'lodash.clonedeep';
import { connect } from 'react-redux';
import { setUserPreferencesModalOpen } from './../store/layout/actions.js';
const { setUserPreferences } = OHIF.redux.actions;
const mapStateToProps = state => {
const contextName = window.store.getState().commandContext.context;
return {
isOpen: state.ui.userPreferencesModalOpen,
windowLevelData: state.preferences[contextName]
? state.preferences[contextName].windowLevelData
: {},
hotKeysData: state.preferences[contextName]
? state.preferences[contextName].hotKeysData
: {},
};
};
const mapDispatchToProps = dispatch => {
return {
onCancel: () => {
dispatch(setUserPreferencesModalOpen(false));
},
onSave: data => {
const contextName = window.store.getState().commandContext.context;
const preferences = cloneDeep(window.store.getState().preferences);
preferences[contextName] = data;
dispatch(setUserPreferences(preferences));
dispatch(setUserPreferencesModalOpen(false));
OHIF.hotkeysUtil.setHotkeys(data.hotKeysData);
},
onResetToDefaults: () => {
dispatch(setUserPreferences());
dispatch(setUserPreferencesModalOpen(false));
OHIF.hotkeysUtil.setHotkeys();
},
};
};
const ConnectedUserPreferencesModal = connect(
mapStateToProps,
mapDispatchToProps
)(UserPreferencesModal);
export default ConnectedUserPreferencesModal;