Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 3 commits into from
Aug 25, 2021
Merged

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

merged 3 commits into from
Aug 25, 2021

Conversation

davidcui1225
Copy link
Contributor

@davidcui1225 davidcui1225 commented Aug 25, 2021

Signed-off-by: David Cui davidcui@amazon.com

Bumps version to 1.0.1.0 and adds remaining notebooks patch fix that was not merged into 1.0 for GA release

Add changes from #118

Check List

  • New functionality includes testing.
    • All tests pass, including unit test, integration test and doctest
  • New functionality has been documented.
    • New functionality has javadoc added
    • New functionality has user manual doc added
  • Commits are signed per the DCO using --signoff

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

Signed-off-by: David Cui <davidcui@amazon.com>
@codecov-commenter
Copy link

codecov-commenter commented Aug 25, 2021

Codecov Report

Merging #142 (020554d) into 1.0 (72705e2) will not change coverage.
The diff coverage is 100.00%.

Impacted file tree graph

@@            Coverage Diff            @@
##                1.0     #142   +/-   ##
=========================================
  Coverage     63.41%   63.41%           
  Complexity      309      309           
=========================================
  Files           101      101           
  Lines          4401     4401           
  Branches        669      669           
=========================================
  Hits           2791     2791           
  Misses         1442     1442           
  Partials        168      168           
Flag Coverage Δ
dashboards-reports 76.01% <100.00%> (ø)
reports-scheduler 53.42% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files Coverage Δ
...ashboards-reports/server/utils/validationHelper.ts 91.66% <100.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 72705e2...020554d. Read the comment docs.

@@ -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\/)?[^\/]+$/;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why is this (_dashboards\/app|app) instead of the (_plugin\/kibana\/|_dashboards\/)?app in main branch?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am going off the state of the file from the last PR we pushed to fix the notebooks context menu bug #118. For the PR #132 where the contents were changed to (_plugin\/kibana\/|_dashboards\/)?app, was that to patch for the same bug? If not, I don't think it should go into the patch release unless it's resolving another similar breaking issue?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i see, could you link issue and commit you picked in the description? thanks

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it's better we should keep the commit history for patch, right? Can you not co-author on one commit, just keep the original one and add a new commit which only bumps version. Then we do a merge or rebase&merge on github?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Currently we are co-authored on the first commit not including the version changes or workflow change, I just had to do some manual work there because the cherry-pick failed for some reason even after fetching

joshuali925
joshuali925 previously approved these changes Aug 25, 2021
Signed-off-by: David Cui <davidcui@amazon.com>
Signed-off-by: David Cui <davidcui@amazon.com>
@davidcui1225 davidcui1225 merged commit 27583be into opensearch-project:1.0 Aug 25, 2021
@davidcui1225 davidcui1225 deleted the 1.0.1.0-patch branch August 25, 2021 23:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants