Merge branch 'main' into fix-shared-link

opensearch-project · Apr 9, 2024 · ee975c8 · ee975c8
2 parents 0dc86f5 + 255e268
commit ee975c8
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 0 deletions.
diff --git a/...tegration/core-opensearch-dashboards/opensearch-dashboards/apps/vis_builder/basic.spec.js b/...tegration/core-opensearch-dashboards/opensearch-dashboards/apps/vis_builder/basic.spec.js
@@ -17,10 +17,12 @@ import {
   VB_PATH_SO_DATA,
   VB_SO_TYPE,
 } from '../../../../../utils/constants';
+import { CURRENT_TENANT } from '../../../../../utils/commands';
 
 if (Cypress.env('VISBUILDER_ENABLED')) {
   describe('Visualization Builder Base Tests', () => {
     before(() => {
+      CURRENT_TENANT.newTenant = 'global';
       cy.deleteIndex(VB_INDEX_ID);
       cy.bulkUploadDocs(VB_PATH_INDEX_DATA);
       cy.importSavedObjects(VB_PATH_SO_DATA);

diff --git a/...ation/core-opensearch-dashboards/opensearch-dashboards/apps/vis_builder/dashboard.spec.js b/...ation/core-opensearch-dashboards/opensearch-dashboards/apps/vis_builder/dashboard.spec.js
@@ -18,10 +18,12 @@ import {
   VB_METRIC_VIS_TITLE,
   VB_BAR_VIS_TITLE,
 } from '../../../../../utils/constants';
+import { CURRENT_TENANT } from '../../../../../utils/commands';
 
 if (Cypress.env('VISBUILDER_ENABLED')) {
   describe('Visualization Builder Dashboard Tests', () => {
     before(() => {
+      CURRENT_TENANT.newTenant = 'global';
       cy.deleteIndex(VB_INDEX_ID);
       cy.bulkUploadDocs(VB_PATH_INDEX_DATA);
 

diff --git a/...on/core-opensearch-dashboards/opensearch-dashboards/apps/vis_builder/experimental.spec.js b/...on/core-opensearch-dashboards/opensearch-dashboards/apps/vis_builder/experimental.spec.js
@@ -11,10 +11,12 @@ import {
   VB_METRIC_VIS_TITLE,
   VB_PATH_SO_DATA,
 } from '../../../../../utils/constants';
+import { CURRENT_TENANT } from '../../../../../utils/commands';
 
 if (Cypress.env('VISBUILDER_ENABLED')) {
   describe('Visualization Builder Experimental settings', () => {
     before(() => {
+      CURRENT_TENANT.newTenant = 'global';
       cy.importSavedObjects(VB_PATH_SO_DATA);
     });
 

diff --git a/.../core-opensearch-dashboards/opensearch-dashboards/apps/vis_builder/vis_types/area.spec.js b/.../core-opensearch-dashboards/opensearch-dashboards/apps/vis_builder/vis_types/area.spec.js
@@ -12,10 +12,12 @@ import {
   VB_PATH_INDEX_DATA,
   VB_PATH_SO_DATA,
 } from '../../../../../../utils/constants';
+import { CURRENT_TENANT } from '../../../../../../utils/commands';
 
 if (Cypress.env('VISBUILDER_ENABLED')) {
   describe('Vis Builder: Area Chart', () => {
     before(() => {
+      CURRENT_TENANT.newTenant = 'global';
       cy.deleteIndex(VB_INDEX_ID);
       cy.bulkUploadDocs(VB_PATH_INDEX_DATA);
       cy.importSavedObjects(VB_PATH_SO_DATA);

diff --git a/...n/core-opensearch-dashboards/opensearch-dashboards/apps/vis_builder/vis_types/bar.spec.js b/...n/core-opensearch-dashboards/opensearch-dashboards/apps/vis_builder/vis_types/bar.spec.js
@@ -12,10 +12,12 @@ import {
   VB_PATH_INDEX_DATA,
   VB_PATH_SO_DATA,
 } from '../../../../../../utils/constants';
+import { CURRENT_TENANT } from '../../../../../../utils/commands';
 
 if (Cypress.env('VISBUILDER_ENABLED')) {
   describe('Vis Builder: Bar Chart', () => {
     before(() => {
+      CURRENT_TENANT.newTenant = 'global';
       cy.deleteIndex(VB_INDEX_ID);
       cy.bulkUploadDocs(VB_PATH_INDEX_DATA);
       cy.importSavedObjects(VB_PATH_SO_DATA);

diff --git a/.../core-opensearch-dashboards/opensearch-dashboards/apps/vis_builder/vis_types/line.spec.js b/.../core-opensearch-dashboards/opensearch-dashboards/apps/vis_builder/vis_types/line.spec.js
@@ -12,10 +12,12 @@ import {
   VB_PATH_INDEX_DATA,
   VB_PATH_SO_DATA,
 } from '../../../../../../utils/constants';
+import { CURRENT_TENANT } from '../../../../../../utils/commands';
 
 if (Cypress.env('VISBUILDER_ENABLED')) {
   describe('Vis Builder: Line Chart', () => {
     before(() => {
+      CURRENT_TENANT.newTenant = 'global';
       cy.deleteIndex(VB_INDEX_ID);
       cy.bulkUploadDocs(VB_PATH_INDEX_DATA);
       cy.importSavedObjects(VB_PATH_SO_DATA);

diff --git a/...ore-opensearch-dashboards/opensearch-dashboards/apps/vis_builder/vis_types/metric.spec.js b/...ore-opensearch-dashboards/opensearch-dashboards/apps/vis_builder/vis_types/metric.spec.js
@@ -12,10 +12,12 @@ import {
   VB_PATH_INDEX_DATA,
   VB_PATH_SO_DATA,
 } from '../../../../../../utils/constants';
+import { CURRENT_TENANT } from '../../../../../../utils/commands';
 
 if (Cypress.env('VISBUILDER_ENABLED')) {
   describe('Vis Builder: Metric Chart', () => {
     before(() => {
+      CURRENT_TENANT.newTenant = 'global';
       cy.deleteIndex(VB_INDEX_ID);
       cy.bulkUploadDocs(VB_PATH_INDEX_DATA);
       cy.importSavedObjects(VB_PATH_SO_DATA);

diff --git a/...core-opensearch-dashboards/opensearch-dashboards/apps/vis_builder/vis_types/table.spec.js b/...core-opensearch-dashboards/opensearch-dashboards/apps/vis_builder/vis_types/table.spec.js
@@ -12,10 +12,12 @@ import {
   VB_PATH_INDEX_DATA,
   VB_PATH_SO_DATA,
 } from '../../../../../../utils/constants';
+import { CURRENT_TENANT } from '../../../../../../utils/commands';
 
 if (Cypress.env('VISBUILDER_ENABLED')) {
   describe('Vis Builder: Table Chart', () => {
     before(() => {
+      CURRENT_TENANT.newTenant = 'global';
       cy.deleteIndex(VB_INDEX_ID);
       cy.bulkUploadDocs(VB_PATH_INDEX_DATA);
       cy.importSavedObjects(VB_PATH_SO_DATA);