1 files changed, 16 insertions, 0 deletions
diff --git a/src/client/views/collections/CollectionView.tsx b/src/client/views/collections/CollectionView.tsx
index 535bf539e..1e693f594 100644
--- a/src/client/views/collections/CollectionView.tsx
+++ b/src/client/views/collections/CollectionView.tsx
@@ -38,6 +38,8 @@ import { SubCollectionViewProps } from './CollectionSubView';
 import { CollectionTimeView } from './CollectionTimeView';
 import { CollectionTreeView } from "./CollectionTreeView";
 import './CollectionView.scss';
+import { FilterBox } from '../nodes/FilterBox';
+import { listSpec } from '../../../fields/Schema';
 export const COLLECTION_BORDER_WIDTH = 2;
 const path = require('path');
 
@@ -117,6 +119,19 @@ export class CollectionView extends Touchable<CollectionViewProps> {
 
     whenActiveChanged = (isActive: boolean) => this.props.whenActiveChanged(this._isChildActive = isActive);
 
+    /**
+     * Applies the collection/dashboard's current filter attributes to the doc being added
+     */
+    addFilterAttributes = (doc: Doc) => {
+        Cast((FilterBox._filterScope === "Current Collection" ? this.props.Document : CurrentUserUtils.ActiveDashboard)._docFilters, listSpec("string"))?.forEach(attribute => {
+            if (attribute.charAt(0).toUpperCase() === attribute.charAt(0)) {
+                const fields = attribute.split(':');
+                if (fields[2] === "check") doc[DataSym][fields[0]] = fields[1];
+                else if (fields[2] === "x" && doc[DataSym][fields[0]] === fields[1]) doc[DataSym][fields[0]] = undefined;
+            }
+        });
+    }
+
     @action.bound
     addDocument = (doc: Doc | Doc[]): boolean => {
         if (this.props.filterAddDocument?.(doc) === false) {
@@ -158,6 +173,7 @@ export class CollectionView extends Touchable<CollectionViewProps> {
                         DocUtils.LeavePushpin(doc);
                         doc._stayInCollection = undefined;
                         doc.context = this.props.Document;
+                        this.addFilterAttributes(doc); // 
                     });
                     added.map(doc => this.props.layerProvider?.(doc, true));// assigns layer values to the newly added document... testing the utility of this
                     (targetDataDoc[this.props.fieldKey] as List<Doc>).push(...added);