Restrict Explore to support only Time based Datasets

cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/explore/01/simple_dataset_select.spec.js

@@ -72,16 +72,8 @@ export const runSimpleDatasetSelectorTests = () => {
         indexPattern: INDEX_PATTERN_WITH_TIME,
         time: true,
       },
-      {
-        indexPattern: INDEX_PATTERN_WITH_NO_TIME,
-        time: false,
-      },
     ]).forEach((config) => {
-      it(`Select ${
-        config.time ? 'time-based' : 'no-time-based'
-      } Indexpattern when original language was ${
-        config.language
-      } from the simple dataset selector`, () => {
+      it(`Select time-based Indexpattern when original language was ${config.language} from the simple dataset selector`, () => {
         cy.osd.navigateToWorkSpaceSpecificPage({
           workspaceName,
           page: 'explore/logs',
@@ -110,6 +102,24 @@ export const runSimpleDatasetSelectorTests = () => {
           cy.getElementByTestId('docTableHeaderField').contains('Time');
         }
       });
+
+      it(`Validate non time-based Indexpattern are filtered when original language was ${config.language} from the simple dataset selector`, () => {
+        cy.osd.navigateToWorkSpaceSpecificPage({
+          workspaceName,
+          page: 'explore/logs',
+          isEnhancement: true,
+        });
+
+        cy.getElementByTestId('datasetSelectButton')
+          .should('not.be.disabled')
+          .click({ force: true });
+
+        cy.get('[data-test-subj*="datasetSelectOption"]').should('have.length', 1);
+        // Ensure no dataset options contain "data_logs_small_no_time_" text
+        cy.get('[data-test-subj*="datasetSelectOption"]').each(($el) => {
+          cy.wrap($el).should('not.contain.text', INDEX_PATTERN_WITH_NO_TIME);
+        });
+      });
     });
   });
 

cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/explore/02/saved_queries.spec.js

@@ -125,21 +125,39 @@ const runSavedQueriesUITests = () => {
 
     testConfigurations.forEach((config) => {
       describe(`saved query lifecycle: ${config.testName}`, () => {
-        beforeEach(() => {
+        let savedQueryName;
+        let saveAsNewQueryName;
+
+        before(() => {
+          savedQueryName = `${workspaceName}-${config.saveName}`;
+          saveAsNewQueryName = config.testName + SAVE_AS_NEW_QUERY_SUFFIX;
+
+          // Clean up any existing queries
           cy.then(() => {
             const workspaceId = Cypress.env(`${workspaceName}:WORKSPACE_ID`);
-            cy.osd.apiDeleteSavedQueryIfExists(`${workspaceName}-${config.saveName}`, workspaceId);
+            cy.osd.apiDeleteSavedQueryIfExists(savedQueryName, workspaceId);
             cy.osd.apiDeleteSavedQueryIfExists(`${workspaceName}-${config.testName}`, workspaceId);
+            cy.osd.apiDeleteSavedQueryIfExists(
+              `${workspaceName}-${saveAsNewQueryName}`,
+              workspaceId
+            );
           });
         });
 
-        it(`should create, load, update, modify and delete the saved query: ${config.testName}`, () => {
+        it('should create and verify saved query', () => {
           createSavedQuery(config);
           loadSavedQuery(config);
+        });
+
+        it('should update saved query', () => {
           updateAndVerifySavedQuery(config);
+        });
 
-          const saveAsNewQueryName = config.testName + SAVE_AS_NEW_QUERY_SUFFIX;
+        it('should modify and save as new query', () => {
           modifyAndVerifySavedQuery(config, saveAsNewQueryName);
+        });
+
+        it('should delete saved query', () => {
           deleteSavedQuery(saveAsNewQueryName);
         });
       });

cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/explore/03/download_csv.spec.js

@@ -8,12 +8,7 @@ import {
   getRandomizedWorkspaceName,
   getRandomizedDatasetId,
 } from '../../../../../../utils/apps/explore/shared';
-import { nonTimeBasedFieldsForDatasetCreation } from '../../../../../../utils/constants';
-import {
-  DATASOURCE_NAME,
-  INDEX_WITH_TIME_1,
-  INDEX_WITHOUT_TIME_1,
-} from '../../../../../../utils/apps/explore/constants';
+import { DATASOURCE_NAME, INDEX_WITH_TIME_1 } from '../../../../../../utils/apps/explore/constants';
 import {
   downloadCsvAndVerify,
   generateDownloadCsvTestConfigurations,
@@ -28,12 +23,10 @@ import {
 import {
   prepareTestSuite,
   createWorkspaceAndDatasetUsingEndpoint,
-  createDatasetWithEndpoint,
 } from '../../../../../../utils/helpers';
 
 const workspaceName = getRandomizedWorkspaceName();
 const datasetWithTimeId = getRandomizedDatasetId();
-const datasetWithoutTimeId = getRandomizedDatasetId();
 
 const runDownloadCsvTests = () => {
   describe('Download as CSV', () => {
@@ -50,12 +43,6 @@ const runDownloadCsvTests = () => {
         'logs', // signalType
         ['use-case-observability'] // features
       );
-
-      createDatasetWithEndpoint(DATASOURCE_NAME, workspaceName, datasetWithoutTimeId, {
-        title: `${INDEX_WITHOUT_TIME_1}*`,
-        signalType: 'logs',
-        fields: nonTimeBasedFieldsForDatasetCreation,
-      });
     });
 
     afterEach(() => {

cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/explore/03/table.spec.js

@@ -6,9 +6,7 @@
 import {
   DATASOURCE_NAME,
   INDEX_WITH_TIME_1,
-  INDEX_WITHOUT_TIME_1,
   INDEX_PATTERN_WITH_TIME_1,
-  nonTimeBasedFieldsForDatasetCreation,
 } from '../../../../../../utils/constants';
 import {
   getRandomizedWorkspaceName,
@@ -19,12 +17,10 @@ import {
 import {
   prepareTestSuite,
   createWorkspaceAndDatasetUsingEndpoint,
-  createDatasetWithEndpoint,
 } from '../../../../../../utils/helpers';
 
 const workspaceName = getRandomizedWorkspaceName();
 const datasetWithTimeId = getRandomizedDatasetId();
-const datasetWithoutTimeId = getRandomizedDatasetId();
 
 const generateTableTestConfiguration = (dataset, datasetType, language) => {
   const baseConfig = {
@@ -54,13 +50,6 @@ export const runTableTests = () => {
         'logs', // signalType
         ['use-case-observability'] // features
       );
-
-      // Create second dataset without time field in the existing workspace
-      createDatasetWithEndpoint(DATASOURCE_NAME, workspaceName, datasetWithoutTimeId, {
-        title: INDEX_WITHOUT_TIME_1,
-        signalType: 'logs',
-        fields: nonTimeBasedFieldsForDatasetCreation,
-      });
     });
 
     beforeEach(() => {
@@ -79,10 +68,7 @@ export const runTableTests = () => {
     });
 
     after(() => {
-      cy.osd.cleanupWorkspaceAndDataSourceAndIndices(workspaceName, [
-        INDEX_WITH_TIME_1,
-        INDEX_WITHOUT_TIME_1,
-      ]);
+      cy.osd.cleanupWorkspaceAndDataSourceAndIndices(workspaceName);
     });
 
     generateAllTestConfigurations(generateTableTestConfiguration, {

cypress/integration/core_opensearch_dashboards/opensearch_dashboards/apps/explore/05/recent_queries.spec.js

@@ -98,7 +98,7 @@ const runRecentQueryTests = () => {
                   config.alternativeDataset,
                   DATASOURCE_NAME,
                   config.language.name,
-                  "I don't want to use the time filter"
+                  'updated_at'
                 );
                 cy.explore.setDataset(config.dataset, DATASOURCE_NAME, config.datasetType);
                 cy.getElementByTestId('exploreRecentQueriesButton').click({

cypress/utils/apps/explore/download_csv.js

@@ -3,13 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {
-  DatasetTypes,
-  DATASOURCE_NAME,
-  INDEX_WITH_TIME_1,
-  INDEX_WITHOUT_TIME_1,
-  QueryLanguages,
-} from './constants';
+import { DatasetTypes, DATASOURCE_NAME, INDEX_WITH_TIME_1, QueryLanguages } from './constants';
 import path from 'path';
 import moment from 'moment';
 import { setDatePickerDatesIfRelevant } from './shared';
@@ -44,14 +38,6 @@ export const generateDownloadCsvTestConfigurations = () => {
           hasTime: true,
           saveName: `${dataset.name}-${language.name}-Time`,
         },
-        {
-          ...sharedConfig,
-          dataset: `${INDEX_WITHOUT_TIME_1}${
-            dataset.name === DatasetTypes.INDEXES.name ? '' : '*'
-          }`,
-          hasTime: false,
-          saveName: `${dataset.name}-${language.name}-NoTime`,
-        },
       ];
     });
   });

cypress/utils/apps/explore/recent_queries.js

@@ -48,7 +48,7 @@ export const generateRecentQueriesTestConfiguration = (dataset, datasetType, lan
     dataset,
     datasetType: customDatasetType,
     language,
-    alternativeDataset: '.opensearch-sap-log-types-config',
+    alternativeDataset: '.kibana',
     defaultQuery: defaultQuery,
     testName: `dataset: ${datasetType} and language: ${language.name}`,
   };

cypress/utils/commands.explore.js

@@ -266,7 +266,7 @@ cy.explore.add(
   'saveQuery',
   (name, description = ' ', includeFilters = true, includeTimeFilter = false) => {
     cy.whenTestIdNotFound('saved-query-management-popover', () => {
-      cy.getElementByTestId('queryPanelFooterSaveQueryButton').click();
+      cy.getElementByTestId('queryPanelFooterSaveQueryButton').click({ force: true });
     });
     cy.getElementByTestId('saved-query-management-save-button').click();
 
@@ -293,7 +293,7 @@ cy.explore.add(
   'updateSavedQuery',
   (name = '', saveAsNewQuery = false, includeFilters = true, includeTimeFilter = false) => {
     cy.whenTestIdNotFound('saved-query-management-popover', () => {
-      cy.getElementByTestId('queryPanelFooterSaveQueryButton').click();
+      cy.getElementByTestId('queryPanelFooterSaveQueryButton').click({ force: true });
     });
     cy.getElementByTestId('saved-query-management-save-button').click();
 

src/plugins/data/public/ui/dataset_select/_dataset_select.scss

@@ -127,4 +127,9 @@
     }
     /* stylelint-enable @osd/stylelint/no_modifying_global_selectors */
   }
+
+  &__timeBasedDisclaimer {
+    margin: 0;
+    margin-bottom: 2px;
+  }
 }