Merge remote-tracking branch 'origin/main' into release-notes-1.0.0.0

.github/workflows/dashboards-reports-release-workflow.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v1
         with:
-          node-version: "10.23.1"
+          node-version: "10.24.1"
 
       - name: Move Dashboards Reports to Plugins Dir
         run: mv dashboards-reports OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}

.github/workflows/dashboards-reports-test-and-build-workflow.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Setup Node
         uses: actions/setup-node@v1
         with:
-          node-version: "10.23.1"
+          node-version: "10.24.1"
 
       - name: Move Dashboards Reports to Plugins Dir
         run: mv dashboards-reports OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}

.github/workflows/reports-scheduler-test-and-build-workflow.yml

@@ -2,6 +2,10 @@ name: Test and Build Reports Scheduler
 
 on: [push, pull_request]
 
+env:
+  OPENSEARCH_VERSION: '1.0'
+  COMMON_UTILS_VERSION: '1.0'
+  JOB_SCHEDULER_VERSION: '1.0'
 
 jobs:
   build:
@@ -19,7 +23,7 @@ jobs:
         with:
           repository: 'opensearch-project/OpenSearch'
           path: OpenSearch
-          ref: '1.0'
+          ref: ${{ env.OPENSEARCH_VERSION }}
       - name: Build OpenSearch
         working-directory: ./OpenSearch
         run: ./gradlew publishToMavenLocal -Dbuild.snapshot=false
@@ -29,22 +33,22 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: 'opensearch-project/common-utils'
-          ref: 'main'
+          ref: ${{ env.COMMON_UTILS_VERSION }}
           path: common-utils
       - name: Build common-utils
         working-directory: ./common-utils
-        run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0
+        run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}.0
 
       # dependencies: job-scheduler
       - name: Checkout job-scheduler
         uses: actions/checkout@v2
         with:
           repository: 'opensearch-project/job-scheduler'
-          ref: 'main'
+          ref: ${{ env.JOB_SCHEDULER_VERSION }}
           path: job-scheduler
       - name: Build job-scheduler
         working-directory: ./job-scheduler
-        run: ./gradlew publishToMavenLocal -Dopensearch.version=1.0.0 -Dbuild.snapshot=false
+        run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}.0 -Dbuild.snapshot=false
 
       # reports-scheduler
       - name: Checkout Reports Scheduler
@@ -53,7 +57,7 @@ jobs:
       - name: Build with Gradle
         run: |
           cd reports-scheduler
-          ./gradlew build -Dopensearch.version=1.0.0
+          ./gradlew build -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}.0
 
       - name: Upload coverage
         uses: codecov/codecov-action@v1

dashboards-reports/.cypress/integration/01-create.spec.ts

@@ -83,6 +83,9 @@ describe('Cypress', () => {
     // set report trigger to Schedule option
     cy.get('[type="radio"]').check({ force: true });
 
+    // set source back to saved search for testing purpose
+    cy.get('#savedSearchReportSource').check({ force: true });
+
     // create scheduled report definition
     cy.get('#createNewReportDefinition').click({ force: true });
   });

dashboards-reports/public/components/report_definitions/report_settings/report_settings.tsx

@@ -163,7 +163,7 @@ export function ReportSettings(props: ReportSettingProps) {
       reportDefinitionRequest.report_params.report_source = 'Dashboard';
       reportDefinitionRequest.report_params.core_params.base_url =
         getDashboardBaseUrlCreate(edit, editDefinitionId, fromInContext) +
-        dashboards[0].value;
+        dashboards[0]?.value;
 
       // set params to visual report params after switch from saved search
       handleDataToVisualReportSourceChange(reportDefinitionRequest);
@@ -172,7 +172,7 @@ export function ReportSettings(props: ReportSettingProps) {
       reportDefinitionRequest.report_params.report_source = 'Visualization';
       reportDefinitionRequest.report_params.core_params.base_url =
         getVisualizationBaseUrlCreate(edit, editDefinitionId, fromInContext) +
-        visualizations[0].value;
+        visualizations[0]?.value;
 
       // set params to visual report params after switch from saved search
       handleDataToVisualReportSourceChange(reportDefinitionRequest);
@@ -181,17 +181,17 @@ export function ReportSettings(props: ReportSettingProps) {
       reportDefinitionRequest.report_params.report_source = 'Saved search';
       reportDefinitionRequest.report_params.core_params.base_url =
         getSavedSearchBaseUrlCreate(edit, editDefinitionId, fromInContext) +
-        savedSearches[0].value;
+        savedSearches[0]?.value;
       reportDefinitionRequest.report_params.core_params.saved_search_id =
-        savedSearches[0].value;
+        savedSearches[0]?.value;
       reportDefinitionRequest.report_params.core_params.report_format = 'csv';
       reportDefinitionRequest.report_params.core_params.limit = 10000;
       reportDefinitionRequest.report_params.core_params.excel = true;
     } else if (e === 'notebooksReportSource') {
       reportDefinitionRequest.report_params.report_source = 'Notebook';
       reportDefinitionRequest.report_params.core_params.base_url =
         getNotebooksBaseUrlCreate(edit, editDefinitionId, fromInContext) +
-        notebooks[0].value;
+        notebooks[0]?.value;
 
       // set params to visual report params after switch from saved search
       handleDataToVisualReportSourceChange(reportDefinitionRequest);

reports-scheduler/build.gradle

@@ -32,6 +32,8 @@ buildscript {
         opensearch_group = "org.opensearch"
         opensearch_version = System.getProperty("opensearch.version", "1.0.0")
         kotlin_version = System.getProperty("kotlin.version", "1.4.0")
+        common_utils_version = "1.0.0.0"
+        job_scheduler_version = "1.0.0.0"
     }
 
     repositories {
@@ -139,8 +141,8 @@ dependencies {
     compile "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
     compile "org.jetbrains.kotlin:kotlin-stdlib-common:${kotlin_version}"
     compile "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.9"
-    compile "${group}:common-utils:${opensearchVersion}"
-    compileOnly "${group}:opensearch-job-scheduler-spi:${opensearchVersion}"
+    compile "${group}:common-utils:${common_utils_version}"
+    compileOnly "${group}:opensearch-job-scheduler-spi:${job_scheduler_version}"
     compile group: 'com.google.guava', name: 'guava', version: '15.0'
     compile "org.json:json:20180813"
     compile group: 'com.github.wnameless', name: 'json-flattener', version: '0.1.0'