bruce-models 6.7.4 → 6.7.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 +20 -11
- package/dist/bruce-models.es5.js.map +1 -1
- package/dist/bruce-models.umd.js +20 -11
- package/dist/bruce-models.umd.js.map +1 -1
- package/dist/lib/bruce-models.js +1 -1
- package/dist/lib/project/project-view.js +19 -10
- package/dist/lib/project/project-view.js.map +1 -1
- package/dist/types/bruce-models.d.ts +1 -1
- package/dist/types/project/project-view.d.ts +10 -3
- package/package.json +1 -1
package/dist/lib/bruce-models.js
CHANGED
|
@@ -114,5 +114,5 @@ __exportStar(require("./data-source/data-source"), exports);
|
|
|
114
114
|
__exportStar(require("./scenario/scenario"), exports);
|
|
115
115
|
__exportStar(require("./tracking/tracking"), exports);
|
|
116
116
|
// This is updated with the package.json version on build.
|
|
117
|
-
exports.VERSION = "6.7.
|
|
117
|
+
exports.VERSION = "6.7.5";
|
|
118
118
|
//# sourceMappingURL=bruce-models.js.map
|
|
@@ -36,21 +36,28 @@ var ProjectView;
|
|
|
36
36
|
*/
|
|
37
37
|
function Get(params) {
|
|
38
38
|
return __awaiter(this, void 0, void 0, function* () {
|
|
39
|
-
let { api, viewId, req: reqParams } = params;
|
|
40
|
-
if (!viewId) {
|
|
41
|
-
throw ("View ID is required.");
|
|
39
|
+
let { api, viewId, bookmarkId, expand, req: reqParams } = params;
|
|
40
|
+
if (!viewId && !bookmarkId) {
|
|
41
|
+
throw ("View ID or Bookmark ID is required.");
|
|
42
42
|
}
|
|
43
43
|
if (!api) {
|
|
44
44
|
api = environment_1.ENVIRONMENT.Api().GetBruceApi();
|
|
45
45
|
}
|
|
46
|
-
const key = GetCacheKey(viewId);
|
|
46
|
+
const key = GetCacheKey(viewId, bookmarkId, expand);
|
|
47
47
|
const cache = api.GetCacheItem(key, reqParams);
|
|
48
48
|
if (cache === null || cache === void 0 ? void 0 : cache.found) {
|
|
49
49
|
return cache.data;
|
|
50
50
|
}
|
|
51
51
|
const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
|
|
52
52
|
try {
|
|
53
|
-
|
|
53
|
+
let url = "ui.view/";
|
|
54
|
+
if (viewId) {
|
|
55
|
+
url += viewId;
|
|
56
|
+
}
|
|
57
|
+
else if (bookmarkId) {
|
|
58
|
+
url += "?SlideID=" + encodeURIComponent(bookmarkId);
|
|
59
|
+
}
|
|
60
|
+
const data = yield api.GET(url, api_1.Api.PrepReqParams(reqParams));
|
|
54
61
|
res({
|
|
55
62
|
view: data
|
|
56
63
|
});
|
|
@@ -132,7 +139,7 @@ var ProjectView;
|
|
|
132
139
|
api = environment_1.ENVIRONMENT.Api().GetBruceApi();
|
|
133
140
|
}
|
|
134
141
|
yield api.DELETE(`ui.view/${viewId}`, api_1.Api.PrepReqParams(reqParams));
|
|
135
|
-
api.Cache.
|
|
142
|
+
api.Cache.RemoveByStartsWith(api_1.Api.ECacheKey.ProjectView);
|
|
136
143
|
});
|
|
137
144
|
}
|
|
138
145
|
ProjectView.Delete = Delete;
|
|
@@ -168,7 +175,7 @@ var ProjectView;
|
|
|
168
175
|
else {
|
|
169
176
|
data = yield api.PUT(`ui.view/${data.ID}`, data, api_1.Api.PrepReqParams(reqParams));
|
|
170
177
|
}
|
|
171
|
-
api.Cache.
|
|
178
|
+
api.Cache.RemoveByStartsWith(api_1.Api.ECacheKey.ProjectView);
|
|
172
179
|
return {
|
|
173
180
|
view: data
|
|
174
181
|
};
|
|
@@ -182,11 +189,13 @@ var ProjectView;
|
|
|
182
189
|
* const key = GetCacheKey("abc");
|
|
183
190
|
* api.Cache.Remove(key);
|
|
184
191
|
* }
|
|
185
|
-
* @param viewId
|
|
192
|
+
* @param viewId ID of the project view to get.
|
|
193
|
+
* @param bookmarkId Optional bookmark ID related to the view we want to find.
|
|
194
|
+
* @param expand Optional expand parameter.
|
|
186
195
|
* @returns
|
|
187
196
|
*/
|
|
188
|
-
function GetCacheKey(viewId) {
|
|
189
|
-
return `${api_1.Api.ECacheKey.ProjectView}${api_1.Api.ECacheKey.Id}${viewId}`;
|
|
197
|
+
function GetCacheKey(viewId, bookmarkId, expand) {
|
|
198
|
+
return `${api_1.Api.ECacheKey.ProjectView}${api_1.Api.ECacheKey.Id}${viewId || ""}${api_1.Api.ECacheKey.ProjectViewBookmark}${bookmarkId || ""}${api_1.Api.ECacheKey.Id}${expand ? (expand === true ? "true" : expand) : "false"}`;
|
|
190
199
|
}
|
|
191
200
|
ProjectView.GetCacheKey = GetCacheKey;
|
|
192
201
|
})(ProjectView = exports.ProjectView || (exports.ProjectView = {}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"project-view.js","sourceRoot":"","sources":["../../../src/project/project-view.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAiC;AAEjC,
|
|
1
|
+
{"version":3,"file":"project-view.js","sourceRoot":"","sources":["../../../src/project/project-view.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { MenuItem } from "./menu-item";
|
|
|
4
4
|
import { ProjectViewTile } from "./project-view-tile";
|
|
5
5
|
import { ProjectViewBookmark } from "./project-view-bookmark";
|
|
6
6
|
import { ProjectViewSelection } from "./project-view-selection";
|
|
7
|
+
import { ProjectViewBookmarkGroup } from "./project-view-bookmark-group";
|
|
7
8
|
/**
|
|
8
9
|
* Describes the "Project View" concept within Nextspace.
|
|
9
10
|
* A project view is a collection of settings for a visualization application we support.
|
|
@@ -32,6 +33,8 @@ export declare namespace ProjectView {
|
|
|
32
33
|
Settings?: Settings;
|
|
33
34
|
IsDefault?: boolean;
|
|
34
35
|
Feature?: string[];
|
|
36
|
+
"UISlide"?: ProjectViewBookmark.IBookmark[];
|
|
37
|
+
"UISlide.Group"?: ProjectViewBookmarkGroup.IGroup[];
|
|
35
38
|
}
|
|
36
39
|
type Settings = ISettings | IWeb3dSettings | IWeb2dSettings;
|
|
37
40
|
/**
|
|
@@ -100,7 +103,9 @@ export declare namespace ProjectView {
|
|
|
100
103
|
*/
|
|
101
104
|
function Get(params: {
|
|
102
105
|
api?: BruceApi.Api;
|
|
103
|
-
viewId
|
|
106
|
+
viewId?: string;
|
|
107
|
+
bookmarkId?: string;
|
|
108
|
+
expand?: string | boolean;
|
|
104
109
|
req?: Api.IReqParams;
|
|
105
110
|
}): Promise<{
|
|
106
111
|
view: IView;
|
|
@@ -152,8 +157,10 @@ export declare namespace ProjectView {
|
|
|
152
157
|
* const key = GetCacheKey("abc");
|
|
153
158
|
* api.Cache.Remove(key);
|
|
154
159
|
* }
|
|
155
|
-
* @param viewId
|
|
160
|
+
* @param viewId ID of the project view to get.
|
|
161
|
+
* @param bookmarkId Optional bookmark ID related to the view we want to find.
|
|
162
|
+
* @param expand Optional expand parameter.
|
|
156
163
|
* @returns
|
|
157
164
|
*/
|
|
158
|
-
function GetCacheKey(viewId: string): string;
|
|
165
|
+
function GetCacheKey(viewId: string, bookmarkId: string, expand: string | boolean): string;
|
|
159
166
|
}
|