#678 Removed DocNoElem

metasfresh · Apr 25, 2017 · a12f754 · a12f754
1 parent 3dc7531
commit a12f754
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 41 deletions.
diff --git a/src/components/Container.js b/src/components/Container.js
@@ -11,7 +11,7 @@ class Container extends Component {
 
     render() {
         const {
-            docActionElem, docStatusData, docNoElement, docNoData,
+            docActionElem, docStatusData, docNoData,
             docSummaryData, dataId, windowType, breadcrumb, references, actions,
             showSidelist, siteName, connectionError, noMargin, entity, children,
             query, attachments, showIndicator, isDocumentNotSaved, hideHeader,
@@ -30,7 +30,6 @@ class Container extends Component {
                             breadcrumb, dataId, dropzoneFocused, notfound
                         }}
                         docStatus = {docActionElem}
-                        docNo = {docNoElement}
                     />
                 }
                 {connectionError && <ErrorScreen />}

diff --git a/src/components/header/Breadcrumb.js b/src/components/header/Breadcrumb.js
@@ -4,7 +4,6 @@ import { connect } from 'react-redux';
 import {push} from 'react-router-redux';
 
 import MenuOverlay from './MenuOverlay';
-import MasterWidget from '../widget/MasterWidget';
 import Tooltips from '../tooltips/Tooltips';
 import keymap from '../../keymap.js';
 
@@ -87,8 +86,7 @@ class Breadcrumb extends Component {
 
     render() {
         const {
-            breadcrumb, windowType, docNo, docNoData, docSummaryData,
-            dataId, siteName
+            breadcrumb, docSummaryData, siteName
         } = this.props;
 
         const {tooltipOpen} = this.state;
@@ -109,43 +107,30 @@ class Breadcrumb extends Component {
                     {breadcrumb && breadcrumb.map((item, index) =>
                         this.renderBtn(item, index+1)
                     )}
+                </div>
 
-                    {docNo && <div className="divider">/</div>}
-
-                    {docNo && <div className="header-input-id header-input-sm">
-                        <MasterWidget
-                            entity="window"
-                            windowType={windowType}
-                            dataId={dataId}
-                            widgetData={[docNoData]}
-                            noLabel={true}
-                            icon={true}
-                            {...docNo}
-                        />
-                </div>}
-
-                    {docSummaryData && <div
+                {docSummaryData &&
+                    <div
                         className="hidden-xs-down header-breadcrumb-line"
                     >
                         <span
                             className="header-breadcrumb-sitename"
                         >
                             {docSummaryData.value}
                         </span>
-                    </div>}
+                    </div>
+                }
 
-                    {siteName && <div className="divider">/</div>}
+                {siteName && <div className="divider">/</div>}
 
-                    {siteName &&
-                        <div>
-                            <span
-                                className="header-item icon-sm"
-                            >{siteName}</span>
-                        </div>
-                    }
-                </div>
+                {siteName &&
+                    <div>
+                        <span
+                            className="header-item icon-sm"
+                        >{siteName}</span>
+                    </div>
+                }
             </div>
-
         )
     }
 }

diff --git a/src/components/header/Header.js b/src/components/header/Header.js
@@ -236,7 +236,7 @@ class Header extends Component {
 
     render() {
         const {
-            docSummaryData, siteName, docNoData, docNo, docStatus,
+            docSummaryData, siteName, docNoData, docStatus,
             docStatusData, windowType, dataId, breadcrumb, showSidelist,
             inbox, selected, entity, query, showIndicator, isDocumentNotSaved,
             selectedWindowType, notfound
@@ -310,8 +310,6 @@ class Header extends Component {
                                 <Breadcrumb
                                     breadcrumb={breadcrumb}
                                     windowType={windowType}
-                                    docNo={docNo}
-                                    docNoData={docNoData}
                                     docSummaryData={docSummaryData}
                                     dataId={dataId}
                                     siteName={siteName}

diff --git a/src/containers/MasterWindow.js b/src/containers/MasterWindow.js
@@ -239,14 +239,12 @@ class MasterWindow extends Component {
         } = this.state;
 
         const {
-            documentNoElement, docActionElement, documentSummaryElement
+            docActionElement, documentSummaryElement
         } = master.layout;
 
         const dataId = master.docId;
 
-        const docNoData = findRowByPropName(
-            master.data, documentNoElement && documentNoElement.fields[0].field
-        );
+        const docNoData = findRowByPropName(master.data, 'DocumentNo');
 
         const docStatusData = {
             'status': findRowByPropName(master.data, 'DocStatus'),
@@ -262,10 +260,9 @@ class MasterWindow extends Component {
         return (
             <Container
                 entity="window"
-                {...{dropzoneFocused, docStatusData, docNoData, docSummaryData,
-                    dataId, breadcrumb}}
+                {...{dropzoneFocused, docStatusData, docSummaryData,
+                    dataId, breadcrumb, docNoData}}
                 docActionElem = {docActionElement}
-                docNoElement = {documentNoElement}
                 windowType={params.windowType}
                 showSidelist={true}
                 showIndicator={!modal.visible}