Bump version and add notebooks context menu fix for 1.0.1.0 patch (#142)

* bump version and add notebooks context menu fix for 1.0.1.0 patch Signed-off-by: David Cui <davidcui@amazon.com> * update core to use 1.0 tag Signed-off-by: David Cui <davidcui@amazon.com> * change opensearch version to 1.0.0 to auto-pick tag Signed-off-by: David Cui <davidcui@amazon.com> Co-authored-by: Joshua Li <joshuali925@gmail.com>
opensearch-project · Aug 25, 2021 · 27583be · 27583be
1 parent 72705e2
commit 27583be
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.github/workflows/reports-scheduler-test-and-build-workflow.yml b/.github/workflows/reports-scheduler-test-and-build-workflow.yml
@@ -3,7 +3,7 @@ name: Test and Build Reports Scheduler
 on: [push, pull_request]
 
 env:
-  OPENSEARCH_VERSION: '1.0'
+  OPENSEARCH_VERSION: '1.0.0'
   COMMON_UTILS_VERSION: '1.0'
   JOB_SCHEDULER_VERSION: '1.0'
 
@@ -37,7 +37,7 @@ jobs:
           path: common-utils
       - name: Build common-utils
         working-directory: ./common-utils
-        run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}.0
+        run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}
 
       # dependencies: job-scheduler
       - name: Checkout job-scheduler
@@ -48,7 +48,7 @@ jobs:
           path: job-scheduler
       - name: Build job-scheduler
         working-directory: ./job-scheduler
-        run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}.0 -Dbuild.snapshot=false
+        run: ./gradlew publishToMavenLocal -Dopensearch.version=${{ env.OPENSEARCH_VERSION }} -Dbuild.snapshot=false
 
       # reports-scheduler
       - name: Checkout Reports Scheduler
@@ -57,7 +57,7 @@ jobs:
       - name: Build with Gradle
         run: |
           cd reports-scheduler
-          ./gradlew build -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}.0
+          ./gradlew build -Dopensearch.version=${{ env.OPENSEARCH_VERSION }}
 
       - name: Upload coverage
         uses: codecov/codecov-action@v1

diff --git a/dashboards-reports/opensearch_dashboards.json b/dashboards-reports/opensearch_dashboards.json
@@ -1,6 +1,6 @@
 {
   "id": "reportsDashboards",
-  "version": "1.0.0.0",
+  "version": "1.0.1.0",
   "opensearchDashboardsVersion": "1.0.0",
   "requiredPlugins": ["navigation", "data", "opensearchDashboardsUtils"],
   "optionalPlugins": ["share"],

diff --git a/dashboards-reports/package.json b/dashboards-reports/package.json
@@ -1,6 +1,6 @@
 {
   "name": "reports-dashboards",
-  "version": "1.0.0.0",
+  "version": "1.0.1.0",
   "description": "OpenSearch Dashboards Reports Plugin",
   "license": "Apache-2.0",
   "main": "index.ts",

diff --git a/dashboards-reports/server/utils/validationHelper.ts b/dashboards-reports/server/utils/validationHelper.ts
@@ -55,7 +55,7 @@ export const isValidRelativeUrl = (relativeUrl: string) => {
 export const regexDuration = /^(-?)P(?=\d|T\d)(?:(\d+)Y)?(?:(\d+)M)?(?:(\d+)([DW]))?(?:T(?:(\d+)H)?(?:(\d+)M)?(?:(\d+(?:\.\d+)?)S)?)?$/;
 export const regexEmailAddress = /\S+@\S+\.\S+/;
 export const regexReportName = /^[\w\-\s\(\)\[\]\,\_\-+]+$/;
-export const regexRelativeUrl = /^\/(_plugin\/kibana\/app|app)\/(dashboards|visualize|discover|notebooks-dashboards\?view=output_only)(\?security_tenant=.+|)#\/(view\/|edit\/)?[^\/]+$/;
+export const regexRelativeUrl = /^\/(_dashboards\/app|app)\/(dashboards|visualize|discover|notebooks-dashboards\?view=output_only)([?&]security_tenant=.+|)#\/(view\/|edit\/)?[^\/]+$/;
 
 export const validateReport = async (
   client: ILegacyScopedClusterClient,