Merge pull request #15733 from ilucin/fix-computed-sort-regression

[BUGFIX] Fix computed sort regression when array prop initially null
emberjs · Oct 13, 2017 · 032a271 · 032a271
2 parents f4bbfe2 + 2cf4219
commit 032a271
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/packages/ember-runtime/lib/computed/reduce_computed_macros.js b/packages/ember-runtime/lib/computed/reduce_computed_macros.js
@@ -740,10 +740,6 @@ function propertySort(itemsKey, sortPropertiesKey) {
       activeObservers.forEach(args => removeObserver(...args));
     }
 
-    let itemsKeyIsAtThis = (itemsKey === '@this');
-    let items = itemsKeyIsAtThis ? this : get(this, itemsKey);
-    if (!isArray(items)) { return emberA(); }
-
     function sortPropertyDidChange() {
       this.notifyPropertyChange(key);
     }
@@ -757,6 +753,10 @@ function propertySort(itemsKey, sortPropertiesKey) {
 
     activeObserversMap.set(this, activeObservers);
 
+    let itemsKeyIsAtThis = (itemsKey === '@this');
+    let items = itemsKeyIsAtThis ? this : get(this, itemsKey);
+    if (!isArray(items)) { return emberA(); }
+
     return sortByNormalizedSortProperties(items, normalizedSortProperties);
   }, { dependentKeys: [`${sortPropertiesKey}.[]`], readOnly: true });
 

diff --git a/packages/ember-runtime/tests/computed/reduce_computed_macros_test.js b/packages/ember-runtime/tests/computed/reduce_computed_macros_test.js
@@ -918,6 +918,13 @@ QUnit.test('updating sort properties detaches observers for old sort properties'
   ], 'after changing removed item array is not updated');
 });
 
+QUnit.test('sort works if array property is null (non array value) on first evaluation of computed prop', function() {
+  obj.set('items', null);
+  deepEqual(obj.get('sortedItems'), []);
+  obj.set('items', emberA([{fname: 'Cersei', lname: 'Lanister'}]));
+  deepEqual(obj.get('sortedItems'), [{fname: 'Cersei', lname: 'Lanister'}]);
+});
+
 QUnit.test('updating sort properties updates the sorted array', function() {
   deepEqual(obj.get('sortedItems').mapBy('fname'), [
     'Cersei',