collection filtering works

3 files changed, 9 insertions, 8 deletions

diff --git a/src/client/views/nodes/DataVizBox/DataVizBox.tsx b/src/client/views/nodes/DataVizBox/DataVizBox.tsx
index f75ba9700..c43177c51 100644
--- a/src/client/views/nodes/DataVizBox/DataVizBox.tsx
+++ b/src/client/views/nodes/DataVizBox/DataVizBox.tsx
@@ -457,10 +457,9 @@ export class DataVizBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
 
     getPossibleTemplates = (): Doc[] => {
         const linkedDocs: Doc[] = LinkManager.Instance.getAllRelatedLinks(this.Document).map(d => DocCast(LinkManager.getOppositeAnchor(d, this.Document)));
-        const linkedCollections: Doc[] = linkedDocs.filter(doc => doc.type === 'config').filter(doc => DocCast(doc.annotationOn).type === 'collection');
+        const linkedCollections: Doc[] = linkedDocs.filter(doc => doc.type === 'config').filter(doc => DocCast(doc.annotationOn).type === 'collection').map(doc => DocCast(doc.annotationOn));
         const isColumnTitle = (title: string): boolean => {
             const colTitles: string[] = Object.keys(this.records[0]);
-            console.log('titles: ' + colTitles)
             for (let i = 0; i < colTitles.length; ++i){
                 if (colTitles[i] === title) {
                     console.log(true); 
@@ -477,7 +476,7 @@ export class DataVizBox extends ViewBoxAnnotatableComponent<FieldViewProps>() {
             }
             return false;
         }
-        return linkedDocs;
+        return linkedCollections.filter(col => isValidTemplate(col));
     }
 
     /**
diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu.scss b/src/client/views/nodes/DataVizBox/DocCreatorMenu.scss
index ba20c9179..4944f3071 100644
--- a/src/client/views/nodes/DataVizBox/DocCreatorMenu.scss
+++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu.scss
@@ -66,9 +66,9 @@
         height: 125px;
         margin-top: 10px;
         margin-left: 10px;
-        border: 1px solid whitesmoke;
+        border: 1px solid rgb(163, 163, 163);
         border-radius: 5px;
-        box-shadow: 5px 5px rgb(34, 34, 37);
+        box-shadow: 5px 5px rgb(29, 29, 31);
 
         &:hover{
             background-color: rgb(72, 72, 73);
@@ -134,6 +134,7 @@
             overflow-y: scroll;
             -ms-overflow-style: none; 
             scrollbar-width: none;
+            border-bottom: solid 1px whitesmoke;
     
             .docCreatorMenu-dropdown-option{
                 display: flex;
diff --git a/src/client/views/nodes/DataVizBox/DocCreatorMenu.tsx b/src/client/views/nodes/DataVizBox/DocCreatorMenu.tsx
index 356172b6a..3ebf97570 100644
--- a/src/client/views/nodes/DataVizBox/DocCreatorMenu.tsx
+++ b/src/client/views/nodes/DataVizBox/DocCreatorMenu.tsx
@@ -150,10 +150,11 @@ export class DocCreatorMenu extends ObservableReactComponent<{}> {
 
     get optionsMenuContents(){
 
-        const layoutOption = (option: 'stacked' | 'grid' | 'row' | 'column' | 'custom') => {
+        const layoutOption = (option: 'stacked' | 'grid' | 'row' | 'column' | 'custom', optStyle?: {}) => {
             return (
                 <div 
                     className="docCreatorMenu-dropdown-option" 
+                    style={optStyle}
                     onPointerDown={e =>
                         setupMoveUpEvents(this, e, returnFalse, emptyFunction,
                             undoable(clickEv => {
@@ -176,7 +177,7 @@ export class DocCreatorMenu extends ObservableReactComponent<{}> {
                         {layoutOption('grid')}
                         {layoutOption('row')}
                         {layoutOption('column')}
-                        {layoutOption('custom')}
+                        {layoutOption('custom', {borderBottom: `0px`})}
                     </div>
                 </div>
                 <div className='docCreatorMenu-layout-preview-window'>
@@ -239,7 +240,7 @@ export class DocCreatorMenu extends ObservableReactComponent<{}> {
                                 )
                             }
                         >
-                            <FontAwesomeIcon icon={this._menuContent === 'templates' ? 'table-cells' : 'window-maximize'}/>
+                            <FontAwesomeIcon icon={this._menuContent === 'templates' ? 'bars' : 'magnifying-glass'}/>
                         </button>
                         <button className='docCreatorMenu-menu-button right'>
                             <FontAwesomeIcon icon={'plus'}/>