From 139d2d9c1643950ed3ff2995f4d3919949a69a21 Mon Sep 17 00:00:00 2001 From: Manasvini B Suryanarayana Date: Mon, 10 Jul 2023 15:16:13 -0700 Subject: [PATCH] [Site] add OSD results (#711) (#742) * [Site] add OSD results * fix linter --------- Signed-off-by: Kawika Avilla Signed-off-by: Kawika Avilla Co-authored-by: Kawika Avilla (cherry picked from commit ad594fb403acc629b9d55ddbe0a02104b6857d1c) Co-authored-by: Kawika Avilla --- site/index.html | 3 +++ site/js/dashboard.js | 37 +++++++++++++++++++++++++++++++++---- site/styles.css | 1 + 3 files changed, 37 insertions(+), 4 deletions(-) diff --git a/site/index.html b/site/index.html index b37cfc075..6002aa724 100644 --- a/site/index.html +++ b/site/index.html @@ -136,6 +136,9 @@

Plugins:

+ diff --git a/site/js/dashboard.js b/site/js/dashboard.js index 338838dca..88c3cd650 100644 --- a/site/js/dashboard.js +++ b/site/js/dashboard.js @@ -17,6 +17,30 @@ const defaults = { }; const plugins = { + 'opensearch-dashboards': { + name: 'OpenSearch-Dashboards', + default: { + videos: [ + 'apps/vis_builder/basic.spec.js', + 'apps/vis_builder/dashboard.spec.js', + 'apps/vis_builder/experimental.spec.js', + 'apps/vis_builder/vis_types/area.spec.js', + 'apps/vis_builder/vis_types/bar.spec.js', + 'apps/vis_builder/vis_types/line.spec.js', + 'apps/vis_builder/vis_types/metric.spec.js', + 'apps/vis_builder/vis_types/table.spec.js', + 'apps/vis_type_table/basic.spec.js', + 'apps/vis_type_table/data.spec.js', + 'apps/vis_type_table/embed.spec.js', + 'apps/vis_type_table/options.spec.js', + 'apps/vis_type_table/split.spec.js', + 'apps/datasource-management-plugin/1_create_datasource.spec.js', + 'apps/datasource-management-plugin/2_datasource_table.spec.js', + 'apps/datasource-management-plugin/3_update_datasource.spec.js', + 'dashboard_sanity_test_spec.js', + ], + }, + }, 'alerting-dashboards-plugin': { name: 'alertingDashboards', default: { @@ -268,6 +292,10 @@ function getPluginLinks(plugin) { var pluginLinksList = document.getElementById('pluginLinksList'); const pluginObject = plugins[plugin]; + const coreBaseUrl = + pluginObject.name === 'OpenSearch-Dashboards' + ? 'core-opensearch-dashboards' + : 'plugins'; const pluginUrl = 'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/' + @@ -276,7 +304,8 @@ function getPluginLinks(plugin) { `${platform}/` + `${arch}/` + `${type}/` + - 'builds/opensearch-dashboards/plugins/' + + 'builds/opensearch-dashboards/' + + `${coreBaseUrl}` + `${pluginObject.name}-${version}.zip`; var githubManifestLink = document.createElement('a'); @@ -328,14 +357,14 @@ function getPluginLinks(plugin) { }/` + `${securityEnabled ? 'with-security' : 'without-security'}` + `${enableLegacyTestsResults() ? 'test-results' : ''}`; - const screenshotBaseUrl = `${s3BaseUrl}/cypress-screenshots/plugins/${plugin}/$SPEC_FILE/$FULL_TEST_FAILURE.png`; - const videosBaseUrl = `${s3BaseUrl}/cypress-videos/plugins/${plugin}`; + const screenshotBaseUrl = `${s3BaseUrl}/cypress-screenshots/${coreBaseUrl}/${plugin}/$SPEC_FILE/$FULL_TEST_FAILURE.png`; + const videosBaseUrl = `${s3BaseUrl}/cypress-videos/${coreBaseUrl}/${plugin}`; document.getElementById( 'baseScreenshotUrlBefore' ).innerHTML = `/tmp/$RANDOM/${ enableLegacyTestsResults() ? 'functionalTestDashboards' : pluginObject.name - }/cypress/screenshots/plugins/${plugin}/$SPEC_FILE/$FULL_TEST_FAILURE.png`; + }/cypress/screenshots/${coreBaseUrl}/${plugin}/$SPEC_FILE/$FULL_TEST_FAILURE.png`; document.getElementById('baseScreenshotUrlAfter').innerHTML = screenshotBaseUrl; diff --git a/site/styles.css b/site/styles.css index 693ccbf43..be0cb6255 100644 --- a/site/styles.css +++ b/site/styles.css @@ -108,6 +108,7 @@ body { border-radius: 6px; box-shadow: rgba(27, 31, 35, 0.04) 0 1px 0, rgba(255, 255, 255, 0.25) 0 3px 0 inset; border: 2px solid rgba(27, 31, 35, 0.15); + overflow-y: scroll; } #pluginLinksDiv button {