Address PR comments

apache-superset · Jan 26, 2021 · 8ae7f07 · 8ae7f07
1 parent 943ab9c
commit 8ae7f07
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 11 deletions.
diff --git a/packages/superset-ui-core/src/query/extractQueryFields.ts b/packages/superset-ui-core/src/query/extractQueryFields.ts
@@ -74,8 +74,7 @@ export default function extractQueryFields(
  }
  if (normalizedKey === 'metrics') {
  finalQueryFields[normalizedKey] = finalQueryFields[normalizedKey].concat(value);
- }
- if (normalizedKey === 'columns') {
+ } else if (normalizedKey === 'columns') {
  // currently the columns field only accept pre-defined columns (string shortcut)
  finalQueryFields[normalizedKey] = finalQueryFields[normalizedKey]
  .concat(value)

diff --git a/packages/superset-ui-core/src/utils/removeDuplicates.ts b/packages/superset-ui-core/src/utils/removeDuplicates.ts
@@ -20,16 +20,16 @@
  * Remove duplicate items from a list.
  */
 export function removeDuplicates<T>(items: T[], hash?: (item: T) => unknown): T[] {
- const seen = new Set();
- const result: T[] = [];
- items.forEach(x => {
- const itemHash = hash ? hash(x) : x;
- if (!seen.has(itemHash)) {
+ if (hash) {
+  const seen = new Set();
+  return items.filter(x => {
+  const itemHash = hash(x);
+  if (seen.has(itemHash)) return false;
  seen.add(itemHash);
- result.push(x);
- }
- });
- return result;
+ return true;
+ });
+ }
+ return [...new Set(items)];
 }
 
 export default removeDuplicates;