From 382e8fb3dd3eb7ca1457850154852862985c7615 Mon Sep 17 00:00:00 2001
From: Kawika Avilla <kavilla414@gmail.com>
Date: Fri, 2 Jun 2023 14:57:35 -0700
Subject: [PATCH 1/2] [Site] add OSD results

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>
---
 site/index.html      |  3 +++
 site/js/dashboard.js | 34 ++++++++++++++++++++++++++++++----
 site/styles.css      |  1 +
 3 files changed, 34 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 @@ <h2>Plugins:</h2>
     <table>
       <tr>
         <td id="pluginButtonsTd">
+          <button id="opensearchDashboardsButton" onclick="getPluginLinks('opensearch-dashboards')">
+            OpenSearch Dashboards
+          </button>
           <button id="alertingDashboardsButton" onclick="getPluginLinks('alerting-dashboards-plugin')">
             alertingDashboards
           </button>
diff --git a/site/js/dashboard.js b/site/js/dashboard.js
index e94f19d4b..70cb066c3 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: {
@@ -286,6 +310,7 @@ 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/' +
@@ -294,7 +319,8 @@ function getPluginLinks(plugin) {
     `${platform}/` +
     `${arch}/` +
     `${type}/` +
-    'builds/opensearch-dashboards/plugins/' +
+    'builds/opensearch-dashboards/' +
+    `${coreBaseUrl}` +
     `${pluginObject.name}-${version}.zip`;
 
   var githubManifestLink = document.createElement('a');
@@ -346,14 +372,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 {

From c1c29db0753f07560d1a1fed526affa992682a70 Mon Sep 17 00:00:00 2001
From: Kawika Avilla <avillk@amazon.com>
Date: Fri, 2 Jun 2023 14:59:55 -0700
Subject: [PATCH 2/2] fix linter

Signed-off-by: Kawika Avilla <avillk@amazon.com>
---
 site/js/dashboard.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/site/js/dashboard.js b/site/js/dashboard.js
index 70cb066c3..e5b1bdbd1 100644
--- a/site/js/dashboard.js
+++ b/site/js/dashboard.js
@@ -310,7 +310,10 @@ function getPluginLinks(plugin) {
 
   var pluginLinksList = document.getElementById('pluginLinksList');
   const pluginObject = plugins[plugin];
-  const coreBaseUrl = pluginObject.name === 'OpenSearch-Dashboards' ? 'core-opensearch-dashboards' : 'plugins';
+  const coreBaseUrl =
+    pluginObject.name === 'OpenSearch-Dashboards'
+      ? 'core-opensearch-dashboards'
+      : 'plugins';
 
   const pluginUrl =
     'https://ci.opensearch.org/ci/dbc/distribution-build-opensearch-dashboards/' +