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

[OSCI][FIX] Discover: Fix the Subfields Display Issue #5429

Merged
merged 9 commits into from
Nov 15, 2023

Conversation

MadaniKK
Copy link
Contributor

@MadaniKK MadaniKK commented Nov 3, 2023

Description

Fix the subfields display issue in Discover left nav bar.

Issues Resolved

Issue #5400 #5208

Screenshot

Before:
image

After:
image

Testing the changes

Check List

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

Signed-off-by: qiwen li <qiwen_li@brown.edu>
@ananzh
Copy link
Member

ananzh commented Nov 3, 2023

This is great! I like all the discussions in the original issue and glad that you find such a simple yet smart solution. Just need a changelog update.

Copy link

codecov bot commented Nov 3, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (cf4f929) 66.98% compared to head (428f554) 66.98%.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #5429   +/-   ##
=======================================
  Coverage   66.98%   66.98%           
=======================================
  Files        3293     3293           
  Lines       63281    63281           
  Branches    10061    10061           
=======================================
+ Hits        42386    42391    +5     
+ Misses      18453    18450    -3     
+ Partials     2442     2440    -2     
Flag Coverage Δ
Linux_1 35.24% <100.00%> (+<0.01%) ⬆️
Linux_2 55.21% <0.00%> (ø)
Linux_3 43.78% <100.00%> (+<0.01%) ⬆️
Linux_4 35.33% <0.00%> (ø)
Windows_1 35.27% <100.00%> (+<0.01%) ⬆️
Windows_2 55.18% <0.00%> (ø)
Windows_3 43.80% <100.00%> (+<0.01%) ⬆️
Windows_4 35.33% <0.00%> (ø)

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

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: qiwen li <qiwen_li@brown.edu>
@MadaniKK
Copy link
Contributor Author

MadaniKK commented Nov 3, 2023

This is great! I like all the discussions in the original issue and glad that you find such a simple yet smart solution. Just need a changelog update.

Thank you for supporting me thru all the digging!

@willie-hung
Copy link
Contributor

Hi @MadaniKK, it seems like your code editor auto format CHANGELOG.md when you are saving the file.

@MadaniKK
Copy link
Contributor Author

MadaniKK commented Nov 4, 2023

Hi @MadaniKK, it seems like your code editor auto format CHANGELOG.md when you are saving the file.

Ah good catch, maybe I should redo the add changelog?

This reverts commit 8d64fad.

redo changelog
@willie-hung
Copy link
Contributor

Yeah, me personally will use git revert the commit and push back to the remote. Hope it helps!

@willie-hung
Copy link
Contributor

And if you are using vscode, you can find Save without Formatting in the Command Palette.
Screenshot 2023-11-03 at 9 14 23 PM

@MadaniKK
Copy link
Contributor Author

MadaniKK commented Nov 4, 2023

And if you are using vscode, you can find Save without Formatting in the Command Palette. Screenshot 2023-11-03 at 9 14 23 PM

I just tried this and It's still causing the same amount of change to the changelog.md 1 file changed, 9 insertions(+), 8 deletions(-)
I also checked that the changelog.md was 813 lines of code before and with my two newly added lines of code now it's 815 lines. And my autoformat on save probably just works in other codes files, not markdown files...So I am not sure why it's causing so many changes either :(

@willie-hung
Copy link
Contributor

willie-hung commented Nov 4, 2023

Have you closed the COMMIT_EDITMSG file? The revert operation completes upon closing the file (vscode). After reverting the commit, CHANGELOG.md should be restored to its initial state. At this point, you can add your changelog entry. Remember to save your changes without applying any formatting.

Signed-off-by: qiwen li <qiwen_li@brown.edu>
This reverts commit ab55920.

revert
@ananzh
Copy link
Member

ananzh commented Nov 13, 2023

@MadaniKK Does this also resolve #5208 right?

I checked the issue and it seems be already fixed by this PR. Because right now, the side nav will show all the nested field, therefore user can not choose the original object.

Screenshot 2023-11-12 at 12 57 45

ananzh
ananzh previously approved these changes Nov 13, 2023
joshuarrrr
joshuarrrr previously approved these changes Nov 13, 2023
Signed-off-by: Anan Zhuang <ananzh@amazon.com>
@ananzh ananzh dismissed stale reviews from joshuarrrr and themself via 428f554 November 15, 2023 17:55
@ananzh ananzh added the discover for discover reinvent label Nov 15, 2023
@ananzh ananzh merged commit 40ba1f5 into opensearch-project:main Nov 15, 2023
70 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Nov 15, 2023
* set flattenHit() deep param as true to allow iterate on nested object

Signed-off-by: Qiwen Li <qiwen_li@brown.edu>

---------

Signed-off-by: qiwen li <qiwen_li@brown.edu>
Signed-off-by: Qiwen Li <qiwen_li@brown.edu>
Signed-off-by: Miki <miki@amazon.com>
Signed-off-by: Anan Zhuang <ananzh@amazon.com>
Co-authored-by: Miki <miki@amazon.com>
Co-authored-by: Anan Zhuang <ananzh@amazon.com>
(cherry picked from commit 40ba1f5)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md
manasvinibs pushed a commit that referenced this pull request Dec 21, 2023
* set flattenHit() deep param as true to allow iterate on nested object

Signed-off-by: Qiwen Li <qiwen_li@brown.edu>

---------

Signed-off-by: qiwen li <qiwen_li@brown.edu>
Signed-off-by: Qiwen Li <qiwen_li@brown.edu>
Signed-off-by: Miki <miki@amazon.com>
Signed-off-by: Anan Zhuang <ananzh@amazon.com>
Co-authored-by: Miki <miki@amazon.com>
Co-authored-by: Anan Zhuang <ananzh@amazon.com>
(cherry picked from commit 40ba1f5)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Miki <miki@amazon.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jan 26, 2024
* set flattenHit() deep param as true to allow iterate on nested object

Signed-off-by: Qiwen Li <qiwen_li@brown.edu>

---------

Signed-off-by: qiwen li <qiwen_li@brown.edu>
Signed-off-by: Qiwen Li <qiwen_li@brown.edu>
Signed-off-by: Miki <miki@amazon.com>
Signed-off-by: Anan Zhuang <ananzh@amazon.com>
Co-authored-by: Miki <miki@amazon.com>
Co-authored-by: Anan Zhuang <ananzh@amazon.com>
(cherry picked from commit 40ba1f5)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
manasvinibs pushed a commit that referenced this pull request Jan 31, 2024
* set flattenHit() deep param as true to allow iterate on nested object



---------







(cherry picked from commit 40ba1f5)

Signed-off-by: qiwen li <qiwen_li@brown.edu>
Signed-off-by: Qiwen Li <qiwen_li@brown.edu>
Signed-off-by: Miki <miki@amazon.com>
Signed-off-by: Anan Zhuang <ananzh@amazon.com>
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: Miki <miki@amazon.com>
Co-authored-by: Anan Zhuang <ananzh@amazon.com>
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 8, 2024
* set flattenHit() deep param as true to allow iterate on nested object

Signed-off-by: Qiwen Li <qiwen_li@brown.edu>

---------

Signed-off-by: qiwen li <qiwen_li@brown.edu>
Signed-off-by: Qiwen Li <qiwen_li@brown.edu>
Signed-off-by: Miki <miki@amazon.com>
Signed-off-by: Anan Zhuang <ananzh@amazon.com>
Co-authored-by: Miki <miki@amazon.com>
Co-authored-by: Anan Zhuang <ananzh@amazon.com>
(cherry picked from commit 40ba1f5)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md
opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 8, 2024
* set flattenHit() deep param as true to allow iterate on nested object

Signed-off-by: Qiwen Li <qiwen_li@brown.edu>

---------

Signed-off-by: qiwen li <qiwen_li@brown.edu>
Signed-off-by: Qiwen Li <qiwen_li@brown.edu>
Signed-off-by: Miki <miki@amazon.com>
Signed-off-by: Anan Zhuang <ananzh@amazon.com>
Co-authored-by: Miki <miki@amazon.com>
Co-authored-by: Anan Zhuang <ananzh@amazon.com>
(cherry picked from commit 40ba1f5)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md
abbyhu2000 pushed a commit that referenced this pull request Feb 9, 2024
* set flattenHit() deep param as true to allow iterate on nested object

Signed-off-by: Qiwen Li <qiwen_li@brown.edu>

---------

Signed-off-by: qiwen li <qiwen_li@brown.edu>
Signed-off-by: Qiwen Li <qiwen_li@brown.edu>
Signed-off-by: Miki <miki@amazon.com>
Signed-off-by: Anan Zhuang <ananzh@amazon.com>
Co-authored-by: Miki <miki@amazon.com>
Co-authored-by: Anan Zhuang <ananzh@amazon.com>
(cherry picked from commit 40ba1f5)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
abbyhu2000 pushed a commit that referenced this pull request Feb 9, 2024
* set flattenHit() deep param as true to allow iterate on nested object

Signed-off-by: Qiwen Li <qiwen_li@brown.edu>

---------

Signed-off-by: qiwen li <qiwen_li@brown.edu>
Signed-off-by: Qiwen Li <qiwen_li@brown.edu>
Signed-off-by: Miki <miki@amazon.com>
Signed-off-by: Anan Zhuang <ananzh@amazon.com>
Co-authored-by: Miki <miki@amazon.com>
Co-authored-by: Anan Zhuang <ananzh@amazon.com>
(cherry picked from commit 40ba1f5)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>

# Conflicts:
#	CHANGELOG.md

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.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.

8 participants