merge with master #600

metasfresh · May 26, 2017 · ed4b32b · ed4b32b
2 parents 55a35c0 + 83af110
commit ed4b32b
Show file tree

Hide file tree

Showing 20 changed files with 209 additions and 108 deletions.
diff --git a/src/actions/GenericActions.js b/src/actions/GenericActions.js
@@ -115,7 +115,7 @@ export function completeRequest(
 
 export function autocompleteRequest(
     docType, propertyName, query, docId, tabId, rowId, entity, subentity,
-    subentityId, viewId
+    subentityId, viewId, attribute
 ) {
     return () => axios.get(
         config.API_URL +
@@ -127,14 +127,15 @@ export function autocompleteRequest(
         (rowId ? '/' + rowId : '') +
         (subentity ? '/' + subentity : '') +
         (subentityId ? '/' + subentityId : '') +
-        '/attribute/' + propertyName +
+        (attribute ? '/attribute/' : '/field/') +
+        propertyName +
         '/typeahead' + '?query=' + encodeURIComponent(query)
     );
 }
 
 export function dropdownRequest(
     docType, propertyName, docId, tabId, rowId, entity, subentity, subentityId,
-    viewId
+    viewId, attribute
 ) {
     return () => axios.get(
         config.API_URL +
@@ -146,7 +147,8 @@ export function dropdownRequest(
         (rowId ? '/' + rowId : '') +
         (subentity ? '/' + subentity : '') +
         (subentityId ? '/' + subentityId : '') +
-        '/attribute/' + propertyName +
+        (attribute ? '/attribute/' : '/field/') +
+        propertyName +
         '/dropdown'
     );
 }

diff --git a/src/actions/WindowActions.js b/src/actions/WindowActions.js
@@ -592,14 +592,15 @@ export function attachFileAction(windowType, docId, data){
 }
 
 //ZOOM INTO
-export function getZoomIntoWindow(windowId, docId, field, tabId, rowId) {
+export function getZoomIntoWindow(entity, windowId, docId, tabId, rowId, field){
    return () => axios.get(
         config.API_URL +
-        '/window/' + windowId +
-        '/' + docId +
+        '/' + entity +
+        '/' + windowId +
+        (docId ? '/' + docId : '') +
         (tabId ? '/' + tabId : '') +
         (rowId ? '/' + rowId : '') +
-        '/attribute' +
+        '/field' +
         '/' + field +
         '/zoomInto?showError=true'
     );

diff --git a/src/assets/css/inputs.css b/src/assets/css/inputs.css
@@ -261,11 +261,24 @@ button {
     border-radius: 2px;
 }
 
+.input-state-false {
+    border-color: $brand-success-dark-color;
+    border-width: 2px;
+}
+
 .input-checkbox input:checked ~ .input-checkbox-tick {
     background: $brand-success-dark-color;
     border-color: $brand-success-dark-color;
 }
 
+.input-side {
+    position: relative;
+    top: -5px;
+    margin-left: 5px;
+    color: $brand-light-color;
+    cursor: pointer;
+}
+
 .input-checkbox input:disabled ~ .input-checkbox-tick {
     pointer-events: none;
     background: #ccc;

diff --git a/src/assets/css/styles.css b/src/assets/css/styles.css
@@ -119,6 +119,10 @@ body {
     z-index: 3;
 }
 
+.context-menu-separator {
+    margin:0;
+}
+
 .context-menu-open {
     display: block;
 }
@@ -1135,3 +1139,21 @@ td.pulse-off input {
     text-decoration: underline;
     cursor: pointer;
 }
+
+.separator {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+    justify-content: flex-start;
+
+    margin-top: .5rem;
+}
+
+.separator-title {
+    color: $brand-font-color-weak;
+}
+
+.separator-hr {
+    width: 100%;
+    margin-left: 1rem;
+}
diff --git a/src/assets/css/table.css b/src/assets/css/table.css
@@ -251,38 +251,31 @@ th {
     position: relative;
 }
 
-.th-lg {
-    width: 200px;
+/* Table cols sizing */
+
+.td-lg {
+    width: 225px;
+    max-width: 225px;
 }
 
-.th-md {
-    width: 100px;
+.td-md {
+    width: 144px;
+    max-width: 144px;
 }
 
-.th-sm {
+.td-sm {
     min-width: 60px;
     max-width: 100px;
 }
 
-.table .td-lg {
-    width: 225px;
-    max-width: 225px;
-}
-
 .td-lg .input-dropdown-list {
     width: 225px;
 }
 
-.table .td-md {
-    width: 144px;
-    max-width: 144px;
-}
-
 .td-lg .input-dropdown-list {
     width: auto;
 }
 
-
 .pagination {
     margin-top: 0;
     margin-bottom: 0;

diff --git a/src/components/Separator.js b/src/components/Separator.js
@@ -0,0 +1,19 @@
+import React, { Component } from 'react';
+
+class Separator extends Component {
+    constructor(props) {
+        super(props);
+    }
+
+    render() {
+        const {title} = this.props;
+        return (
+            <div className="separator col-xs-12">
+                <span className="separator-title">{title}</span>
+                <hr className="separator-hr" />
+            </div>
+        );
+    }
+}
+
+export default Separator;
diff --git a/src/components/Window.js b/src/components/Window.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react';
 
 import Dropzone from './Dropzone';
+import Separator from './Separator';
 
 import {
     findRowByPropName
@@ -85,20 +86,22 @@ class Window extends Component {
 
     renderSections = (sections) => {
         return sections.map((elem, id)=> {
-            const columns = elem.columns;
+            const {title, columns} = elem;
+            const isFirst = (id === 0);
             return (
                 <div className="row" key={'section' + id}>
-                    {columns && this.renderColumns(columns)}
+                    {title && <Separator {...{title}} />}
+                    {columns && this.renderColumns(columns, isFirst)}
                 </div>
             )
        })
     }
 
-    renderColumns = (columns) => {
+    renderColumns = (columns, isSectionFirst) => {
         const maxRows = 12;
         const colWidth = Math.floor(maxRows / columns.length);
         return columns.map((elem, id)=> {
-            const isFirst = (id === 0);
+            const isFirst = id === 0 && isSectionFirst;
             const elementGroups = elem.elementGroups;
             return (
                 <div className={'col-sm-' + colWidth} key={'col' + id}>
@@ -111,6 +114,7 @@ class Window extends Component {
     }
 
     renderElementGroups = (group, isFirst) => {
+        const {isModal} = this.props;
         return group.map((elem, id)=> {
             const {type, elementsLine} = elem;
             const shouldBeFocused = isFirst && (id === 0);
@@ -123,6 +127,7 @@ class Window extends Component {
                 elementsLine && elementsLine.length > 0 &&
                     <div
                         key={'elemGroups' + id}
+                        ref={c => isModal && shouldBeFocused && c && c.focus()}
                         tabIndex={shouldBeFocused ? 0 : undefined}
                         className={
                             'panel panel-spaced panel-distance ' +

diff --git a/src/components/app/DocumentList.js b/src/components/app/DocumentList.js
@@ -539,7 +539,7 @@ class DocumentList extends Component {
                                 {...{isIncluded, disconnectFromState, autofocus,
                                     open, page, closeOverlays, inBackground,
                                     disablePaginationShortcuts, isModal,
-                                    hasIncluded
+                                    hasIncluded, viewId
                                 }}
                             >
                                 {layout.supportAttributes && !isIncluded &&

diff --git a/src/components/app/SelectionAttributes.js b/src/components/app/SelectionAttributes.js
@@ -98,6 +98,7 @@ class SelectionAttributes extends Component {
                     {DLWrapperLayout && DLWrapperLayout.map((item, id) =>
                         <RawWidget
                             entity={entity}
+                            attribute={true}
                             widgetType={item.widgetType}
                             fields={item.fields}
                             dataId={DLWrapperDataId}

diff --git a/src/components/filters/FiltersItem.js b/src/components/filters/FiltersItem.js
@@ -39,8 +39,8 @@ class FiltersItem extends Component {
             active.parameters.map(item => {
                 this.mergeData(
                     item.parameterName,
-                    item.value ? item.value : '',
-                    item.valueTo ? item.valueTo : ''
+                    item.value != null ? item.value : '',
+                    item.valueTo != null ? item.valueTo : ''
                 );
             })
         }else if(filter.parameters){

diff --git a/src/components/header/Actions.js b/src/components/header/Actions.js
@@ -23,6 +23,9 @@ class Actions extends Component {
         } = this.props;
 
         if(!windowType || docId === 'notfound' || notfound){
+            this.setState({
+                data: []
+            })
             return;
         }
 
@@ -32,7 +35,11 @@ class Actions extends Component {
             this.setState({
                 data: response.data.actions
             });
-        });
+        }).catch(() => {
+            this.setState({
+                data: []
+            })
+        })
     }
 
     renderData = () => {