From 76fac0c700bf1e98c8284f4bfb9559b15ae279fb Mon Sep 17 00:00:00 2001
From: Ariya Hidayat <ariya@metabase.com>
Date: Thu, 12 May 2022 05:40:42 -0700
Subject: [PATCH] Use native `Array.isArray` to check for array type (#22653)
---
frontend/interfaces/underscore.js | 1 -
frontend/src/metabase/lib/request.js | 2 +-
.../test/metabase/scenarios/onboarding/auth/signin.cy.spec.js | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/frontend/interfaces/underscore.js b/frontend/interfaces/underscore.js
index 27e7fe0ed5d..c0fd622b27a 100755
--- a/frontend/interfaces/underscore.js
+++ b/frontend/interfaces/underscore.js
@@ -71,7 +71,6 @@ declare module "underscore" {
declare function isEmpty(o: any): boolean;
declare function isString(o: any): boolean;
declare function isObject(o: any): boolean;
- declare function isArray(o: any): boolean;
declare function groupBy<T>(
a: Array<T>,
diff --git a/frontend/src/metabase/lib/request.js b/frontend/src/metabase/lib/request.js
index b910747b58b..1c46dc4053f 100644
--- a/frontend/src/metabase/lib/request.js
+++ b/frontend/src/metabase/lib/request.js
@@ -52,7 +52,7 @@ export class RestfulRequest {
mergeToDictionary = (dict, result) => {
dict = dict || {};
- result = _.isArray(result)
+ result = Array.isArray(result)
? _.indexBy(result, "id")
: { [result.id]: result };
diff --git a/frontend/test/metabase/scenarios/onboarding/auth/signin.cy.spec.js b/frontend/test/metabase/scenarios/onboarding/auth/signin.cy.spec.js
index 07d61b097cd..0facea506a9 100644
--- a/frontend/test/metabase/scenarios/onboarding/auth/signin.cy.spec.js
+++ b/frontend/test/metabase/scenarios/onboarding/auth/signin.cy.spec.js
@@ -89,7 +89,7 @@ describe("scenarios > auth > signin", () => {
sizes.forEach(size => {
it(`should redirect from /auth/forgot_password back to /auth/login (viewport: ${size}) (metabase#12658)`, () => {
- if (Cypress._.isArray(size)) {
+ if (Array.isArray(size)) {
cy.viewport(size[0], size[1]);
} else {
cy.viewport(size);
--
GitLab