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

[Feature Anywhere] Fix unrelated changes to be synced with main #4414

Merged

Conversation

ohltyler
Copy link
Member

@ohltyler ohltyler commented Jun 27, 2023

Description

Fix unrelated changes / revert some changes such that they are synced with main.

Check List

  • All tests pass
    • yarn test:jest
    • yarn test:jest_integration
    • yarn test:ftr
  • New functionality includes testing.
  • New functionality has been documented.
  • Update CHANGELOG.md
  • Commits are signed per the DCO using --signoff

Signed-off-by: Tyler Ohlsen <ohltyler@amazon.com>
@codecov
Copy link

codecov bot commented Jun 27, 2023

Codecov Report

Merging #4414 (2b602d3) into feature/feature-anywhere (45ecc1f) will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@                     Coverage Diff                      @@
##           feature/feature-anywhere    #4414      +/-   ##
============================================================
+ Coverage                     66.43%   66.45%   +0.01%     
============================================================
  Files                          3287     3287              
  Lines                         63258    63256       -2     
  Branches                       9796     9796              
============================================================
+ Hits                          42026    42037      +11     
+ Misses                        18868    18855      -13     
  Partials                       2364     2364              
Flag Coverage Δ
Linux 66.37% <100.00%> (+<0.01%) ⬆️
Windows 66.40% <100.00%> (+0.02%) ⬆️

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

Impacted Files Coverage Δ
...rc/core/public/notifications/toasts/toasts_api.tsx 88.23% <ø> (ø)
.../plugins/data_source/server/data_source_service.ts 75.00% <100.00%> (+3.57%) ⬆️

... and 1 file with indirect coverage changes

/**
* Unique ID for the toast. Can be used to prevent duplicate toasts on re-renders.
*/
id?: string;
Copy link
Member

Choose a reason for hiding this comment

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

I remember this change being in main, do you know why this is deleted here?

Copy link
Member Author

Choose a reason for hiding this comment

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

Actually, looks like this change is not in main. I think it exists in the feature branch since it was cherry-picked, perhaps from 2.x?

Do you recall the owner of that change, and can we get that front ported into main?

Copy link
Member Author

Choose a reason for hiding this comment

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

In the meantime I will merge this since it was flagging this PR as adding this change, which is correct when compared with main currently. Removing it will remove this change from being related to this PR which is what we want.

Copy link
Member

Choose a reason for hiding this comment

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

Oh shoot, yeah thanks catching that. Lemme look into why it's missing

Copy link
Member Author

Choose a reason for hiding this comment

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

I see it is not in 2.x either actually..

@ashwin-pc ashwin-pc self-assigned this Jun 28, 2023
@ohltyler ohltyler merged commit f028e8d into opensearch-project:feature/feature-anywhere Jun 29, 2023
@ohltyler ohltyler deleted the fix-conflicts branch June 29, 2023 17:20
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.

4 participants