Merge pull request #559 from metasfresh/dev-558

#558 saveStatus respected inside modal
metasfresh · Mar 21, 2017 · 62868c4 · 62868c4
2 parents 3b16749 + e822824
commit 62868c4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/src/components/app/Modal.js b/src/components/app/Modal.js
@@ -227,7 +227,7 @@ class Modal extends Component {
 
     render() {
         const {
-            data, modalTitle, modalType
+            data, modalTitle, modalType, isDocumentNotSaved
         } = this.props;
 
         const {
@@ -275,7 +275,7 @@ class Modal extends Component {
                             }
                         </div>
                     </div>
-                    <Indicator />
+                    <Indicator {...{isDocumentNotSaved}}/>
                     <div
                         className={
                             `panel-modal-content js-panel-modal-content

diff --git a/src/containers/DocList.js b/src/containers/DocList.js
@@ -95,6 +95,10 @@ class DocList extends Component {
                         viewId={query.viewId}
                         rawModalVisible={rawModal.visible}
                         indicator={indicator}
+                        isDocumentNotSaved={
+                            !modal.saveStatus.saved &&
+                            !modal.validStatus.initialValue
+                        }
                      />
                  }
                  {rawModal.visible &&

diff --git a/src/containers/MasterWindow.js b/src/containers/MasterWindow.js
@@ -147,6 +147,10 @@ class MasterWindow extends Component {
                         closeCallback={this.closeModalCallback}
                         rawModalVisible={rawModal.visible}
                         indicator={indicator}
+                        isDocumentNotSaved={
+                            !modal.saveStatus.saved &&
+                            !modal.validStatus.initialValue
+                        }
                      />
                  }
                  {rawModal.visible &&

diff --git a/src/reducers/windowHandler.js b/src/reducers/windowHandler.js
@@ -17,7 +17,9 @@ const initialState = {
         modalType: '',
         isAdvanced: false,
         viewDocumentIds: null,
-        triggerField: null
+        triggerField: null,
+        saveStatus: {},
+        validStatus: {}
     },
     rawModal: {
         visible: false,