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

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @journeyapps-labs/reactor-mod-data-browser
 
+## 3.6.0
+
+### Minor Changes
+
+- 25ca8e5: Add schema model delete workflows to the data browser.
+  - Add a delete action for individual schema model records.
+  - Add batch delete for multi-selected query rows.
+  - Add query table selection controls and selected-row context menu actions for batch operations.
+  - Close open model panels and refresh query views after records are deleted.
+
+## 3.5.0
+
+### Minor Changes
+
+- 794a3d6: Add configurable schema and query display preferences in the data browser.
+  - add schema ordering preferences for models and fields, including schema-defined ordering for models and fields/relationships
+  - apply shared field ordering consistently across table columns, forms, and filterable schema fields
+  - add a query preference to toggle showing the raw ID value in the ID column while keeping the copy button available
+  - add a query preference to place table controls at the top, bottom, or both, defaulting to both
+
 ## 3.4.0
 
 ### Minor Changes

package/dist/@types/actions/schema-model/DeleteSchemaModelAction.d.ts

@@ -0,0 +1,12 @@
+import { EntityAction, EntityActionEvent } from '@journeyapps-labs/reactor-mod';
+import { SchemaModelObject } from '../../core/SchemaModelObject';
+import { ModelPanelModel } from '../../panels/model/ModelPanelFactory';
+export interface DeleteSchemaModelActionEvent extends EntityActionEvent<SchemaModelObject> {
+    sourcePanel?: ModelPanelModel;
+}
+export declare class DeleteSchemaModelAction extends EntityAction<SchemaModelObject, DeleteSchemaModelActionEvent> {
+    static ID: string;
+    constructor();
+    fireEvent(event: DeleteSchemaModelActionEvent): Promise<any>;
+    static get(): DeleteSchemaModelAction;
+}

package/dist/@types/core/AbstractConnection.d.ts

@@ -38,12 +38,14 @@ export declare abstract class AbstractConnection extends BaseObserver<AbstractCo
         };
     }>;
     batchSave(models: SchemaModelObject[]): Promise<void>;
+    batchDelete(models: SchemaModelObject[]): Promise<void>;
     getSchemaModelDefinitionByName(name: string): SchemaModelDefinition;
     get isOnline(): boolean;
     get isLoadingOnline(): boolean;
     waitForSchemaModelDefinitionByName(name: string): Promise<SchemaModelDefinition>;
     abstract getConnection(): Promise<Database>;
     protected getSchema(): Promise<Schema>;
+    protected getOrderedSchemaObjects(schema: Schema): ObjectType[];
     reload(): Promise<void>;
     init(): Promise<void>;
     protected connectOnline(): Promise<void>;

package/dist/@types/core/SchemaModelDefinition.d.ts

@@ -24,6 +24,22 @@ export interface FilterableField {
     label: string;
     group: 'Fields' | 'Belongs to';
 }
+export declare enum OrderedSchemaFieldType {
+    FIELD = "FIELD",
+    BELONGS_TO = "BELONGS_TO"
+}
+export type OrderedSchemaFieldOrRelationship = {
+    type: OrderedSchemaFieldType.FIELD;
+    object: Variable;
+    key: string;
+    label: string;
+} | {
+    type: OrderedSchemaFieldType.BELONGS_TO;
+    object: ObjectType['belongsTo'][string];
+    key: string;
+    label: string;
+    variable: Variable;
+};
 export declare class SchemaModelDefinition extends BaseObserver<SchemaModelDefinitionListener> implements LifecycleModel<ObjectType> {
     protected options: SchemaModelDefinitionOptions;
     cache: Map<string, SchemaModelObject>;
@@ -49,5 +65,9 @@ export declare class SchemaModelDefinition extends BaseObserver<SchemaModelDefin
         variable: Variable;
         relationship: ObjectType['belongsTo'][string];
     } | undefined;
+    private getSchemaOrderedFields;
+    private getSchemaOrderedBelongsToFields;
+    private getAlphabeticalOrderedFields;
+    getOrderedFieldsAndRelationships(): OrderedSchemaFieldOrRelationship[];
     getFilterableFields(typeEngine: TypeEngine): FilterableField[];
 }

package/dist/@types/core/delete-schema-models.d.ts

@@ -0,0 +1,8 @@
+import { ReactorPanelModel } from '@journeyapps-labs/reactor-mod';
+import { SchemaModelObject } from './SchemaModelObject';
+export interface DeleteSchemaModelsOptions {
+    models: SchemaModelObject[];
+    sourcePanel?: ReactorPanelModel;
+}
+export declare const runDeleteSchemaModels: (options: DeleteSchemaModelsOptions) => Promise<boolean>;
+export declare const deleteSchemaModels: (options: DeleteSchemaModelsOptions) => Promise<boolean>;

package/dist/@types/entities/SchemaModelTreePresenterComponent.d.ts

@@ -0,0 +1,10 @@
+import { CachedEntityTreePresenterContext, EntityTreePresenterComponent, ReactorTreeEntity } from '@journeyapps-labs/reactor-mod';
+import { SchemaModelDefinition } from '../core/SchemaModelDefinition';
+declare class SchemaModelTreePresenterContext extends CachedEntityTreePresenterContext<SchemaModelDefinition> {
+    getSortedEntities(entities: SchemaModelDefinition[]): SchemaModelDefinition[];
+    protected doGenerateTreeNode(entity: SchemaModelDefinition, options: any): ReactorTreeEntity;
+}
+export declare class SchemaModelTreePresenterComponent extends EntityTreePresenterComponent<SchemaModelDefinition> {
+    protected _generateContext(): SchemaModelTreePresenterContext;
+}
+export {};

package/dist/@types/forms/types/shared/ui.d.ts

@@ -239,6 +239,8 @@ declare namespace S {
                     groupBackground: string;
                     even: string;
                     odd: string;
+                    selectedEven: string;
+                    selectedOdd: string;
                     pills: string;
                     text: string;
                     pillsSpecial: string;
@@ -496,6 +498,8 @@ declare namespace S {
                     groupBackground: string;
                     even: string;
                     odd: string;
+                    selectedEven: string;
+                    selectedOdd: string;
                     pills: string;
                     text: string;
                     pillsSpecial: string;
@@ -754,6 +758,8 @@ declare namespace S {
                     groupBackground: string;
                     even: string;
                     odd: string;
+                    selectedEven: string;
+                    selectedOdd: string;
                     pills: string;
                     text: string;
                     pillsSpecial: string;

package/dist/@types/index.d.ts

@@ -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/@types/panels/query/PageResultsWidget.d.ts

@@ -1,9 +1,13 @@
 import * as React from 'react';
-import { Page } from '../../core/query/Page';
+import { Page, PageRow } from '../../core/query/Page';
+import { MultiSelectChangeEvent } from '@journeyapps-labs/reactor-mod';
 import { AbstractQuery } from '../../core/query/AbstractQuery';
+import { SchemaModelObject } from '../../core/SchemaModelObject';
 export interface PageResultsWidgetProps {
     page: Page;
     query: AbstractQuery;
+    selectedModels: SchemaModelObject[];
+    onSelectionChange: (event: MultiSelectChangeEvent<PageRow>) => void;
     scrollTop: number;
     scrollLeft: number;
     onScroll: (offsets: {

package/dist/@types/panels/query/QueryPanelFactory.d.ts

@@ -6,14 +6,22 @@ import { WorkspaceEngine, WorkspaceModelFactoryEvent } from '@projectstorm/react
 import { AbstractConnection } from '../../core/AbstractConnection';
 import { SharedConnectionPanelFactory } from '../_shared/SharedConnectionPanelFactory';
 import { Page } from '../../core/query/Page';
+import { SchemaModelObject } from '../../core/SchemaModelObject';
 export declare class QueryPanelModel extends ReactorPanelModel {
     accessor connStore: ConnectionStore;
     accessor query: AbstractQuery;
     accessor current_page: number;
     accessor current_page_data: Page | null;
+    accessor selected_models: SchemaModelObject[];
     accessor table_scroll_top: number;
     accessor table_scroll_left: number;
     constructor(query: AbstractQuery);
+    clearSelection(): void;
+    mergeSelectionForPage(event: {
+        page: Page;
+        models: SchemaModelObject[];
+    }): void;
+    reloadQuery(): Promise<void>;
     isSerializable(): boolean;
     toArray(): {
         current_page: number;

package/dist/@types/panels/query/TableControlsWidget.d.ts

@@ -8,5 +8,7 @@ export interface TableControlsWidgetProps {
     query: AbstractQuery;
     onLoadSavedQuery?: (id: string) => Promise<any> | any;
     loading?: boolean;
+    selectedCount: number;
+    onDeleteSelected: () => Promise<void>;
 }
 export declare const TableControlsWidget: React.FC<TableControlsWidgetProps>;

package/dist/@types/panels/query/table-controls/SelectionControlsWidget.d.ts

@@ -0,0 +1,6 @@
+import * as React from 'react';
+export interface SelectionControlsWidgetProps {
+    selectedCount: number;
+    onDeleteSelected: () => Promise<void>;
+}
+export declare const SelectionControlsWidget: React.FC<SelectionControlsWidgetProps>;

package/dist/@types/preferences/QueryControlPreferences.d.ts

@@ -1,7 +1,19 @@
-import { PrefsStore } from '@journeyapps-labs/reactor-mod';
+import { PrefsStore, SetSetting } from '@journeyapps-labs/reactor-mod';
 export declare enum QueryControlPreferences {
     SHOW_SORT_CONTROLS = "databrowser/query-controls/show-sort-controls",
     SHOW_FILTER_CONTROLS = "databrowser/query-controls/show-filter-controls",
-    FILTER_NULL_FIELDS_IN_RELATIONSHIP_PEEK = "databrowser/query-controls/filter-null-fields-in-relationship-peek"
+    FILTER_NULL_FIELDS_IN_RELATIONSHIP_PEEK = "databrowser/query-controls/filter-null-fields-in-relationship-peek",
+    SHOW_ID_VALUE_IN_ID_COLUMN = "databrowser/query-controls/show-id-value-in-id-column",
+    TABLE_CONTROLS_POSITION = "databrowser/query-controls/table-controls-position"
+}
+export declare enum TableControlsPositionValue {
+    TOP = "top",
+    BOTTOM = "bottom",
+    BOTH = "both"
+}
+export declare class TableControlsPositionPreference extends SetSetting {
+    static KEY: QueryControlPreferences;
+    constructor();
+    static getValue(): TableControlsPositionValue;
 }
 export declare const registerQueryControlPreferences: (prefsStore: PrefsStore) => void;

package/dist/@types/preferences/SchemaOrderingPreferences.d.ts

@@ -0,0 +1,22 @@
+import { PrefsStore, SetSetting } from '@journeyapps-labs/reactor-mod';
+export declare enum SchemaModelOrderValue {
+    ALPHABETICAL = "alphabetical",
+    AS_DEFINED_IN_SCHEMA = "as_defined_in_schema"
+}
+export declare class SchemaModelOrderingPreference extends SetSetting {
+    static KEY: string;
+    constructor();
+    static getValue(): SchemaModelOrderValue;
+}
+export declare enum SchemaFieldOrderValue {
+    ALPHABETICAL = "alphabetical",
+    BELONGS_TO_FIRST = "belongs_to_first",
+    BELONGS_TO_LAST = "belongs_to_last",
+    AS_DEFINED_IN_SCHEMA = "as_defined_in_schema"
+}
+export declare class SchemaFieldOrderingPreference extends SetSetting {
+    static KEY: string;
+    constructor();
+    static getValue(): SchemaFieldOrderValue;
+}
+export declare const registerSchemaOrderingPreferences: (prefsStore: PrefsStore) => void;

package/dist/DataBrowserModule.js

@@ -17,6 +17,7 @@ import { EditSchemaModelAction } from './actions/schema-model/EditSchemaModelAct
 import { TypeEngine } from './forms/TypeEngine';
 import { ViewSchemaModelAsJsonAction } from './actions/schema-model/ViewSchemaModelAsJsonAction';
 import { ViewHasManyAction } from './actions/schema-model/ViewHasManyAction';
+import { DeleteSchemaModelAction } from './actions/schema-model/DeleteSchemaModelAction';
 import { ModelJsonPanelFactory } from './panels/model-json/ModelJsonPanelFactory';
 import { SchemaModelIndexDefinition } from './entities/SchemaModelIndexDefinition';
 import { SavedQueryStore } from './stores/SavedQueryStore';
@@ -24,6 +25,7 @@ import { SavedQueryEntityDefinition } from './entities/SavedQueryEntityDefinitio
 import { OpenSavedQueryAction } from './actions/saved-queries/OpenSavedQueryAction';
 import { RemoveSavedQueryAction } from './actions/saved-queries/RemoveSavedQueryAction';
 import { registerQueryControlPreferences } from './preferences/QueryControlPreferences';
+import { registerSchemaOrderingPreferences } from './preferences/SchemaOrderingPreferences';
 export class DataBrowserModule extends AbstractReactorModule {
     constructor() {
         super({
@@ -45,11 +47,13 @@ export class DataBrowserModule extends AbstractReactorModule {
         actionStore.registerAction(new EditSchemaModelAction());
         actionStore.registerAction(new ViewSchemaModelAsJsonAction());
         actionStore.registerAction(new ViewHasManyAction());
+        actionStore.registerAction(new DeleteSchemaModelAction());
         actionStore.registerAction(new OpenSavedQueryAction());
         actionStore.registerAction(new RemoveSavedQueryAction());
         system.addStore(ConnectionStore, connectionStore);
         system.addStore(SavedQueryStore, new SavedQueryStore());
         registerQueryControlPreferences(ioc.get(PrefsStore));
+        registerSchemaOrderingPreferences(ioc.get(PrefsStore));
         system.registerDefinition(new ConnectionEntityDefinition());
         system.registerDefinition(new ConnectionFactoryEntityDefinition());
         system.registerDefinition(new SchemaModelDefinitionEntityDefinition());

package/dist/DataBrowserModule.js.map

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

package/dist/actions/schema-model/DeleteSchemaModelAction.js

@@ -0,0 +1,27 @@
+import { ActionStore, EntityAction, ioc, setupDeleteConfirmation } from '@journeyapps-labs/reactor-mod';
+import { DataBrowserEntities } from '../../entities';
+import { runDeleteSchemaModels } from '../../core/delete-schema-models';
+export class DeleteSchemaModelAction extends EntityAction {
+    constructor() {
+        super({
+            id: DeleteSchemaModelAction.ID,
+            name: 'Delete schema model',
+            icon: 'trash',
+            target: DataBrowserEntities.SCHEMA_MODEL_OBJECT
+        });
+        setupDeleteConfirmation({
+            action: this
+        });
+    }
+    async fireEvent(event) {
+        await runDeleteSchemaModels({
+            models: [event.targetEntity],
+            sourcePanel: event.sourcePanel
+        });
+    }
+    static get() {
+        return ioc.get(ActionStore).getActionByID(DeleteSchemaModelAction.ID);
+    }
+}
+DeleteSchemaModelAction.ID = 'DELETE_SCHEMA_MODEL';
+//# sourceMappingURL=DeleteSchemaModelAction.js.map

package/dist/actions/schema-model/DeleteSchemaModelAction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"DeleteSchemaModelAction.js","sourceRoot":"","sources":["../../../src/actions/schema-model/DeleteSchemaModelAction.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,YAAY,EAEZ,GAAG,EACH,uBAAuB,EACxB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAOxE,MAAM,OAAO,uBAAwB,SAAQ,YAA6D;IAGxG;QACE,KAAK,CAAC;YACJ,EAAE,EAAE,uBAAuB,CAAC,EAAE;YAC9B,IAAI,EAAE,qBAAqB;YAC3B,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,mBAAmB,CAAC,mBAAmB;SAChD,CAAC,CAAC;QAEH,uBAAuB,CAAC;YACtB,MAAM,EAAE,IAAI;SACb,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAAmC;QACjD,MAAM,qBAAqB,CAAC;YAC1B,MAAM,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC;YAC5B,WAAW,EAAE,KAAK,CAAC,WAAW;SAC/B,CAAC,CAAC;IACL,CAAC;IAED,MAAM,CAAC,GAAG;QACR,OAAO,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,aAAa,CAA0B,uBAAuB,CAAC,EAAE,CAAC,CAAC;IACjG,CAAC;;AAxBM,0BAAE,GAAG,qBAAqB,CAAC"}

package/dist/core/AbstractConnection.js

@@ -1,5 +1,4 @@
 import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInitializers } from "tslib";
-import * as _ from 'lodash';
 import { SchemaModelDefinition } from './SchemaModelDefinition';
 import { v4 } from 'uuid';
 import { BaseObserver } from '@journeyapps-labs/common-utils';
@@ -7,6 +6,8 @@ import { Collection, LifecycleCollection } from '@journeyapps-labs/lib-reactor-d
 import { when } from 'mobx';
 import { computed, observable } from 'mobx';
 import { getDefaultConnectionColor } from './connection-colors';
+import { SchemaModelOrderValue, SchemaModelOrderingPreference } from '../preferences/SchemaOrderingPreferences';
+import * as _ from 'lodash';
 export var ConnectionOnlineState;
 (function (ConnectionOnlineState) {
     ConnectionOnlineState["OFFLINE"] = "offline";
@@ -81,6 +82,27 @@ let AbstractConnection = (() => {
                     model.reload();
                 }
             }
+            async batchDelete(models) {
+                var _b, _c;
+                if (models.length === 0) {
+                    return;
+                }
+                const database = await this.getConnection();
+                let batch = new database.Batch();
+                for (let model of models) {
+                    if (!((_b = model === null || model === void 0 ? void 0 : model.model) === null || _b === void 0 ? void 0 : _b.persisted)) {
+                        continue;
+                    }
+                    batch.destroy(model.model);
+                }
+                await batch.execute();
+                for (let model of models) {
+                    if (!((_c = model === null || model === void 0 ? void 0 : model.model) === null || _c === void 0 ? void 0 : _c.persisted)) {
+                        continue;
+                    }
+                    model.definition.cache.delete(model.id);
+                }
+            }
             getSchemaModelDefinitionByName(name) {
                 return this.schema_models.items.find((i) => i.definition.name === name);
             }
@@ -99,10 +121,17 @@ let AbstractConnection = (() => {
                 const connection = await this.getConnection();
                 return connection.schema;
             }
+            getOrderedSchemaObjects(schema) {
+                const objects = Object.keys(schema.objects).map((key) => schema.objects[key]);
+                if (SchemaModelOrderingPreference.getValue() === SchemaModelOrderValue.ALPHABETICAL) {
+                    return _.sortBy(objects, (object) => (object.label || object.name || '').toLowerCase());
+                }
+                return objects;
+            }
             async reload() {
                 await this.schema_models_collection.load(async () => {
                     const schema = await this.getSchema();
-                    return _.values(schema.objects);
+                    return this.getOrderedSchemaObjects(schema);
                 });
             }
             async init() { }
@@ -133,7 +162,7 @@ let AbstractConnection = (() => {
             }
             async getSchemaModelDefinitions() {
                 const schema = await this.getSchema();
-                return _.map(schema.objects, (o) => {
+                return this.getOrderedSchemaObjects(schema).map((o) => {
                     return new SchemaModelDefinition({
                         definition: o,
                         connection: this

package/dist/core/AbstractConnection.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractConnection.js","sourceRoot":"","sources":["../../src/core/AbstractConnection.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AbstractConnection.js","sourceRoot":"","sources":["../../src/core/AbstractConnection.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAChE,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,0CAA0C,CAAC;AAC3F,OAAO,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAI5C,OAAO,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,6BAA6B,EAAE,MAAM,0CAA0C,CAAC;AAChH,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAa5B,MAAM,CAAN,IAAY,qBAIX;AAJD,WAAY,qBAAqB;IAC/B,4CAAmB,CAAA;IACnB,4CAAmB,CAAA;IACnB,0CAAiB,CAAA;AACnB,CAAC,EAJW,qBAAqB,KAArB,qBAAqB,QAIhC;IAEqB,kBAAkB;;sBAAS,YAAY;;;;;;;;;;sBAAvC,kBAAmB,SAAQ,WAAwC;YAE3E,IAAS,KAAK,4FAAS;YAAvB,IAAS,KAAK,iGAAS;YACvB,IAAS,WAAW,kGAAwB;YAA5C,IAAS,WAAW,uGAAwB;YAOxD,YAAmB,OAAkC;gBACnD,KAAK,EAAE,CAAC;gBADS,YAAO,IAVN,mDAAkB,EAUnB,OAAO,EAA2B;gBARhC,2GAAc;gBACd,4KAAmC;gBAExD,6BAAwB,2DAAyB;gBAO/C,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC;gBACf,IAAI,CAAC,KAAK,GAAG,yBAAyB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAChD,IAAI,CAAC,WAAW,GAAG,qBAAqB,CAAC,OAAO,CAAC;gBACjD,IAAI,CAAC,wBAAwB,GAAG,IAAI,UAAU,EAAE,CAAC;gBACjD,IAAI,CAAC,aAAa,GAAG,IAAI,mBAAmB,CAAC;oBAC3C,UAAU,EAAE,IAAI,CAAC,wBAAwB;oBACzC,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE;wBACnB,IAAI,KAAK,GAAG,IAAI,qBAAqB,CAAC;4BACpC,UAAU,EAAE,CAAC;4BACb,UAAU,EAAE,IAAI;yBACjB,CAAC,CAAC;wBAEH,KAAK,CAAC,IAAI,EAAE,CAAC;wBACb,OAAO,KAAK,CAAC;oBACf,CAAC;oBACD,mBAAmB,EAAE,CAAC,CAAC,EAAE,EAAE;wBACzB,OAAO,CAAC,CAAC,IAAI,CAAC;oBAChB,CAAC;iBACF,CAAC,CAAC;YACL,CAAC;YAID,KAAK,CAAC,UAAU;gBACd,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,CAAC;oBAChC,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,EAAE;yBACjD,UAAU,EAAE;yBACZ,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,MAAM,CAAC;yBACzB,OAAO,CAAC,GAAG,EAAE;wBACZ,IAAI,CAAC,qBAAqB,GAAG,IAAI,CAAC;oBACpC,CAAC,CAAC,CAAC;gBACP,CAAC;gBACD,OAAO,IAAI,CAAC,qBAAqB,CAAC;YACpC,CAAC;YAED,KAAK,CAAC,SAAS,CAAC,MAA2B;gBACzC,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACxB,OAAO;gBACT,CAAC;gBACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC5C,IAAI,KAAK,GAAG,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACjC,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;oBACzB,MAAM,KAAK,CAAC,YAAY,EAAE,CAAC;oBAC3B,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC1B,CAAC;gBACD,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;gBACtB,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;oBACzB,KAAK,CAAC,MAAM,EAAE,CAAC;gBACjB,CAAC;YACH,CAAC;YAED,KAAK,CAAC,WAAW,CAAC,MAA2B;;gBAC3C,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACxB,OAAO;gBACT,CAAC;gBACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC5C,IAAI,KAAK,GAAG,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACjC,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;oBACzB,IAAI,CAAC,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAK,0CAAE,SAAS,CAAA,EAAE,CAAC;wBAC7B,SAAS;oBACX,CAAC;oBACD,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;gBAC7B,CAAC;gBACD,MAAM,KAAK,CAAC,OAAO,EAAE,CAAC;gBACtB,KAAK,IAAI,KAAK,IAAI,MAAM,EAAE,CAAC;oBACzB,IAAI,CAAC,CAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,KAAK,0CAAE,SAAS,CAAA,EAAE,CAAC;wBAC7B,SAAS;oBACX,CAAC;oBACD,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAC1C,CAAC;YACH,CAAC;YAED,8BAA8B,CAAC,IAAY;gBACzC,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;YAC1E,CAAC;YAES,IAAI,QAAQ;gBACpB,OAAO,IAAI,CAAC,WAAW,KAAK,qBAAqB,CAAC,MAAM,CAAC;YAC3D,CAAC;YAES,IAAI,eAAe;gBAC3B,OAAO,IAAI,CAAC,WAAW,KAAK,qBAAqB,CAAC,OAAO,CAAC;YAC5D,CAAC;YAED,KAAK,CAAC,kCAAkC,CAAC,IAAY;gBACnD,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;gBAC1B,MAAM,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC9D,OAAO,IAAI,CAAC,8BAA8B,CAAC,IAAI,CAAC,CAAC;YACnD,CAAC;YAIS,KAAK,CAAC,SAAS;gBACvB,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;gBAC9C,OAAO,UAAU,CAAC,MAAM,CAAC;YAC3B,CAAC;YAES,uBAAuB,CAAC,MAAc;gBAC9C,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC9E,IAAI,6BAA6B,CAAC,QAAQ,EAAE,KAAK,qBAAqB,CAAC,YAAY,EAAE,CAAC;oBACpF,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;gBAC1F,CAAC;gBACD,OAAO,OAAO,CAAC;YACjB,CAAC;YAED,KAAK,CAAC,MAAM;gBACV,MAAM,IAAI,CAAC,wBAAwB,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;oBAClD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;oBACtC,OAAO,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC;gBAC9C,CAAC,CAAC,CAAC;YACL,CAAC;YAED,KAAK,CAAC,IAAI,KAAI,CAAC;YAEL,KAAK,CAAC,aAAa;gBAC3B,MAAM,IAAI,CAAC,MAAM,EAAE,CAAC;YACtB,CAAC;YAED,KAAK,CAAC,YAAY;gBAChB,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;oBAClB,OAAO;gBACT,CAAC;gBACD,IAAI,CAAC,IAAI,CAAC,yBAAyB,EAAE,CAAC;oBACpC,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAC3D,CAAC;gBACD,MAAM,IAAI,CAAC,yBAAyB,CAAC;YACvC,CAAC;YAEO,KAAK,CAAC,gBAAgB;gBAC5B,IAAI,CAAC,WAAW,GAAG,qBAAqB,CAAC,OAAO,CAAC;gBACjD,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;oBAC3B,IAAI,CAAC,WAAW,GAAG,qBAAqB,CAAC,MAAM,CAAC;gBAClD,CAAC;wBAAS,CAAC;oBACT,IAAI,IAAI,CAAC,WAAW,KAAK,qBAAqB,CAAC,OAAO,EAAE,CAAC;wBACvD,IAAI,CAAC,WAAW,GAAG,qBAAqB,CAAC,OAAO,CAAC;oBACnD,CAAC;oBACD,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC;gBACxC,CAAC;YACH,CAAC;YAES,KAAK,CAAC,yBAAyB;gBACvC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;gBACtC,OAAO,IAAI,CAAC,uBAAuB,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;oBACpD,OAAO,IAAI,qBAAqB,CAAC;wBAC/B,UAAU,EAAE,CAAC;wBACb,UAAU,EAAE,IAAI;qBACjB,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;YACL,CAAC;YAED,MAAM;gBACJ,IAAI,CAAC,gBAAgB,CAAC,CAAC,EAAE,EAAE,EAAE,WAAC,OAAA,MAAA,EAAE,CAAC,OAAO,kDAAI,CAAA,EAAA,CAAC,CAAC;YAChD,CAAC;YAED,SAAS;gBACP,OAAO;oBACL,EAAE,EAAE,IAAI,CAAC,EAAE;oBACX,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG;oBACjC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE;oBAC1B,KAAK,EAAE,IAAI,CAAC,KAAK;iBAClB,CAAC;YACJ,CAAC;YAED,IAAI,IAAI;gBACN,OAAO;oBACL,UAAU,EAAE,IAAI,CAAC,EAAE;iBACpB,CAAC;YACJ,CAAC;;;;;;;iCAlLA,UAAU;uCACV,UAAU;wCAqFV,QAAQ;+CAIR,QAAQ;YA1FG,kKAAS,KAAK,6BAAL,KAAK,qFAAS;YACvB,oLAAS,WAAW,6BAAX,WAAW,iGAAwB;YAqF9C,6KAAI,QAAQ,6DAErB;YAES,kMAAI,eAAe,6DAE5B;;;;;SA9FmB,kBAAkB"}

package/dist/core/SchemaModelDefinition.js

@@ -7,6 +7,12 @@ import { queue } from 'async';
 import { observable } from 'mobx';
 import { IndexModel } from './IndexModel';
 import { STANDARD_MODEL_FIELD_LABELS, StandardModelFields, idVariable } from './query/StandardModelFields';
+import { SchemaFieldOrderValue, SchemaFieldOrderingPreference } from '../preferences/SchemaOrderingPreferences';
+export var OrderedSchemaFieldType;
+(function (OrderedSchemaFieldType) {
+    OrderedSchemaFieldType["FIELD"] = "FIELD";
+    OrderedSchemaFieldType["BELONGS_TO"] = "BELONGS_TO";
+})(OrderedSchemaFieldType || (OrderedSchemaFieldType = {}));
 let SchemaModelDefinition = (() => {
     var _a, _SchemaModelDefinition_indexes_accessor_storage;
     let _classSuper = BaseObserver;
@@ -175,6 +181,62 @@ let SchemaModelDefinition = (() => {
                     relationship
                 };
             }
+            getSchemaOrderedFields() {
+                return Object.keys(this.definition.attributes).map((key) => this.definition.attributes[key]);
+            }
+            getSchemaOrderedBelongsToFields() {
+                return Object.keys(this.definition.belongsTo)
+                    .map((relationshipName) => {
+                    const relationship = this.definition.belongsTo[relationshipName];
+                    const variable = this.getBelongsToIdVariableForRelationship(relationshipName);
+                    if (!relationship || !variable) {
+                        return null;
+                    }
+                    return {
+                        type: OrderedSchemaFieldType.BELONGS_TO,
+                        object: relationship,
+                        key: variable.name,
+                        label: relationship.name || variable.label || variable.name,
+                        variable
+                    };
+                })
+                    .filter((value) => !!value);
+            }
+            getAlphabeticalOrderedFields() {
+                return _.sortBy(this.getSchemaOrderedFields().map((attribute) => {
+                    return {
+                        type: OrderedSchemaFieldType.FIELD,
+                        object: attribute,
+                        key: attribute.name,
+                        label: attribute.label || attribute.name
+                    };
+                }), (item) => item.label.toLowerCase());
+            }
+            getOrderedFieldsAndRelationships() {
+                const orderedFields = this.getAlphabeticalOrderedFields();
+                const orderedBelongsTo = _.sortBy(this.getSchemaOrderedBelongsToFields(), (item) => item.label.toLowerCase());
+                switch (SchemaFieldOrderingPreference.getValue()) {
+                    case SchemaFieldOrderValue.ALPHABETICAL:
+                        return _.sortBy([...orderedFields, ...orderedBelongsTo], (item) => item.label.toLowerCase());
+                    case SchemaFieldOrderValue.BELONGS_TO_FIRST:
+                        return [...orderedBelongsTo, ...orderedFields];
+                    case SchemaFieldOrderValue.BELONGS_TO_LAST:
+                        return [...orderedFields, ...orderedBelongsTo];
+                    case SchemaFieldOrderValue.AS_DEFINED_IN_SCHEMA:
+                    default:
+                        return [
+                            ...this.getSchemaOrderedFields().map((attribute) => {
+                                return {
+                                    type: OrderedSchemaFieldType.FIELD,
+                                    object: attribute,
+                                    key: attribute.name,
+                                    label: attribute.label || attribute.name
+                                };
+                            }),
+                            ...this.getSchemaOrderedBelongsToFields()
+                        ];
+                }
+            }
             getFilterableFields(typeEngine) {
                 var _b;
                 return [
@@ -187,28 +249,22 @@ let SchemaModelDefinition = (() => {
                             }
                         ]
                         : []),
-                    ...Object.values(this.definition.belongsToIdVars)
-                        .map((variable) => {
-                        if (!(variable === null || variable === void 0 ? void 0 : variable.name) || !variable.relationship) {
-                            return null;
+                    ...this.getOrderedFieldsAndRelationships()
+                        .map((entry) => {
+                        if (entry.type === OrderedSchemaFieldType.BELONGS_TO) {
+                            return {
+                                key: entry.key,
+                                label: entry.label,
+                                group: 'Belongs to'
+                            };
                         }
-                        const relationship = this.definition.belongsTo[variable.relationship];
-                        return {
-                            key: variable.name,
-                            label: (relationship === null || relationship === void 0 ? void 0 : relationship.name) || variable.label || variable.name,
-                            group: 'Belongs to'
-                        };
-                    })
-                        .filter((value) => !!value),
-                    ...Object.values(this.definition.attributes)
-                        .map((attribute) => {
-                        const handler = typeEngine.getHandler(attribute.type);
+                        const handler = typeEngine.getHandler(entry.object.type);
                         if (!(handler === null || handler === void 0 ? void 0 : handler.setupFilter)) {
                             return null;
                         }
                         return {
-                            key: attribute.name,
-                            label: attribute.label || attribute.name,
+                            key: entry.key,
+                            label: entry.label,
                             group: 'Fields'
                         };
                     })

package/dist/core/SchemaModelDefinition.js.map

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