#630 Caching selection, to allow work 3 nested gridviews at the same …

…time (wip)
metasfresh · Apr 14, 2017 · 1d21983 · 1d21983
1 parent 81dc72c
commit 1d21983
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 4 deletions.
diff --git a/src/assets/css/styles.css b/src/assets/css/styles.css
@@ -402,8 +402,8 @@ body {
 }
 
 .document-list-included {
-    flex: 1;
-    margin-left: .5rem;
+    flex: 2;
+    margin-left: .1rem;
     overflow: auto;
     overflow-x: hidden;
 }

diff --git a/src/components/app/DocumentList.js b/src/components/app/DocumentList.js
@@ -400,8 +400,13 @@ class DocumentList extends Component {
                             />}
                         </div>
                         <QuickActions
-                            windowType={windowType}
-                            viewId={viewId}
+                            windowType={
+                                (includedView && includedView.windowType) ?
+                                    includedView.windowType : windowType
+                            }
+                            viewId={(includedView && includedView.viewId) ?
+                                includedView.viewId : viewId
+                            }
                             selected={selectionValid ? selected : undefined}
                             refresh={refresh}
                             shouldNotUpdate={inBackground}

diff --git a/src/components/table/Table.js b/src/components/table/Table.js
@@ -63,6 +63,7 @@ class Table extends Component {
             JSON.stringify(nextState.selected) !==
             JSON.stringify(this.state.selected)
         ){
+            console.log('tabela')
             dispatch(selectTableItems(nextState.selected, type));
         }
     }

diff --git a/src/components/table/TablePagination.js b/src/components/table/TablePagination.js
@@ -246,6 +246,7 @@ class TablePagination extends Component {
         return (
             <div className="pagination-wrapper">
                 <div className="pagination-row">
+                    {compressed && <div />}
                     {!compressed && this.renderSelectAll()}
 
                     <div className="items-row-2 pagination-part">

diff --git a/src/containers/DocList.js b/src/containers/DocList.js
@@ -113,6 +113,9 @@ class DocList extends Component {
                              isModal={true}
                              processStatus={processStatus}
                              includedView={includedView}
+                             inBackground={
+                                 includedView.windowType && includedView.viewId
+                             }
                          >
                              <DocumentList
                                  type="grid"