Merge branch 'main' into tracesLoadSort

Author: TackAdam

.cypress/integration/app_analytics_test/app_analytics.spec.js

@@ -303,6 +303,7 @@ describe('Viewing application', () => {
 
   it('Opens service detail flyout when Service Name is clicked', () => {
     cy.get('[data-test-subj="app-analytics-serviceTab"]').click();
+    cy.get('[data-test-subj="globalLoadingIndicator"]').should('not.exist');
     cy.get('*[data-test-subj^="service-link"]').eq(0).click();
     cy.get('[data-test-subj="serviceDetailFlyoutTitle"]').should('be.visible');
     cy.get('[data-test-subj="Number of connected servicesDescriptionList"]').should('contain', '3');
@@ -319,6 +320,7 @@ describe('Viewing application', () => {
 
   it('Opens trace detail flyout when Trace ID is clicked', () => {
     cy.get('[data-test-subj="app-analytics-traceTab"]').click();
+    cy.get('[data-test-subj="globalLoadingIndicator"]').should('not.exist');
     cy.get('[title="03f9c770db5ee2f1caac0afc36db49ba"]').click();
     cy.get('[data-test-subj="traceDetailFlyoutTitle"]').should('be.visible');
     cy.get('[data-test-subj="traceDetailFlyout"]').within(($flyout) => {
@@ -339,6 +341,7 @@ describe('Viewing application', () => {
 
   it('Opens span detail flyout when Span ID is clicked', () => {
     cy.get('[data-test-subj="app-analytics-traceTab"]').click();
+    cy.get('[data-test-subj="globalLoadingIndicator"]').should('not.exist');
     cy.get('input[type="search"]').click().type(`5ff3516909562c60`);
     cy.get('[data-test-subj="globalLoadingIndicator"]').should('not.exist');
     cy.get('[data-test-subj="dataGridRowCell"]').contains('5ff3516909562c60').click();
@@ -432,6 +435,7 @@ describe('Viewing application', () => {
     changeTimeTo24('months');
     cy.get('[data-test-subj="app-analytics-logTab"]').click();
     cy.get('[data-test-subj="superDatePickerApplyTimeButton"]').click();
+    cy.get('[data-test-subj="globalLoadingIndicator"]').should('not.exist');
     cy.get('[id="explorerPlotComponent"]', { timeout: timeoutDelay }).should('exist');
     cy.get('[data-test-subj="searchAutocompleteTextArea"]').focus();
     cy.get('[data-test-subj="searchAutocompleteTextArea"]').type('      ' + query_two, {

.cypress/utils/app_constants.js

@@ -140,6 +140,7 @@ export const changeTimeTo24 = (timeUnit) => {
   cy.get('[aria-label="Time unit"]').select(timeUnit);
   cy.get('.euiButton').contains('Apply').click();
   cy.get('[data-test-subj="superDatePickerApplyTimeButton"]').click();
+  cy.get('[data-test-subj="globalLoadingIndicator"]').should('not.exist');
 };
 
 export const expectMessageOnHover = (button, message) => {

.github/workflows/integration-tests-workflow.yml

@@ -178,12 +178,6 @@ jobs:
           name: dashboard.logs
           path: OpenSearch-Dashboards/dashboard.log
 
-      - name: Install Cypress
-        run: |
-          cd ./OpenSearch-Dashboards/plugins/dashboards-observability
-          npx cypress install
-        shell: bash
-
       - name: Get Cypress version
         id: cypress_version
         run: |

.husky/hooks/check-test-only.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+
+# Get all staged files
+staged_files=$(git diff --cached --name-only --diff-filter=ACM | grep -E '\.(js|jsx|ts|tsx)$')
+
+if [[ -z "$staged_files" ]]; then
+  exit 0
+fi
+
+# Check for .only in Jest or Cypress test files
+only_pattern="(describe|it|test|context|cy)\.only\("
+found_only=false
+
+for file in $staged_files; do
+  # Check if file has .only
+  if grep -E "$only_pattern" "$file" > /dev/null; then
+    echo "Error: Found .only in $file"
+    echo "Please remove all instances of .only before committing"
+    found_only=true
+  fi
+done
+
+if [[ "$found_only" = true ]]; then
+  exit 1
+fi
+
+exit 0

package.json

@@ -7,8 +7,8 @@
     "osd": "node ../../scripts/osd",
     "build": "yarn plugin-helpers build",
     "test": "../../node_modules/.bin/jest --config ./test/jest.config.js",
-    "cypress:run": "TZ=America/Los_Angeles cypress run",
-    "cypress:open": "TZ=America/Los_Angeles cypress open",
+    "cypress:run": "TZ=America/Los_Angeles ../../node_modules/cypress/bin/cypress run",
+    "cypress:open": "TZ=America/Los_Angeles ../../node_modules/cypress/bin/cypress open",
     "plugin-helpers": "node ../../scripts/plugin_helpers",
     "prepare": "husky install",
     "lint:es": "node ../../scripts/eslint",
@@ -17,6 +17,7 @@
   },
   "lint-staged": {
     "*.{ts,tsx,js,jsx}": [
+      ".husky/hooks/check-test-only.sh",
       "yarn lint --fix"
     ]
   },
@@ -47,7 +48,6 @@
     "@types/react-test-renderer": "^18.0.0",
     "@types/sanitize-filename": "^1.6.3",
     "antlr4ts-cli": "^0.5.0-alpha.4",
-    "cypress": "12.17.4",
     "cypress-multi-reporters": "^1.6.4",
     "cypress-parallel": "^0.14.0",
     "cypress-watch-and-reload": "^1.10.6",
@@ -59,7 +59,7 @@
   "resolutions": {
     "@types/react": "^16.14.23",
     "react-syntax-highlighter": "^15.4.3",
-    "prismjs": "^1.22.0",
+    "prismjs": "^1.30.0",
     "trim": "^1.0.0",
     "lodash": "^4.17.21",
     "glob-parent": "^6.0.1",