Skip to content

chore(compass-crud): Do not recreate HadronDocument instances in render #3073

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
May 10, 2022
Merged

chore(compass-crud): Do not recreate HadronDocument instances in render #3073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a6f2af8
chore(compass-crud): Do not recreate HadronDocument instances in render
gribnoysup May 10, 2022
fe18ba3
chore(compass-crud): Use isRoot instead of type prop check
gribnoysup May 10, 2022
cd679f2
chore(compass-schema-validation): Remove unused dependency
gribnoysup May 10, 2022
532ba0c
chore(compass-crud): More optional chaining
gribnoysup May 10, 2022
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
2 changes: 0 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions packages/compass-aggregations/src/components/input-preview/input-preview.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Document } from '@mongodb-js/compass-crud';
import HadronDocument from 'hadron-document';
import LoadingOverlay from '../loading-overlay';

import styles from './input-preview.module.less';
Expand All @@ -26,7 +25,7 @@ class InputPreview extends Component {
const documents = (this.props.documents || []).map((doc, i) => {
return (
<div key={i} className={styles['input-preview-document-card']}>
<Document doc={new HadronDocument(doc)} editable={false} />
<Document doc={doc} editable={false} />
</div>
);
});
Expand Down
6 changes: 1 addition & 5 deletions packages/compass-aggregations/src/components/stage-preview/stage-preview.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import React, { Component } from 'react';
import PropTypes from 'prop-types';
import { Document } from '@mongodb-js/compass-crud';
import { TextButton } from 'hadron-react-buttons';
import HadronDocument from 'hadron-document';
import LoadingOverlay from '../loading-overlay';
import { OUT, MERGE } from '../../modules/pipeline';
import decomment from 'decomment';
Expand Down Expand Up @@ -211,10 +210,7 @@ class StagePreview extends Component {
const documents = this.props.documents.map((doc, i) => {
return (
<div key={i} className={styles['stage-preview-document-card']}>
<Document
doc={new HadronDocument(doc)}
editable={false}
/>
<Document doc={doc} editable={false} />
</div>
);
});
Expand Down
53 changes: 27 additions & 26 deletions packages/compass-crud/src/components/document.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,41 @@
import React from 'react';
import React, { useMemo } from 'react';
import PropTypes from 'prop-types';
import HadronDocument from 'hadron-document';
import EditableDocument from './editable-document';
import ReadonlyDocument from './readonly-document';

/**
* Component for a single document in a list of documents.
*/
class Document extends React.Component {
/**
* Render a single document list item.
*
* @returns {React.Component} The component.
*/
render() {
if (this.props.editable && this.props.isTimeSeries) {
return (
<ReadonlyDocument
doc={this.props.doc}
copyToClipboard={this.props.copyToClipboard}
openInsertDocumentDialog={this.props.openInsertDocumentDialog}
/>
);
}
if (this.props.editable) {
return (<EditableDocument {...this.props} />);
const Document = (props) => {
const {
editable,
isTimeSeries,
copyToClipboard,
openInsertDocumentDialog,
doc: _doc,
} = props;

const doc = useMemo(() => {
if (_doc?.isRoot?.()) {
return _doc;
}
return new HadronDocument(_doc);
}, [_doc]);

if (editable && isTimeSeries) {
return (
<ReadonlyDocument
doc={this.props.doc}
copyToClipboard={this.props.copyToClipboard}
doc={doc}
copyToClipboard={copyToClipboard}
openInsertDocumentDialog={openInsertDocumentDialog}
/>
);
}
}

Document.displayName = 'Document';
if (editable) {
return <EditableDocument {...props} doc={doc} />;
}

return <ReadonlyDocument doc={doc} copyToClipboard={copyToClipboard} />;
};

Document.propTypes = {
doc: PropTypes.object.isRequired,
Expand Down
1 change: 0 additions & 1 deletion packages/compass-schema-validation/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@
"font-awesome": "^4.7.0",
"hadron-app": "^4.22.0",
"hadron-app-registry": "^8.11.0",
"hadron-document": "^7.10.0",
"hadron-react-buttons": "^5.8.0",
"hadron-react-components": "^5.14.0",
"html-webpack-plugin": "^3.2.0",
Expand Down
4 changes: 1 addition & 3 deletions packages/compass-schema-validation/src/components/document-preview/document-preview.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';
import classnames from 'classnames';
import { Document } from '@mongodb-js/compass-crud';
import HadronDocument from 'hadron-document';

import styles from './document-preview.module.less';

Expand Down Expand Up @@ -37,7 +35,7 @@ class DocumentPreview extends Component {
<div className={styles['document-preview-documents']}>
<div className={styles['document-preview-document-card']}>
<Document
doc={new HadronDocument(this.props.document)}
doc={this.props.document}
editable={false}
/>
</div>
Expand Down