Skip to content

Commit 55370d8

Browse files
authored
Revert "feat: allow updates and deletes on time-series collections COMPASS-6786" (#4396)
Revert "feat: allow updates and deletes on time-series collections COMPASS-6786 (#4382)" This reverts commit 411feec.
1 parent 4eacf73 commit 55370d8

File tree

11 files changed

+1
-110
lines changed

11 files changed

+1
-110
lines changed

package-lock.json

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

packages/compass-crud/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@
105105
"react-dom": "^17.0.2",
106106
"reflux": "^0.4.1",
107107
"reflux-state-mixin": "github:mongodb-js/reflux-state-mixin",
108-
"semver": "^5.4.1",
109108
"sinon": "^8.1.1",
110109
"webpack": "^4.46.0"
111110
},

packages/compass-crud/src/components/document-json-view.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ export type DocumentJsonViewProps = {
2727
} & Pick<
2828
JSONEditorProps,
2929
| 'isTimeSeries'
30-
| 'serverVersion'
3130
| 'copyToClipboard'
3231
| 'removeDocument'
3332
| 'replaceDocument'
@@ -62,7 +61,6 @@ class DocumentJsonView extends React.Component<DocumentJsonViewProps> {
6261
doc={doc}
6362
editable={this.props.isEditable}
6463
isTimeSeries={this.props.isTimeSeries}
65-
serverVersion={this.props.serverVersion}
6664
copyToClipboard={this.props.copyToClipboard}
6765
removeDocument={this.props.removeDocument}
6866
replaceDocument={this.props.replaceDocument}

packages/compass-crud/src/components/document-list-view.tsx

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ export type DocumentListViewProps = {
2929
} & Pick<
3030
DocumentProps,
3131
| 'isTimeSeries'
32-
| 'serverVersion'
3332
| 'copyToClipboard'
3433
| 'removeDocument'
3534
| 'replaceDocument'
@@ -62,7 +61,6 @@ class DocumentListView extends React.Component<DocumentListViewProps> {
6261
doc={doc}
6362
editable={this.props.isEditable}
6463
isTimeSeries={this.props.isTimeSeries}
65-
serverVersion={this.props.serverVersion}
6664
copyToClipboard={this.props.copyToClipboard}
6765
removeDocument={this.props.removeDocument}
6866
replaceDocument={this.props.replaceDocument}
@@ -93,7 +91,6 @@ class DocumentListView extends React.Component<DocumentListViewProps> {
9391
docs: PropTypes.array.isRequired,
9492
isEditable: PropTypes.bool,
9593
isTimeSeries: PropTypes.bool,
96-
serverVersion: PropTypes.string,
9794
removeDocument: PropTypes.func,
9895
replaceDocument: PropTypes.func,
9996
updateDocument: PropTypes.func,

packages/compass-crud/src/components/document-list.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,6 @@ class DocumentList extends React.Component<DocumentListProps> {
343343
isEditable: PropTypes.bool.isRequired,
344344
isExportable: PropTypes.bool.isRequired,
345345
isTimeSeries: PropTypes.bool,
346-
serverVersion: PropTypes.string,
347346
store: PropTypes.object.isRequired,
348347
openInsertDocumentDialog: PropTypes.func,
349348
openImportFileDialog: PropTypes.func,
@@ -398,7 +397,6 @@ DocumentList.propTypes = {
398397
isEditable: PropTypes.bool.isRequired,
399398
isExportable: PropTypes.bool.isRequired,
400399
isTimeSeries: PropTypes.bool,
401-
serverVersion: PropTypes.string,
402400
store: PropTypes.object.isRequired,
403401
openInsertDocumentDialog: PropTypes.func,
404402
openImportFileDialog: PropTypes.func,

packages/compass-crud/src/components/document.tsx

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@ import EditableDocument from './editable-document';
66
import type { ReadonlyDocumentProps } from './readonly-document';
77
import ReadonlyDocument from './readonly-document';
88
import type { BSONObject } from '../stores/crud-store';
9-
import { hasEditableTimeSeriesSupport } from '../utils/editable-time-series';
109

1110
export type DocumentProps = {
1211
doc: HadronDocument | BSONObject;
1312
editable: boolean;
1413
isTimeSeries?: boolean;
15-
serverVersion?: string;
1614
isExpanded?: boolean;
1715
} & Omit<EditableDocumentProps, 'doc' | 'expandAll'> &
1816
Pick<ReadonlyDocumentProps, 'copyToClipboard' | 'openInsertDocumentDialog'>;
@@ -21,7 +19,6 @@ const Document = (props: DocumentProps) => {
2119
const {
2220
editable,
2321
isTimeSeries,
24-
serverVersion,
2522
isExpanded,
2623
copyToClipboard,
2724
openInsertDocumentDialog,
@@ -37,11 +34,7 @@ const Document = (props: DocumentProps) => {
3734
return new HadronDocument(_doc as any);
3835
}, [_doc]);
3936

40-
if (
41-
editable &&
42-
isTimeSeries &&
43-
!hasEditableTimeSeriesSupport(serverVersion)
44-
) {
37+
if (editable && isTimeSeries) {
4538
return (
4639
<ReadonlyDocument
4740
doc={doc}
@@ -69,7 +62,6 @@ Document.propTypes = {
6962
doc: PropTypes.object.isRequired,
7063
editable: PropTypes.bool,
7164
isTimeSeries: PropTypes.bool,
72-
serverVersion: PropTypes.string,
7365
removeDocument: PropTypes.func,
7466
replaceDocument: PropTypes.func,
7567
updateDocument: PropTypes.func,

packages/compass-crud/src/components/json-editor.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ export type JSONEditorProps = {
5252
doc: Document;
5353
editable: boolean;
5454
isTimeSeries?: boolean;
55-
serverVersion?: string;
5655
removeDocument?: CrudActions['removeDocument'];
5756
replaceDocument?: CrudActions['replaceDocument'];
5857
updateDocument?: CrudActions['updateDocument'];

packages/compass-crud/src/stores/crud-store.spec.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,6 @@ describe('store', function () {
206206
isEditable: true,
207207
isReadonly: false,
208208
isTimeSeries: false,
209-
serverVersion: '4.0.0',
210209
isWritable: false,
211210
ns: '',
212211
outdated: false,

packages/compass-crud/src/stores/crud-store.ts

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -190,19 +190,6 @@ export const setIsTimeSeries = (
190190
store.onTimeSeriesChanged(isTimeSeries);
191191
};
192192

193-
/**
194-
* Set the serverVersion flag in the store.
195-
*
196-
* @param {Store} store - The store.
197-
* @param {Boolean} serverVersion - The current version of the server.
198-
*/
199-
export const setServerVersion = (
200-
store: CrudStoreImpl,
201-
serverVersion: string
202-
) => {
203-
store.onServerVersionChanged(serverVersion);
204-
};
205-
206193
/**
207194
* Set the namespace in the store.
208195
*
@@ -268,7 +255,6 @@ type CrudStoreOptions = {
268255
isReadonly: boolean;
269256
namespace: string;
270257
isTimeSeries: boolean;
271-
serverVersion: string;
272258
dataProvider: { error?: Error; dataProvider?: DataService };
273259
noRefreshOnConfigure?: boolean;
274260
};
@@ -333,7 +319,6 @@ type CrudState = {
333319
isDataLake: boolean;
334320
isReadonly: boolean;
335321
isTimeSeries: boolean;
336-
serverVersion: string;
337322
status: DOCUMENTS_STATUSES;
338323
debouncingLoad: boolean;
339324
loadingCount: boolean;
@@ -389,7 +374,6 @@ class CrudStoreImpl
389374
isDataLake: false,
390375
isReadonly: false,
391376
isTimeSeries: false,
392-
serverVersion: '4.0.0',
393377
status: DOCUMENTS_STATUS_INITIAL,
394378
debouncingLoad: false,
395379
loadingCount: false,
@@ -488,15 +472,6 @@ class CrudStoreImpl
488472
this.setState({ isTimeSeries });
489473
}
490474

491-
/**
492-
* Set the current server version.
493-
*
494-
* @param {Boolean} serverVersion - The current server version.
495-
*/
496-
onServerVersionChanged(serverVersion: string) {
497-
this.setState({ serverVersion });
498-
}
499-
500475
/**
501476
* Plugin lifecycle method that is called when the namespace changes in
502477
* Compass. Trigger with new namespace and cleared path/types.
@@ -1563,10 +1538,6 @@ const configureStore = (options: CrudStoreOptions & GridStoreOptions) => {
15631538
setIsTimeSeries(store, options.isTimeSeries);
15641539
}
15651540

1566-
if (options.serverVersion) {
1567-
setServerVersion(store, options.serverVersion);
1568-
}
1569-
15701541
if (options.dataProvider) {
15711542
setDataProvider(
15721543
store,

packages/compass-crud/src/utils/editable-time-series.spec.ts

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)