Skip to content

Fix saving index pattern when there is a conflict #21947

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

Merged
merged 4 commits into from
Aug 15, 2018
Merged

Fix saving index pattern when there is a conflict #21947

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd6613f
Place back saved object client error formatting
jen-huang Aug 13, 2018
a12a568
Rename vars
jen-huang Aug 13, 2018
2eaaa5b
Change index pattern saving to read FetchError nested status code
jen-huang Aug 13, 2018
e94d34a
Merge remote-tracking branch 'upstream/master' into fix/conflict-error
jen-huang Aug 14, 2018
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
6 changes: 4 additions & 2 deletions src/ui/public/index_patterns/__tests__/_index_pattern.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ jest.mock('../../saved_objects', () => {
update: async (type, id, body, { version }) => {
if (object._version !== version) {
throw {
statusCode: 409
res: {
status: 409
}
};
}

Expand Down Expand Up @@ -158,6 +160,6 @@ describe('IndexPattern', () => {
result = err;
}

expect(result.statusCode).toBe(409);
expect(result.res.status).toBe(409);
});
});
2 changes: 1 addition & 1 deletion src/ui/public/index_patterns/_index_pattern.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ export function IndexPatternProvider(Private, config, Promise, confirmModalPromi
setVersion(this, _version);
})
.catch(err => {
if (err.statusCode === 409 && saveAttempts++ < MAX_ATTEMPTS_TO_RESOLVE_CONFLICTS) {
if (_.get(err, 'res.status') === 409 && saveAttempts++ < MAX_ATTEMPTS_TO_RESOLVE_CONFLICTS) {
const samePattern = new IndexPattern(this.id);
return samePattern.init()
.then(() => {
Expand Down