Skip to content

Commit f718bfc

Browse files
committed
cleanup
1 parent 7f66ad3 commit f718bfc

File tree

5 files changed

+23
-16
lines changed

5 files changed

+23
-16
lines changed

package-lock.json

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/compass-components/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
"@mongodb-js/prettier-config-compass": "^1.2.2",
9898
"@mongodb-js/testing-library-compass": "^1.2.2",
9999
"@mongodb-js/tsconfig-compass": "^1.2.2",
100+
"mongodb": "^6.12.0",
100101
"@types/chai": "^4.2.21",
101102
"@types/chai-dom": "^0.0.10",
102103
"@types/mocha": "^9.0.0",

packages/compass-components/src/components/document-list/document-edit-actions-footer.tsx

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import React, { useCallback, useEffect, useRef, useState } from 'react';
2-
import type { MongoServerError } from 'mongodb';
32
import type HadronDocument from 'hadron-document';
43
import { Element } from 'hadron-document';
54
import { Button } from '../leafygreen';
@@ -89,13 +88,17 @@ function useHadronDocumentStatus(
8988
const invalidElementsRef = useRef(new Set());
9089

9190
const updateStatus = useCallback(
92-
(newStatus: Status, error: Error | MongoServerError | null = null) => {
91+
(
92+
newStatus: Status,
93+
error: Error | null = null,
94+
errorDetails?: Record<string, unknown>
95+
) => {
9396
setStatus(newStatus);
9497
setError(
9598
error
9699
? {
97100
message: error?.message,
98-
details: (error as MongoServerError).errInfo,
101+
details: errorDetails,
99102
}
100103
: null
101104
);
@@ -142,17 +145,23 @@ function useHadronDocumentStatus(
142145
const onUpdateSuccess = () => {
143146
updateStatus('UpdateSuccess');
144147
};
145-
const onUpdateError = (err: Error | MongoServerError) => {
146-
updateStatus('UpdateError', err);
148+
const onUpdateError = (
149+
err: Error,
150+
errorDetails?: Record<string, unknown>
151+
) => {
152+
updateStatus('UpdateError', err, errorDetails);
147153
};
148154
const onRemoveStart = () => {
149155
updateStatus('DeleteStart');
150156
};
151157
const onRemoveSuccess = () => {
152158
updateStatus('DeleteSuccess');
153159
};
154-
const onRemoveError = (err: Error | MongoServerError) => {
155-
updateStatus('DeleteError', err);
160+
const onRemoveError = (
161+
err: Error,
162+
errorDetails?: Record<string, unknown>
163+
) => {
164+
updateStatus('DeleteError', err, errorDetails);
156165
};
157166

158167
doc.on(Element.Events.Added, onUpdate);

packages/compass-e2e-tests/tests/collection-documents-tab.test.ts

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import {
2020
import { context as testRunnerContext } from '../helpers/test-runner-context';
2121
import type { ChainablePromiseElement } from 'webdriverio';
2222
import { tryToInsertDocument } from '../helpers/commands/try-to-insert-document';
23-
import { isClickable } from 'webdriverio/build/commands/element';
2423

2524
const { expect } = chai;
2625

@@ -738,7 +737,7 @@ FindIterable<Document> result = collection.find(filter);`);
738737
await browser.runFindOperation('Documents', '{ "phone": 12345 }');
739738
});
740739

741-
it.only('shows error info when editing via list view', async function () {
740+
it('shows error info when editing via list view', async function () {
742741
const document = browser.$(Selectors.DocumentListEntry);
743742
await document.waitForDisplayed();
744743

@@ -751,11 +750,6 @@ FindIterable<Document> result = collection.find(filter);`);
751750
const deleteBtn = browser.$(
752751
`${Selectors.HadronDocumentElement}:last-child ${Selectors.HadronDocumentRemoveElement}`
753752
);
754-
console.log({
755-
isDisplayed: await deleteBtn.isDisplayed(),
756-
isClickable: await deleteBtn.isClickable(),
757-
isEnabled: await deleteBtn.isEnabled(),
758-
});
759753

760754
await deleteBtn.waitForDisplayed();
761755
console.log('I am displayed');

packages/hadron-document/src/document.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import type { BSONArray, BSONObject, BSONValue } from './utils';
1212
import { objectToIdiomaticEJSON } from './utils';
1313
import type { HadronEJSONOptions } from './utils';
1414
import { DocumentEvents } from '.';
15+
import type { MongoServerError } from 'mongodb';
1516

1617
/**
1718
* The event constant.
@@ -478,7 +479,7 @@ export class Document extends EventEmitter {
478479
}
479480

480481
onUpdateError(error: Error) {
481-
this.emit('update-error', error);
482+
this.emit('update-error', error, (error as MongoServerError).errInfo);
482483
}
483484

484485
markForDeletion() {
@@ -505,7 +506,7 @@ export class Document extends EventEmitter {
505506
}
506507

507508
onRemoveError(error: Error) {
508-
this.emit('remove-error', error);
509+
this.emit('remove-error', error, (error as MongoServerError).errInfo);
509510
}
510511

511512
setModifiedEJSONString(ejson: string | null) {

0 commit comments

Comments
 (0)