fix: defaultTenant does not take effect (#1318)

Signed-off-by: SuZhou-Joe <[email protected]>

Author: SuZhou-Joe

cypress/utils/commands.js

@@ -587,3 +587,14 @@ Cypress.Commands.add('loadSampleData', (type) => {
     url: `${BASE_PATH}/api/sample_data/${type}`,
   });
 });
+
+Cypress.Commands.add('fleshTenantSettings', () => {
+  if (Cypress.env('SECURITY_ENABLED')) {
+    // Use xhr request is good enough to flesh tenant
+    cy.request({
+      url: `${BASE_PATH}/app/home?security_tenant=${CURRENT_TENANT.defaultTenant}`,
+      method: 'GET',
+      failOnStatusCode: false,
+    });
+  }
+});

cypress/utils/dashboards/commands.js

@@ -7,8 +7,6 @@ import './vis_builder/commands';
 import './vis_type_table/commands';
 import './vis-augmenter/commands';
 import './data_explorer/commands';
-import { BASE_PATH } from '../base_constants';
-import { CURRENT_TENANT } from '../commands';
 
 Cypress.Commands.add('waitForLoader', () => {
   const opts = { log: false };
@@ -119,14 +117,3 @@ Cypress.Commands.add('setTopNavDate', (start, end, submit = true) => {
 Cypress.Commands.add('updateTopNav', (options) => {
   cy.getElementByTestId('querySubmitButton', options).click({ force: true });
 });
-
-Cypress.Commands.add('fleshTenantSettings', () => {
-  if (Cypress.env('SECURITY_ENABLED')) {
-    // Use xhr request is good enough to flesh tenant
-    cy.request({
-      url: `${BASE_PATH}/app/home?security_tenant=${CURRENT_TENANT.defaultTenant}`,
-      method: 'GET',
-      failOnStatusCode: false,
-    });
-  }
-});