@journeyapps-labs/reactor-mod-data-browser 3.1.0 → 3.1.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@journeyapps-labs/reactor-mod-data-browser",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "main": "./dist/index.js",
   "typings": "./dist/@types/index",
   "publishConfig": {
@@ -21,8 +21,8 @@
     "@journeyapps-labs/common-sdk": "^1.0.3",
     "@journeyapps-labs/common-utils": "^1.0.1",
     "@journeyapps-labs/lib-reactor-data-layer": "1.0.10",
-    "@journeyapps-labs/reactor-mod": "5.0.0",
-    "@journeyapps-labs/reactor-mod-editor": "2.0.0",
+    "@journeyapps-labs/reactor-mod": "5.0.2",
+    "@journeyapps-labs/reactor-mod-editor": "2.0.2",
     "@journeyapps/db": "^8.1.1",
     "@journeyapps/parser-schema": "^8.2.5",
     "@projectstorm/react-workspaces-core": "4.2.3",

package/src/core/query/AbstractQuery.ts

@@ -29,4 +29,6 @@ export abstract class AbstractQuery {
   abstract get totalPages(): number;
 
   abstract getPage(number: number): Page;
+
+  abstract matches(query: AbstractQuery): boolean;
 }

package/src/core/query/query-changed/ChangedModelQuery.ts

@@ -3,6 +3,7 @@ import { SchemaModelObject } from '../../SchemaModelObject';
 import { AbstractQuery } from '../AbstractQuery';
 import { Page } from '../Page';
 import { SimpleQuery } from '../query-simple/SimpleQuery';
+import * as _ from 'lodash';
 
 export class ChangedModelQuery extends AbstractQuery {
   constructor(protected query: SimpleQuery) {
@@ -32,4 +33,11 @@ export class ChangedModelQuery extends AbstractQuery {
     page.models = this.query.getDirtyObjects();
     return page;
   }
+
+  matches(query: AbstractQuery): boolean {
+    if (query instanceof ChangedModelQuery) {
+      return _.isEqual(query.query.serialize(), this.query.serialize());
+    }
+    return false;
+  }
 }

package/src/core/query/query-simple/SimpleQuery.tsx

@@ -1,7 +1,6 @@
 import { inject, ioc, TableColumn } from '@journeyapps-labs/reactor-mod';
 import { ConnectionStore } from '../../../stores/ConnectionStore';
 import { Promise } from '@journeyapps/db';
-import * as _ from 'lodash';
 import { Page } from '../Page';
 import { SchemaModelDefinition } from '../../SchemaModelDefinition';
 import { action, observable } from 'mobx';
@@ -15,6 +14,8 @@ import { applyFiltersAndSorts } from './SimpleQueryPlanner';
 import { buildSimpleQueryColumns } from './SimpleQueryColumns';
 import { SimpleQuerySortState } from './SimpleQuerySortState';
 import { SimpleQueryFilterState } from './SimpleQueryFilterState';
+import { AbstractQuery } from '../AbstractQuery';
+import * as _ from 'lodash';
 
 export interface SimpleQueryOptions {
   definition?: SchemaModelDefinition;
@@ -23,7 +24,6 @@ export interface SimpleQueryOptions {
 
 export interface SimpleQueryEncoded extends AbstractQueryEncoded {
   limit: number;
-  definition: string;
   filters?: SerializedSimpleFilter[];
   sorts?: SerializedSimpleQuerySort[];
 }
@@ -83,6 +83,13 @@ export class SimpleQuery extends AbstractSerializableQuery<SimpleQueryEncoded> {
     });
   }
 
+  matches(query: AbstractQuery): boolean {
+    if (query instanceof SimpleQuery) {
+      return _.isEqual(this.serialize(), query.serialize());
+    }
+    return false;
+  }
+
   @action async load() {
     this._pages = [];
     const collection = await this.options.definition.getCollection();

package/src/entities/ConnectionEntityDefinition.tsx

@@ -6,6 +6,7 @@ import {
   EntityPanelComponent,
   inject,
   InlineTreePresenterComponent,
+  SearchableTreeSearchScope,
   SimpleEntitySearchEngineComponent
 } from '@journeyapps-labs/reactor-mod';
 import { DataBrowserEntities } from '../entities';
@@ -54,7 +55,8 @@ export class ConnectionEntityDefinition extends EntityDefinition<AbstractConnect
     this.registerComponent(
       new InlineTreePresenterComponent<AbstractConnection>({
         loadChildrenAsNodesAreOpened: true,
-        cacheTreeEntities: false
+        cacheTreeEntities: true,
+        searchScope: SearchableTreeSearchScope.VISIBLE_ONLY
       })
     );
 

package/src/entities/SchemaModelDefinitionEntityDefinition.ts

@@ -79,7 +79,13 @@ export class SchemaModelDefinitionEntityDefinition extends EntityDefinition<Sche
 
     this.registerComponent(
       new InlineTreePresenterComponent({
-        loadChildrenAsNodesAreOpened: true
+        loadChildrenAsNodesAreOpened: true,
+        cacheTreeEntities: true,
+        augmentTreeNodeProps: () => {
+          return {
+            openOnSingleClick: false
+          };
+        }
       })
     );
 

package/src/panels/query/QueryPanelFactory.tsx

@@ -80,6 +80,10 @@ export class QueryPanelFactory extends SharedConnectionPanelFactory<QueryPanelMo
     });
   }
 
+  matchesModel(m1: QueryPanelModel, m2: QueryPanelModel) {
+    return m1.query.matches(m2.query);
+  }
+
   getSimpleName(model: QueryPanelModel): string {
     return model.query?.getSimpleName();
   }