Bug 5861 Fix: fix import api always display `overwritten` after importing saved objects, after this fix, the first time import will display `new` and after that will display `overwritten` if import the same objects by yujin-emma · Pull Request #5871 · opensearch-project/OpenSearch-Dashboards

yujin-emma · 2024-02-14T17:33:36Z

Description

Adjust the order of checkConflicts, checkConflictForDataSource and checkOriginConflict.
The root cause of issue 5861 is when check conflict with data source, if there is no data source conflict, the object will be added in pendingOverwrites without checking wether the object found or not, which is told by checkConflict results, in errors array

We do not need to mutate the pendingOverwrites in checkConflictForDataSource since checkConflicts already handled

Issues Resolved

Fixes #5861

Screenshot

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: yujin-emma <yujin.emma.work@gmail.com>

…s into bug-5861

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>

codecov · 2024-02-14T17:48:10Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (26fc902) 66.98% compared to head (489c273) 66.98%.
Report is 1 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #5871      +/-   ##
==========================================
- Coverage   66.98%   66.98%   -0.01%     
==========================================
  Files        3304     3304              
  Lines       63572    63569       -3     
  Branches    10153    10153              
==========================================
- Hits        42585    42582       -3     
  Misses      18520    18520              
  Partials     2467     2467

Flag	Coverage Δ
Linux_1	`35.21% <ø> (ø)`
Linux_2	`55.11% <100.00%> (-0.01%)`	⬇️
Linux_3	`43.55% <0.00%> (+<0.01%)`	⬆️
Linux_4	`35.20% <0.00%> (+<0.01%)`	⬆️
Windows_1	`35.24% <ø> (ø)`
Windows_2	`55.07% <100.00%> (-0.01%)`	⬇️
Windows_3	`43.55% <0.00%> (+<0.01%)`	⬆️
Windows_4	`35.20% <0.00%> (+<0.01%)`	⬆️

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: yujin-emma <yujin.emma.work@gmail.com>

Flyingliuhub · 2024-02-14T19:57:18Z

@yujin-emma can we have better bug title, like as the detail which you are trying to address, not the bug number. Thanks

yujin-emma · 2024-02-14T20:40:58Z

 - [Multiple Datasource] Add datasource picker component and use it in devtools and tutorial page when multiple datasource is enabled ([#5756](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5756))
 - [Multiple Datasource] Add datasource picker to import saved object flyout when multiple data source is enabled ([#5781](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5781))
- [Multiple Datasource] Add interfaces to register add-on authentication method from plug-in module ([#5851](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5851)) 
+- [Multiple Datasource] Add interfaces to register add-on authentication method from plug-in module ([#5851](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/5851))


Hi, this change comes from rebasing the main, this change is from this commit: yujin-emma@e08bf30

yujin-emma · 2024-02-15T20:39:40Z

Found a test failure not related to the code change in this PR: #5876

yujin-emma · 2024-02-16T17:07:28Z

Checks on feature branch only failed with the function test failure issue: #5876, already filed another issue with this test, the left failure should be fine with rerun

Signed-off-by: Yu Jin <112784385+yujin-emma@users.noreply.github.com>

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>

…ting saved objects, after this fix, the first time import will display `new` and after that will display `overwritten` if import the same objects (#5871) * bug fix 5861 Signed-off-by: yujin-emma <yujin.emma.work@gmail.com> * clean unused parameters in test Signed-off-by: yujin-emma <yujin.emma.work@gmail.com> * bug fix 5861 Signed-off-by: yujin-emma <yujin.emma.work@gmail.com> * clean unused parameters in test Signed-off-by: yujin-emma <yujin.emma.work@gmail.com> * fix failed UT Signed-off-by: yujin-emma <yujin.emma.work@gmail.com> * update CHANGELOG.md Signed-off-by: yujin-emma <yujin.emma.work@gmail.com> * Update changelog message Signed-off-by: yujin-emma <yujin.emma.work@gmail.com> --------- Signed-off-by: yujin-emma <yujin.emma.work@gmail.com> Signed-off-by: Yu Jin <112784385+yujin-emma@users.noreply.github.com> (cherry picked from commit d8aefae) Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> # Conflicts: # CHANGELOG.md

…ting saved objects, after this fix, the first time import will display `new` and after that will display `overwritten` if import the same objects (#5871) (#5891) * bug fix 5861 Signed-off-by: yujin-emma <yujin.emma.work@gmail.com> * clean unused parameters in test Signed-off-by: yujin-emma <yujin.emma.work@gmail.com> * bug fix 5861 Signed-off-by: yujin-emma <yujin.emma.work@gmail.com> * clean unused parameters in test Signed-off-by: yujin-emma <yujin.emma.work@gmail.com> * fix failed UT Signed-off-by: yujin-emma <yujin.emma.work@gmail.com> * update CHANGELOG.md Signed-off-by: yujin-emma <yujin.emma.work@gmail.com> * Update changelog message Signed-off-by: yujin-emma <yujin.emma.work@gmail.com> --------- Signed-off-by: yujin-emma <yujin.emma.work@gmail.com> Signed-off-by: Yu Jin <112784385+yujin-emma@users.noreply.github.com> (cherry picked from commit d8aefae) 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>

yujin-emma added 6 commits February 12, 2024 20:39

bug fix 5861

abc6911

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>

clean unused parameters in test

3eafc04

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>

bug fix 5861

f7fdd22

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>

clean unused parameters in test

e083002

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>

Merge branch 'bug-5861' of github.com:yujin-emma/OpenSearch-Dashboard…

3a583db

…s into bug-5861

fix failed UT

3385b14

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>

yujin-emma requested review from AMoo-Miki, BSFishy, Flyingliuhub, SuZhou-Joe, ZilongX, abbyhu2000, ananzh, ashwin-pc, bandinib-amzn, curq, joshuarrrr, kavilla, kristenTian, manasvinibs, zengyan-amazon and zhongnansu as code owners February 14, 2024 17:33

github-actions bot added the repeat-contributor label Feb 14, 2024

update CHANGELOG.md

4b29c8d

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>

yujin-emma changed the title ~~Bug 5861~~ Bug 5861 Fix: fix import api always display overwritten after importing saved objects, after this fix, the first time import will display new and after that will display overwritten if import the same objects Feb 14, 2024

yujin-emma commented Feb 14, 2024

View reviewed changes

Merge branch 'main' into bug-5861

be5f85c

Signed-off-by: Yu Jin <112784385+yujin-emma@users.noreply.github.com>

ZilongX added the multiple datasource multiple datasource project label Feb 16, 2024

ZilongX previously approved these changes Feb 16, 2024

View reviewed changes

AMoo-Miki previously approved these changes Feb 16, 2024

View reviewed changes

AMoo-Miki added the v2.13.0 label Feb 16, 2024

Update changelog message

489c273

Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>

yujin-emma dismissed stale reviews from AMoo-Miki and ZilongX via 489c273 February 16, 2024 21:10

AMoo-Miki approved these changes Feb 16, 2024

View reviewed changes

ZilongX approved these changes Feb 16, 2024

View reviewed changes

ZilongX merged commit d8aefae into opensearch-project:main Feb 16, 2024

ZilongX added the backport 2.x label Feb 16, 2024

AMoo-Miki mentioned this pull request Feb 17, 2024

[BUG] At first time, Import saved objects with check existing objects and automatically override, when there is no conflict and create new objects, still display {number} objects overwritten #5861

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 5861 Fix: fix import api always display `overwritten` after importing saved objects, after this fix, the first time import will display `new` and after that will display `overwritten` if import the same objects#5871

Bug 5861 Fix: fix import api always display `overwritten` after importing saved objects, after this fix, the first time import will display `new` and after that will display `overwritten` if import the same objects#5871
ZilongX merged 9 commits intoopensearch-project:mainfrom
yujin-emma:bug-5861

yujin-emma commented Feb 14, 2024 •

edited by AMoo-Miki

Loading

Uh oh!

codecov bot commented Feb 14, 2024 •

edited

Loading

Uh oh!

Flyingliuhub commented Feb 14, 2024

Uh oh!

yujin-emma Feb 14, 2024

Uh oh!

yujin-emma commented Feb 15, 2024

Uh oh!

yujin-emma commented Feb 16, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

yujin-emma commented Feb 14, 2024 • edited by AMoo-Miki Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Issues Resolved

Screenshot

Testing the changes

Check List

Uh oh!

codecov bot commented Feb 14, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Flyingliuhub commented Feb 14, 2024

Uh oh!

yujin-emma Feb 14, 2024

Choose a reason for hiding this comment

Uh oh!

yujin-emma commented Feb 15, 2024

Uh oh!

yujin-emma commented Feb 16, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

yujin-emma commented Feb 14, 2024 •

edited by AMoo-Miki

Loading

codecov bot commented Feb 14, 2024 •

edited

Loading