Fix #10631 New MapStore Home Page

pom.xml

@@ -11,7 +11,7 @@
         <mapstore2.version>DEV</mapstore2.version>
         <tomcat.version>9.0.90</tomcat.version>
         <tomcat.port>8080</tomcat.port>
-        <geostore-webapp.version>2.2-SNAPSHOT</geostore-webapp.version>
+        <geostore-webapp.version>2.3-SNAPSHOT</geostore-webapp.version>
         <print-lib.version>2.3.1</print-lib.version>
         <http_proxy.version>1.6-SNAPSHOT</http_proxy.version>
         <spring.version>5.3.18</spring.version>

project/standard/templates/configs/pluginsConfig.json

@@ -511,7 +511,7 @@
       ]
     },
     {
-      "name": "DeleteMap",
+      "name": "DeleteResource",
       "glyph": "trash",
       "title": "plugins.DeleteMap.title",
       "hidden": false,

web/client/components/I18N/LangBar.jsx

@@ -40,7 +40,9 @@ class LangBar extends React.Component {
                 className={this.props.className}>
                 <DropdownButton
                     pullRight
+                    noCaret
                     id={this.props.id}
+                    className="square-button-md _border-transparent"
                     title={
                         <FlagButton
                             componentAsButton={false}

web/client/components/contextcreator/ContextCreator.jsx

@@ -256,7 +256,7 @@ export default class ContextCreator extends React.Component {
         allAvailablePlugins: [],
         isCfgValidated: false,
         curStepId: 'general-settings',
-        saveDestLocation: '/context-manager',
+        saveDestLocation: '/',
         onInit: () => { },
         onSetStep: () => { },
         onShowTutorial: () => { },
@@ -267,7 +267,7 @@ export default class ContextCreator extends React.Component {
         pluginsToUpload: [],
         onShowBackToPageConfirmation: () => { },
         showBackToPageConfirmation: false,
-        backToPageDestRoute: '/context-manager',
+        backToPageDestRoute: '/',
         backToPageConfirmationMessage: 'contextCreator.undo',
         tutorials: CONTEXT_TUTORIALS,
         tutorialsList: false,

web/client/components/contextcreator/__tests__/ContextCreator-test.jsx

@@ -69,7 +69,7 @@ describe('ContextCreator component', () => {
             expect(saveBtn.childNodes[0].innerHTML).toBe('save');
             ReactTestUtils.Simulate.click(saveBtn); // <-- trigger event callback
             // check destination path
-            expect(spyonSave).toHaveBeenCalledWith("/context-manager");
+            expect(spyonSave).toHaveBeenCalledWith("/");
         });
         it('custom destination', () => {
             const eng = {

web/client/components/home/Home.jsx

@@ -13,17 +13,13 @@ import PropTypes from 'prop-types';
 import { Glyphicon, Tooltip } from 'react-bootstrap';
 import OverlayTrigger from '../misc/OverlayTrigger';
 import Message from '../../components/I18N/Message';
-import ConfirmModal from '../../components/misc/ResizableModal';
 import { pick } from "lodash";
 import { goToHomePage } from '../../actions/router';
 
 class Home extends React.Component {
     static propTypes = {
         icon: PropTypes.string,
         onCheckMapChanges: PropTypes.func,
-        onCloseUnsavedDialog: PropTypes.func,
-        displayUnsavedDialog: PropTypes.bool,
-        renderUnsavedMapChangesDialog: PropTypes.bool,
         tooltipPosition: PropTypes.string,
         bsStyle: PropTypes.string,
         hidden: PropTypes.bool
@@ -36,9 +32,6 @@ class Home extends React.Component {
 
     static defaultProps = {
         icon: "home",
-        onCheckMapChanges: () => {},
-        onCloseUnsavedDialog: () => {},
-        renderUnsavedMapChangesDialog: true,
         tooltipPosition: 'left',
         bsStyle: 'primary',
         hidden: false
@@ -48,47 +41,21 @@ class Home extends React.Component {
         const { tooltipPosition, hidden, ...restProps} = this.props;
         let tooltip = <Tooltip id="toolbar-home-button">{<Message msgId="gohome"/>}</Tooltip>;
         return hidden ? false : (
-            <React.Fragment>
-                <OverlayTrigger overlay={tooltip} placement={tooltipPosition}>
-                    <Button
-                        id="home-button"
-                        className="square-button"
-                        bsStyle={this.props.bsStyle}
-                        onClick={this.checkUnsavedChanges}
-                        tooltip={tooltip}
-                        {...pick(restProps, ['disabled', 'active', 'block', 'componentClass', 'href', 'children', 'icon', 'bsStyle', 'className'])}
-                    ><Glyphicon glyph={this.props.icon}/></Button>
-                </OverlayTrigger>
-                <ConfirmModal
-                    ref="unsavedMapModal"
-                    show={this.props.displayUnsavedDialog || false}
-                    onClose={this.props.onCloseUnsavedDialog}
-                    title={<Message msgId="resources.maps.unsavedMapConfirmTitle" />}
-                    buttons={[{
-                        bsStyle: "primary",
-                        text: <Message msgId="resources.maps.unsavedMapConfirmButtonText" />,
-                        onClick: this.goHome
-                    }, {
-                        text: <Message msgId="resources.maps.unsavedMapCancelButtonText" />,
-                        onClick: this.props.onCloseUnsavedDialog
-                    }]}
-                    fitContent
-                >
-                    <div className="ms-detail-body">
-                        <Message msgId="resources.maps.unsavedMapConfirmMessage" />
-                    </div>
-                </ConfirmModal>
-            </React.Fragment>
+            <OverlayTrigger overlay={tooltip} placement={tooltipPosition}>
+                <Button
+                    id="home-button"
+                    className="square-button"
+                    bsStyle={this.props.bsStyle}
+                    onClick={this.checkUnsavedChanges}
+                    tooltip={tooltip}
+                    {...pick(restProps, ['disabled', 'active', 'block', 'componentClass', 'href', 'children', 'icon', 'bsStyle', 'className'])}
+                ><Glyphicon glyph={this.props.icon}/></Button>
+            </OverlayTrigger>
         );
     }
 
     checkUnsavedChanges = () => {
-        if (this.props.renderUnsavedMapChangesDialog) {
-            this.props.onCheckMapChanges(this.goHome);
-        } else {
-            this.props.onCloseUnsavedDialog();
-            this.goHome();
-        }
+        this.goHome();
     }
 
     goHome = () => {

web/client/components/import/dragZone/DragZone.jsx

@@ -26,7 +26,7 @@ export default ({
     disableClick
     ref={onRef}
     id="DRAGDROP_IMPORT_ZONE"
-    style={{ position: "relative", height: '100%', ...style }}
+    style={{ position: "absolute", top: 0, left: 0, height: '100%', ...style }}
     accept={accept}
     onDrop={onDrop}
     onDragEnter={onDragEnter}
@@ -40,7 +40,7 @@ export default ({
             left: 0,
             background: 'rgba(0,0,0,0.75)',
             color: '#fff',
-            zIndex: 2000,
+            zIndex: 4000,
             display: 'flex',
             textAlign: 'center'
         }}>

web/client/components/layout/BorderLayout.jsx

@@ -34,9 +34,9 @@ export default ({id, children, header, footer, columns, height, style = {}, clas
             flex: 1,
             overflowY: "auto"
         }}>
-            <main className="ms2-border-layout-content" style={{flex: 1, overflowX: 'hidden'}}>
+            <div className="ms2-border-layout-content" style={{flex: 1, overflowX: 'hidden'}}>
                 {height ? <div style={{height}}>{children}</div> : children}
-            </main>
+            </div>
             {height ? <div style={{height}}>{columns}</div> : columns}
         </div>
         {footer}

web/client/components/misc/enhancers/tooltip.jsx

@@ -23,6 +23,7 @@ import { omit } from 'lodash';
  * @prop {string} [tooltipId] if present will show a localized tooltip using the tooltipId as msgId
  * @prop {string} [tooltipPosition="top"]
  * @prop {string} tooltipTrigger see react overlay trigger
+ * @prop {object} tooltipParams parameter to pass to the tooltip message id
  * @example
  * render() {
  *   const Cmp = tooltip((props) =><El {...props}></El>); // or simply tooltip(El);
@@ -32,12 +33,12 @@ import { omit } from 'lodash';
  */
 export default branch(
     ({tooltip, tooltipId} = {}) => tooltip || tooltipId,
-    (Wrapped) => ({tooltip, tooltipId, tooltipPosition = "top", tooltipTrigger, keyProp, idDropDown, args, ...props} = {}) => (<OverlayTrigger
+    (Wrapped) => ({tooltip, tooltipId, tooltipPosition = "top", tooltipTrigger, keyProp, idDropDown, tooltipParams, args, ...props} = {}) => (<OverlayTrigger
         trigger={tooltipTrigger}
         id={idDropDown}
         key={keyProp}
         placement={tooltipPosition}
-        overlay={<Tooltip id={"tooltip-" + keyProp}>{tooltipId ? <Message msgId={tooltipId} msgParams={{data: args}} /> : tooltip}</Tooltip>}><Wrapped {...props}/></OverlayTrigger>),
+        overlay={<Tooltip id={"tooltip-" + keyProp}>{tooltipId ? <Message msgId={tooltipId} msgParams={{data: args, ...tooltipParams}} /> : tooltip}</Tooltip>}><Wrapped {...props}/></OverlayTrigger>),
     // avoid to pass non needed props
-    (Wrapped) => (props) => <Wrapped {...(omit(props, ["tooltipId", "tooltip", "tooltipPosition"]))}>{props.children}</Wrapped>
+    (Wrapped) => (props) => <Wrapped {...(omit(props, ["tooltipId", "tooltip", "tooltipPosition", "tooltipParams"]))}>{props.children}</Wrapped>
 );

web/client/components/share/SharePanel.jsx

@@ -98,7 +98,8 @@ class SharePanel extends React.Component {
         addMarker: PropTypes.func,
         viewerOptions: PropTypes.object,
         mapType: PropTypes.string,
-        updateMapView: PropTypes.func
+        updateMapView: PropTypes.func,
+        onClearShareResource: PropTypes.func
     };
 
     static defaultProps = {
@@ -118,7 +119,8 @@ class SharePanel extends React.Component {
         isScrollPosition: false,
         hideMarker: () => {},
         addMarker: () => {},
-        updateMapView: () => {}
+        updateMapView: () => {},
+        onClearShareResource: () => {}
     };
 
     static contextTypes = {
@@ -182,6 +184,9 @@ class SharePanel extends React.Component {
             });
         }
     }
+    componentWillUnmount() {
+        this.props.onClearShareResource();
+    }
 
     initializeDefaults = (props) => {
         const coordinate = this.getCoordinates(props);