WIP - attempt at saved layout

src/components/Window.js

@@ -14,12 +14,13 @@ export class Window extends Component {
    * Renders things
    */
   render() {
-    const { manifest, window } = this.props;
+    const { manifest, window, layout } = this.props;
     if (!window) return <></>;
 
     return (
       <div id={window.id} className={ns('window')}>
         <WindowTopBar
+          layout={layout}
           windowId={window.id}
           manifest={manifest}
         />
@@ -42,9 +43,11 @@ export class Window extends Component {
 Window.propTypes = {
   window: PropTypes.object, // eslint-disable-line react/forbid-prop-types
   manifest: PropTypes.object, // eslint-disable-line react/forbid-prop-types
+  layout: PropTypes.object, // eslint-disable-line react/forbid-prop-types
 };
 
 Window.defaultProps = {
   window: null,
   manifest: null,
+  layout: null,
 };

src/containers/WindowTopBar.js

@@ -8,7 +8,7 @@ import { getWindowManifest, getManifestTitle } from '../state/selectors';
 import { WindowTopBar } from '../components/WindowTopBar';
 
 /** mapStateToProps */
-const mapStateToProps = (state, { windowId }) => ({
+const mapStateToProps = (state, { windowId, layout }) => ({
   manifestTitle: getManifestTitle(getWindowManifest(state, windowId)),
   maximized: state.windows[windowId].maximized,
 });
@@ -18,9 +18,9 @@ const mapStateToProps = (state, { windowId }) => ({
  * @memberof ManifestListItem
  * @private
  */
-const mapDispatchToProps = (dispatch, { windowId }) => ({
+const mapDispatchToProps = (dispatch, { windowId, layout }) => ({
   closeWindow: () => dispatch(actions.closeWindow(windowId)),
-  maximizeWindow: () => dispatch(actions.maximizeWindow(windowId)),
+  maximizeWindow: () => dispatch(actions.maximizeWindow(windowId, layout)),
   minimizeWindow: () => dispatch(actions.minimizeWindow(windowId)),
   toggleWindowSideBar: () => dispatch(actions.toggleWindowSideBar(windowId)),
 });

src/containers/Workspace.js

 import { compose } from 'redux';
 import { connect } from 'react-redux';
-import pickBy from 'lodash/pickBy';
 import { Workspace } from '../components/Workspace';
 
 /**
@@ -13,10 +12,7 @@ const mapStateToProps = state => (
     isWorkspaceControlPanelVisible: state.config.workspaceControlPanel.enabled,
     workspaceType: state.config.workspace.type,
     windows: state.windows,
-    // pickBy(state.windows, window => window.maximized === false),
-    // Object.keys(state.windows)
-    //   .map(id => state.windows[id])
-    //   .filter(window => window.displayable === true),
+    savedLayout: state.workspace.savedLayout,
   }
 );
 

src/state/actions/action-types.js

@@ -31,6 +31,7 @@ const ActionTypes = {
   RECEIVE_INFO_RESPONSE: 'RECEIVE_INFO_RESPONSE',
   RECEIVE_INFO_RESPONSE_FAILURE: 'RECEIVE_INFO_RESPONSE_FAILURE',
   REMOVE_INFO_RESPONSE: 'REMOVE_INFO_RESPONSE',
+  SAVE_WORKSPACE_MOSAIC_LAYOUT: 'SAVE_WORKSPACE_MOSAIC_LAYOUT',
   UPDATE_WORKSPACE_MOSAIC_LAYOUT: 'UPDATE_WORKSPACE_MOSAIC_LAYOUT',
   UPDATE_VIEWPORT: 'UPDATE_VIEWPORT',
 };

src/state/actions/window.js

@@ -40,8 +40,12 @@ export function addWindow(options) {
  * @param  {String} windowId
  * @memberof ActionCreators
  */
-export function maximizeWindow(windowId) {
-  return { type: ActionTypes.MAXIMIZE_WINDOW, windowId };
+export function maximizeWindow(windowId, layout) {
+  // return { type: ActionTypes.MAXIMIZE_WINDOW, windowId };
+  return (dispatch) => {
+    dispatch({ type: ActionTypes.MAXIMIZE_WINDOW, windowId });
+    dispatch({ type: ActionTypes.SAVE_WORKSPACE_MOSAIC_LAYOUT, layout });
+  };
 }
 
 /**

src/state/actions/workspace.js

@@ -20,6 +20,16 @@ export function toggleZoomControls(showZoomControls) {
   return { type: ActionTypes.TOGGLE_ZOOM_CONTROLS, showZoomControls };
 }
 
+/**
+ * saveWorkspaceMosaicLayout - action creator
+ *
+ * @param  {Object} layout
+ * @memberof ActionCreators
+ */
+export function saveWorkspaceMosaicLayout(layout) {
+  return { type: ActionTypes.SAVE_WORKSPACE_MOSAIC_LAYOUT, layout };
+}
+
 /**
  * updateWorkspaceMosaicLayout - action creator
  *

src/state/reducers/workspace.js

@@ -11,6 +11,8 @@ export const workspaceReducer = (state = {}, action) => {
       return { ...state, isFullscreenEnabled: action.isFullscreenEnabled };
     case ActionTypes.TOGGLE_ZOOM_CONTROLS:
       return { ...state, showZoomControls: action.showZoomControls };
+    case ActionTypes.SAVE_WORKSPACE_MOSAIC_LAYOUT:
+      return { ...state, savedLayout: action.layout };
     case ActionTypes.UPDATE_WORKSPACE_MOSAIC_LAYOUT:
       return { ...state, layout: action.layout };
     case ActionTypes.SET_WORKSPACE_ADD_VISIBILITY: