@journeyapps-labs/reactor-mod-data-browser 3.6.0 → 3.6.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/dist/@types/core/SchemaModelObject.d.ts +3 -0
- package/dist/@types/core/query/AbstractQuery.d.ts +3 -1
- package/dist/actions/schema-definitions/CreateModelAction.js +1 -1
- package/dist/actions/schema-definitions/CreateModelAction.js.map +1 -1
- package/dist/core/AbstractConnection.js +2 -1
- package/dist/core/AbstractConnection.js.map +1 -1
- package/dist/core/SchemaModelDefinition.js +2 -2
- package/dist/core/SchemaModelDefinition.js.map +1 -1
- package/dist/core/SchemaModelObject.js +52 -9
- package/dist/core/SchemaModelObject.js.map +1 -1
- package/dist/core/query/AbstractQuery.js +48 -10
- package/dist/core/query/AbstractQuery.js.map +1 -1
- package/dist/core/query/widgets/SmartFilterWidget.js +1 -1
- package/dist/core/query/widgets/SmartFilterWidget.js.map +1 -1
- package/dist/forms/SchemaModelForm.js +9 -3
- package/dist/forms/SchemaModelForm.js.map +1 -1
- package/dist/panels/_shared/SharedModelPanelFactory.js +4 -2
- package/dist/panels/_shared/SharedModelPanelFactory.js.map +1 -1
- package/dist/panels/model/ModelPanelWidget.js +3 -3
- package/dist/panels/model/ModelPanelWidget.js.map +1 -1
- package/dist/panels/query/TableControlsWidget.js +11 -2
- package/dist/panels/query/TableControlsWidget.js.map +1 -1
- package/dist/panels/query/table-controls/ChangesControlsWidget.js +1 -1
- package/dist/panels/query/table-controls/ChangesControlsWidget.js.map +1 -1
- package/dist/panels/query/table-controls/PageControlsWidget.js +8 -5
- package/dist/panels/query/table-controls/PageControlsWidget.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist-module/bundle.js +36 -36
- package/dist-module/bundle.js.map +1 -1
- package/package.json +6 -6
- package/src/actions/schema-definitions/CreateModelAction.ts +1 -1
- package/src/core/AbstractConnection.ts +2 -1
- package/src/core/SchemaModelDefinition.ts +3 -5
- package/src/core/SchemaModelObject.ts +30 -7
- package/src/core/query/AbstractQuery.ts +16 -2
- package/src/core/query/widgets/SmartFilterWidget.tsx +1 -1
- package/src/forms/SchemaModelForm.tsx +7 -2
- package/src/panels/_shared/SharedModelPanelFactory.tsx +4 -2
- package/src/panels/model/ModelPanelWidget.tsx +3 -3
- package/src/panels/query/TableControlsWidget.tsx +22 -2
- package/src/panels/query/table-controls/ChangesControlsWidget.tsx +1 -1
- package/src/panels/query/table-controls/PageControlsWidget.tsx +7 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,17 @@
|
|
|
1
1
|
# @journeyapps-labs/reactor-mod-data-browser
|
|
2
2
|
|
|
3
|
+
## 3.6.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- e5eb224: Improve data browser query and model editing workflows.
|
|
8
|
+
- Fix empty query result sets showing a perpetual page-count spinner and keep the page selector disabled when no pages are available.
|
|
9
|
+
- Add a primary "Create model" action to simple query panels.
|
|
10
|
+
- Fix new model forms and restored new model panels so draft objects hydrate correctly.
|
|
11
|
+
- Fix clearing belongs-to relationships before saving.
|
|
12
|
+
- Improve model and bulk-save feedback with button loading states, visor loading, and success notifications.
|
|
13
|
+
- Adjust filter tooltip positioning to reduce table overflow.
|
|
14
|
+
|
|
3
15
|
## 3.6.0
|
|
4
16
|
|
|
5
17
|
### Minor Changes
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ApiObjectData, DatabaseAdapter, DatabaseObject } from '@journeyapps/db';
|
|
2
2
|
import { SchemaModelDefinition } from './SchemaModelDefinition';
|
|
3
|
+
import { NotificationStore, VisorStore } from '@journeyapps-labs/reactor-mod';
|
|
3
4
|
export interface SchemaModelObjectOptions {
|
|
4
5
|
definition: SchemaModelDefinition;
|
|
5
6
|
adapter: DatabaseAdapter;
|
|
@@ -7,6 +8,8 @@ export interface SchemaModelObjectOptions {
|
|
|
7
8
|
}
|
|
8
9
|
export declare class SchemaModelObject {
|
|
9
10
|
options: SchemaModelObjectOptions;
|
|
11
|
+
accessor visorStore: VisorStore;
|
|
12
|
+
accessor notificationStore: NotificationStore;
|
|
10
13
|
accessor data: ApiObjectData;
|
|
11
14
|
accessor model: DatabaseObject;
|
|
12
15
|
accessor updated_at: Date;
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { Page } from './Page';
|
|
2
2
|
import { AbstractConnection } from '../AbstractConnection';
|
|
3
|
-
import { TableColumn } from '@journeyapps-labs/reactor-mod';
|
|
3
|
+
import { NotificationStore, TableColumn, VisorStore } from '@journeyapps-labs/reactor-mod';
|
|
4
4
|
import { SchemaModelObject } from '../SchemaModelObject';
|
|
5
5
|
export declare abstract class AbstractQuery {
|
|
6
6
|
type: string;
|
|
7
7
|
connection: AbstractConnection;
|
|
8
|
+
accessor visorStore: VisorStore;
|
|
9
|
+
accessor notificationStore: NotificationStore;
|
|
8
10
|
id: string;
|
|
9
11
|
constructor(type: string, connection: AbstractConnection);
|
|
10
12
|
batchSave(): Promise<void>;
|
|
@@ -15,7 +15,7 @@ let CreateModelAction = (() => {
|
|
|
15
15
|
super({
|
|
16
16
|
id: _a.ID,
|
|
17
17
|
name: 'Create schema model',
|
|
18
|
-
icon: '
|
|
18
|
+
icon: 'plus',
|
|
19
19
|
target: DataBrowserEntities.SCHEMA_MODEL_DEFINITION
|
|
20
20
|
});
|
|
21
21
|
_CreateModelAction_workspaceStore_accessor_storage.set(this, __runInitializers(this, _workspaceStore_initializers, void 0));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CreateModelAction.js","sourceRoot":"","sources":["../../../src/actions/schema-definitions/CreateModelAction.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,WAAW,EACX,YAAY,EAEZ,MAAM,EACN,GAAG,EACH,cAAc,EACf,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;IAE1D,iBAAiB;;sBAAS,YAAY;;;;sBAAtC,iBAAkB,SAAQ,WAAmC;YAIxE,IAAS,cAAc,oGAAiB;YAAxC,IAAS,cAAc,yGAAiB;YAExC;gBACE,KAAK,CAAC;oBACJ,EAAE,EAAE,EAAiB,CAAC,EAAE;oBACxB,IAAI,EAAE,qBAAqB;oBAC3B,IAAI,EAAE,
|
|
1
|
+
{"version":3,"file":"CreateModelAction.js","sourceRoot":"","sources":["../../../src/actions/schema-definitions/CreateModelAction.ts"],"names":[],"mappings":";AAAA,OAAO,EACL,WAAW,EACX,YAAY,EAEZ,MAAM,EACN,GAAG,EACH,cAAc,EACf,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;IAE1D,iBAAiB;;sBAAS,YAAY;;;;sBAAtC,iBAAkB,SAAQ,WAAmC;YAIxE,IAAS,cAAc,oGAAiB;YAAxC,IAAS,cAAc,yGAAiB;YAExC;gBACE,KAAK,CAAC;oBACJ,EAAE,EAAE,EAAiB,CAAC,EAAE;oBACxB,IAAI,EAAE,qBAAqB;oBAC3B,IAAI,EAAE,MAAM;oBACZ,MAAM,EAAE,mBAAmB,CAAC,uBAAuB;iBACpD,CAAC,CAAC;gBARI,4HAA+B;;aASvC;YAED,KAAK,CAAC,SAAS,CAAC,KAA+C;gBAC7D,IAAI,CAAC,cAAc,CAAC,QAAQ,CAC1B,IAAI,eAAe,CAAC;oBAClB,UAAU,EAAE,KAAK,CAAC,YAAY;oBAC9B,KAAK,EAAE,MAAM,KAAK,CAAC,YAAY,CAAC,sBAAsB,EAAE;iBACzD,CAAC,CACH,CAAC;YACJ,CAAC;YAED,MAAM,CAAC,GAAG;gBACR,OAAO,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,aAAa,CAAoB,EAAiB,CAAC,EAAE,CAAC,CAAC;YACrF,CAAC;;;;;;0CAvBA,MAAM,CAAC,cAAc,CAAC;YACvB,6LAAS,cAAc,6BAAd,cAAc,uGAAiB;;;QAHjC,KAAE,GAAG,qBAAsB;;;SADvB,iBAAiB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractConnection.js","sourceRoot":"","sources":["../../src/core/AbstractConnection.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AbstractConnection.js","sourceRoot":"","sources":["../../src/core/AbstractConnection.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,8 @@ import { BaseObserver } from '@journeyapps-labs/common-utils';
|
|
|
6
6
|
import { queue } from 'async';
|
|
7
7
|
import { observable } from 'mobx';
|
|
8
8
|
import { IndexModel } from './IndexModel';
|
|
9
|
-
import { STANDARD_MODEL_FIELD_LABELS, StandardModelFields
|
|
10
|
-
import {
|
|
9
|
+
import { idVariable, STANDARD_MODEL_FIELD_LABELS, StandardModelFields } from './query/StandardModelFields';
|
|
10
|
+
import { SchemaFieldOrderingPreference, SchemaFieldOrderValue } from '../preferences/SchemaOrderingPreferences';
|
|
11
11
|
export var OrderedSchemaFieldType;
|
|
12
12
|
(function (OrderedSchemaFieldType) {
|
|
13
13
|
OrderedSchemaFieldType["FIELD"] = "FIELD";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaModelDefinition.js","sourceRoot":"","sources":["../../src/core/SchemaModelDefinition.ts"],"names":[],"mappings":";AAEA,OAAO,EAAc,iBAAiB,EAAmB,MAAM,iBAAiB,CAAC;AACjF,OAAO,KAAK,CAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAe,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"SchemaModelDefinition.js","sourceRoot":"","sources":["../../src/core/SchemaModelDefinition.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,16 @@
|
|
|
1
1
|
import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInitializers } from "tslib";
|
|
2
2
|
import { DatabaseObject } from '@journeyapps/db';
|
|
3
|
-
import { action, observable } from 'mobx';
|
|
3
|
+
import { action, observable, runInAction } from 'mobx';
|
|
4
|
+
import { inject, NotificationStore, NotificationType, VisorStore } from '@journeyapps-labs/reactor-mod';
|
|
4
5
|
let SchemaModelObject = (() => {
|
|
5
|
-
var _a, _SchemaModelObject_data_accessor_storage, _SchemaModelObject_model_accessor_storage, _SchemaModelObject_updated_at_accessor_storage, _SchemaModelObject_patch_accessor_storage;
|
|
6
|
+
var _a, _SchemaModelObject_visorStore_accessor_storage, _SchemaModelObject_notificationStore_accessor_storage, _SchemaModelObject_data_accessor_storage, _SchemaModelObject_model_accessor_storage, _SchemaModelObject_updated_at_accessor_storage, _SchemaModelObject_patch_accessor_storage;
|
|
6
7
|
let _instanceExtraInitializers = [];
|
|
8
|
+
let _visorStore_decorators;
|
|
9
|
+
let _visorStore_initializers = [];
|
|
10
|
+
let _visorStore_extraInitializers = [];
|
|
11
|
+
let _notificationStore_decorators;
|
|
12
|
+
let _notificationStore_initializers = [];
|
|
13
|
+
let _notificationStore_extraInitializers = [];
|
|
7
14
|
let _data_decorators;
|
|
8
15
|
let _data_initializers = [];
|
|
9
16
|
let _data_extraInitializers = [];
|
|
@@ -16,8 +23,15 @@ let SchemaModelObject = (() => {
|
|
|
16
23
|
let _patch_decorators;
|
|
17
24
|
let _patch_initializers = [];
|
|
18
25
|
let _patch_extraInitializers = [];
|
|
26
|
+
let _clearEdits_decorators;
|
|
27
|
+
let _revert_decorators;
|
|
28
|
+
let _set_decorators;
|
|
19
29
|
let _setData_decorators;
|
|
20
30
|
return _a = class SchemaModelObject {
|
|
31
|
+
get visorStore() { return __classPrivateFieldGet(this, _SchemaModelObject_visorStore_accessor_storage, "f"); }
|
|
32
|
+
set visorStore(value) { __classPrivateFieldSet(this, _SchemaModelObject_visorStore_accessor_storage, value, "f"); }
|
|
33
|
+
get notificationStore() { return __classPrivateFieldGet(this, _SchemaModelObject_notificationStore_accessor_storage, "f"); }
|
|
34
|
+
set notificationStore(value) { __classPrivateFieldSet(this, _SchemaModelObject_notificationStore_accessor_storage, value, "f"); }
|
|
21
35
|
get data() { return __classPrivateFieldGet(this, _SchemaModelObject_data_accessor_storage, "f"); }
|
|
22
36
|
set data(value) { __classPrivateFieldSet(this, _SchemaModelObject_data_accessor_storage, value, "f"); }
|
|
23
37
|
get model() { return __classPrivateFieldGet(this, _SchemaModelObject_model_accessor_storage, "f"); }
|
|
@@ -28,7 +42,9 @@ let SchemaModelObject = (() => {
|
|
|
28
42
|
set patch(value) { __classPrivateFieldSet(this, _SchemaModelObject_patch_accessor_storage, value, "f"); }
|
|
29
43
|
constructor(options) {
|
|
30
44
|
this.options = (__runInitializers(this, _instanceExtraInitializers), options);
|
|
31
|
-
|
|
45
|
+
_SchemaModelObject_visorStore_accessor_storage.set(this, __runInitializers(this, _visorStore_initializers, void 0));
|
|
46
|
+
_SchemaModelObject_notificationStore_accessor_storage.set(this, (__runInitializers(this, _visorStore_extraInitializers), __runInitializers(this, _notificationStore_initializers, void 0)));
|
|
47
|
+
_SchemaModelObject_data_accessor_storage.set(this, (__runInitializers(this, _notificationStore_extraInitializers), __runInitializers(this, _data_initializers, void 0)));
|
|
32
48
|
_SchemaModelObject_model_accessor_storage.set(this, (__runInitializers(this, _data_extraInitializers), __runInitializers(this, _model_initializers, void 0)));
|
|
33
49
|
_SchemaModelObject_updated_at_accessor_storage.set(this, (__runInitializers(this, _model_extraInitializers), __runInitializers(this, _updated_at_initializers, void 0)));
|
|
34
50
|
_SchemaModelObject_patch_accessor_storage.set(this, (__runInitializers(this, _updated_at_extraInitializers), __runInitializers(this, _patch_initializers, void 0)));
|
|
@@ -40,22 +56,32 @@ let SchemaModelObject = (() => {
|
|
|
40
56
|
this.patch = new Map();
|
|
41
57
|
}
|
|
42
58
|
async applyPatches() {
|
|
59
|
+
var _b;
|
|
43
60
|
if (!this.model) {
|
|
44
61
|
const collection = await this.definition.getCollection();
|
|
45
|
-
|
|
62
|
+
runInAction(() => {
|
|
63
|
+
this.model = collection.create();
|
|
64
|
+
});
|
|
46
65
|
}
|
|
47
66
|
for (let entry of this.patch.entries()) {
|
|
48
67
|
if (this.definition.definition.belongsTo[entry[0]]) {
|
|
49
|
-
this.model[entry[0]](entry[1].model);
|
|
68
|
+
this.model[entry[0]](((_b = entry[1]) === null || _b === void 0 ? void 0 : _b.model) || null);
|
|
50
69
|
}
|
|
51
70
|
else {
|
|
52
71
|
this.model[entry[0]] = entry[1];
|
|
53
72
|
}
|
|
54
73
|
}
|
|
55
|
-
this.
|
|
74
|
+
this.clearEdits();
|
|
56
75
|
}
|
|
57
76
|
async save() {
|
|
58
|
-
await this.definition.
|
|
77
|
+
await this.visorStore.wrap(`Saving ${this.definition.definition.label}`, async () => {
|
|
78
|
+
await this.definition.connection.batchSave([this]);
|
|
79
|
+
});
|
|
80
|
+
this.notificationStore.showNotification({
|
|
81
|
+
title: 'Model updated',
|
|
82
|
+
description: `${this.definition.definition.label} was updated`,
|
|
83
|
+
type: NotificationType.SUCCESS
|
|
84
|
+
});
|
|
59
85
|
}
|
|
60
86
|
clearEdits() {
|
|
61
87
|
this.patch.clear();
|
|
@@ -80,30 +106,47 @@ let SchemaModelObject = (() => {
|
|
|
80
106
|
this.updated_at = new Date(data._updated_at);
|
|
81
107
|
}
|
|
82
108
|
async reload() {
|
|
83
|
-
await this.definition.load(this.id);
|
|
109
|
+
const model = await this.definition.load(this.id);
|
|
110
|
+
if (model && model !== this) {
|
|
111
|
+
this.setData(model.data);
|
|
112
|
+
this.definition.cache.set(this.id, this);
|
|
113
|
+
}
|
|
84
114
|
}
|
|
85
115
|
get definition() {
|
|
86
116
|
return this.options.definition;
|
|
87
117
|
}
|
|
88
118
|
get id() {
|
|
89
|
-
|
|
119
|
+
var _b;
|
|
120
|
+
return (_b = this.data) === null || _b === void 0 ? void 0 : _b.id;
|
|
90
121
|
}
|
|
91
122
|
},
|
|
123
|
+
_SchemaModelObject_visorStore_accessor_storage = new WeakMap(),
|
|
124
|
+
_SchemaModelObject_notificationStore_accessor_storage = new WeakMap(),
|
|
92
125
|
_SchemaModelObject_data_accessor_storage = new WeakMap(),
|
|
93
126
|
_SchemaModelObject_model_accessor_storage = new WeakMap(),
|
|
94
127
|
_SchemaModelObject_updated_at_accessor_storage = new WeakMap(),
|
|
95
128
|
_SchemaModelObject_patch_accessor_storage = new WeakMap(),
|
|
96
129
|
(() => {
|
|
97
130
|
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
|
|
131
|
+
_visorStore_decorators = [inject(VisorStore)];
|
|
132
|
+
_notificationStore_decorators = [inject(NotificationStore)];
|
|
98
133
|
_data_decorators = [observable];
|
|
99
134
|
_model_decorators = [observable];
|
|
100
135
|
_updated_at_decorators = [observable];
|
|
101
136
|
_patch_decorators = [observable];
|
|
137
|
+
_clearEdits_decorators = [action];
|
|
138
|
+
_revert_decorators = [action];
|
|
139
|
+
_set_decorators = [action];
|
|
102
140
|
_setData_decorators = [action];
|
|
141
|
+
__esDecorate(_a, null, _visorStore_decorators, { kind: "accessor", name: "visorStore", static: false, private: false, access: { has: obj => "visorStore" in obj, get: obj => obj.visorStore, set: (obj, value) => { obj.visorStore = value; } }, metadata: _metadata }, _visorStore_initializers, _visorStore_extraInitializers);
|
|
142
|
+
__esDecorate(_a, null, _notificationStore_decorators, { kind: "accessor", name: "notificationStore", static: false, private: false, access: { has: obj => "notificationStore" in obj, get: obj => obj.notificationStore, set: (obj, value) => { obj.notificationStore = value; } }, metadata: _metadata }, _notificationStore_initializers, _notificationStore_extraInitializers);
|
|
103
143
|
__esDecorate(_a, null, _data_decorators, { kind: "accessor", name: "data", static: false, private: false, access: { has: obj => "data" in obj, get: obj => obj.data, set: (obj, value) => { obj.data = value; } }, metadata: _metadata }, _data_initializers, _data_extraInitializers);
|
|
104
144
|
__esDecorate(_a, null, _model_decorators, { kind: "accessor", name: "model", static: false, private: false, access: { has: obj => "model" in obj, get: obj => obj.model, set: (obj, value) => { obj.model = value; } }, metadata: _metadata }, _model_initializers, _model_extraInitializers);
|
|
105
145
|
__esDecorate(_a, null, _updated_at_decorators, { kind: "accessor", name: "updated_at", static: false, private: false, access: { has: obj => "updated_at" in obj, get: obj => obj.updated_at, set: (obj, value) => { obj.updated_at = value; } }, metadata: _metadata }, _updated_at_initializers, _updated_at_extraInitializers);
|
|
106
146
|
__esDecorate(_a, null, _patch_decorators, { kind: "accessor", name: "patch", static: false, private: false, access: { has: obj => "patch" in obj, get: obj => obj.patch, set: (obj, value) => { obj.patch = value; } }, metadata: _metadata }, _patch_initializers, _patch_extraInitializers);
|
|
147
|
+
__esDecorate(_a, null, _clearEdits_decorators, { kind: "method", name: "clearEdits", static: false, private: false, access: { has: obj => "clearEdits" in obj, get: obj => obj.clearEdits }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
148
|
+
__esDecorate(_a, null, _revert_decorators, { kind: "method", name: "revert", static: false, private: false, access: { has: obj => "revert" in obj, get: obj => obj.revert }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
149
|
+
__esDecorate(_a, null, _set_decorators, { kind: "method", name: "set", static: false, private: false, access: { has: obj => "set" in obj, get: obj => obj.set }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
107
150
|
__esDecorate(_a, null, _setData_decorators, { kind: "method", name: "setData", static: false, private: false, access: { has: obj => "setData" in obj, get: obj => obj.setData }, metadata: _metadata }, null, _instanceExtraInitializers);
|
|
108
151
|
if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
|
|
109
152
|
})(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaModelObject.js","sourceRoot":"","sources":["../../src/core/SchemaModelObject.ts"],"names":[],"mappings":";AAAA,OAAO,EAAkC,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjF,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"SchemaModelObject.js","sourceRoot":"","sources":["../../src/core/SchemaModelObject.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,50 @@
|
|
|
1
|
+
import { __classPrivateFieldGet, __classPrivateFieldSet, __esDecorate, __runInitializers } from "tslib";
|
|
1
2
|
import { v4 } from 'uuid';
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
3
|
+
import { inject, NotificationStore, NotificationType, VisorStore } from '@journeyapps-labs/reactor-mod';
|
|
4
|
+
let AbstractQuery = (() => {
|
|
5
|
+
var _a, _AbstractQuery_visorStore_accessor_storage, _AbstractQuery_notificationStore_accessor_storage;
|
|
6
|
+
let _visorStore_decorators;
|
|
7
|
+
let _visorStore_initializers = [];
|
|
8
|
+
let _visorStore_extraInitializers = [];
|
|
9
|
+
let _notificationStore_decorators;
|
|
10
|
+
let _notificationStore_initializers = [];
|
|
11
|
+
let _notificationStore_extraInitializers = [];
|
|
12
|
+
return _a = class AbstractQuery {
|
|
13
|
+
get visorStore() { return __classPrivateFieldGet(this, _AbstractQuery_visorStore_accessor_storage, "f"); }
|
|
14
|
+
set visorStore(value) { __classPrivateFieldSet(this, _AbstractQuery_visorStore_accessor_storage, value, "f"); }
|
|
15
|
+
get notificationStore() { return __classPrivateFieldGet(this, _AbstractQuery_notificationStore_accessor_storage, "f"); }
|
|
16
|
+
set notificationStore(value) { __classPrivateFieldSet(this, _AbstractQuery_notificationStore_accessor_storage, value, "f"); }
|
|
17
|
+
constructor(type, connection) {
|
|
18
|
+
this.type = type;
|
|
19
|
+
this.connection = connection;
|
|
20
|
+
_AbstractQuery_visorStore_accessor_storage.set(this, __runInitializers(this, _visorStore_initializers, void 0));
|
|
21
|
+
_AbstractQuery_notificationStore_accessor_storage.set(this, (__runInitializers(this, _visorStore_extraInitializers), __runInitializers(this, _notificationStore_initializers, void 0)));
|
|
22
|
+
this.id = __runInitializers(this, _notificationStore_extraInitializers);
|
|
23
|
+
this.id = v4();
|
|
24
|
+
}
|
|
25
|
+
async batchSave() {
|
|
26
|
+
const dirtyObjects = this.getDirtyObjects();
|
|
27
|
+
await this.visorStore.wrap(`Saving ${dirtyObjects.length} models`, async () => {
|
|
28
|
+
await this.connection.batchSave(dirtyObjects);
|
|
29
|
+
});
|
|
30
|
+
this.notificationStore.showNotification({
|
|
31
|
+
title: 'Models updated',
|
|
32
|
+
description: `${dirtyObjects.length} ${dirtyObjects.length === 1 ? 'model was' : 'models were'} updated`,
|
|
33
|
+
type: NotificationType.SUCCESS
|
|
34
|
+
});
|
|
35
|
+
}
|
|
36
|
+
},
|
|
37
|
+
_AbstractQuery_visorStore_accessor_storage = new WeakMap(),
|
|
38
|
+
_AbstractQuery_notificationStore_accessor_storage = new WeakMap(),
|
|
39
|
+
(() => {
|
|
40
|
+
const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(null) : void 0;
|
|
41
|
+
_visorStore_decorators = [inject(VisorStore)];
|
|
42
|
+
_notificationStore_decorators = [inject(NotificationStore)];
|
|
43
|
+
__esDecorate(_a, null, _visorStore_decorators, { kind: "accessor", name: "visorStore", static: false, private: false, access: { has: obj => "visorStore" in obj, get: obj => obj.visorStore, set: (obj, value) => { obj.visorStore = value; } }, metadata: _metadata }, _visorStore_initializers, _visorStore_extraInitializers);
|
|
44
|
+
__esDecorate(_a, null, _notificationStore_decorators, { kind: "accessor", name: "notificationStore", static: false, private: false, access: { has: obj => "notificationStore" in obj, get: obj => obj.notificationStore, set: (obj, value) => { obj.notificationStore = value; } }, metadata: _metadata }, _notificationStore_initializers, _notificationStore_extraInitializers);
|
|
45
|
+
if (_metadata) Object.defineProperty(_a, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
|
|
46
|
+
})(),
|
|
47
|
+
_a;
|
|
48
|
+
})();
|
|
49
|
+
export { AbstractQuery };
|
|
12
50
|
//# sourceMappingURL=AbstractQuery.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractQuery.js","sourceRoot":"","sources":["../../../src/core/query/AbstractQuery.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"AbstractQuery.js","sourceRoot":"","sources":["../../../src/core/query/AbstractQuery.ts"],"names":[],"mappings":";AAEA,OAAO,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,gBAAgB,EAAe,UAAU,EAAE,MAAM,+BAA+B,CAAC;IAG/F,aAAa;;;;;;;;sBAAb,aAAa;YAEjC,IAAS,UAAU,4FAAa;YAAhC,IAAS,UAAU,iGAAa;YAGhC,IAAS,iBAAiB,mGAAoB;YAA9C,IAAS,iBAAiB,wGAAoB;YAI9C,YACS,IAAY,EACZ,UAA8B;gBAD9B,SAAI,GAAJ,IAAI,CAAQ;gBACZ,eAAU,GAAV,UAAU,CAAoB;gBAT9B,gHAAuB;gBAGvB,wLAAqC;gBAE9C,OAAE,iEAAS;gBAMT,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,CAAC;YACjB,CAAC;YAED,KAAK,CAAC,SAAS;gBACb,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;gBAC5C,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,YAAY,CAAC,MAAM,SAAS,EAAE,KAAK,IAAI,EAAE;oBAC5E,MAAM,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;gBAChD,CAAC,CAAC,CAAC;gBACH,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC;oBACtC,KAAK,EAAE,gBAAgB;oBACvB,WAAW,EAAE,GAAG,YAAY,CAAC,MAAM,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,UAAU;oBACxG,IAAI,EAAE,gBAAgB,CAAC,OAAO;iBAC/B,CAAC,CAAC;YACL,CAAC;;;;;;sCAzBA,MAAM,CAAC,UAAU,CAAC;6CAGlB,MAAM,CAAC,iBAAiB,CAAC;YAF1B,iLAAS,UAAU,6BAAV,UAAU,+FAAa;YAGhC,sMAAS,iBAAiB,6BAAjB,iBAAiB,6GAAoB;;;;;SAL1B,aAAa"}
|
|
@@ -36,7 +36,7 @@ export const SmartFilterWidget = (props) => {
|
|
|
36
36
|
const isActive = (((_b = (_a = props.filter) === null || _a === void 0 ? void 0 : _a.statements) === null || _b === void 0 ? void 0 : _b.length) || 0) > 0;
|
|
37
37
|
return (React.createElement(S.FilterButton, Object.assign({ active: isActive }, setupTooltipProps({
|
|
38
38
|
tooltip: getFilterTooltip(props.filter),
|
|
39
|
-
tooltipPos: TooltipPosition.
|
|
39
|
+
tooltipPos: TooltipPosition.BOTTOM_RIGHT
|
|
40
40
|
}), { onClick: async (event) => {
|
|
41
41
|
const filter = await props.setupFilter({
|
|
42
42
|
variable: props.variable,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SmartFilterWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/SmartFilterWidget.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SmartFilterWidget.js","sourceRoot":"","sources":["../../../../src/core/query/widgets/SmartFilterWidget.tsx"],"names":[],"mappings":"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"}
|
|
@@ -70,8 +70,8 @@ export { Binding };
|
|
|
70
70
|
export class TypedBinding extends Binding {
|
|
71
71
|
constructor(options) {
|
|
72
72
|
super(Object.assign(Object.assign({}, options), { resolve: async () => {
|
|
73
|
-
var _a;
|
|
74
|
-
return (_a = options.model) === null || _a === void 0 ? void 0 : _a.model[options.name];
|
|
73
|
+
var _a, _b;
|
|
74
|
+
return (_b = (_a = options.model) === null || _a === void 0 ? void 0 : _a.model) === null || _b === void 0 ? void 0 : _b[options.name];
|
|
75
75
|
} }));
|
|
76
76
|
this.handler = this.typeEngine.getHandler(options.variable.type);
|
|
77
77
|
}
|
|
@@ -103,6 +103,7 @@ let SchemaModelForm = (() => {
|
|
|
103
103
|
var _b;
|
|
104
104
|
if (entry.type === OrderedSchemaFieldType.BELONGS_TO) {
|
|
105
105
|
const relationship = entry.object;
|
|
106
|
+
const idVariable = options.definition.getBelongsToIdVariableForRelationship(relationship.name);
|
|
106
107
|
const definition = options.definition.connection.getSchemaModelDefinitionByName(relationship.foreignType.name);
|
|
107
108
|
if (!definition) {
|
|
108
109
|
return null;
|
|
@@ -119,7 +120,12 @@ let SchemaModelForm = (() => {
|
|
|
119
120
|
model: this.options.object,
|
|
120
121
|
input: entity,
|
|
121
122
|
resolve: () => {
|
|
122
|
-
|
|
123
|
+
var _b, _c, _d, _e;
|
|
124
|
+
if (idVariable && ((_b = options.object) === null || _b === void 0 ? void 0 : _b.model)) {
|
|
125
|
+
const objectId = options.object.model[idVariable.name];
|
|
126
|
+
return objectId ? definition.resolve(objectId) : null;
|
|
127
|
+
}
|
|
128
|
+
if (!((_e = (_d = (_c = options.object) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d.belongs_to) === null || _e === void 0 ? void 0 : _e[relationship.name])) {
|
|
123
129
|
return null;
|
|
124
130
|
}
|
|
125
131
|
return definition.resolve(options.object.data.belongs_to[relationship.name]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SchemaModelForm.js","sourceRoot":"","sources":["../../src/forms/SchemaModelForm.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,WAAW,EAAa,SAAS,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAI1F,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAe,MAAM,cAAc,CAAC;AACvD,OAAO,EAAE,OAAO,EAAqB,MAAM,MAAM,CAAC;AAElD,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;IAc1D,OAAO;;;;;sBAAP,OAAO;YAElB,IAAS,UAAU,sFAAa;YAAhC,IAAS,UAAU,2FAAa;YAOhC,YAAsB,OAAsB;gBAAtB,YAAO,GAAP,OAAO,CAAe;gBAPnC,0GAAuB;gBAEhC,8BAAyB,0DAAU;gBAMjC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;gBACvC,IAAI,CAAC,yBAAyB,GAAG,KAAK,CAAC;gBACvC,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,gBAAgB,CAAC;oBACtC,YAAY,EAAE,KAAK,IAAI,EAAE;wBACvB,IAAI,IAAI,CAAC,yBAAyB,EAAE,CAAC;4BACnC,OAAO;wBACT,CAAC;wBACD,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;oBACxD,CAAC;iBACF,CAAC,CAAC;gBACH,IAAI,CAAC,SAAS,GAAG,OAAO,CAAC,KAAK,IAAI,EAAE;oBAClC,IAAI,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAClC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC3B,KAAK,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAC;oBAClC,CAAC;oBACD,IAAI,CAAC,yBAAyB,GAAG,IAAI,CAAC;oBACtC,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;wBAClB,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;oBACvB,CAAC;yBAAM,CAAC;wBACN,IAAI,OAAO,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;wBACvC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;oBAC1B,CAAC;oBACD,IAAI,CAAC,yBAAyB,GAAG,KAAK,CAAC;gBACzC,CAAC,CAAC,CAAC;YACL,CAAC;YAED,KAAK,CAAC,MAAM,CAAC,KAAK;gBAChB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,KAAK,CAAC,MAAM,CAAC,KAAK;gBAChB,OAAO,KAAK,CAAC;YACf,CAAC;YAED,IAAI,KAAK;gBACP,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC;YAC5B,CAAC;YAED,OAAO;gBACL,IAAI,CAAC,SAAS,EAAE,CAAC;gBACjB,IAAI,CAAC,SAAS,EAAE,CAAC;YACnB,CAAC;;;;;sCAlDA,MAAM,CAAC,UAAU,CAAC;YACnB,iLAAS,UAAU,6BAAV,UAAU,+FAAa;;;;;SAFrB,OAAO;AAsDpB,MAAM,OAAO,YAAa,SAAQ,OAAO;IAEvC,YAAY,OAAgE;QAC1E,KAAK,iCACA,OAAO,KACV,OAAO,EAAE,KAAK,IAAI,EAAE;;gBAClB,OAAO,MAAA,OAAO,CAAC,KAAK,0CAAE,KAAK,
|
|
1
|
+
{"version":3,"file":"SchemaModelForm.js","sourceRoot":"","sources":["../../src/forms/SchemaModelForm.tsx"],"names":[],"mappings":"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"}
|
|
@@ -40,8 +40,10 @@ let SharedModelPanelModel = (() => {
|
|
|
40
40
|
};
|
|
41
41
|
}
|
|
42
42
|
async decodeEntities(data) {
|
|
43
|
-
|
|
44
|
-
|
|
43
|
+
const definition = data.definition;
|
|
44
|
+
const model = definition ? data.model || (await definition.generateNewModelObject()) : null;
|
|
45
|
+
this.definition = definition;
|
|
46
|
+
this.model = model;
|
|
45
47
|
}
|
|
46
48
|
},
|
|
47
49
|
_SharedModelPanelModel_connStore_accessor_storage = new WeakMap(),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SharedModelPanelFactory.js","sourceRoot":"","sources":["../../../src/panels/_shared/SharedModelPanelFactory.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAGlC,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;IAQjE,qBAAqB;;sBAAS,iBAAiB;;;;;;;;;;sBAA/C,qBAAsB,SAAQ,WAAiB;YAE1D,IAAS,SAAS,mGAAkB;YAApC,IAAS,SAAS,wGAAkB;YAGpC,IAAS,UAAU,oGAAwB;YAA3C,IAAS,UAAU,yGAAwB;YAG3C,IAAS,KAAK,+FAAoB;YAAlC,IAAS,KAAK,oGAAoB;YAElC,YAAY,IAAY,EAAE,OAAsC;gBAC9D,KAAK,CAAC,IAAI,CAAC,CAAC;gBATL,sHAA2B;gBAG3B,iLAAkC;gBAGlC,wKAAyB;;gBAIhC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;gBAC5B,IAAI,CAAC,UAAU,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,CAAC;gBACtC,IAAI,CAAC,KAAK,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC;aAC7B;YAED,cAAc;;gBACZ,OAAO;oBACL,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,KAAK,EAAE,CAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,KAAK,EAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;iBAC7C,CAAC;YACJ,CAAC;YAED,KAAK,CAAC,cAAc,CAAC,IAAwC;gBAC3D,
|
|
1
|
+
{"version":3,"file":"SharedModelPanelFactory.js","sourceRoot":"","sources":["../../../src/panels/_shared/SharedModelPanelFactory.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAGlC,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;IAQjE,qBAAqB;;sBAAS,iBAAiB;;;;;;;;;;sBAA/C,qBAAsB,SAAQ,WAAiB;YAE1D,IAAS,SAAS,mGAAkB;YAApC,IAAS,SAAS,wGAAkB;YAGpC,IAAS,UAAU,oGAAwB;YAA3C,IAAS,UAAU,yGAAwB;YAG3C,IAAS,KAAK,+FAAoB;YAAlC,IAAS,KAAK,oGAAoB;YAElC,YAAY,IAAY,EAAE,OAAsC;gBAC9D,KAAK,CAAC,IAAI,CAAC,CAAC;gBATL,sHAA2B;gBAG3B,iLAAkC;gBAGlC,wKAAyB;;gBAIhC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;gBAC5B,IAAI,CAAC,UAAU,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,UAAU,CAAC;gBACtC,IAAI,CAAC,KAAK,GAAG,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,KAAK,CAAC;aAC7B;YAED,cAAc;;gBACZ,OAAO;oBACL,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,KAAK,EAAE,CAAA,MAAA,IAAI,CAAC,KAAK,0CAAE,KAAK,EAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI;iBAC7C,CAAC;YACJ,CAAC;YAED,KAAK,CAAC,cAAc,CAAC,IAAwC;gBAC3D,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;gBACnC,MAAM,KAAK,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,MAAM,UAAU,CAAC,sBAAsB,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC5F,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;gBAC7B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;YACrB,CAAC;;;;;;;;qCA5BA,MAAM,CAAC,eAAe,CAAC;sCAGvB,UAAU;iCAGV,UAAU;YALX,8KAAS,SAAS,6BAAT,SAAS,6FAAkB;YAGpC,iLAAS,UAAU,6BAAV,UAAU,+FAAwB;YAG3C,kKAAS,KAAK,6BAAL,KAAK,qFAAoB;;;;;SARvB,qBAAqB;AAgClC,MAAM,OAAgB,uBAAyD,SAAQ,4BAA+B;IAC1G,aAAa,CAAC,KAAQ;;QAC9B,OAAO,CAAA,MAAA,KAAK,CAAC,UAAU,0CAAE,UAAU,KAAI,IAAI,CAAC;IAC9C,CAAC;IAED,aAAa,CAAC,KAAQ;;QACpB,IAAI,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC;QACzB,IAAI,WAAW,GAAG,KAAK,CAAC,UAAU,CAAC;QACnC,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC,KAAK,KAAK,CAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,OAAO,KAAI,cAAc,EAAE,CAAC;QACtF,CAAC;QACD,OAAO,GAAG,WAAW,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC3C,CAAC;CACF"}
|
|
@@ -24,7 +24,7 @@ export const ModelPanelWidget = observer((props) => {
|
|
|
24
24
|
const [form, setForm] = useState(null);
|
|
25
25
|
const _theme = ioc.get(ThemeStore).getCurrentTheme(theme);
|
|
26
26
|
useEffect(() => {
|
|
27
|
-
if (!props.model.definition) {
|
|
27
|
+
if (!props.model.definition || !props.model.model) {
|
|
28
28
|
return;
|
|
29
29
|
}
|
|
30
30
|
let _form = new SchemaModelForm({
|
|
@@ -55,8 +55,8 @@ export const ModelPanelWidget = observer((props) => {
|
|
|
55
55
|
}
|
|
56
56
|
return (React.createElement(LoadingPanelWidget, { loading: !form }, () => {
|
|
57
57
|
return (React.createElement(BorderLayoutWidget, { top: top, bottom: React.createElement(S.Buttons, null,
|
|
58
|
-
React.createElement(PanelButtonWidget, { disabled: props.model.model.patch.size === 0, label: "Save", icon: "save", iconColor: _theme.status.success, action: () => {
|
|
59
|
-
props.model.model.save();
|
|
58
|
+
React.createElement(PanelButtonWidget, { disabled: props.model.model.patch.size === 0, label: "Save", icon: "save", iconColor: _theme.status.success, action: async () => {
|
|
59
|
+
await props.model.model.save();
|
|
60
60
|
} }),
|
|
61
61
|
React.createElement(PanelButtonWidget, { disabled: props.model.model.patch.size === 0, label: "Discard edits", icon: "arrow-rotate-back", action: () => {
|
|
62
62
|
props.model.model.clearEdits();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ModelPanelWidget.js","sourceRoot":"","sources":["../../../src/panels/model/ModelPanelWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,EACL,kBAAkB,EAElB,GAAG,EACH,kBAAkB,EAClB,qBAAqB,EACrB,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,KAAK,EACL,UAAU,EACX,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,oDAAoD,CAAC;AAM7F,IAAU,CAAC,CAaV;AAbD,WAAU,CAAC;IACI,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA;;eAEtB,qBAAqB;MAC9B,gBAAgB;GACnB,CAAC;IAEW,SAAO,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;GAKhC,CAAC;AACJ,CAAC,EAbS,CAAC,KAAD,CAAC,QAaV;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAoC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;;IAClF,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAkB,IAAI,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IAE1D,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"ModelPanelWidget.js","sourceRoot":"","sources":["../../../src/panels/model/ModelPanelWidget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,EACL,kBAAkB,EAElB,GAAG,EACH,kBAAkB,EAClB,qBAAqB,EACrB,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EAChB,KAAK,EACL,UAAU,EACX,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,oDAAoD,CAAC;AAM7F,IAAU,CAAC,CAaV;AAbD,WAAU,CAAC;IACI,WAAS,GAAG,MAAM,CAAC,GAAG,CAAA;;eAEtB,qBAAqB;MAC9B,gBAAgB;GACnB,CAAC;IAEW,SAAO,GAAG,MAAM,CAAC,GAAG,CAAA;;;;;GAKhC,CAAC;AACJ,CAAC,EAbS,CAAC,KAAD,CAAC,QAaV;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAoC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE;;IAClF,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAkB,IAAI,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC;IAE1D,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;YAClD,OAAO;QACT,CAAC;QACD,IAAI,KAAK,GAAG,IAAI,eAAe,CAAC;YAC9B,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK;YACzB,UAAU,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU;SACnC,CAAC,CAAC;QACH,OAAO,CAAC,KAAK,CAAC,CAAC;QACf,OAAO,GAAG,EAAE;YACV,KAAK,CAAC,OAAO,EAAE,CAAC;QAClB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC;IAEhD,IAAI,GAAG,GAAG,IAAI,CAAC;IACf,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;QACtB,MAAM,cAAc,GAAU,CAAA,MAAA,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,0CAAE,SAAS;YAC9D,CAAC,CAAC;gBACE,uBAAuB,CAAC,GAAG,EAAE,CAAC,iBAAiB,CAC7C;oBACE,YAAY,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK;oBAC/B,WAAW,EAAE,KAAK,CAAC,KAAK;iBACzB,EACD,IAAI,CACL;aACF,CAAC,MAAM,CAAC,CAAC,MAAM,EAAiB,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;YAC/C,CAAC,CAAC,EAAE,CAAC;QAEP,GAAG,GAAG,CACJ,oBAAC,kBAAkB,IACjB,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE;gBACJ;oBACE,KAAK,EAAE,IAAI;oBACX,KAAK,EAAE,MAAA,KAAK,CAAC,KAAK,0CAAE,EAAE;iBACvB;aACF,GACD,CACH,CAAC;IACJ,CAAC;IAED,OAAO,CACL,oBAAC,kBAAkB,IAAC,OAAO,EAAE,CAAC,IAAI,IAC/B,GAAG,EAAE;QACJ,OAAO,CACL,oBAAC,kBAAkB,IACjB,GAAG,EAAE,GAAG,EACR,MAAM,EACJ,oBAAC,CAAC,CAAC,OAAO;gBACR,oBAAC,iBAAiB,IAChB,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,EAC5C,KAAK,EAAC,MAAM,EACZ,IAAI,EAAC,MAAM,EACX,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAChC,MAAM,EAAE,KAAK,IAAI,EAAE;wBACjB,MAAM,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;oBACjC,CAAC,GACD;gBACF,oBAAC,iBAAiB,IAChB,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,EAC5C,KAAK,EAAC,eAAe,EACrB,IAAI,EAAC,mBAAmB,EACxB,MAAM,EAAE,GAAG,EAAE;wBACX,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;oBACjC,CAAC,GACD,CACQ;YAGd,oBAAC,CAAC,CAAC,SAAS,QAAE,IAAI,CAAC,MAAM,EAAE,CAAe,CACvB,CACtB,CAAC;IACJ,CAAC,CACkB,CACtB,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as React from 'react';
|
|
2
|
-
import { IconWidget, ioc, PrefsStore, styled } from '@journeyapps-labs/reactor-mod';
|
|
2
|
+
import { IconWidget, ioc, PanelButtonMode, PanelButtonWidget, PrefsStore, styled } from '@journeyapps-labs/reactor-mod';
|
|
3
3
|
import { observer } from 'mobx-react';
|
|
4
4
|
import * as _ from 'lodash';
|
|
5
5
|
import { SimpleQuery } from '../../core/query/query-simple/SimpleQuery';
|
|
@@ -11,6 +11,7 @@ import { ChangesControlsWidget } from './table-controls/ChangesControlsWidget';
|
|
|
11
11
|
import { FilterControlsWidget } from './table-controls/FilterControlsWidget';
|
|
12
12
|
import { QueryControlPreferences } from '../../preferences/QueryControlPreferences';
|
|
13
13
|
import { SelectionControlsWidget } from './table-controls/SelectionControlsWidget';
|
|
14
|
+
import { CreateModelAction } from '../../actions/schema-definitions/CreateModelAction';
|
|
14
15
|
export const TableControlsWidget = observer((props) => {
|
|
15
16
|
const prefsStore = ioc.get(PrefsStore);
|
|
16
17
|
const simpleQuery = props.query instanceof SimpleQuery ? props.query : null;
|
|
@@ -22,7 +23,15 @@ export const TableControlsWidget = observer((props) => {
|
|
|
22
23
|
null);
|
|
23
24
|
const showSortControls = prefsStore.getPreference(QueryControlPreferences.SHOW_SORT_CONTROLS).checked;
|
|
24
25
|
const showFilterControls = prefsStore.getPreference(QueryControlPreferences.SHOW_FILTER_CONTROLS).checked;
|
|
26
|
+
const createModelButton = (simpleQuery === null || simpleQuery === void 0 ? void 0 : simpleQuery.options.definition)
|
|
27
|
+
? CreateModelAction.get().renderAsButton((btn) => {
|
|
28
|
+
return React.createElement(PanelButtonWidget, Object.assign({}, btn, { label: "Create model", mode: PanelButtonMode.PRIMARY }));
|
|
29
|
+
}, {
|
|
30
|
+
targetEntity: simpleQuery.options.definition
|
|
31
|
+
})
|
|
32
|
+
: null;
|
|
25
33
|
return (React.createElement(S.Container, { className: props.className },
|
|
34
|
+
createModelButton,
|
|
26
35
|
React.createElement(PageControlsWidget, { query: props.query, currentPage: props.current_page, goToPage: props.goToPage }),
|
|
27
36
|
React.createElement(QueryControlsWidget, { query: props.query, simpleQuery: simpleQuery, activeSavedQueryName: (activeSavedQuery === null || activeSavedQuery === void 0 ? void 0 : activeSavedQuery.name) || null, onLoadSavedQuery: props.onLoadSavedQuery }),
|
|
28
37
|
simpleQuery && showFilterControls ? (React.createElement(FilterControlsWidget, { simpleQuery: simpleQuery, goToPage: props.goToPage })) : null,
|
|
@@ -39,7 +48,7 @@ var S;
|
|
|
39
48
|
column-gap: 20px;
|
|
40
49
|
row-gap: 20px;
|
|
41
50
|
padding: 5px 5px;
|
|
42
|
-
align-items:
|
|
51
|
+
align-items: flex-end;
|
|
43
52
|
flex-wrap: wrap;
|
|
44
53
|
`;
|
|
45
54
|
S.Loading = styled(IconWidget) `
|