support mds is not enabled

Signed-off-by: Hailong Cui <[email protected]>
opensearch-project · Nov 12, 2024 · 04e3abf · 04e3abf
1 parent fe0f9f8
commit 04e3abf
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/...shboards/opensearch-dashboards/workspace-plugin/mds_workspace_analytics_overviews.spec.js b/...shboards/opensearch-dashboards/workspace-plugin/mds_workspace_analytics_overviews.spec.js
@@ -27,7 +27,7 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
           library_write: { users: ['%me%'] },
           write: { users: ['%me%'] },
         },
-        dataSources: [dsId],
+        ...(dsId ? { dataSources: [dsId] } : {}),
       },
     }).then((value) => {
       workspaceId = value;

diff --git a/...shboards/opensearch-dashboards/workspace-plugin/mds_workspace_essential_overviews.spec.js b/...shboards/opensearch-dashboards/workspace-plugin/mds_workspace_essential_overviews.spec.js
@@ -27,7 +27,7 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
           library_write: { users: ['%me%'] },
           write: { users: ['%me%'] },
         },
-        dataSources: [datasourceId],
+        ...(datasourceId ? { dataSources: [datasourceId] } : {}),
       },
     }).then((value) => {
       workspaceId = value;

diff --git a/...-dashboards/opensearch-dashboards/workspace-plugin/mds_workspace_search_overviews.spec.js b/...-dashboards/opensearch-dashboards/workspace-plugin/mds_workspace_search_overviews.spec.js
@@ -11,6 +11,7 @@ const workspaceName = `test_workspace_search_${Math.random()
   .substring(7)}`;
 let workspaceDescription = 'This is a  search workspace description.';
 let workspaceId;
+let datasourceId;
 let workspaceFeatures = ['use-case-search'];
 
 const MDSEnabled = Cypress.env('DATASOURCE_MANAGEMENT_ENABLED');
@@ -26,7 +27,7 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
           library_write: { users: ['%me%'] },
           write: { users: ['%me%'] },
         },
-        dataSources: [datasourceId],
+        ...(datasourceId ? { dataSources: [datasourceId] } : {}),
       },
     }).then((value) => {
       workspaceId = value;
@@ -39,7 +40,7 @@ if (Cypress.env('WORKSPACE_ENABLED')) {
       if (MDSEnabled) {
         cy.deleteAllDataSources();
         cy.createDataSourceNoAuth().then((result) => {
-          const datasourceId = result[0];
+          datasourceId = result[0];
           expect(datasourceId).to.be.a('string').that.is.not.empty;
           createWorkspace(datasourceId);
         });

diff --git a/cypress/utils/commands.js b/cypress/utils/commands.js
@@ -601,7 +601,9 @@ Cypress.Commands.add(
     cy.request({
       method: 'POST',
       headers: { 'osd-xsrf': 'opensearch-dashboards' },
-      url: `${BASE_PATH}/w/${workspaceId}/api/sample_data/${type}?data_source_id=${datasourceId}`,
+      url: `${BASE_PATH}/w/${workspaceId}/api/sample_data/${type}?data_source_id=${
+        datasourceId || ''
+      }`,
     });
   }
 );
@@ -612,7 +614,9 @@ Cypress.Commands.add(
     cy.request({
       method: 'DELETE',
       headers: { 'osd-xsrf': 'opensearch-dashboards' },
-      url: `${BASE_PATH}/w/${workspaceId}/api/sample_data/${type}?data_source_id=${datasourceId}`,
+      url: `${BASE_PATH}/w/${workspaceId}/api/sample_data/${type}?data_source_id=${
+        datasourceId || ''
+      }`,
     });
   }
 );