@journeyapps-labs/reactor-mod-data-browser 3.4.0 → 3.6.0

package/dist/core/delete-schema-models.js

@@ -0,0 +1,101 @@
+import { CrudError } from '@journeyapps/db';
+import { DialogStore, ioc, NotificationStore, NotificationType, WorkspaceStore } from '@journeyapps-labs/reactor-mod';
+import * as _ from 'lodash';
+import { QueryPanelModel } from '../panels/query/QueryPanelFactory';
+import { ModelPanelModel } from '../panels/model/ModelPanelFactory';
+const normalizeModels = (models) => {
+    return _.uniqBy(models.filter((model) => { var _a; return (_a = model === null || model === void 0 ? void 0 : model.model) === null || _a === void 0 ? void 0 : _a.persisted; }), (model) => model.id);
+};
+const getErrorMessage = (error) => {
+    var _a;
+    if (error instanceof CrudError) {
+        return ((_a = error.firstError()) === null || _a === void 0 ? void 0 : _a.detail) || error.message;
+    }
+    if (error instanceof Error) {
+        return error.message;
+    }
+    return 'An unknown error occurred while deleting the selected models.';
+};
+const buildDeleteMarkdown = (models) => {
+    var _a;
+    if (models.length === 1) {
+        const model = models[0];
+        const display = ((_a = model.data) === null || _a === void 0 ? void 0 : _a.display) || model.id;
+        return `Delete **${display}**?\n\nThis action cannot be undone.`;
+    }
+    return `Delete **${models.length}** models?\n\nThis action cannot be undone.`;
+};
+export const runDeleteSchemaModels = async (options) => {
+    var _a;
+    const models = normalizeModels(options.models);
+    if (models.length === 0) {
+        return false;
+    }
+    const definition = models[0].definition;
+    const mismatchedModel = models.find((model) => model.definition.connection !== definition.connection);
+    if (mismatchedModel) {
+        ioc.get(NotificationStore).showNotification({
+            title: 'Cannot delete models',
+            description: 'Selected models must come from the same connection.',
+            type: NotificationType.ERROR
+        });
+        return false;
+    }
+    try {
+        await definition.connection.batchDelete(models);
+        const sourcePanelID = (_a = options.sourcePanel) === null || _a === void 0 ? void 0 : _a.id;
+        if (options.sourcePanel instanceof ModelPanelModel) {
+            options.sourcePanel.delete();
+        }
+        await Promise.all(ioc
+            .get(WorkspaceStore)
+            .flatten(ioc.get(WorkspaceStore).getRoot())
+            .map(async (panel) => {
+            if (panel.id === sourcePanelID) {
+                return;
+            }
+            if (panel instanceof QueryPanelModel) {
+                await panel.reloadQuery();
+                return;
+            }
+            if (panel instanceof ModelPanelModel && models.some((model) => { var _a; return model.id === ((_a = panel.model) === null || _a === void 0 ? void 0 : _a.id); })) {
+                panel.delete();
+            }
+        }));
+        ioc.get(NotificationStore).showNotification({
+            title: models.length === 1 ? 'Model deleted' : 'Models deleted',
+            description: models.length === 1
+                ? 'The selected model has been deleted.'
+                : `${models.length} selected models have been deleted.`,
+            type: NotificationType.SUCCESS
+        });
+        return true;
+    }
+    catch (error) {
+        ioc.get(NotificationStore).showNotification({
+            title: 'Delete failed',
+            description: getErrorMessage(error),
+            type: NotificationType.ERROR
+        });
+        return false;
+    }
+};
+export const deleteSchemaModels = async (options) => {
+    const models = normalizeModels(options.models);
+    if (models.length <= 1) {
+        return false;
+    }
+    const confirmed = await ioc.get(DialogStore).showConfirmDialog({
+        title: 'Delete selected models',
+        markdown: buildDeleteMarkdown(models),
+        yesBtn: {
+            label: `Delete ${models.length} models`,
+            icon: 'trash'
+        }
+    });
+    if (!confirmed) {
+        return false;
+    }
+    return runDeleteSchemaModels(Object.assign(Object.assign({}, options), { models }));
+};
+//# sourceMappingURL=delete-schema-models.js.map

package/dist/core/delete-schema-models.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"delete-schema-models.js","sourceRoot":"","sources":["../../src/core/delete-schema-models.ts"],"names":[],"mappings":"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"}

package/dist/core/query/query-simple/SimpleQueryColumns.js

@@ -1,6 +1,5 @@
 import * as React from 'react';
 import { ioc } from '@journeyapps-labs/reactor-mod';
-import * as _ from 'lodash';
 import { CellDisplayWidget } from '../widgets/CellDisplayWidget';
 import { SmartColumnWidget } from '../widgets/SmartColumnWidget';
 import { SmartCellDisplayWidget } from '../widgets/SmartCellDisplayWidget';
@@ -12,6 +11,7 @@ import { STANDARD_MODEL_FIELD_LABELS, StandardModelFields, idVariable } from '..
 import { TypeEngine } from '../../../forms/TypeEngine';
 import { setupBelongsToFilter } from '../../../forms/types/belongs-to-filter';
 import { Condition, SimpleFilter, Statement } from '../filters';
+import { OrderedSchemaFieldType } from '../../SchemaModelDefinition';
 export const buildSimpleQueryColumns = (options) => {
     var _a, _b;
     const getSortLabel = (field, label) => {
@@ -55,58 +55,63 @@ export const buildSimpleQueryColumns = (options) => {
                 return React.createElement(CellDisplayWidget, { name: StandardModelFields.UPDATED_AT, cell: row.model.updated_at, row: row });
             }
         },
-        ..._.map(options.definition.definition.belongsToIdVars, (a) => {
-            return {
-                key: a.name,
-                display: (React.createElement(SmartColumnWidget, { variable: options.definition.definition.belongsToVars[a.relationship], typeLabel: `Belongs To: ${options.definition.definition.belongsTo[a.relationship].foreignType.label}`, filter: options.filterState.getFilter(a.name), setupFilter: async ({ filter }) => {
-                        return await setupBelongsToFilter({
-                            definition: options.definition,
-                            relationship: options.definition.definition.belongsTo[a.relationship],
-                            variable: a,
-                            filter
-                        });
-                    }, filterChanged: async (filter) => {
-                        var _a;
-                        if (!filter) {
-                            (_a = options.filterState.getFilter(a.name)) === null || _a === void 0 ? void 0 : _a.delete();
-                            return;
-                        }
-                        options.filterState.setFilter(a.name, filter);
-                    } })),
-                noWrap: true,
-                shrink: true,
-                accessor: (cell, row) => {
-                    return (React.createElement(SmartBelongsToDisplayWidget, { variable_id: a, row: row, connection: options.connection, filterBelongsTo: async (object) => {
-                            options.filterState.setFilter(a.name, new SimpleFilter(a, [new Statement(Condition.EQUALS, object.id)]));
-                        } }));
-                }
-            };
-        }),
-        ..._.map(options.definition.definition.attributes, (a) => {
+        ...options.definition.getOrderedFieldsAndRelationships().flatMap((entry) => {
             var _a, _b, _c;
-            return {
-                key: a.name,
-                display: (React.createElement(SmartColumnWidget, { variable: a, typeLabel: (_b = (_a = ioc.get(TypeEngine).getHandler(a.type)) === null || _a === void 0 ? void 0 : _a.getTypeLabel) === null || _b === void 0 ? void 0 : _b.call(_a, a.type), filter: options.filterState.getFilter(a.name), sortDirection: (_c = options.sortState.getSort(a.name)) === null || _c === void 0 ? void 0 : _c.direction, onToggleSort: async () => {
-                        const sort = options.sortState.getSort(a.name);
-                        if (!sort) {
-                            options.sortState.addSort(SimpleQuerySort.create(a.name));
-                            return;
-                        }
-                        sort.toggle();
-                    }, filterChanged: async (filter) => {
-                        var _a;
-                        if (!filter) {
-                            (_a = options.filterState.getFilter(a.name)) === null || _a === void 0 ? void 0 : _a.delete();
-                            return;
+            if (entry.type === OrderedSchemaFieldType.BELONGS_TO) {
+                const variable = entry.variable;
+                const relationship = entry.object;
+                return [
+                    {
+                        key: variable.name,
+                        display: (React.createElement(SmartColumnWidget, { variable: options.definition.definition.belongsToVars[variable.relationship], typeLabel: `Belongs To: ${relationship.foreignType.label}`, filter: options.filterState.getFilter(variable.name), setupFilter: async ({ filter }) => {
+                                return await setupBelongsToFilter({
+                                    definition: options.definition,
+                                    relationship,
+                                    variable,
+                                    filter
+                                });
+                            }, filterChanged: async (filter) => {
+                                var _a;
+                                if (!filter) {
+                                    (_a = options.filterState.getFilter(variable.name)) === null || _a === void 0 ? void 0 : _a.delete();
+                                    return;
+                                }
+                                options.filterState.setFilter(variable.name, filter);
+                            } })),
+                        noWrap: true,
+                        accessor: (cell, row) => {
+                            return (React.createElement(SmartBelongsToDisplayWidget, { variable_id: variable, row: row, connection: options.connection, filterBelongsTo: async (object) => {
+                                    options.filterState.setFilter(variable.name, new SimpleFilter(variable, [new Statement(Condition.EQUALS, object.id)]));
+                                } }));
                         }
-                        options.filterState.setFilter(a.name, filter);
-                    } })),
-                noWrap: true,
-                shrink: true,
-                accessor: (cell, row) => {
-                    return React.createElement(SmartCellDisplayWidget, { name: a.name, row: row });
+                    }
+                ];
+            }
+            const attribute = entry.object;
+            return [
+                {
+                    key: attribute.name,
+                    display: (React.createElement(SmartColumnWidget, { variable: attribute, typeLabel: (_b = (_a = ioc.get(TypeEngine).getHandler(attribute.type)) === null || _a === void 0 ? void 0 : _a.getTypeLabel) === null || _b === void 0 ? void 0 : _b.call(_a, attribute.type), filter: options.filterState.getFilter(attribute.name), sortDirection: (_c = options.sortState.getSort(attribute.name)) === null || _c === void 0 ? void 0 : _c.direction, onToggleSort: async () => {
+                            const sort = options.sortState.getSort(attribute.name);
+                            if (!sort) {
+                                options.sortState.addSort(SimpleQuerySort.create(attribute.name));
+                                return;
+                            }
+                            sort.toggle();
+                        }, filterChanged: async (filter) => {
+                            var _a;
+                            if (!filter) {
+                                (_a = options.filterState.getFilter(attribute.name)) === null || _a === void 0 ? void 0 : _a.delete();
+                                return;
+                            }
+                            options.filterState.setFilter(attribute.name, filter);
+                        } })),
+                    noWrap: true,
+                    accessor: (cell, row) => {
+                        return React.createElement(SmartCellDisplayWidget, { name: attribute.name, row: row });
+                    }
                 }
-            };
+            ];
         })
     ];
 };

package/dist/core/query/query-simple/SimpleQueryColumns.js.map

@@ -1 +1 @@
-{"version":3,"file":"SimpleQueryColumns.js","sourceRoot":"","sources":["../../../../src/core/query/query-simple/SimpleQueryColumns.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"SimpleQueryColumns.js","sourceRoot":"","sources":["../../../../src/core/query/query-simple/SimpleQueryColumns.tsx"],"names":[],"mappings":"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"}

package/dist/core/query/widgets/IDCellDisplayWidget.js

@@ -1,10 +1,15 @@
 import * as React from 'react';
-import { NotificationStore, NotificationType, TableButtonWidget, ioc, styled } from '@journeyapps-labs/reactor-mod';
+import { observer } from 'mobx-react';
+import { NotificationStore, NotificationType, PrefsStore, TableButtonWidget, ioc, styled } from '@journeyapps-labs/reactor-mod';
 import { copyTextToClipboard } from '@journeyapps-labs/lib-reactor-utils';
-export const IDCellDisplayWidget = (props) => {
+import { QueryControlPreferences } from '../../../preferences/QueryControlPreferences';
+export const IDCellDisplayWidget = observer((props) => {
     const notifications = ioc.get(NotificationStore);
+    const showIdValue = ioc
+        .get(PrefsStore)
+        .getPreference(QueryControlPreferences.SHOW_ID_VALUE_IN_ID_COLUMN).checked;
     return (React.createElement(S.Container, null,
-        React.createElement(S.Value, null, props.id),
+        showIdValue ? React.createElement(S.Value, null, props.id) : null,
         React.createElement(TableButtonWidget, { icon: "copy", tooltip: "Copy ID", action: () => {
                 copyTextToClipboard(props.id);
                 notifications.showNotification({
@@ -13,7 +18,7 @@ export const IDCellDisplayWidget = (props) => {
                     type: NotificationType.SUCCESS
                 });
             } })));
-};
+});
 var S;
 (function (S) {
     S.Container = styled.div `

package/dist/core/query/widgets/IDCellDisplayWidget.js.map

@@ -1 +1 @@
-{"version":3,"file":"IDCellDisplayWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/IDCellDisplayWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AACpH,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAM1E,MAAM,CAAC,MAAM,mBAAmB,GAAuC,CAAC,KAAK,EAAE,EAAE;IAC/E,MAAM,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IAEjD,OAAO,CACL,oBAAC,CAAC,CAAC,SAAS;QACV,oBAAC,CAAC,CAAC,KAAK,QAAE,KAAK,CAAC,EAAE,CAAW;QAC7B,oBAAC,iBAAiB,IAChB,IAAI,EAAC,MAAM,EACX,OAAO,EAAC,SAAS,EACjB,MAAM,EAAE,GAAG,EAAE;gBACX,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAC9B,aAAa,CAAC,gBAAgB,CAAC;oBAC7B,KAAK,EAAE,QAAQ;oBACf,WAAW,EAAE,wBAAwB;oBACrC,IAAI,EAAE,gBAAgB,CAAC,OAAO;iBAC/B,CAAC,CAAC;YACL,CAAC,GACD,CACU,CACf,CAAC;AACJ,CAAC,CAAC;AAEF,IAAU,CAAC,CAeV;AAfD,WAAU,CAAC;IACI,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;;GAOlC,CAAC;IAEW,OAAK,GAAG,MAAM,CAAC,GAAG,CAAA;;;;GAI9B,CAAC;AACJ,CAAC,EAfS,CAAC,KAAD,CAAC,QAeV"}
+{"version":3,"file":"IDCellDisplayWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/IDCellDisplayWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAEL,iBAAiB,EACjB,gBAAgB,EAChB,UAAU,EACV,iBAAiB,EACjB,GAAG,EACH,MAAM,EACP,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,8CAA8C,CAAC;AAMvF,MAAM,CAAC,MAAM,mBAAmB,GAAuC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;IACxF,MAAM,aAAa,GAAG,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;IACjD,MAAM,WAAW,GAAG,GAAG;SACpB,GAAG,CAAC,UAAU,CAAC;SACf,aAAa,CAAiB,uBAAuB,CAAC,0BAA0B,CAAC,CAAC,OAAO,CAAC;IAE7F,OAAO,CACL,oBAAC,CAAC,CAAC,SAAS;QACT,WAAW,CAAC,CAAC,CAAC,oBAAC,CAAC,CAAC,KAAK,QAAE,KAAK,CAAC,EAAE,CAAW,CAAC,CAAC,CAAC,IAAI;QACnD,oBAAC,iBAAiB,IAChB,IAAI,EAAC,MAAM,EACX,OAAO,EAAC,SAAS,EACjB,MAAM,EAAE,GAAG,EAAE;gBACX,mBAAmB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAC9B,aAAa,CAAC,gBAAgB,CAAC;oBAC7B,KAAK,EAAE,QAAQ;oBACf,WAAW,EAAE,wBAAwB;oBACrC,IAAI,EAAE,gBAAgB,CAAC,OAAO;iBAC/B,CAAC,CAAC;YACL,CAAC,GACD,CACU,CACf,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,IAAU,CAAC,CAeV;AAfD,WAAU,CAAC;IACI,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;;;GAOlC,CAAC;IAEW,OAAK,GAAG,MAAM,CAAC,GAAG,CAAA;;;;GAI9B,CAAC;AACJ,CAAC,EAfS,CAAC,KAAD,CAAC,QAeV"}

package/dist/entities/SchemaModelDefinitionEntityDefinition.js

@@ -1,9 +1,10 @@
 import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInitializers } from "tslib";
-import { DescendantEntityProviderComponent, EntityActionHandlerComponent, EntityDefinition, EntityDescriberComponent, inject, InlineEntityEncoderComponent, InlineTreePresenterComponent, SimpleParentEntitySearchEngine } from '@journeyapps-labs/reactor-mod';
+import { DescendantEntityProviderComponent, EntityActionHandlerComponent, EntityDefinition, EntityDescriberComponent, InlineEntityEncoderComponent, inject, SimpleParentEntitySearchEngine } from '@journeyapps-labs/reactor-mod';
 import { DataBrowserEntities } from '../entities';
 import { ConnectionStore } from '../stores/ConnectionStore';
 import { SchemaModelDefinition } from '../core/SchemaModelDefinition';
 import { QuerySchemaModelAction } from '../actions/schema-definitions/QuerySchemaModelAction';
+import { SchemaModelTreePresenterComponent } from './SchemaModelTreePresenterComponent';
 let SchemaModelDefinitionEntityDefinition = (() => {
     var _a, _SchemaModelDefinitionEntityDefinition_connectionStore_accessor_storage;
     let _classSuper = EntityDefinition;
@@ -58,15 +59,7 @@ let SchemaModelDefinitionEntityDefinition = (() => {
                         return connection.waitForSchemaModelDefinitionByName(entity.type);
                     }
                 }));
-                this.registerComponent(new InlineTreePresenterComponent({
-                    loadChildrenAsNodesAreOpened: true,
-                    cacheTreeEntities: true,
-                    augmentTreeNodeProps: () => {
-                        return {
-                            openOnSingleClick: false
-                        };
-                    }
-                }));
+                this.registerComponent(new SchemaModelTreePresenterComponent({ loadChildrenAsNodesAreOpened: true }));
                 this.registerComponent(new SimpleParentEntitySearchEngine({
                     label: 'Simple',
                     type: DataBrowserEntities.CONNECTION,

package/dist/entities/SchemaModelDefinitionEntityDefinition.js.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaModelDefinitionEntityDefinition.js","sourceRoot":"","sources":["../../src/entities/SchemaModelDefinitionEntityDefinition.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SchemaModelDefinitionEntityDefinition.js","sourceRoot":"","sources":["../../src/entities/SchemaModelDefinitionEntityDefinition.ts"],"names":[],"mappings":"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"}

package/dist/entities/SchemaModelObjectEntityDefinition.js

@@ -5,6 +5,7 @@ import { ConnectionStore } from '../stores/ConnectionStore';
 import { SchemaModelObject } from '../core/SchemaModelObject';
 import { validate as validateUUID } from 'uuid';
 import { ViewHasManyAction } from '../actions/schema-model/ViewHasManyAction';
+import { DeleteSchemaModelAction } from '../actions/schema-model/DeleteSchemaModelAction';
 let SchemaModelObjectEntityDefinition = (() => {
     var _a, _SchemaModelObjectEntityDefinition_connectionStore_accessor_storage;
     let _classSuper = EntityDefinition;
@@ -77,6 +78,10 @@ let SchemaModelObjectEntityDefinition = (() => {
                 return t.model.id;
             }
             isActionAllowedForEntity(action, entity) {
+                var _b;
+                if (action.id === DeleteSchemaModelAction.ID) {
+                    return !!((_b = entity.model) === null || _b === void 0 ? void 0 : _b.persisted);
+                }
                 if (action.id === ViewHasManyAction.ID) {
                     return Object.keys(entity.definition.definition.hasMany || {}).length > 0;
                 }

package/dist/entities/SchemaModelObjectEntityDefinition.js.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaModelObjectEntityDefinition.js","sourceRoot":"","sources":["../../src/entities/SchemaModelObjectEntityDefinition.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SchemaModelObjectEntityDefinition.js","sourceRoot":"","sources":["../../src/entities/SchemaModelObjectEntityDefinition.ts"],"names":[],"mappings":"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"}

package/dist/entities/SchemaModelTreePresenterComponent.js

@@ -0,0 +1,23 @@
+import { CachedEntityTreePresenterContext, EntityReactorNode, EntityTreePresenterComponent } from '@journeyapps-labs/reactor-mod';
+import { SchemaModelOrderValue, SchemaModelOrderingPreference } from '../preferences/SchemaOrderingPreferences';
+class SchemaModelTreePresenterContext extends CachedEntityTreePresenterContext {
+    getSortedEntities(entities) {
+        if (SchemaModelOrderingPreference.getValue() === SchemaModelOrderValue.AS_DEFINED_IN_SCHEMA) {
+            return entities;
+        }
+        return super.getSortedEntities(entities);
+    }
+    doGenerateTreeNode(entity, options) {
+        return new EntityReactorNode({
+            entity,
+            definition: this.definition,
+            events: options === null || options === void 0 ? void 0 : options.events
+        });
+    }
+}
+export class SchemaModelTreePresenterComponent extends EntityTreePresenterComponent {
+    _generateContext() {
+        return new SchemaModelTreePresenterContext(this);
+    }
+}
+//# sourceMappingURL=SchemaModelTreePresenterComponent.js.map

package/dist/entities/SchemaModelTreePresenterComponent.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SchemaModelTreePresenterComponent.js","sourceRoot":"","sources":["../../src/entities/SchemaModelTreePresenterComponent.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gCAAgC,EAChC,iBAAiB,EACjB,4BAA4B,EAE7B,MAAM,+BAA+B,CAAC;AAEvC,OAAO,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,0CAA0C,CAAC;AAEhH,MAAM,+BAAgC,SAAQ,gCAAuD;IACnG,iBAAiB,CAAC,QAAiC;QACjD,IAAI,6BAA6B,CAAC,QAAQ,EAAE,KAAK,qBAAqB,CAAC,oBAAoB,EAAE,CAAC;YAC5F,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,OAAO,KAAK,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;IAC3C,CAAC;IAES,kBAAkB,CAAC,MAA6B,EAAE,OAAO;QACjE,OAAO,IAAI,iBAAiB,CAAC;YAC3B,MAAM;YACN,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,MAAM,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,MAAM;SACxB,CAAC,CAAC;IACL,CAAC;CACF;AAED,MAAM,OAAO,iCAAkC,SAAQ,4BAAmD;IAC9F,gBAAgB;QACxB,OAAO,IAAI,+BAA+B,CAAC,IAAI,CAAC,CAAC;IACnD,CAAC;CACF"}

package/dist/forms/SchemaModelForm.js

@@ -1,10 +1,10 @@
 import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInitializers } from "tslib";
 import { EntityInput, FormModel, inject } from '@journeyapps-labs/reactor-mod';
-import * as _ from 'lodash';
 import { DataBrowserEntities } from '../entities';
 import { DirtyWrapperInput } from './inputs/DirtyWrapperInput';
 import { TypeEngine } from './TypeEngine';
 import { autorun } from 'mobx';
+import { OrderedSchemaFieldType } from '../core/SchemaModelDefinition';
 let Binding = (() => {
     var _a, _Binding_typeEngine_accessor_storage;
     let _typeEngine_decorators;
@@ -97,41 +97,43 @@ let SchemaModelForm = (() => {
                 _SchemaModelForm_typeEngine_accessor_storage.set(this, __runInitializers(this, _typeEngine_initializers, void 0));
                 this.bindings = __runInitializers(this, _typeEngine_extraInitializers);
                 this.bindings = new Set();
-                _.map(options.definition.definition.belongsTo, (relationship) => {
-                    const definition = options.definition.connection.getSchemaModelDefinitionByName(relationship.foreignType.name);
-                    let entity = new EntityInput({
-                        name: relationship.name,
-                        entityType: DataBrowserEntities.SCHEMA_MODEL_OBJECT,
-                        parent: definition,
-                        label: relationship.name,
-                        value: null
-                    });
-                    return new Binding({
-                        name: relationship.name,
-                        model: this.options.object,
-                        input: entity,
-                        resolve: () => {
-                            if (!options.object.data.belongs_to[relationship.name]) {
-                                return null;
-                            }
-                            return definition.resolve(options.object.data.belongs_to[relationship.name]);
-                        }
-                    });
-                })
-                    .filter((f) => !!f)
-                    .forEach((binding) => {
-                    this.bindings.add(binding);
-                    this.addInput(new DirtyWrapperInput(binding.input, options.object));
-                });
-                _.map(options.definition.definition.attributes, (attribute) => {
+                options.definition
+                    .getOrderedFieldsAndRelationships()
+                    .map((entry) => {
                     var _b;
+                    if (entry.type === OrderedSchemaFieldType.BELONGS_TO) {
+                        const relationship = entry.object;
+                        const definition = options.definition.connection.getSchemaModelDefinitionByName(relationship.foreignType.name);
+                        if (!definition) {
+                            return null;
+                        }
+                        const entity = new EntityInput({
+                            name: relationship.name,
+                            entityType: DataBrowserEntities.SCHEMA_MODEL_OBJECT,
+                            parent: definition,
+                            label: relationship.name,
+                            value: null
+                        });
+                        return new Binding({
+                            name: relationship.name,
+                            model: this.options.object,
+                            input: entity,
+                            resolve: () => {
+                                if (!options.object.data.belongs_to[relationship.name]) {
+                                    return null;
+                                }
+                                return definition.resolve(options.object.data.belongs_to[relationship.name]);
+                            }
+                        });
+                    }
+                    const attribute = entry.object;
                     let field = (_b = this.typeEngine.getHandler(attribute.type)) === null || _b === void 0 ? void 0 : _b.generateField({
                         name: attribute.name,
                         label: attribute.label,
                         type: attribute.type
                     });
                     if (!field) {
-                        return;
+                        return null;
                     }
                     return new TypedBinding({
                         variable: attribute,

package/dist/forms/SchemaModelForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"SchemaModelForm.js","sourceRoot":"","sources":["../../src/forms/SchemaModelForm.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"SchemaModelForm.js","sourceRoot":"","sources":["../../src/forms/SchemaModelForm.tsx"],"names":[],"mappings":"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"}

package/dist/index.js

@@ -13,6 +13,7 @@ export * from './entities/QueryEntityDefinition';
 export * from './entities/ConnectionEntityDefinition';
 export * from './entities/ConnectionFactoryEntityDefinition';
 export * from './entities/SchemaModelDefinitionEntityDefinition';
+export * from './entities/SchemaModelTreePresenterComponent';
 export * from './entities/SchemaModelObjectEntityDefinition';
 export * from './panels/query/QueryPanelFactory';
 export * from './panels/model/ModelPanelFactory';

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,cAAc,YAAY,CAAC;AAC3B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,0BAA0B,CAAC;AACzC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,sCAAsC,CAAC;AACrD,cAAc,+BAA+B,CAAC;AAE9C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc,8CAA8C,CAAC;AAC7D,cAAc,kDAAkD,CAAC;AACjE,cAAc,8CAA8C,CAAC;AAE7D,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,0CAA0C,CAAC;AACzD,cAAc,+CAA+C,CAAC;AAE9D,cAAc,0BAA0B,CAAC;AAEzC,cAAc,2CAA2C,CAAC;AAC1D,cAAc,8CAA8C,CAAC;AAC7D,cAAc,gDAAgD,CAAC;AAC/D,cAAc,qDAAqD,CAAC;AACpE,cAAc,8CAA8C,CAAC;AAC7D,cAAc,8CAA8C,CAAC;AAE7D,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,cAAc,YAAY,CAAC;AAC3B,cAAc,8BAA8B,CAAC;AAC7C,cAAc,0BAA0B,CAAC;AACzC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,mBAAmB,CAAC;AAClC,cAAc,sCAAsC,CAAC;AACrD,cAAc,+BAA+B,CAAC;AAE9C,cAAc,kCAAkC,CAAC;AACjD,cAAc,uCAAuC,CAAC;AACtD,cAAc,8CAA8C,CAAC;AAC7D,cAAc,kDAAkD,CAAC;AACjE,cAAc,8CAA8C,CAAC;AAC7D,cAAc,8CAA8C,CAAC;AAE7D,cAAc,kCAAkC,CAAC;AACjD,cAAc,kCAAkC,CAAC;AACjD,cAAc,0CAA0C,CAAC;AACzD,cAAc,+CAA+C,CAAC;AAE9D,cAAc,0BAA0B,CAAC;AAEzC,cAAc,2CAA2C,CAAC;AAC1D,cAAc,8CAA8C,CAAC;AAC7D,cAAc,gDAAgD,CAAC;AAC/D,cAAc,qDAAqD,CAAC;AACpE,cAAc,8CAA8C,CAAC;AAC7D,cAAc,8CAA8C,CAAC;AAE7D,eAAe,iBAAiB,CAAC"}

package/dist/panels/model/ModelPanelWidget.js

@@ -4,6 +4,7 @@ import { observer } from 'mobx-react';
 import styled from '@emotion/styled';
 import { BorderLayoutWidget, ioc, LoadingPanelWidget, PANEL_CONTENT_PADDING, PanelButtonWidget, PanelToolbarWidget, ScrollableDivCss, theme, ThemeStore } from '@journeyapps-labs/reactor-mod';
 import { SchemaModelForm } from '../../forms/SchemaModelForm';
+import { DeleteSchemaModelAction } from '../../actions/schema-model/DeleteSchemaModelAction';
 var S;
 (function (S) {
     S.Container = styled.div `
@@ -19,7 +20,7 @@ var S;
   `;
 })(S || (S = {}));
 export const ModelPanelWidget = observer((props) => {
-    var _a;
+    var _a, _b;
     const [form, setForm] = useState(null);
     const _theme = ioc.get(ThemeStore).getCurrentTheme(theme);
     useEffect(() => {
@@ -37,15 +38,18 @@ export const ModelPanelWidget = observer((props) => {
     }, [props.model.model, props.model.definition]);
     let top = null;
     if (props.model.model) {
-        top = (React.createElement(PanelToolbarWidget, { btns: [
-            // {
-            //   label: 'Delete object',
-            //   action: () => {}
-            // }
-            ], meta: [
+        const toolbarButtons = ((_a = props.model.model.model) === null || _a === void 0 ? void 0 : _a.persisted)
+            ? [
+                DeleteSchemaModelAction.get().representAsButton({
+                    targetEntity: props.model.model,
+                    sourcePanel: props.model
+                }, true)
+            ].filter((button) => !!button)
+            : [];
+        top = (React.createElement(PanelToolbarWidget, { btns: toolbarButtons, meta: [
                 {
                     label: 'ID',
-                    value: (_a = props.model) === null || _a === void 0 ? void 0 : _a.id
+                    value: (_b = props.model) === null || _b === void 0 ? void 0 : _b.id
                 }
             ] }));
     }

package/dist/panels/model/ModelPanelWidget.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModelPanelWidget.js","sourceRoot":"","sources":["../../../src/panels/model/ModelPanelWidget.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ModelPanelWidget.js","sourceRoot":"","sources":["../../../src/panels/model/ModelPanelWidget.tsx"],"names":[],"mappings":"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"}