chore(compass-crud): adjust cancel editing logic COMPASS-9564 #7107
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,8 +4,13 @@ import { connect } from 'mongodb-data-service'; | |
| import AppRegistry, { | ||
| createActivateHelpers, | ||
| } from '@mongodb-js/compass-app-registry'; | ||
| import HadronDocument, { | ||
| DocumentEvents, | ||
| Element, | ||
| type DocumentEventsType, | ||
| } from 'hadron-document'; | ||
| import { MongoDBInstance } from 'mongodb-instance-model'; | ||
| import type { EventEmitter } from 'events'; | ||
| import { once } from 'events'; | ||
| import sinon from 'sinon'; | ||
| import chai, { expect } from 'chai'; | ||
|
|
@@ -110,6 +115,15 @@ function waitForState(store, cb, timeout?: number) { | |
| return waitForStates(store, [cb], timeout); | ||
| } | ||
|
|
||
| function onceDocumentEvent( | ||
|
There was a problem hiding this comment. [nitpick] Instead of casting to Node’s EventEmitter and using Copilot uses AI. Check for mistakes. There was a problem hiding this comment. I mean... not the worst idea I guess |
||
| doc: HadronDocument, | ||
| event: DocumentEventsType | ||
| ): Promise<unknown[]> { | ||
| // The once function was not meant for strongly typed events, so we need to | ||
| // do some additional type casting. | ||
| return once(doc as unknown as EventEmitter, event as string); | ||
| } | ||
|
|
||
| const mockFieldStoreService = { | ||
| updateFieldsFromDocuments() {}, | ||
| updateFieldsFromSchema() {}, | ||
|
|
@@ -503,7 +517,7 @@ describe('store', function () { | |
| }); | ||
|
|
||
| it('sets the error for the document', function (done) { | ||
| hadronDoc.on(DocumentEvents.RemoveError, ({ message }) => { | ||
| expect(message).to.equal('error happened'); | ||
| done(); | ||
| }); | ||
|
|
@@ -547,11 +561,11 @@ describe('store', function () { | |
| done(); | ||
| }, store); | ||
|
|
||
| hadronDoc.on(DocumentEvents.UpdateBlocked, () => { | ||
| done(new Error("Didn't expect update to be blocked.")); | ||
| }); | ||
|
|
||
| hadronDoc.on(DocumentEvents.UpdateError, (errorMessage) => { | ||
| done( | ||
| new Error( | ||
| `Didn't expect update to error. Errored with message: ${errorMessage}` | ||
|
|
@@ -586,11 +600,11 @@ describe('store', function () { | |
| setTimeout(() => done(), 100); | ||
| }, store); | ||
|
|
||
| hadronDoc.on(DocumentEvents.UpdateBlocked, () => { | ||
| done(new Error("Didn't expect update to be blocked.")); | ||
| }); | ||
|
|
||
| hadronDoc.on(DocumentEvents.UpdateError, (errorMessage) => { | ||
| done( | ||
| new Error( | ||
| `Didn't expect update to error. Errored with message: ${errorMessage}` | ||
|
|
@@ -613,7 +627,7 @@ describe('store', function () { | |
| }); | ||
|
|
||
| it('sets the error for the document', function (done) { | ||
| hadronDoc.on(DocumentEvents.UpdateError, ({ message }) => { | ||
| expect(message).to.equal( | ||
| 'Unable to update, no changes have been made.' | ||
| ); | ||
|
|
@@ -636,7 +650,7 @@ describe('store', function () { | |
| }); | ||
|
|
||
| it('sets the error for the document', function (done) { | ||
| hadronDoc.on(DocumentEvents.UpdateError, ({ message }) => { | ||
| expect(message).to.equal('error happened'); | ||
| done(); | ||
| }); | ||
|
|
@@ -655,7 +669,7 @@ describe('store', function () { | |
| }); | ||
|
|
||
| it('sets the update blocked for the document', function (done) { | ||
| hadronDoc.on(DocumentEvents.UpdateBlocked, () => { | ||
| done(); | ||
| }); | ||
|
|
||
|
|
@@ -728,7 +742,7 @@ describe('store', function () { | |
| const invalidHadronDoc = new HadronDocument(doc); | ||
| (invalidHadronDoc as any).getId = null; | ||
|
|
||
| invalidHadronDoc.on(DocumentEvents.UpdateError, ({ message }) => { | ||
| expect(message).to.equal( | ||
| 'An error occured when attempting to update the document: this.getId is not a function' | ||
| ); | ||
|
|
@@ -765,7 +779,10 @@ describe('store', function () { | |
| }); | ||
|
|
||
| it('rejects the update and emits update-error', async function () { | ||
| const updateErrorEvent = onceDocumentEvent( | ||
| hadronDoc, | ||
| DocumentEvents.UpdateError | ||
| ); | ||
|
|
||
| await store.updateDocument(hadronDoc); | ||
| expect((await updateErrorEvent)[0]).to.match(/Update blocked/); | ||
|
|
@@ -998,7 +1015,7 @@ describe('store', function () { | |
| }); | ||
|
|
||
| it('sets the error for the document', function (done) { | ||
| hadronDoc.on(DocumentEvents.UpdateError, ({ message }) => { | ||
| expect(message).to.equal('error happened'); | ||
| done(); | ||
| }); | ||
|
|
@@ -1085,7 +1102,10 @@ describe('store', function () { | |
| }); | ||
|
|
||
| it('rejects the update and emits update-error', async function () { | ||
| const updateErrorEvent = onceDocumentEvent( | ||
| hadronDoc, | ||
| DocumentEvents.UpdateError | ||
| ); | ||
|
|
||
| await store.replaceDocument(hadronDoc); | ||
| expect((await updateErrorEvent)[0]).to.match(/Update blocked/); | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe
'update-start'.. etc. can be encompassed underDocumentEvents? Not sure if there was an explicit reason they weren't before.I also renamed their constant string values for consistency and I wouldn't expect this would break things unless we have some external dependentes that expect these exact strings which doesn't seem like it?