Handle null widgets when filtering for scrolled seed

codevise · Jul 2, 2024 · b00862f · b00862f
1 parent 3e76439
commit b00862f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/package/spec/editor/collections/widgetsCollection-spec.js b/package/spec/editor/collections/widgetsCollection-spec.js
@@ -32,4 +32,19 @@ describe('WidgetsCollection', () => {
 
     expect(subsetCollection.pluck('type_name')).toEqual(['consent_bar']);
   });
+
+  it('ignores null widgets', () => {
+    const widgetTypes = factories.widgetTypes([
+      {role: 'consent', name: 'consent_bar', insertPoint: 'react'}
+    ]);
+    const widgets = new WidgetsCollection([
+      {type_name: 'consent_bar', role: 'consent'},
+      {type_name: null, role: 'other'},
+    ], {widgetTypes});
+    widgets.subject = factories.entry();
+
+    const subsetCollection = widgets.withInsertPoint('react');
+
+    expect(subsetCollection.pluck('type_name')).toEqual(['consent_bar']);
+  });
 });
diff --git a/package/src/editor/collections/WidgetsCollection.js b/package/src/editor/collections/WidgetsCollection.js
@@ -39,7 +39,9 @@ export const WidgetsCollection = Backbone.Collection.extend({
     return new SubsetCollection({
       parent: this,
       watchAttribute: 'type_name',
-      filter: widget => widget.widgetType().insertPoint === insertPoint
+      filter: widget => (
+        widget.widgetType() && widget.widgetType().insertPoint === insertPoint
+      )
     });
   }
 });