From 27583be104218e5663590c0dbf02449a5f196f14 Mon Sep 17 00:00:00 2001 From: David Cui <53581635+davidcui1225@users.noreply.github.com> Date: Wed, 25 Aug 2021 16:31:50 -0700 Subject: [PATCH] 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 * update core to use 1.0 tag Signed-off-by: David Cui * change opensearch version to 1.0.0 to auto-pick tag Signed-off-by: David Cui Co-authored-by: Joshua Li --- .../reports-scheduler-test-and-build-workflow.yml | 8 ++++---- dashboards-reports/opensearch_dashboards.json | 2 +- dashboards-reports/package.json | 2 +- dashboards-reports/server/utils/validationHelper.ts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/reports-scheduler-test-and-build-workflow.yml b/.github/workflows/reports-scheduler-test-and-build-workflow.yml index 564ce506..5aa5201d 100644 --- 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 index 8e3da82b..8dae5038 100644 --- 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 index 8feb3f0d..800bf860 100644 --- 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 index 26632e0c..b0aa38fa 100644 --- 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,