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

Reduce code conflicts #589

Merged
merged 6 commits into from
Jan 24, 2023
Merged

Conversation

bowenlan-amzn
Copy link
Member

@bowenlan-amzn bowenlan-amzn commented Jan 24, 2023

Description

Reduce the code conflict with the internal code base

Files with difference:

Item count

  • public/components/ContentPanel/ContentPanel.tsx
  • public/pages/Indices/containers/Indices/Indices.tsx
  • public/pages/ManagedIndices/containers/ManagedIndices/ManagedIndices.tsx ContentPanel
  • public/pages/Policies/containers/Policies/Policies.tsx

Policy difference, Page title difference

  • public/utils/constants.ts
  • public/pages/Main/Main.tsx
  • public/pages/CreatePolicy/utils/constants.ts
  • public/pages/CreatePolicy/components/ConfigurePolicy/ConfigurePolicy.tsx
  • public/pages/ManagedIndices/containers/ManagedIndices/ManagedIndices.tsx Policy managed indices
  • public/pages/Policies/containers/Policies/Policies.tsx
  • public/pages/ManagedIndices/components/ManagedIndexControls/ManagedIndexControls.tsx

Indices, Managed indicex, Policy page auto refresh is removed

  • public/pages/Indices/components/IndexControls/IndexControls.tsx
  • public/pages/Indices/components/IndexControls/IndexControls.test.tsx
  • public/pages/Indices/containers/Indices/Indices.tsx
  • public/pages/ManagedIndices/components/ManagedIndexControls/ManagedIndexControls.tsx
  • public/pages/ManagedIndices/components/ManagedIndexControls/ManagedIndexControls.test.tsx
  • public/pages/Policies/components/PolicyControls/PolicyControls.tsx
  • public/pages/Policies/components/PolicyControls/PolicyControls.test.tsx
  • public/pages/ManagedIndices/containers/ManagedIndices/ManagedIndices.tsx add refresh button

page render diff

  • public/pages/ManagedIndices/containers/ManagedIndices/ManagedIndices.tsx
    • style={{ width: "100%", overflow: "hidden", textOverflow: "ellipsis" }}

Datastream security fix

  • public/pages/ManagedIndices/containers/ManagedIndices/ManagedIndices.tsx SECURITY_EXCEPTION_MESSAGE

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.

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
@codecov-commenter
Copy link

codecov-commenter commented Jan 24, 2023

Codecov Report

Merging #589 (2184652) into main (7192b2b) will decrease coverage by 0.04%.
The diff coverage is n/a.

❗ Current head 2184652 differs from pull request most recent head 9082a50. Consider uploading reports for the commit 9082a50 to get more accurate results

@@            Coverage Diff             @@
##             main     #589      +/-   ##
==========================================
- Coverage   59.70%   59.67%   -0.04%     
==========================================
  Files         268      268              
  Lines        8863     8863              
  Branches     1616     1618       +2     
==========================================
- Hits         5292     5289       -3     
- Misses       3177     3180       +3     
  Partials      394      394              
Impacted Files Coverage Δ
...icies/components/PolicyControls/PolicyControls.tsx 85.71% <0.00%> (-14.29%) ⬇️
...Indices/components/IndexControls/IndexControls.tsx 90.90% <0.00%> (-9.10%) ⬇️
...ents/ManagedIndexControls/ManagedIndexControls.tsx 90.90% <0.00%> (-9.10%) ⬇️
...ublic/pages/Indices/containers/Indices/Indices.tsx 82.50% <0.00%> (ø)
...ic/pages/Policies/containers/Policies/Policies.tsx 84.26% <0.00%> (ø)
...dices/containers/ManagedIndices/ManagedIndices.tsx 77.27% <0.00%> (+0.17%) ⬆️
...in/public/components/ContentPanel/ContentPanel.tsx 85.00% <0.00%> (+1.66%) ⬆️

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
@bowenlan-amzn bowenlan-amzn merged commit 74c0da1 into opensearch-project:main Jan 24, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 24, 2023
* Item count in Content panel

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Constants

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Datastream security message

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Unify the refresh

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Update test snapshot

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Update cypress test

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
(cherry picked from commit 74c0da1)
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 24, 2023
* Item count in Content panel

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Constants

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Datastream security message

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Unify the refresh

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Update test snapshot

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Update cypress test

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
(cherry picked from commit 74c0da1)
AWSHurneyt pushed a commit that referenced this pull request Jan 25, 2023
* Item count in Content panel

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Constants

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Datastream security message

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Unify the refresh

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Update test snapshot

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Update cypress test

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
(cherry picked from commit 74c0da1)

Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
AWSHurneyt pushed a commit that referenced this pull request Jan 25, 2023
* Item count in Content panel

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Constants

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Datastream security message

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Unify the refresh

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Update test snapshot

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Update cypress test

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
(cherry picked from commit 74c0da1)

Co-authored-by: bowenlan-amzn <bowenlan23@gmail.com>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.3 failed:

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

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.3 2.3
# Navigate to the new working tree
cd .worktrees/backport-2.3
# Create a new branch
git switch --create backport/backport-589-to-2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 74c0da1a0f0cb450a212109fbdee8374469b3dce
# Push it to GitHub
git push --set-upstream origin backport/backport-589-to-2.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.3

Then, create a pull request where the base branch is 2.3 and the compare/head branch is backport/backport-589-to-2.3.

bowenlan-amzn added a commit to bowenlan-amzn/index-management-dashboards-plugin that referenced this pull request Jan 25, 2023
* Item count in Content panel

* Constants

* Datastream security message

* Unify the refresh

* Update test snapshot

* Update cypress test

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
@bowenlan-amzn bowenlan-amzn mentioned this pull request Jan 25, 2023
1 task
Angie-Zhang pushed a commit that referenced this pull request Jan 26, 2023
* Reduce code conflicts (#589)

* Item count in Content panel

* Constants

* Datastream security message

* Unify the refresh

* Update test snapshot

* Update cypress test

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Update test snap

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Fix cypress workflow

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
bowenlan-amzn added a commit to bowenlan-amzn/index-management-dashboards-plugin that referenced this pull request Jan 30, 2023
* Reduce code conflicts (opensearch-project#589)

* Item count in Content panel

* Constants

* Datastream security message

* Unify the refresh

* Update test snapshot

* Update cypress test

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Update test snap

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Fix cypress workflow

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
@bowenlan-amzn bowenlan-amzn mentioned this pull request Jan 30, 2023
1 task
bowenlan-amzn added a commit to bowenlan-amzn/index-management-dashboards-plugin that referenced this pull request Jan 30, 2023
* Reduce code conflicts (opensearch-project#589)

* Item count in Content panel

* Constants

* Datastream security message

* Unify the refresh

* Update test snapshot

* Update cypress test

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Update test snap

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

* Fix cypress workflow

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.com>
Angie-Zhang pushed a commit that referenced this pull request Jan 31, 2023
* Reduce code conflicts (#589)

* Item count in Content panel

* Constants

* Datastream security message

* Unify the refresh

* Update test snapshot

* Update cypress test



* Update test snap



* Fix cypress workflow

Signed-off-by: bowenlan-amzn <bowenlan23@gmail.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.

4 participants