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

Fix broken osd functional test repo #189

Merged
merged 5 commits into from
Apr 24, 2024

Conversation

riysaxen-amzn
Copy link
Collaborator

@riysaxen-amzn riysaxen-amzn commented Apr 24, 2024

Description

This PR will fix the broken osd repo functional tests

Issues Resolved

Testing

freshVideo.mov

Check List

  • 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.

riysaxen-amzn and others added 3 commits April 24, 2024 14:17
Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
@@ -78,7 +79,7 @@ export default class Main extends Component<MainProps, MainState> {
'ses_account',
'email_group',
],
tooltipSupport: serverFeatures.tooltipSupport,
tooltipSupport: false,

Choose a reason for hiding this comment

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

Is this a tmp fix?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

not really, this is when serverFeatures is null, we should assign some boolean to tooltip

@yujin-emma
Copy link

Could you please add a video in the description to show the notification is healthy with the fix

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
@BionIT
Copy link

BionIT commented Apr 24, 2024

Can we fix the reference in server folder, eg. https://github.com/opensearch-project/dashboards-notifications/pull/188/files#diff-6495f662f11eb9366b891c845ddac043c64b34f3a11695a2bdb0d55f58169d4cR14

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Copy link

@BionIT BionIT left a comment

Choose a reason for hiding this comment

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

Copy link

@yujin-emma yujin-emma left a comment

Choose a reason for hiding this comment

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

Overall look good to me, since the CHANNEL_TYPE and BACKEND_CHANNEL_TYPE are the only constant that used in server folder but defined in public folder previously, this fix will be fine for now. But for long term, I prefer to moving all the shared utils under common folder.

@riysaxen-amzn
Copy link
Collaborator Author

Overall look good to me, since the CHANNEL_TYPE and BACKEND_CHANNEL_TYPE are the only constant that used in server folder but defined in public folder previously, this fix will be fine for now. But for long term, I prefer to moving all the shared utils under common folder.

i agree

@AWSHurneyt AWSHurneyt merged commit e597081 into opensearch-project:main Apr 24, 2024
6 of 7 checks passed
@SuZhou-Joe
Copy link
Member

Should close #185

@BionIT
Copy link

BionIT commented Apr 25, 2024

Could we backport this fix to 2.x? @AWSHurneyt @SuZhou-Joe

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/dashboards-notifications/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/dashboards-notifications/backport-2.x
# Create a new branch
git switch --create backport/backport-189-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 e59708146ddb77b350a9b79a465af3bd5725892b
# Push it to GitHub
git push --set-upstream origin backport/backport-189-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/dashboards-notifications/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-189-to-2.x.

riysaxen-amzn added a commit to riysaxen-amzn/dashboards-notifications that referenced this pull request Apr 25, 2024
* moved constants to common folder

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fix broken osd functionaltest Repo

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fixing the UT's

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fixing the UT's

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

---------

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
(cherry picked from commit e597081)
@SuZhou-Joe
Copy link
Member

SuZhou-Joe commented Apr 26, 2024

@BionIT this PR should be backported after #181. And @amsiglan @riysaxen-amzn could you please help to backport as you have more context than us and you are the authors of the PRs related. and we are afraid we may make an unnecessary backport by accident.

AWSHurneyt pushed a commit that referenced this pull request Apr 26, 2024
* Fix broken osd functional test repo (#189)

* moved constants to common folder

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fix broken osd functionaltest Repo

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fixing the UT's

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* fixing the UT's

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

---------

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
(cherry picked from commit e597081)

* fix merge conflict

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* revert configRoutes changes

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

* revert configRoutes changes

Signed-off-by: Riya Saxena <riysaxen@amazon.com>

---------

Signed-off-by: Riya Saxena <riysaxen@amazon.com>
Signed-off-by: Riya <69919272+riysaxen-amzn@users.noreply.github.com>
Co-authored-by: Hailong Cui <ihailong@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants