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

Making fit and finish changes for ISM policy & Composable template pages #1150

Merged
merged 11 commits into from
Sep 2, 2024

Conversation

astute-decipher
Copy link
Contributor

@astute-decipher astute-decipher commented Aug 27, 2024

Description

Making fit and finish changes for ISM policy & Composable template pages according to the guidance

Issues Resolved

[List any issues this PR will resolve]

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.

@skumawat2025
Copy link
Contributor

LGTM. Gone through the pages offline.

@danieldong51
Copy link

danieldong51 commented Aug 29, 2024

Not sure if it's in scope, but the Delete Modal header and text should be EuiText size="s" in public/pages/Policies/containers/Policies/Policies.tsx (uses public/components/ConfirmationModal/ConfirmationModal.tsx)

Screenshot 2024-08-29 at 11 47 56 AM

@danieldong51
Copy link

Also the Delete Policy in public/pages/PolicyDetails/components/DeleteModal/DeleteModal.tsx text should be EuiText size="s"
Screenshot 2024-08-29 at 11 49 09 AM

@danieldong51
Copy link

Also not sure if in scope, but the Modal header should be small h2's in public/components/JSONModal/JSONModal.tsx:
Screenshot 2024-08-29 at 11 52 17 AM

@danieldong51
Copy link

The Text in public/pages/Policies/components/PolicyEmptyPrompt/PolicyEmptyPrompt.tsx should be small:

Screenshot 2024-08-29 at 12 00 21 PM

Shubh Sahu added 11 commits September 2, 2024 15:14
Signed-off-by: Shubh Sahu <[email protected]>
Signed-off-by: Shubh Sahu <[email protected]>
Signed-off-by: Shubh Sahu <[email protected]>
Signed-off-by: Shubh Sahu <[email protected]>
Signed-off-by: Shubh Sahu <[email protected]>
Signed-off-by: Shubh Sahu <[email protected]>
Signed-off-by: Shubh Sahu <[email protected]>
Signed-off-by: Shubh Sahu <[email protected]>
Signed-off-by: Shubh Sahu <[email protected]>
Signed-off-by: Shubh Sahu <[email protected]>
@SuZhou-Joe SuZhou-Joe merged commit 44260f6 into opensearch-project:main Sep 2, 2024
6 of 9 checks passed
@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/index-management-dashboards-plugin/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/index-management-dashboards-plugin/backport-2.x
# Create a new branch
git switch --create backport/backport-1150-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 44260f640fb141be17a6e673d3242696eec0e1d3
# Push it to GitHub
git push --set-upstream origin backport/backport-1150-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/index-management-dashboards-plugin/backport-2.x

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

opensearch-trigger-bot bot pushed a commit that referenced this pull request Sep 3, 2024
…ges (#1150)

* Fit and finish changes ISM

Signed-off-by: Shubh Sahu <[email protected]>

* more fit changes

Signed-off-by: Shubh Sahu <[email protected]>

* final fit n finish changes

Signed-off-by: Shubh Sahu <[email protected]>

* final fit n finish changes

Signed-off-by: Shubh Sahu <[email protected]>

* few more small changes

Signed-off-by: Shubh Sahu <[email protected]>

* more fit changes

Signed-off-by: Shubh Sahu <[email protected]>

* final fit n finish changes

Signed-off-by: Shubh Sahu <[email protected]>

* final fitnfinsh changes complete

Signed-off-by: Shubh Sahu <[email protected]>

* adding plus icon

Signed-off-by: Shubh Sahu <[email protected]>

* rebaseing

Signed-off-by: Shubh Sahu <[email protected]>

* rebasing 2.0

Signed-off-by: Shubh Sahu <[email protected]>

---------

Signed-off-by: Shubh Sahu <[email protected]>
Co-authored-by: Shubh Sahu <[email protected]>
(cherry picked from commit 44260f6)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
SuZhou-Joe pushed a commit that referenced this pull request Sep 3, 2024
…ges (#1150) (#1162)

* Fit and finish changes ISM



* more fit changes



* final fit n finish changes



* final fit n finish changes



* few more small changes



* more fit changes



* final fit n finish changes



* final fitnfinsh changes complete



* adding plus icon



* rebaseing



* rebasing 2.0



---------



(cherry picked from commit 44260f6)

Signed-off-by: Shubh Sahu <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Shubh Sahu <[email protected]>
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