merge prep

4 files changed, 10 insertions, 29 deletions

diff --git a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
index c673f0e56..ef1819120 100644
--- a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
+++ b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
@@ -700,42 +700,24 @@ export class CollectionSchemaView extends CollectionSubView() {
 
     @action
     setKey = (key: string, defaultVal?: any, index?: number) => {
-        if (this.columnKeys.includes(key)){
-            return;
-        }
-
+        if (this.columnKeys.includes(key)) return;
+    
         if (this._makeNewColumn) {
             this.addColumn(key, defaultVal);
             this._makeNewColumn = false;
-        } else {
-            this.changeColumnKey(this._columnMenuIndex! | index!, key, defaultVal);
-        }
+        } else this.changeColumnKey(this._columnMenuIndex! | index!, key, defaultVal);
+        
         this.closeColumnMenu();
     };
 
     setCellValues = (key: string, value: string) => {
         const selectedDocs: Doc[] = [];
         this.childDocs.forEach(doc => {
-            const docIsSelected = this._selectedCells && !(this._selectedCells?.filter(d => d === doc).length === 0);
-            if (docIsSelected) {
-                selectedDocs.push(doc);
-            }
-        });
-        if (selectedDocs.length === 1) {
-            this.childDocs.forEach(doc => Doc.SetField(doc, key, value));
-        } else {
-            selectedDocs.forEach(doc => Doc.SetField(doc, key, value));
-        }
-        return true;
-    };
-
-    setSelectedColumnValues = (key: string, value: string) => {
-        this.childDocs.forEach(doc => {
-            const docIsSelected = this._selectedCells && !(this._selectedCells?.filter(d => d === doc).length === 0);
-            if (docIsSelected) {
-                Doc.SetField(doc, key, value);
-            }
+            const isSelected = this._selectedCells && !(this._selectedCells?.filter(d => d === doc).length === 0);
+            isSelected && selectedDocs.push(doc); 
         });
+        if (selectedDocs.length === 1) this.childDocs.forEach(doc => Doc.SetField(doc, key, value)); // if only one cell selected, fill all
+        else selectedDocs.forEach(doc => Doc.SetField(doc, key, value)); // else only fill selected cells
         return true;
     };
 
diff --git a/src/client/views/collections/collectionSchema/SchemaRowBox.tsx b/src/client/views/collections/collectionSchema/SchemaRowBox.tsx
index 908939ecc..da272cd18 100644
--- a/src/client/views/collections/collectionSchema/SchemaRowBox.tsx
+++ b/src/client/views/collections/collectionSchema/SchemaRowBox.tsx
@@ -60,7 +60,6 @@ export class SchemaRowBox extends ViewBoxBaseComponent<SchemaRowBoxProps>() {
     deselectCell = () => this.schemaView?.deselectAllCells();
     selectedCells = () => this.schemaView?._selectedDocs;
     setColumnValues = (field: any, value: any) => this.schemaView?.setCellValues(field, value) ?? false;
-    setSelectedColumnValues = (field: any, value: any) => this.schemaView?.setSelectedColumnValues(field, value) ?? false;
     columnWidth = computedFn((index: number) => () => this.schemaView?.displayColumnWidths[index] ?? CollectionSchemaView._minColWidth);
     render() {
         return (
@@ -147,7 +146,6 @@ export class SchemaRowBox extends ViewBoxBaseComponent<SchemaRowBoxProps>() {
                             selectedCells={this.selectedCells}
                             selectedCol={this.selectedCol}
                             setColumnValues={this.setColumnValues}
-                            setSelectedColumnValues={this.setSelectedColumnValues}
                             oneLine={BoolCast(this.schemaDoc?._singleLine)}
                             menuTarget={this.schemaView.MenuTarget}
                             cleanupField={this.cleanupField}
diff --git a/src/client/views/collections/collectionSchema/SchemaTableCell.tsx b/src/client/views/collections/collectionSchema/SchemaTableCell.tsx
index 4531f30a8..e6660f379 100644
--- a/src/client/views/collections/collectionSchema/SchemaTableCell.tsx
+++ b/src/client/views/collections/collectionSchema/SchemaTableCell.tsx
@@ -48,7 +48,6 @@ export interface SchemaTableCellProps {
     isRowActive: () => boolean | undefined;
     getFinfo: (fieldKey: string) => FInfo | undefined;
     setColumnValues: (field: string, value: string) => boolean;
-    setSelectedColumnValues: (field: string, value: string) => boolean;
     oneLine?: boolean; // whether all input should fit on one line vs allowing textare multiline inputs
     allowCRs?: boolean; // allow carriage returns in text input (othewrise CR ends the edit)
     finishEdit?: () => void; // notify container that edit is over (eg. to hide view in DashFieldView)
diff --git a/src/client/views/global/globalScripts.ts b/src/client/views/global/globalScripts.ts
index c595681b7..8e5c39ddf 100644
--- a/src/client/views/global/globalScripts.ts
+++ b/src/client/views/global/globalScripts.ts
@@ -66,6 +66,8 @@ ScriptingGlobals.add(function setBackgroundColor(color?: string, checkResult?: b
             } else {
                 const dataKey = Doc.LayoutFieldKey(dv.Document);
                 const alternate = (dv.layoutDoc[dataKey + '_usePath'] ? '_' + dv.layoutDoc[dataKey + '_usePath'] : '').replace(':hover', '');
+                console.log('color: ' + dv.dataDoc[fieldKey + alternate] + ' to set to: ' + color)
+                dv.layoutDoc[fieldKey + alternate] = undefined;
                 dv.dataDoc[fieldKey + alternate] = color;
             }
         });