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.

Sign up for GitHub

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

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

Merged
merged 9 commits into from
Feb 16, 2024
Merged

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

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
abc6911
bug fix 5861
yujin-emma Feb 12, 2024
3eafc04
clean unused parameters in test
yujin-emma Feb 12, 2024
f7fdd22
bug fix 5861
yujin-emma Feb 12, 2024
e083002
clean unused parameters in test
yujin-emma Feb 12, 2024
3a583db
Merge branch 'bug-5861' of github.com:yujin-emma/OpenSearch-Dashboard…
yujin-emma Feb 14, 2024
3385b14
fix failed UT
yujin-emma Feb 14, 2024
4b29c8d
update CHANGELOG.md
yujin-emma Feb 14, 2024
be5f85c
Merge branch 'main' into bug-5861
yujin-emma Feb 16, 2024
489c273
Update changelog message
yujin-emma Feb 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
clean unused parameters in test 
Signed-off-by: yujin-emma <yujin.emma.work@gmail.com>
  • Loading branch information
@yujin-emma
yujin-emma committed Feb 12, 2024
commit 3eafc04c5c2f1b932584263cf121908dd915183e
4 changes: 2 additions & 2 deletions src/core/server/saved_objects/import/import_saved_objects.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@ describe('#importSavedObjectsFromStream', () => {
};

test('with createNewCopies disabled', async () => {
const options = setupOptions(false, undefined);
const options = setupOptions();
getMockFn(checkConflicts).mockResolvedValue({
errors: [],
filteredObjects: [],
Expand Down Expand Up @@ -557,7 +557,7 @@ describe('#importSavedObjectsFromStream', () => {
});

test('accumulates multiple errors', async () => {
const options = setupOptions(false, undefined);
const options = setupOptions();
const errors = [createError(), createError(), createError(), createError(), createError()];
getMockFn(collectSavedObjects).mockResolvedValue({
errors: [errors[0]],
Expand Down