Merge pull request #10749 from DestinyItemManager/migrate-reversed

Fix migration of reversed sorts

src/app/dim-api/reducer.ts

@@ -463,23 +463,20 @@ function migrateSettings(state: DimApiState) {
   }
 
   // Replace 'element' sort with 'elementWeapon' and 'elementArmor'
-  const sortOrder = state.settings.itemSortOrderCustom || [];
-  const reversals = state.settings.itemSortReversals || [];
+  const sortOrder = [...new Set(state.settings.itemSortOrderCustom || [])];
+  const reversals = [...new Set(state.settings.itemSortReversals || [])];
 
   if (sortOrder.includes('element')) {
-    state = changeSetting(
-      state,
-      'itemSortOrderCustom',
-      sortOrder.toSpliced(sortOrder.indexOf('element'), 1, 'elementWeapon', 'elementArmor'),
-    );
+    sortOrder.splice(sortOrder.indexOf('element'), 1, 'elementWeapon', 'elementArmor');
+  }
+  if (sortOrder.length !== (state.settings.itemSortOrderCustom?.length ?? 0)) {
+    state = changeSetting(state, 'itemSortOrderCustom', sortOrder);
   }
-
   if (reversals.includes('element')) {
-    state = changeSetting(
-      state,
-      'itemSortReversals',
-      reversals.toSpliced(sortOrder.indexOf('element'), 1, 'elementWeapon', 'elementArmor'),
-    );
+    reversals.splice(reversals.indexOf('element'), 1, 'elementWeapon', 'elementArmor');
+  }
+  if (reversals.length !== (state.settings.itemSortReversals?.length ?? 0)) {
+    state = changeSetting(state, 'itemSortReversals', reversals);
   }
 
   // converts any old custom stats stored in the old settings key, to the new format

src/app/search/__snapshots__/query-parser.test.ts.snap

@@ -1,5 +1,15 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`parse |   |: ast 1`] = `
+{
+  "length": 0,
+  "op": "noop",
+  "startIndex": 0,
+}
+`;
+
+exports[`parse |   |: lexer 1`] = `[]`;
+
 exports[`parse |  (
     (
     (is:weapon -is:maxpower powerlimit:1060 or tag:junk or is:blue)

src/app/search/query-parser.test.ts

@@ -73,6 +73,7 @@ const cases = [
   [
     '/* My cool search */ (/* armor */ is:armor and is:blue) or (/*weapons*/ is:weapon and perkname:"Kill Clip")',
   ],
+  ['   '],
 ];
 
 // Each of these asserts that the first query is the same as the second query once parsed

src/app/search/search-filter.ts

@@ -256,6 +256,9 @@ export function parseAndValidateQuery<I, FilterCtx, SuggestionsCtx>(
       if (ast.op === 'or' && ast.operands.every((op) => op.op === 'filter' && op.type === 'id')) {
         saveInHistory = false;
       }
+      if (ast.op === 'noop') {
+        saveable = false;
+      }
       canonical = canonicalizeQuery(ast);
       saveable = canonical.length <= 2048;
     }