@singularsystems/neo-core 0.10.27 → 0.10.31
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/dist/AppServices/NeoModule.js +2 -0
- package/dist/AppServices/NeoModule.js.map +1 -1
- package/dist/Components/FileManager/FileManager.d.ts +1 -2
- package/dist/Components/FileManager/FileManager.js +2 -9
- package/dist/Components/FileManager/FileManager.js.map +1 -1
- package/dist/Data/Deserialiser.d.ts +1 -0
- package/dist/Data/Deserialiser.js +10 -3
- package/dist/Data/Deserialiser.js.map +1 -1
- package/dist/Extensions.d.ts +1 -1
- package/dist/Validation/ValidationHelpers.d.ts +1 -1
- package/dist/Validation/ValidationHelpers.js +2 -1
- package/dist/Validation/ValidationHelpers.js.map +1 -1
- package/package.json +2 -2
|
@@ -11,12 +11,14 @@ import LocalisationService from '../Localisation/LocalisationService';
|
|
|
11
11
|
import { NotificationHelper } from '../Components/Notifications/NotificationHelper';
|
|
12
12
|
import { RouteSecurityService } from "../Routing/RouteSecurityService";
|
|
13
13
|
import { NeoLoginErrorHandler } from "../Security/LoginErrorHandler";
|
|
14
|
+
import { SecurityService } from "../Security/SecurityService";
|
|
14
15
|
var neoModule = new Module("neo", function (container) {
|
|
15
16
|
container.bind(NeoTypes.Config.ConfigService).to(ConfigService).inSingletonScope();
|
|
16
17
|
container.bind(NeoTypes.Core.ConnectionManager).to(ConnectionManager).inSingletonScope();
|
|
17
18
|
container.bind(NeoTypes.Routing.MenuItemProvider).to(MenuItemProvider).inSingletonScope();
|
|
18
19
|
container.bind(NeoTypes.Routing.RouteSecurityService).to(RouteSecurityService).inSingletonScope();
|
|
19
20
|
container.bind(NeoTypes.Security.LoginErrorHandler).to(NeoLoginErrorHandler).inSingletonScope();
|
|
21
|
+
container.bind(NeoTypes.Security.SecurityService).to(SecurityService).inSingletonScope();
|
|
20
22
|
container.bind(NeoTypes.Localisation.LocalisationService).to(LocalisationService).inSingletonScope();
|
|
21
23
|
container.bind(NeoTypes.UI.ModalStore).to(ModalStore).inSingletonScope();
|
|
22
24
|
container.bind(NeoTypes.UI.NotificationStore).to(NotificationStore).inTransientScope();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NeoModule.js","sourceRoot":"","sources":["../../src/AppServices/NeoModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,CAAC;AAC7B,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+CAA+C,CAAC;AAClF,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,KAAK,CAAC;AAC9C,OAAO,UAAU,MAAM,gCAAgC,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,4BAA4B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,mBAAmB,MAAM,qCAAqC,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AACpF,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"NeoModule.js","sourceRoot":"","sources":["../../src/AppServices/NeoModule.ts"],"names":[],"mappings":"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"}
|
|
@@ -31,7 +31,6 @@ export interface IFileManager<TOptions = IBaseFileManagerOptions> {
|
|
|
31
31
|
}
|
|
32
32
|
export declare abstract class FileManagerBase<TOptions extends IBaseFileManagerOptions> implements IFileManager<TOptions> {
|
|
33
33
|
private _uploadEndpoint?;
|
|
34
|
-
protected _options: TOptions;
|
|
35
34
|
readonly currentUploads: FileUploadBatch[];
|
|
36
35
|
get isUploading(): boolean;
|
|
37
36
|
get uploadPercent(): number;
|
|
@@ -43,7 +42,7 @@ export declare abstract class FileManagerBase<TOptions extends IBaseFileManagerO
|
|
|
43
42
|
constructor(uploadEndpoint?: string, options?: TOptions);
|
|
44
43
|
constructor(options: TOptions);
|
|
45
44
|
get uploadEndpoint(): string | undefined;
|
|
46
|
-
|
|
45
|
+
options: TOptions;
|
|
47
46
|
/** Shows a file dialog and then calls processFiles. */
|
|
48
47
|
showFileDialog(): void;
|
|
49
48
|
/** Checks if the file extensions are allowed. Shows a modal if not. */
|
|
@@ -13,10 +13,10 @@ var FileManagerBase = /** @class */ (function () {
|
|
|
13
13
|
this.currentUploads = [];
|
|
14
14
|
if (uploadEndpointOrOptions === undefined || typeof uploadEndpointOrOptions === "string") {
|
|
15
15
|
this._uploadEndpoint = uploadEndpointOrOptions;
|
|
16
|
-
this.
|
|
16
|
+
this.options = options || {};
|
|
17
17
|
}
|
|
18
18
|
else {
|
|
19
|
-
this.
|
|
19
|
+
this.options = uploadEndpointOrOptions;
|
|
20
20
|
}
|
|
21
21
|
}
|
|
22
22
|
Object.defineProperty(FileManagerBase.prototype, "isUploading", {
|
|
@@ -47,13 +47,6 @@ var FileManagerBase = /** @class */ (function () {
|
|
|
47
47
|
enumerable: true,
|
|
48
48
|
configurable: true
|
|
49
49
|
});
|
|
50
|
-
Object.defineProperty(FileManagerBase.prototype, "options", {
|
|
51
|
-
get: function () {
|
|
52
|
-
return this._options;
|
|
53
|
-
},
|
|
54
|
-
enumerable: true,
|
|
55
|
-
configurable: true
|
|
56
|
-
});
|
|
57
50
|
/** Shows a file dialog and then calls processFiles. */
|
|
58
51
|
FileManagerBase.prototype.showFileDialog = function () {
|
|
59
52
|
var fileInput = document.getElementById("neo-file-input");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../../../src/Components/FileManager/FileManager.ts"],"names":[],"mappings":";AAAA,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAEnD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAqCpD,IAAM,eAAe,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;AAE5C;
|
|
1
|
+
{"version":3,"file":"FileManager.js","sourceRoot":"","sources":["../../../src/Components/FileManager/FileManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -95,7 +95,7 @@ var Deserialiser = /** @class */ (function () {
|
|
|
95
95
|
}
|
|
96
96
|
else {
|
|
97
97
|
if (fromItem.$ref) {
|
|
98
|
-
toItem = this.
|
|
98
|
+
toItem = this.getReferencedObject(fromItem.$ref);
|
|
99
99
|
deserialise = false;
|
|
100
100
|
}
|
|
101
101
|
else {
|
|
@@ -125,7 +125,7 @@ var Deserialiser = /** @class */ (function () {
|
|
|
125
125
|
for (var key in from) {
|
|
126
126
|
var fromItem = from[key];
|
|
127
127
|
if (fromItem.$ref) {
|
|
128
|
-
to[key] = this.
|
|
128
|
+
to[key] = this.getReferencedObject(fromItem.$ref);
|
|
129
129
|
}
|
|
130
130
|
else {
|
|
131
131
|
var mustCreate = !to[key];
|
|
@@ -190,7 +190,7 @@ var Deserialiser = /** @class */ (function () {
|
|
|
190
190
|
// Properties of type Parent are ignored. Parent will be set when the item is added to a list.
|
|
191
191
|
if (propertyInfo.relationType !== RelationType.Parent) {
|
|
192
192
|
if (fromValue.$ref) {
|
|
193
|
-
to[key] = this.
|
|
193
|
+
to[key] = this.getReferencedObject(fromValue.$ref);
|
|
194
194
|
}
|
|
195
195
|
else {
|
|
196
196
|
var mustCreate = !to[key];
|
|
@@ -241,6 +241,13 @@ var Deserialiser = /** @class */ (function () {
|
|
|
241
241
|
}
|
|
242
242
|
this.endObjectDeserialise(to, justCreated);
|
|
243
243
|
};
|
|
244
|
+
Deserialiser.prototype.getReferencedObject = function (id) {
|
|
245
|
+
var found = this.objectRefs[id];
|
|
246
|
+
if (!found) {
|
|
247
|
+
throw "Cannot find $id: " + id + ".";
|
|
248
|
+
}
|
|
249
|
+
return found.to;
|
|
250
|
+
};
|
|
244
251
|
return Deserialiser;
|
|
245
252
|
}());
|
|
246
253
|
export { Deserialiser };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Deserialiser.js","sourceRoot":"","sources":["../../src/Data/Deserialiser.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAErF,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AA0BjC;IAAA;QAEY,eAAU,GAAgD,EAAE,CAAC;QAC7D,qBAAgB,GAAiB,EAAE,CAAC;QACpC,YAAO,GAAwB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"Deserialiser.js","sourceRoot":"","sources":["../../src/Data/Deserialiser.ts"],"names":[],"mappings":"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"}
|
package/dist/Extensions.d.ts
CHANGED
|
@@ -70,7 +70,7 @@ declare global {
|
|
|
70
70
|
* Adds the value if it does not exists, and returns it.
|
|
71
71
|
* @param valueCallback Callback function which returns a value for the key.
|
|
72
72
|
*/
|
|
73
|
-
getOrAdd(key: K, valueCallback: (key: K) => V): V;
|
|
73
|
+
getOrAdd?(key: K, valueCallback: (key: K) => V): V;
|
|
74
74
|
}
|
|
75
75
|
}
|
|
76
76
|
export {};
|
|
@@ -7,6 +7,6 @@ export interface IInvalidObjectGraph extends IInvalidObject {
|
|
|
7
7
|
valueObjects: IInvalidObjectGraph[];
|
|
8
8
|
}
|
|
9
9
|
/** Gets a validation summary graph for display of broken rules */
|
|
10
|
-
export declare function getValidationSummary(model: IModelBase, displayMode?: ValidationDisplayMode): IInvalidObjectGraph;
|
|
10
|
+
export declare function getValidationSummary(model: IModelBase, displayMode?: ValidationDisplayMode): IInvalidObjectGraph | null;
|
|
11
11
|
/** Gets a validation summary graph for display of broken rules */
|
|
12
12
|
export declare function getValidationSummary(models: IModelBase[], displayMode?: ValidationDisplayMode): IInvalidObjectGraph[];
|
|
@@ -34,6 +34,7 @@ var ObjectRecursionState = /** @class */ (function (_super) {
|
|
|
34
34
|
return ObjectRecursionState;
|
|
35
35
|
}(ModelTraverser.RecursionState));
|
|
36
36
|
export function getValidationSummary(model, displayMode) {
|
|
37
|
+
var _a;
|
|
37
38
|
var root = { model: undefined, objectDisplayInfo: [], isValid: true, childLists: [], propertyRules: [], childObjects: [], valueObjects: [] };
|
|
38
39
|
var state = new ObjectRecursionState(root);
|
|
39
40
|
var models;
|
|
@@ -52,6 +53,6 @@ export function getValidationSummary(model, displayMode) {
|
|
|
52
53
|
}
|
|
53
54
|
});
|
|
54
55
|
}
|
|
55
|
-
return isArray ? root.childLists : root.childLists[0];
|
|
56
|
+
return isArray ? root.childLists : (_a = root.childLists[0], (_a !== null && _a !== void 0 ? _a : null));
|
|
56
57
|
}
|
|
57
58
|
//# sourceMappingURL=ValidationHelpers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ValidationHelpers.js","sourceRoot":"","sources":["../../src/Validation/ValidationHelpers.ts"],"names":[],"mappings":";AAEA,OAAO,KAAK,cAAc,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAQ7C;IAAmC,wCAA6B;IAE5D,8BAAmB,MAA2B;QAA9C,YACI,iBAAO,SACV;QAFkB,YAAM,GAAN,MAAM,CAAqB;QAKtC,WAAK,GAAqE,EAAE,CAAC;;IAHrF,CAAC;IAKM,kCAAG,GAAV,UAAW,MAAsB,EAAE,YAA2B;QAE1D,IAAI,CAAC,OAAO,yBAAQ,MAAM,KAAE,UAAU,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,GAAE,CAAC;QACjF,IAAI,YAAY,KAAK,YAAY,CAAC,WAAW,EAAE;YAC3C,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC/C;aAAM,IAAI,YAAY,KAAK,YAAY,CAAC,WAAW,EAAE;YAClD,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC/C;aAAM;YACH,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC7C;IACL,CAAC;IAED,wCAAS,GAAT;QACI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;IAC/B,CAAC;IACD,uCAAQ,GAAR;QACI,IAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAG,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACnC,CAAC;IACL,2BAAC;AAAD,CAAC,AA9BD,CAAmC,cAAc,CAAC,cAAc,GA8B/D;AAMD,MAAM,UAAU,oBAAoB,CAAC,KAAiC,EAAE,WAAmC
|
|
1
|
+
{"version":3,"file":"ValidationHelpers.js","sourceRoot":"","sources":["../../src/Validation/ValidationHelpers.ts"],"names":[],"mappings":";AAEA,OAAO,KAAK,cAAc,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAQ7C;IAAmC,wCAA6B;IAE5D,8BAAmB,MAA2B;QAA9C,YACI,iBAAO,SACV;QAFkB,YAAM,GAAN,MAAM,CAAqB;QAKtC,WAAK,GAAqE,EAAE,CAAC;;IAHrF,CAAC;IAKM,kCAAG,GAAV,UAAW,MAAsB,EAAE,YAA2B;QAE1D,IAAI,CAAC,OAAO,yBAAQ,MAAM,KAAE,UAAU,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,GAAE,CAAC;QACjF,IAAI,YAAY,KAAK,YAAY,CAAC,WAAW,EAAE;YAC3C,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC/C;aAAM,IAAI,YAAY,KAAK,YAAY,CAAC,WAAW,EAAE;YAClD,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC/C;aAAM;YACH,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC7C;IACL,CAAC;IAED,wCAAS,GAAT;QACI,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC;IAC/B,CAAC;IACD,uCAAQ,GAAR;QACI,IAAM,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,EAAG,CAAC;QACpC,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC;QACjC,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACnC,CAAC;IACL,2BAAC;AAAD,CAAC,AA9BD,CAAmC,cAAc,CAAC,cAAc,GA8B/D;AAMD,MAAM,UAAU,oBAAoB,CAAC,KAAiC,EAAE,WAAmC;;IAEvG,IAAI,IAAI,GAAwB,EAAE,KAAK,EAAE,SAAgB,EAAE,iBAAiB,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;IACzK,IAAI,KAAK,GAAG,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,MAAqB,CAAC;IAC1B,IAAI,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC;IAErC,IAAI,OAAO,EAAE;QACT,MAAM,GAAG,KAAqB,CAAC;KAClC;SAAM;QACH,MAAM,GAAG,CAAC,KAAmB,CAAC,CAAC;KAClC;IAED,KAAkB,UAAM,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,EAAE;QAArB,IAAI,OAAK,eAAA;QACV,cAAc,CAAC,aAAa,CAAC,OAAK,EAAE,KAAK,EAAE,UAAC,IAAI,EAAE,KAAK,EAAE,YAAY;YACjE,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACf,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,WAAW,IAAI,qBAAqB,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC;aACvG;QACL,CAAC,CAAC,CAAC;KACN;IAED,OAAO,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,MAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,uCAAI,IAAI,EAAC,CAAC;AACpE,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@singularsystems/neo-core",
|
|
3
|
-
"version": "0.10.
|
|
3
|
+
"version": "0.10.31",
|
|
4
4
|
"description": "Core functionality for the Neo client library",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -27,4 +27,4 @@
|
|
|
27
27
|
"reflect-metadata": "0.1.13",
|
|
28
28
|
"tslib": "1.10.0"
|
|
29
29
|
}
|
|
30
|
-
}
|
|
30
|
+
}
|