bruce-models 0.8.4 → 0.8.5
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/bruce-models.es5.js +776 -435
- package/dist/bruce-models.es5.js.map +1 -1
- package/dist/bruce-models.umd.js +768 -432
- package/dist/bruce-models.umd.js.map +1 -1
- package/dist/lib/account/account.js +15 -13
- package/dist/lib/account/account.js.map +1 -1
- package/dist/lib/ann-document/ann-document.js +6 -6
- package/dist/lib/ann-document/ann-document.js.map +1 -1
- package/dist/lib/api/api.js +19 -2
- package/dist/lib/api/api.js.map +1 -1
- package/dist/lib/api/bruce-api.js +10 -6
- package/dist/lib/api/bruce-api.js.map +1 -1
- package/dist/lib/bruce-models.js +2 -0
- package/dist/lib/bruce-models.js.map +1 -1
- package/dist/lib/calculator/calculator.js +53 -0
- package/dist/lib/calculator/calculator.js.map +1 -1
- package/dist/lib/client-file/client-file.js +11 -12
- package/dist/lib/client-file/client-file.js.map +1 -1
- package/dist/lib/common/cache.js +83 -0
- package/dist/lib/common/cache.js.map +1 -1
- package/dist/lib/custom-form/custom-form-content.js +27 -0
- package/dist/lib/custom-form/custom-form-content.js.map +1 -0
- package/dist/lib/custom-form/custom-form.js +10 -10
- package/dist/lib/custom-form/custom-form.js.map +1 -1
- package/dist/lib/data-lab/data-lab.js +2 -2
- package/dist/lib/data-lab/data-lab.js.map +1 -1
- package/dist/lib/entity/entity-attachment-type.js +7 -7
- package/dist/lib/entity/entity-attachment-type.js.map +1 -1
- package/dist/lib/entity/entity-attachment.js +13 -13
- package/dist/lib/entity/entity-attachment.js.map +1 -1
- package/dist/lib/entity/entity-comment.js +7 -7
- package/dist/lib/entity/entity-comment.js.map +1 -1
- package/dist/lib/entity/entity-coords.js +11 -11
- package/dist/lib/entity/entity-coords.js.map +1 -1
- package/dist/lib/entity/entity-link.js +7 -7
- package/dist/lib/entity/entity-link.js.map +1 -1
- package/dist/lib/entity/entity-lod.js +11 -10
- package/dist/lib/entity/entity-lod.js.map +1 -1
- package/dist/lib/entity/entity-relation-type.js +10 -10
- package/dist/lib/entity/entity-relation-type.js.map +1 -1
- package/dist/lib/entity/entity-relation.js +10 -10
- package/dist/lib/entity/entity-relation.js.map +1 -1
- package/dist/lib/entity/entity-source.js +8 -8
- package/dist/lib/entity/entity-source.js.map +1 -1
- package/dist/lib/entity/entity-tag.js +12 -12
- package/dist/lib/entity/entity-tag.js.map +1 -1
- package/dist/lib/entity/entity-type.js +10 -10
- package/dist/lib/entity/entity-type.js.map +1 -1
- package/dist/lib/entity/entity.js +14 -14
- package/dist/lib/entity/entity.js.map +1 -1
- package/dist/lib/import/import-cad.js +4 -4
- package/dist/lib/import/import-cad.js.map +1 -1
- package/dist/lib/import/import-csv.js +2 -2
- package/dist/lib/import/import-csv.js.map +1 -1
- package/dist/lib/import/import-json.js +2 -2
- package/dist/lib/import/import-json.js.map +1 -1
- package/dist/lib/import/import-kml.js +2 -2
- package/dist/lib/import/import-kml.js.map +1 -1
- package/dist/lib/import/imported-file.js +6 -6
- package/dist/lib/import/imported-file.js.map +1 -1
- package/dist/lib/markup/markup.js +111 -1
- package/dist/lib/markup/markup.js.map +1 -1
- package/dist/lib/program-key/program-key.js +10 -10
- package/dist/lib/program-key/program-key.js.map +1 -1
- package/dist/lib/project/project-view-bookmark.js +12 -12
- package/dist/lib/project/project-view-bookmark.js.map +1 -1
- package/dist/lib/project/project-view-legacy-tile.js +6 -6
- package/dist/lib/project/project-view-legacy-tile.js.map +1 -1
- package/dist/lib/project/project-view.js +11 -11
- package/dist/lib/project/project-view.js.map +1 -1
- package/dist/lib/server/message-broker.js +56 -34
- package/dist/lib/server/message-broker.js.map +1 -1
- package/dist/lib/server/pending-action.js +6 -6
- package/dist/lib/server/pending-action.js.map +1 -1
- package/dist/lib/server/task.js +4 -4
- package/dist/lib/server/task.js.map +1 -1
- package/dist/lib/style/style.js +10 -10
- package/dist/lib/style/style.js.map +1 -1
- package/dist/lib/tileset/tileset.js +30 -32
- package/dist/lib/tileset/tileset.js.map +1 -1
- package/dist/lib/user/session.js +7 -7
- package/dist/lib/user/session.js.map +1 -1
- package/dist/lib/user/user-group.js +12 -12
- package/dist/lib/user/user-group.js.map +1 -1
- package/dist/lib/user/user.js +30 -30
- package/dist/lib/user/user.js.map +1 -1
- package/dist/types/account/account.d.ts +8 -5
- package/dist/types/ann-document/ann-document.d.ts +18 -3
- package/dist/types/api/api.d.ts +3 -1
- package/dist/types/api/bruce-api.d.ts +1 -1
- package/dist/types/bruce-models.d.ts +2 -0
- package/dist/types/calculator/calculator.d.ts +8 -0
- package/dist/types/client-file/client-file.d.ts +6 -5
- package/dist/types/common/cache.d.ts +9 -0
- package/dist/types/custom-form/custom-form-content.d.ts +67 -0
- package/dist/types/custom-form/custom-form.d.ts +7 -5
- package/dist/types/data-lab/data-lab.d.ts +2 -1
- package/dist/types/entity/entity-attachment-type.d.ts +4 -3
- package/dist/types/entity/entity-attachment.d.ts +7 -6
- package/dist/types/entity/entity-comment.d.ts +4 -3
- package/dist/types/entity/entity-coords.d.ts +6 -5
- package/dist/types/entity/entity-link.d.ts +4 -3
- package/dist/types/entity/entity-lod.d.ts +6 -4
- package/dist/types/entity/entity-relation-type.d.ts +5 -4
- package/dist/types/entity/entity-relation.d.ts +5 -4
- package/dist/types/entity/entity-source.d.ts +4 -3
- package/dist/types/entity/entity-tag.d.ts +6 -5
- package/dist/types/entity/entity-type.d.ts +5 -4
- package/dist/types/entity/entity.d.ts +6 -6
- package/dist/types/import/import-cad.d.ts +3 -2
- package/dist/types/import/import-csv.d.ts +2 -1
- package/dist/types/import/import-json.d.ts +2 -1
- package/dist/types/import/import-kml.d.ts +2 -1
- package/dist/types/import/imported-file.d.ts +3 -2
- package/dist/types/markup/markup.d.ts +95 -31
- package/dist/types/program-key/program-key.d.ts +5 -4
- package/dist/types/project/project-view-bookmark.d.ts +6 -5
- package/dist/types/project/project-view-legacy-tile.d.ts +3 -2
- package/dist/types/project/project-view.d.ts +5 -4
- package/dist/types/server/message-broker.d.ts +54 -35
- package/dist/types/server/pending-action.d.ts +3 -3
- package/dist/types/server/task.d.ts +3 -3
- package/dist/types/style/style.d.ts +5 -4
- package/dist/types/tileset/tileset.d.ts +13 -12
- package/dist/types/user/session.d.ts +4 -3
- package/dist/types/user/user-group.d.ts +7 -7
- package/dist/types/user/user.d.ts +14 -13
- package/package.json +1 -1
|
@@ -90,17 +90,17 @@ var Account;
|
|
|
90
90
|
value: EDbRegion.Australia
|
|
91
91
|
}
|
|
92
92
|
];
|
|
93
|
-
function Get(api, id) {
|
|
93
|
+
function Get(api, id, reqParams) {
|
|
94
94
|
return __awaiter(this, void 0, void 0, function () {
|
|
95
95
|
var cacheData, req;
|
|
96
96
|
return __generator(this, function (_a) {
|
|
97
97
|
switch (_a.label) {
|
|
98
98
|
case 0:
|
|
99
|
-
cacheData = api.Cache.Get(GetCacheKey(id));
|
|
99
|
+
cacheData = (reqParams === null || reqParams === void 0 ? void 0 : reqParams.noCache) ? null : api.Cache.Get(GetCacheKey(id));
|
|
100
100
|
if (cacheData) {
|
|
101
101
|
return [2 /*return*/, cacheData];
|
|
102
102
|
}
|
|
103
|
-
return [4 /*yield*/, api.GET("account/" + id)];
|
|
103
|
+
return [4 /*yield*/, api.GET("account/" + id, reqParams)];
|
|
104
104
|
case 1:
|
|
105
105
|
req = _a.sent();
|
|
106
106
|
api.Cache.Set(GetCacheKey(id), req, api_1.Api.DEFAULT_CACHE_DURATION);
|
|
@@ -110,16 +110,16 @@ var Account;
|
|
|
110
110
|
});
|
|
111
111
|
}
|
|
112
112
|
Account.Get = Get;
|
|
113
|
-
function GetRelatedList(api) {
|
|
113
|
+
function GetRelatedList(api, reqParams) {
|
|
114
114
|
return __awaiter(this, void 0, void 0, function () {
|
|
115
115
|
var cacheData, req, prom;
|
|
116
116
|
var _this = this;
|
|
117
117
|
return __generator(this, function (_a) {
|
|
118
|
-
cacheData = api.Cache.Get(GetListCacheKey(api.GetSessionId()));
|
|
118
|
+
cacheData = (reqParams === null || reqParams === void 0 ? void 0 : reqParams.noCache) ? null : api.Cache.Get(GetListCacheKey(api.GetSessionId()));
|
|
119
119
|
if (cacheData) {
|
|
120
120
|
return [2 /*return*/, cacheData];
|
|
121
121
|
}
|
|
122
|
-
req = api.GET("user/relatedClientAccounts");
|
|
122
|
+
req = api.GET("user/relatedClientAccounts", reqParams);
|
|
123
123
|
prom = new Promise(function (res, rej) { return __awaiter(_this, void 0, void 0, function () {
|
|
124
124
|
var data, items, e_1;
|
|
125
125
|
return __generator(this, function (_a) {
|
|
@@ -146,18 +146,18 @@ var Account;
|
|
|
146
146
|
});
|
|
147
147
|
}
|
|
148
148
|
Account.GetRelatedList = GetRelatedList;
|
|
149
|
-
function GetAppSettings(api, id, appId) {
|
|
149
|
+
function GetAppSettings(api, id, appId, reqParams) {
|
|
150
150
|
return __awaiter(this, void 0, void 0, function () {
|
|
151
151
|
var cacheData, req, prom;
|
|
152
152
|
var _this = this;
|
|
153
153
|
return __generator(this, function (_a) {
|
|
154
154
|
switch (_a.label) {
|
|
155
155
|
case 0:
|
|
156
|
-
cacheData = api.Cache.Get(GetCacheKey(id, appId));
|
|
156
|
+
cacheData = (reqParams === null || reqParams === void 0 ? void 0 : reqParams.noCache) ? null : api.Cache.Get(GetCacheKey(id, appId));
|
|
157
157
|
if (cacheData) {
|
|
158
158
|
return [2 /*return*/, cacheData];
|
|
159
159
|
}
|
|
160
|
-
return [4 /*yield*/, api.GET("account/" + id + "?ApplicationID=" + appId)];
|
|
160
|
+
return [4 /*yield*/, api.GET("account/" + id + "?ApplicationID=" + appId, reqParams)];
|
|
161
161
|
case 1:
|
|
162
162
|
req = _a.sent();
|
|
163
163
|
prom = new Promise(function (res, rej) { return __awaiter(_this, void 0, void 0, function () {
|
|
@@ -194,13 +194,14 @@ var Account;
|
|
|
194
194
|
* @param id
|
|
195
195
|
* @param appId
|
|
196
196
|
* @param data
|
|
197
|
+
* @param reqParams
|
|
197
198
|
* @returns
|
|
198
199
|
*/
|
|
199
|
-
function UpdateAppSettings(api, id, appId, data) {
|
|
200
|
+
function UpdateAppSettings(api, id, appId, data, reqParams) {
|
|
200
201
|
return __awaiter(this, void 0, void 0, function () {
|
|
201
202
|
return __generator(this, function (_a) {
|
|
202
203
|
switch (_a.label) {
|
|
203
|
-
case 0: return [4 /*yield*/, api.POST("account/" + id + "/applicationSettings/" + appId, data)];
|
|
204
|
+
case 0: return [4 /*yield*/, api.POST("account/" + id + "/applicationSettings/" + appId, data, reqParams)];
|
|
204
205
|
case 1:
|
|
205
206
|
data = _a.sent();
|
|
206
207
|
api.Cache.RemoveByStartsWith(api_1.Api.ECacheKey.Account + api_1.Api.ECacheKey.Id + id);
|
|
@@ -217,9 +218,10 @@ var Account;
|
|
|
217
218
|
* @param name
|
|
218
219
|
* @param region
|
|
219
220
|
* @param starterContent
|
|
221
|
+
* @param reqParams
|
|
220
222
|
* @returns
|
|
221
223
|
*/
|
|
222
|
-
function Create(api, id, name, region, starterContent) {
|
|
224
|
+
function Create(api, id, name, region, starterContent, reqParams) {
|
|
223
225
|
return __awaiter(this, void 0, void 0, function () {
|
|
224
226
|
var reqData, res;
|
|
225
227
|
return __generator(this, function (_a) {
|
|
@@ -234,7 +236,7 @@ var Account;
|
|
|
234
236
|
"DBLocation": region,
|
|
235
237
|
"StarterContent": starterContent
|
|
236
238
|
};
|
|
237
|
-
res = api.POST("clientAccount/" + id, reqData, api_1.Api.PrepReqParams());
|
|
239
|
+
res = api.POST("clientAccount/" + id, reqData, api_1.Api.PrepReqParams(reqParams));
|
|
238
240
|
api.Cache.Remove(GetListCacheKey(api.GetSessionId()));
|
|
239
241
|
return [2 /*return*/, res];
|
|
240
242
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../src/account/account.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAAiC;AAKjC,IAAM,kBAAkB,GAAG,CAAC,aAAa,EAAE,YAAY,EAAE,SAAS,CAAC,CAAC;AAEpE;;;GAGG;AACH,IAAiB,OAAO,
|
|
1
|
+
{"version":3,"file":"account.js","sourceRoot":"","sources":["../../../src/account/account.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,7 +56,7 @@ var AnnDocument;
|
|
|
56
56
|
(function (EType) {
|
|
57
57
|
EType["SVG"] = "SVG";
|
|
58
58
|
})(EType = AnnDocument.EType || (AnnDocument.EType = {}));
|
|
59
|
-
function Get(api, docId) {
|
|
59
|
+
function Get(api, docId, reqParams) {
|
|
60
60
|
return __awaiter(this, void 0, void 0, function () {
|
|
61
61
|
var key, cacheData, req;
|
|
62
62
|
return __generator(this, function (_a) {
|
|
@@ -64,18 +64,18 @@ var AnnDocument;
|
|
|
64
64
|
throw ("Doc ID is required.");
|
|
65
65
|
}
|
|
66
66
|
key = GetCacheKey(docId);
|
|
67
|
-
cacheData = api.Cache.Get(key);
|
|
67
|
+
cacheData = (reqParams === null || reqParams === void 0 ? void 0 : reqParams.noCache) ? null : api.Cache.Get(key);
|
|
68
68
|
if (cacheData) {
|
|
69
69
|
return [2 /*return*/, cacheData];
|
|
70
70
|
}
|
|
71
|
-
req = api.GET("documentView/" + docId, api_1.Api.PrepReqParams());
|
|
71
|
+
req = api.GET("documentView/" + docId, api_1.Api.PrepReqParams(reqParams));
|
|
72
72
|
api.Cache.Set(key, req, api_1.Api.DEFAULT_CACHE_DURATION);
|
|
73
73
|
return [2 /*return*/, req];
|
|
74
74
|
});
|
|
75
75
|
});
|
|
76
76
|
}
|
|
77
77
|
AnnDocument.Get = Get;
|
|
78
|
-
function GetList(api, type) {
|
|
78
|
+
function GetList(api, type, reqParams) {
|
|
79
79
|
return __awaiter(this, void 0, void 0, function () {
|
|
80
80
|
var cacheData, req;
|
|
81
81
|
var _this = this;
|
|
@@ -83,7 +83,7 @@ var AnnDocument;
|
|
|
83
83
|
if (!type) {
|
|
84
84
|
type = "";
|
|
85
85
|
}
|
|
86
|
-
cacheData = api.Cache.Get(GetListCacheKey(type));
|
|
86
|
+
cacheData = (reqParams === null || reqParams === void 0 ? void 0 : reqParams.noCache) ? null : api.Cache.Get(GetListCacheKey(type));
|
|
87
87
|
if (cacheData) {
|
|
88
88
|
return [2 /*return*/, cacheData];
|
|
89
89
|
}
|
|
@@ -94,7 +94,7 @@ var AnnDocument;
|
|
|
94
94
|
case 0:
|
|
95
95
|
_a.trys.push([0, 2, , 3]);
|
|
96
96
|
url = "documentViews" + (type ? "?type=" + type : "");
|
|
97
|
-
return [4 /*yield*/, api.GET(url, api_1.Api.PrepReqParams())];
|
|
97
|
+
return [4 /*yield*/, api.GET(url, api_1.Api.PrepReqParams(reqParams))];
|
|
98
98
|
case 1:
|
|
99
99
|
data = _a.sent();
|
|
100
100
|
res(data.Items);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ann-document.js","sourceRoot":"","sources":["../../../src/ann-document/ann-document.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAAiC;AAKjC;;;GAGG;AACH,IAAiB,WAAW,
|
|
1
|
+
{"version":3,"file":"ann-document.js","sourceRoot":"","sources":["../../../src/ann-document/ann-document.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAAiC;AAKjC;;;GAGG;AACH,IAAiB,WAAW,CAwE3B;AAxED,WAAiB,WAAW;IACxB,SAAgB,WAAW,CAAC,EAAU;QAClC,OAAO,KAAG,SAAG,CAAC,SAAS,CAAC,WAAW,GAAG,SAAG,CAAC,SAAS,CAAC,EAAE,GAAG,EAAI,CAAC;IAClE,CAAC;IAFe,uBAAW,cAE1B,CAAA;IAED,SAAgB,eAAe,CAAC,IAAU;QACtC,OAAO,SAAG,CAAC,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC;IAC5C,CAAC;IAFe,2BAAe,kBAE9B,CAAA;IA0BD,IAAY,KAEX;IAFD,WAAY,KAAK;QACb,oBAAW,CAAA;IACf,CAAC,EAFW,KAAK,GAAL,iBAAK,KAAL,iBAAK,QAEhB;IAED,SAAsB,GAAG,CAAC,GAAiB,EAAE,KAAa,EAAE,SAA0B;;;;gBAClF,IAAI,CAAC,KAAK,EAAE;oBACR,MAAK,CAAC,qBAAqB,CAAC,CAAC;iBAChC;gBACK,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;gBACzB,SAAS,GAAG,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACjE,IAAI,SAAS,EAAE;oBACX,sBAAO,SAAS,EAAC;iBACpB;gBACK,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,kBAAgB,KAAO,EAAE,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC3E,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,SAAG,CAAC,sBAAsB,CAAC,CAAC;gBACpD,sBAAO,GAAG,EAAC;;;KACd;IAZqB,eAAG,MAYxB,CAAA;IAED,SAAsB,OAAO,CAAC,GAAiB,EAAE,IAAW,EAAE,SAA0B;;;;;gBACpF,IAAI,CAAC,IAAI,EAAE;oBACP,IAAI,GAAG,EAAE,CAAC;iBACb;gBACK,SAAS,GAAG,CAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;gBACnF,IAAI,SAAS,EAAE;oBACX,sBAAO,SAAS,EAAC;iBACpB;gBACK,GAAG,GAAyB,IAAI,OAAO,CAAC,UAAO,GAAG,EAAE,GAAG;;;;;;gCAE/C,GAAG,GAAG,eAAe,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gCAC/C,qBAAM,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,EAAA;;gCAAvD,IAAI,GAAG,SAAgD;gCAC7D,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;;;;gCAGhB,GAAG,CAAC,GAAC,CAAC,CAAC;;;;;qBAEd,CAAC,CAAC;gBACH,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;gBAC1C,sBAAO,GAAG,EAAC;;;KACd;IApBqB,mBAAO,UAoB5B,CAAA;AACL,CAAC,EAxEgB,WAAW,GAAX,mBAAW,KAAX,mBAAW,QAwE3B"}
|
package/dist/lib/api/api.js
CHANGED
|
@@ -1,4 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
2
13
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
14
|
exports.Api = void 0;
|
|
4
15
|
/**
|
|
@@ -76,10 +87,16 @@ var Api;
|
|
|
76
87
|
/**
|
|
77
88
|
* Prepares default settings for a request to Bruce Api.
|
|
78
89
|
* Our requests WRONGLY have utf-16 for 95% of them. Please be wary of that.
|
|
90
|
+
* @param base
|
|
79
91
|
* @returns
|
|
80
92
|
*/
|
|
81
|
-
function PrepReqParams() {
|
|
82
|
-
|
|
93
|
+
function PrepReqParams(base) {
|
|
94
|
+
base = __assign({}, base);
|
|
95
|
+
base.headers = __assign({}, base.headers);
|
|
96
|
+
if (!base.headers.encoding) {
|
|
97
|
+
base.headers.encoding = Api.EEncoding.UTF16;
|
|
98
|
+
}
|
|
99
|
+
return base;
|
|
83
100
|
}
|
|
84
101
|
Api.PrepReqParams = PrepReqParams;
|
|
85
102
|
})(Api = exports.Api || (exports.Api = {}));
|
package/dist/lib/api/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/api/api.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/api/api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAEA;;GAEG;AACH,IAAiB,GAAG,CA8GnB;AA9GD,WAAiB,GAAG;IAChB,IAAY,SA+BX;IA/BD,WAAY,SAAS;QACjB,qBAAQ,CAAA;QACR,8BAAiB,CAAA;QACjB,sCAAyB,CAAA;QACzB,wCAA2B,CAAA;QAC3B,+CAAkC,CAAA;QAClC,gCAAmB,CAAA;QACnB,sCAAyB,CAAA;QACzB,gCAAmB,CAAA;QACnB,4CAA+B,CAAA;QAC/B,0CAA6B,CAAA;QAC7B,sCAAyB,CAAA;QACzB,0CAA6B,CAAA;QAC7B,wBAAW,CAAA;QACX,sCAAyB,CAAA;QACzB,gCAAmB,CAAA;QACnB,0BAAa,CAAA;QACb,wCAA2B,CAAA;QAC3B,8CAAiC,CAAA;QACjC,kCAAqB,CAAA;QACrB,0CAA6B,CAAA;QAC7B,wBAAW,CAAA;QACX,4BAAe,CAAA;QACf,8CAAiC,CAAA;QACjC,0BAAa,CAAA;QACb,oCAAuB,CAAA;QACvB,wCAA2B,CAAA;QAC3B,oCAAuB,CAAA;QACvB,gCAAmB,CAAA;QACnB,sCAAyB,CAAA;QACzB,0CAA6B,CAAA;IACjC,CAAC,EA/BW,SAAS,GAAT,aAAS,KAAT,aAAS,QA+BpB;IACY,0BAAsB,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,aAAa;IAC9C,uBAAmB,GAAG,UAAU,CAAC;IACjC,uBAAmB,GAAG,gBAAgB,CAAC;IAEpD;;;OAGG;IACH,IAAY,IAKX;IALD,WAAY,IAAI;QACZ,mBAAW,CAAA;QACX,mBAAW,CAAA;QACX,mBAAW,CAAA;QACX,qBAAa,CAAA;IACjB,CAAC,EALW,IAAI,GAAJ,QAAI,KAAJ,QAAI,QAKf;IAGD;;;;OAIG;IACH,SAAgB,MAAM,CAAC,GAAW;QAC9B,OAAO,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IAC/E,CAAC;IAFe,UAAM,SAErB,CAAA;IAOD,IAAY,UAIX;IAJD,WAAY,UAAU;QAClB,2CAAQ,CAAA;QACR,yCAAO,CAAA;QACP,4CAAS,CAAA;IACb,CAAC,EAJW,UAAU,GAAV,cAAU,KAAV,cAAU,QAIrB;IAED,IAAY,SAGX;IAHD,WAAY,SAAS;QACjB,2BAAc,CAAA;QACd,+BAAkB,CAAA;IACtB,CAAC,EAHW,SAAS,GAAT,aAAS,KAAT,aAAS,QAGpB;IAeD;;;;;OAKG;IACH,SAAgB,aAAa,CAAC,IAAwC;QAClE,IAAI,gBACG,IAAI,CACV,CAAC;QACF,IAAI,CAAC,OAAO,gBACL,IAAI,CAAC,OAAO,CAClB,CAAA;QACD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;YACxB,IAAI,CAAC,OAAO,CAAC,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC;SAC/C;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAXe,iBAAa,gBAW5B,CAAA;AAML,CAAC,EA9GgB,GAAG,GAAH,WAAG,KAAH,WAAG,QA8GnB"}
|
|
@@ -53,7 +53,6 @@ exports.BruceApi = void 0;
|
|
|
53
53
|
var account_1 = require("../account/account");
|
|
54
54
|
var abstract_api_1 = require("./abstract-api");
|
|
55
55
|
var api_1 = require("./api");
|
|
56
|
-
var cam_api_1 = require("./cam-api");
|
|
57
56
|
var message_broker_1 = require("../server/message-broker");
|
|
58
57
|
var BruceApi;
|
|
59
58
|
(function (BruceApi) {
|
|
@@ -95,13 +94,13 @@ var BruceApi;
|
|
|
95
94
|
});
|
|
96
95
|
/**
|
|
97
96
|
* Loads regional base url and sets up message broker.
|
|
98
|
-
* @param cam
|
|
97
|
+
* @param cam Required for loading regional base url.
|
|
99
98
|
* @returns
|
|
100
99
|
*/
|
|
101
100
|
Api.prototype.init = function (cam) {
|
|
102
101
|
var _a;
|
|
103
102
|
return __awaiter(this, void 0, void 0, function () {
|
|
104
|
-
var prefix, url, env,
|
|
103
|
+
var prefix, url, env, settings, endpoint, e_1;
|
|
105
104
|
return __generator(this, function (_b) {
|
|
106
105
|
switch (_b.label) {
|
|
107
106
|
case 0:
|
|
@@ -124,11 +123,11 @@ var BruceApi;
|
|
|
124
123
|
throw ("Specified Environment is not valid. SuppliedEnv=" + env);
|
|
125
124
|
}
|
|
126
125
|
this.baseUrl = url;
|
|
126
|
+
if (!cam) return [3 /*break*/, 4];
|
|
127
127
|
_b.label = 1;
|
|
128
128
|
case 1:
|
|
129
129
|
_b.trys.push([1, 3, , 4]);
|
|
130
|
-
|
|
131
|
-
return [4 /*yield*/, account_1.Account.GetAppSettings(camApi, this.accountId, account_1.Account.EAppId.BruceApi)];
|
|
130
|
+
return [4 /*yield*/, account_1.Account.GetAppSettings(cam, this.accountId, account_1.Account.EAppId.BruceApi)];
|
|
132
131
|
case 2:
|
|
133
132
|
settings = _b.sent();
|
|
134
133
|
if (this.loadCancelled) {
|
|
@@ -148,7 +147,12 @@ var BruceApi;
|
|
|
148
147
|
console.error(e_1);
|
|
149
148
|
return [3 /*break*/, 4];
|
|
150
149
|
case 4:
|
|
151
|
-
|
|
150
|
+
try {
|
|
151
|
+
this.messageBroker = new message_broker_1.MessageBroker.WebSocketBroker(this.baseUrl, this.env);
|
|
152
|
+
}
|
|
153
|
+
catch (e) {
|
|
154
|
+
console.warn("BruceApi: Failed to create message broker.", e);
|
|
155
|
+
}
|
|
152
156
|
return [2 /*return*/];
|
|
153
157
|
}
|
|
154
158
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bruce-api.js","sourceRoot":"","sources":["../../../src/api/bruce-api.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8CAA6C;AAC7C,+CAA6C;AAC7C,6BAAiC;
|
|
1
|
+
{"version":3,"file":"bruce-api.js","sourceRoot":"","sources":["../../../src/api/bruce-api.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/bruce-models.js
CHANGED
|
@@ -12,6 +12,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
12
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
13
|
__exportStar(require("./ann-document/ann-document"), exports);
|
|
14
14
|
__exportStar(require("./custom-form/custom-form"), exports);
|
|
15
|
+
__exportStar(require("./custom-form/custom-form-content"), exports);
|
|
15
16
|
__exportStar(require("./api/abstract-api"), exports);
|
|
16
17
|
__exportStar(require("./api/api"), exports);
|
|
17
18
|
__exportStar(require("./api/bruce-api"), exports);
|
|
@@ -83,4 +84,5 @@ __exportStar(require("./import/import-csv"), exports);
|
|
|
83
84
|
__exportStar(require("./import/import-json"), exports);
|
|
84
85
|
__exportStar(require("./import/import-kml"), exports);
|
|
85
86
|
__exportStar(require("./import/imported-file"), exports);
|
|
87
|
+
__exportStar(require("./markup/markup"), exports);
|
|
86
88
|
//# sourceMappingURL=bruce-models.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bruce-models.js","sourceRoot":"","sources":["../../src/bruce-models.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8DAA4C;AAE5C,4DAA0C;
|
|
1
|
+
{"version":3,"file":"bruce-models.js","sourceRoot":"","sources":["../../src/bruce-models.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8DAA4C;AAE5C,4DAA0C;AAC1C,oEAAkD;AAElD,qDAAmC;AACnC,4CAA0B;AAC1B,kDAAgC;AAChC,gDAA8B;AAC9B,gDAA8B;AAC9B,mDAAiC;AAEjC,0DAAwC;AAExC,kDAAgC;AAChC,uDAAqC;AACrC,iDAA+B;AAC/B,kDAAgC;AAChC,kDAAgC;AAChC,iDAA+B;AAC/B,iDAA+B;AAC/B,uDAAqC;AACrC,sDAAoC;AACpC,oDAAkC;AAClC,qDAAmC;AACnC,+CAA6B;AAE7B,kEAAgD;AAChD,6DAA2C;AAC3C,0DAAwC;AACxC,uDAAqC;AACrC,sDAAoC;AACpC,gEAA8C;AAC9C,2DAAyC;AACzC,yDAAuC;AACvC,sDAAoC;AACpC,uDAAqC;AACrC,kDAAgC;AAChC,gEAA8C;AAC9C,gEAA8C;AAC9C,wEAAsD;AACtD,uEAAqD;AACrD,yDAAuC;AAEvC,4DAA0C;AAE1C,4DAA0C;AAE1C,yDAAuC;AACvC,sDAAoC;AACpC,kEAAgD;AAChD,yDAAuC;AACvC,qEAAmD;AACnD,8DAA4C;AAE5C,0DAAwC;AACxC,0DAAwC;AAExC,gDAA8B;AAE9B,wDAAsC;AACtC,uEAAqD;AACrD,6DAA2C;AAC3C,kEAAgD;AAChD,sEAAoD;AACpD,8DAA4C;AAC5C,+DAA6C;AAC7C,kEAAgD;AAChD,oDAAkC;AAElC,oDAAkC;AAClC,iDAA+B;AAC/B,oDAAkC;AAClC,8CAA4B;AAE5B,oDAAkC;AAElC,uDAAqC;AACrC,oDAAkC;AAClC,sDAAoC;AACpC,oDAAkC;AAClC,mDAAiC;AAEjC,sDAAoC;AAEpC,sDAAoC;AACpC,sDAAoC;AACpC,uDAAqC;AACrC,sDAAoC;AACpC,yDAAuC;AAEvC,kDAAgC"}
|
|
@@ -74,6 +74,59 @@ var Calculator;
|
|
|
74
74
|
return null;
|
|
75
75
|
}
|
|
76
76
|
Calculator.GetValue = GetValue;
|
|
77
|
+
/**
|
|
78
|
+
* Calculates the value of arbitrary field options with assumption that desired result is a color.
|
|
79
|
+
* Will return null if a color is not found.
|
|
80
|
+
* @param fields
|
|
81
|
+
* @param entity
|
|
82
|
+
* @param tags
|
|
83
|
+
*/
|
|
84
|
+
function GetColor(fields, entity, tags) {
|
|
85
|
+
if (!tags) {
|
|
86
|
+
tags = [];
|
|
87
|
+
}
|
|
88
|
+
if (!entity) {
|
|
89
|
+
entity = {};
|
|
90
|
+
}
|
|
91
|
+
for (var i = 0; i < fields.length; i++) {
|
|
92
|
+
var field = fields[i];
|
|
93
|
+
var value = void 0;
|
|
94
|
+
switch (field.type) {
|
|
95
|
+
case EValueType.Color:
|
|
96
|
+
value = field.value;
|
|
97
|
+
break;
|
|
98
|
+
case EValueType.Gradient:
|
|
99
|
+
value = GetGradientValue(field.value, entity);
|
|
100
|
+
break;
|
|
101
|
+
case EValueType.Input:
|
|
102
|
+
value = GetInputValue(field.value, entity);
|
|
103
|
+
break;
|
|
104
|
+
case EValueType.Mapping:
|
|
105
|
+
value = GetMappingValue(field.value, entity);
|
|
106
|
+
break;
|
|
107
|
+
case EValueType.RandomColor:
|
|
108
|
+
value = color_1.Color.RandomColor();
|
|
109
|
+
break;
|
|
110
|
+
case EValueType.TagColor:
|
|
111
|
+
for (var i_2 = 0; i_2 < tags.length; i_2++) {
|
|
112
|
+
var tag = tags[i_2];
|
|
113
|
+
if (tag.Color) {
|
|
114
|
+
value = color_1.Color.ColorFromStr(tag.Color);
|
|
115
|
+
break;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
break;
|
|
119
|
+
}
|
|
120
|
+
if (typeof value === "string") {
|
|
121
|
+
value = color_1.Color.ColorFromStr(value);
|
|
122
|
+
}
|
|
123
|
+
if (value && typeof value === "object" && (value.red || value.red == 0)) {
|
|
124
|
+
return value;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
return null;
|
|
128
|
+
}
|
|
129
|
+
Calculator.GetColor = GetColor;
|
|
77
130
|
function GetMappingValue(value, entity) {
|
|
78
131
|
var attrPath = path_utils_1.PathUtils.Parse(value.field);
|
|
79
132
|
var eValue = +entity_1.Entity.GetValue(entity, attrPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculator.js","sourceRoot":"","sources":["../../../src/calculator/calculator.ts"],"names":[],"mappings":";;;AAAA,yCAAwC;AACxC,2CAA0C;AAC1C,2DAAyD;AACzD,iDAA+C;AAE/C;;;GAGG;AACH,IAAiB,UAAU,
|
|
1
|
+
{"version":3,"file":"calculator.js","sourceRoot":"","sources":["../../../src/calculator/calculator.ts"],"names":[],"mappings":"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"}
|
|
@@ -56,7 +56,7 @@ var ClientFile;
|
|
|
56
56
|
return api.GetBaseUrl() + "/file/" + file.ID + (file.FileExt ? file.FileExt : "");
|
|
57
57
|
}
|
|
58
58
|
ClientFile.GetUrlWithExt = GetUrlWithExt;
|
|
59
|
-
function Get(api, fileId) {
|
|
59
|
+
function Get(api, fileId, reqParams) {
|
|
60
60
|
return __awaiter(this, void 0, void 0, function () {
|
|
61
61
|
var key, cacheData, req;
|
|
62
62
|
return __generator(this, function (_a) {
|
|
@@ -64,18 +64,18 @@ var ClientFile;
|
|
|
64
64
|
throw ("File ID is required.");
|
|
65
65
|
}
|
|
66
66
|
key = GetCacheKey(fileId);
|
|
67
|
-
cacheData = api.Cache.Get(key);
|
|
67
|
+
cacheData = (reqParams === null || reqParams === void 0 ? void 0 : reqParams.noCache) ? null : api.Cache.Get(key);
|
|
68
68
|
if (cacheData) {
|
|
69
69
|
return [2 /*return*/, cacheData];
|
|
70
70
|
}
|
|
71
|
-
req = api.GET("file/" + fileId + "/details", api_1.Api.PrepReqParams());
|
|
71
|
+
req = api.GET("file/" + fileId + "/details", api_1.Api.PrepReqParams(reqParams));
|
|
72
72
|
api.Cache.Set(key, req, api_1.Api.DEFAULT_CACHE_DURATION);
|
|
73
73
|
return [2 /*return*/, req];
|
|
74
74
|
});
|
|
75
75
|
});
|
|
76
76
|
}
|
|
77
77
|
ClientFile.Get = Get;
|
|
78
|
-
function Delete(api, fileIds) {
|
|
78
|
+
function Delete(api, fileIds, reqParams) {
|
|
79
79
|
return __awaiter(this, void 0, void 0, function () {
|
|
80
80
|
var data, i, key;
|
|
81
81
|
return __generator(this, function (_a) {
|
|
@@ -87,7 +87,7 @@ var ClientFile;
|
|
|
87
87
|
data = {
|
|
88
88
|
Items: fileIds
|
|
89
89
|
};
|
|
90
|
-
return [4 /*yield*/, api.POST("deleteFiles", data, api_1.Api.PrepReqParams())];
|
|
90
|
+
return [4 /*yield*/, api.POST("deleteFiles", data, api_1.Api.PrepReqParams(reqParams))];
|
|
91
91
|
case 1:
|
|
92
92
|
_a.sent();
|
|
93
93
|
for (i = 0; i < fileIds.length; i++) {
|
|
@@ -100,7 +100,7 @@ var ClientFile;
|
|
|
100
100
|
});
|
|
101
101
|
}
|
|
102
102
|
ClientFile.Delete = Delete;
|
|
103
|
-
function Upload(api, file, purpose,
|
|
103
|
+
function Upload(api, file, purpose, reqParams) {
|
|
104
104
|
return __awaiter(this, void 0, void 0, function () {
|
|
105
105
|
var formData, params;
|
|
106
106
|
return __generator(this, function (_a) {
|
|
@@ -113,8 +113,7 @@ var ClientFile;
|
|
|
113
113
|
"Purpose": purpose
|
|
114
114
|
};
|
|
115
115
|
}
|
|
116
|
-
params = api_1.Api.PrepReqParams();
|
|
117
|
-
params.onProgress = onProgress;
|
|
116
|
+
params = api_1.Api.PrepReqParams(reqParams);
|
|
118
117
|
params.formData = formData;
|
|
119
118
|
return [2 /*return*/, api.UPLOAD("file/uploadNew", file, params)];
|
|
120
119
|
});
|
|
@@ -145,12 +144,12 @@ var ClientFile;
|
|
|
145
144
|
ERowOperator["AND"] = "AND";
|
|
146
145
|
ERowOperator["OR"] = "OR";
|
|
147
146
|
})(ERowOperator = V1.ERowOperator || (V1.ERowOperator = {}));
|
|
148
|
-
function GetList(api, filter) {
|
|
147
|
+
function GetList(api, filter, reqParams) {
|
|
149
148
|
return __awaiter(this, void 0, void 0, function () {
|
|
150
149
|
var data;
|
|
151
150
|
return __generator(this, function (_a) {
|
|
152
151
|
switch (_a.label) {
|
|
153
|
-
case 0: return [4 /*yield*/, api.POST("files/filtered", filter, api_1.Api.PrepReqParams())];
|
|
152
|
+
case 0: return [4 /*yield*/, api.POST("files/filtered", filter, api_1.Api.PrepReqParams(reqParams))];
|
|
154
153
|
case 1:
|
|
155
154
|
data = _a.sent();
|
|
156
155
|
return [2 /*return*/, data.Items];
|
|
@@ -169,7 +168,7 @@ var ClientFile;
|
|
|
169
168
|
EConvertExt["GLB"] = ".glb";
|
|
170
169
|
EConvertExt["SKP"] = ".skp";
|
|
171
170
|
})(EConvertExt = Processor.EConvertExt || (Processor.EConvertExt = {}));
|
|
172
|
-
function ConvertFormat(api, clientFileId, ext) {
|
|
171
|
+
function ConvertFormat(api, clientFileId, ext, reqParams) {
|
|
173
172
|
return __awaiter(this, void 0, void 0, function () {
|
|
174
173
|
return __generator(this, function (_a) {
|
|
175
174
|
if (!clientFileId || !ext) {
|
|
@@ -179,7 +178,7 @@ var ClientFile;
|
|
|
179
178
|
clientFileId: clientFileId,
|
|
180
179
|
destinationFormat: ext,
|
|
181
180
|
operations: []
|
|
182
|
-
})];
|
|
181
|
+
}, reqParams)];
|
|
183
182
|
});
|
|
184
183
|
});
|
|
185
184
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client-file.js","sourceRoot":"","sources":["../../../src/client-file/client-file.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kCAAiC;AAIjC;;;GAGG;AACH,IAAiB,UAAU,
|
|
1
|
+
{"version":3,"file":"client-file.js","sourceRoot":"","sources":["../../../src/client-file/client-file.ts"],"names":[],"mappings":"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"}
|