@esri/hub-common 14.48.1 → 14.49.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/dist/esm/ArcGISContext.js +8 -0
- package/dist/esm/ArcGISContext.js.map +1 -1
- package/dist/esm/ArcGISContextManager.js +148 -95
- package/dist/esm/ArcGISContextManager.js.map +1 -1
- package/dist/esm/core/schemas/internal/metrics/setMetricAndDisplay.js +15 -6
- package/dist/esm/core/schemas/internal/metrics/setMetricAndDisplay.js.map +1 -1
- package/dist/esm/permissions/checkPermission.js +8 -1
- package/dist/esm/permissions/checkPermission.js.map +1 -1
- package/dist/esm/projects/HubProject.js +3 -2
- package/dist/esm/projects/HubProject.js.map +1 -1
- package/dist/esm/sites/_internal/SiteBusinessRules.js +4 -1
- package/dist/esm/sites/_internal/SiteBusinessRules.js.map +1 -1
- package/dist/esm/sites/_internal/_migrate-telemetry-config.js +2 -1
- package/dist/esm/sites/_internal/_migrate-telemetry-config.js.map +1 -1
- package/dist/esm/sites/site-schema-version.js +1 -1
- package/dist/esm/utils/hubUserAppResources.js +62 -9
- package/dist/esm/utils/hubUserAppResources.js.map +1 -1
- package/dist/esm/utils/internal/fetchAndMigrateUserHubSettings.js +39 -0
- package/dist/esm/utils/internal/fetchAndMigrateUserHubSettings.js.map +1 -0
- package/dist/node/ArcGISContext.js +8 -0
- package/dist/node/ArcGISContext.js.map +1 -1
- package/dist/node/ArcGISContextManager.js +147 -94
- package/dist/node/ArcGISContextManager.js.map +1 -1
- package/dist/node/core/schemas/internal/metrics/setMetricAndDisplay.js +15 -6
- package/dist/node/core/schemas/internal/metrics/setMetricAndDisplay.js.map +1 -1
- package/dist/node/permissions/checkPermission.js +8 -1
- package/dist/node/permissions/checkPermission.js.map +1 -1
- package/dist/node/projects/HubProject.js +2 -1
- package/dist/node/projects/HubProject.js.map +1 -1
- package/dist/node/sites/_internal/SiteBusinessRules.js +4 -1
- package/dist/node/sites/_internal/SiteBusinessRules.js.map +1 -1
- package/dist/node/sites/_internal/_migrate-telemetry-config.js +2 -1
- package/dist/node/sites/_internal/_migrate-telemetry-config.js.map +1 -1
- package/dist/node/sites/site-schema-version.js +1 -1
- package/dist/node/utils/hubUserAppResources.js +70 -13
- package/dist/node/utils/hubUserAppResources.js.map +1 -1
- package/dist/node/utils/internal/fetchAndMigrateUserHubSettings.js +43 -0
- package/dist/node/utils/internal/fetchAndMigrateUserHubSettings.js.map +1 -0
- package/dist/types/ArcGISContext.d.ts +17 -0
- package/dist/types/ArcGISContextManager.d.ts +21 -9
- package/dist/types/sites/site-schema-version.d.ts +1 -1
- package/dist/types/utils/hubUserAppResources.d.ts +46 -0
- package/dist/types/utils/internal/fetchAndMigrateUserHubSettings.d.ts +12 -0
- package/package.json +1 -1
|
@@ -54,6 +54,7 @@ export class ArcGISContext {
|
|
|
54
54
|
}
|
|
55
55
|
this._featureFlags = opts.featureFlags || {};
|
|
56
56
|
this._userResourceTokens = opts.userResourceTokens || [];
|
|
57
|
+
this._userHubSettings = opts.userHubSettings || null;
|
|
57
58
|
}
|
|
58
59
|
/**
|
|
59
60
|
* Return the UserSession if authenticated
|
|
@@ -357,6 +358,13 @@ export class ArcGISContext {
|
|
|
357
358
|
get userResourceTokens() {
|
|
358
359
|
return this._userResourceTokens;
|
|
359
360
|
}
|
|
361
|
+
/**
|
|
362
|
+
* Return the user hub settings.
|
|
363
|
+
* Updates must be done via `contextManager.updateUserHubSettings`
|
|
364
|
+
*/
|
|
365
|
+
get userHubSettings() {
|
|
366
|
+
return this._userHubSettings;
|
|
367
|
+
}
|
|
360
368
|
/**
|
|
361
369
|
* Return a token for a specific app
|
|
362
370
|
* @param app
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArcGISContext.js","sourceRoot":"","sources":["../../src/ArcGISContext.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAGpD,OAAO,EAAE,2BAA2B,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"ArcGISContext.js","sourceRoot":"","sources":["../../src/ArcGISContext.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,29 @@ import { ArcGISContext, } from "./ArcGISContext";
|
|
|
4
4
|
import { getHubApiFromPortalUrl } from "./urls/getHubApiFromPortalUrl";
|
|
5
5
|
import { getPortalBaseFromOrgUrl } from "./urls/getPortalBaseFromOrgUrl";
|
|
6
6
|
import { Level, Logger } from "./utils/logger";
|
|
7
|
-
import { cloneObject } from "./util";
|
|
7
|
+
import { cloneObject, maybeAdd } from "./util";
|
|
8
8
|
import { base64ToUnicode, unicodeToBase64 } from "./utils/encoding";
|
|
9
9
|
import { request } from "@esri/arcgis-rest-request";
|
|
10
10
|
import { failSafe } from "./utils/fail-safe";
|
|
11
|
+
import { updateUserHubSettings, } from "./utils/hubUserAppResources";
|
|
12
|
+
import { fetchAndMigrateUserHubSettings } from "./utils/internal/fetchAndMigrateUserHubSettings";
|
|
13
|
+
import { getProp, getWithDefault } from "./objects";
|
|
14
|
+
/**
|
|
15
|
+
* Properties that we can always serialize/deserialize regardless of authentication status
|
|
16
|
+
*/
|
|
17
|
+
const CONTEXT_SERIALIZABLE_PROPS = [
|
|
18
|
+
"portalUrl",
|
|
19
|
+
"serviceStatus",
|
|
20
|
+
"featureFlags",
|
|
21
|
+
"properties",
|
|
22
|
+
"resourceConfigs",
|
|
23
|
+
"trustedOrgIds",
|
|
24
|
+
"trustedOrgs",
|
|
25
|
+
];
|
|
26
|
+
/**
|
|
27
|
+
* Properties that we only serialize/deserialize if the user is authenticated
|
|
28
|
+
*/
|
|
29
|
+
const CONTEXT_AUTHD_SERIALIZABLE_PROPS = ["resourceTokens", "portal", "currentUser"];
|
|
11
30
|
/**
|
|
12
31
|
* The manager exposes context (`IArcGISContext`), which combines a `UserSession` with
|
|
13
32
|
* the `portal/self` and `user/self` responses to provide a central lookup for platform
|
|
@@ -33,8 +52,10 @@ export class ArcGISContextManager {
|
|
|
33
52
|
this._properties = {};
|
|
34
53
|
this._logLevel = Level.error;
|
|
35
54
|
this._featureFlags = {};
|
|
55
|
+
this._trustedOrgIds = [];
|
|
56
|
+
this._trustedOrgs = [];
|
|
36
57
|
this._resourceConfigs = [];
|
|
37
|
-
this.
|
|
58
|
+
this._userResourceTokens = [];
|
|
38
59
|
// Having a unique id makes debugging easier
|
|
39
60
|
this.id = new Date().getTime();
|
|
40
61
|
if (opts.logLevel) {
|
|
@@ -63,7 +84,7 @@ export class ArcGISContextManager {
|
|
|
63
84
|
this._hubUrl = getHubApiFromPortalUrl(this._portalUrl);
|
|
64
85
|
}
|
|
65
86
|
if (opts.portal) {
|
|
66
|
-
this.
|
|
87
|
+
this._portal = cloneObject(opts.portal);
|
|
67
88
|
}
|
|
68
89
|
if (opts.currentUser) {
|
|
69
90
|
this._currentUser = cloneObject(opts.currentUser);
|
|
@@ -81,10 +102,10 @@ export class ArcGISContextManager {
|
|
|
81
102
|
this._trustedOrgs = cloneObject(opts.trustedOrgs);
|
|
82
103
|
}
|
|
83
104
|
if (opts.resourceConfigs) {
|
|
84
|
-
this._resourceConfigs = opts.resourceConfigs;
|
|
105
|
+
this._resourceConfigs = cloneObject(opts.resourceConfigs);
|
|
85
106
|
}
|
|
86
107
|
if (opts.resourceTokens) {
|
|
87
|
-
this.
|
|
108
|
+
this._userResourceTokens = cloneObject(opts.resourceTokens);
|
|
88
109
|
}
|
|
89
110
|
}
|
|
90
111
|
/**
|
|
@@ -110,48 +131,51 @@ export class ArcGISContextManager {
|
|
|
110
131
|
* @returns
|
|
111
132
|
*/
|
|
112
133
|
static async deserialize(serializedContext) {
|
|
134
|
+
// decode the string
|
|
113
135
|
const decoded = base64ToUnicode(serializedContext);
|
|
114
136
|
const state = JSON.parse(decoded);
|
|
115
137
|
// create opts and populate from state
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
138
|
+
let opts = {};
|
|
139
|
+
//
|
|
140
|
+
// iterate the serialized props
|
|
141
|
+
CONTEXT_SERIALIZABLE_PROPS.forEach((prop) => {
|
|
142
|
+
opts = maybeAdd(prop, getProp(state, prop), opts);
|
|
143
|
+
});
|
|
144
|
+
// check if there is a session and if it's still valid
|
|
119
145
|
if (state.session) {
|
|
120
|
-
// re-create the session
|
|
121
146
|
const userSession = UserSession.deserialize(state.session);
|
|
122
|
-
// if the session is still valid, use it and the other properties
|
|
123
147
|
if (userSession.tokenExpires.getTime() > Date.now()) {
|
|
148
|
+
CONTEXT_AUTHD_SERIALIZABLE_PROPS.forEach((prop) => {
|
|
149
|
+
opts = maybeAdd(prop, getProp(state, prop), opts);
|
|
150
|
+
});
|
|
151
|
+
// CRTITICAL: This must be done after the maybeAdd calls above
|
|
152
|
+
// as those return clones of the opts object, and cloneObject
|
|
153
|
+
// does not support cloning a UserSession
|
|
124
154
|
opts.authentication = userSession;
|
|
125
|
-
if (state.portal) {
|
|
126
|
-
opts.portal = state.portal;
|
|
127
|
-
}
|
|
128
|
-
if (state.currentUser) {
|
|
129
|
-
opts.currentUser = state.currentUser;
|
|
130
|
-
}
|
|
131
|
-
if (state.properties) {
|
|
132
|
-
opts.properties = state.properties;
|
|
133
|
-
}
|
|
134
|
-
if (state.trustedOrgIds) {
|
|
135
|
-
opts.trustedOrgIds = state.trustedOrgIds;
|
|
136
|
-
}
|
|
137
|
-
if (state.trustedOrgs) {
|
|
138
|
-
opts.trustedOrgs = state.trustedOrgs;
|
|
139
|
-
}
|
|
140
155
|
}
|
|
141
156
|
}
|
|
142
|
-
else {
|
|
143
|
-
// if the session is expired, we can still carry forward the portalUrl
|
|
144
|
-
// we don't need this when auth is passed b/c it will use that instead
|
|
145
|
-
// of portalUrl
|
|
146
|
-
opts.portalUrl = state.portalUrl;
|
|
147
|
-
}
|
|
148
|
-
// service status and feature flags are safe to carry forward even if session is expired
|
|
149
|
-
opts.serviceStatus = state.serviceStatus;
|
|
150
|
-
opts.featureFlags = state.featureFlags;
|
|
151
|
-
opts.resourceConfigs = state.resourceConfigs;
|
|
152
|
-
opts.resourceTokens = state.resourceTokens;
|
|
153
157
|
return ArcGISContextManager.create(opts);
|
|
154
158
|
}
|
|
159
|
+
/**
|
|
160
|
+
* Serialize the context into a string that can be stored
|
|
161
|
+
* and re-hydrated
|
|
162
|
+
* @returns
|
|
163
|
+
*/
|
|
164
|
+
serialize() {
|
|
165
|
+
let state = {};
|
|
166
|
+
// iterate the serializable props...
|
|
167
|
+
CONTEXT_SERIALIZABLE_PROPS.forEach((prop) => {
|
|
168
|
+
state = maybeAdd(prop, getProp(this, `_${prop}`), state);
|
|
169
|
+
});
|
|
170
|
+
// If user is authenticated, serialize the session and other auth related props
|
|
171
|
+
if (this._authentication) {
|
|
172
|
+
state.session = this._authentication.serialize();
|
|
173
|
+
CONTEXT_AUTHD_SERIALIZABLE_PROPS.forEach((prop) => {
|
|
174
|
+
state = maybeAdd(prop, getProp(this, `_${prop}`), state);
|
|
175
|
+
});
|
|
176
|
+
}
|
|
177
|
+
return unicodeToBase64(JSON.stringify(state));
|
|
178
|
+
}
|
|
155
179
|
/**
|
|
156
180
|
* Set the Authentication (UserSession) for the context.
|
|
157
181
|
* This should be called when a user signs into a running
|
|
@@ -184,9 +208,9 @@ export class ArcGISContextManager {
|
|
|
184
208
|
}
|
|
185
209
|
// Clear the auth related props
|
|
186
210
|
this._authentication = null;
|
|
187
|
-
this.
|
|
211
|
+
this._portal = null;
|
|
188
212
|
this._currentUser = null;
|
|
189
|
-
this.
|
|
213
|
+
this._userResourceTokens = [];
|
|
190
214
|
// re-create the context
|
|
191
215
|
this._context = new ArcGISContext(this.contextOpts);
|
|
192
216
|
}
|
|
@@ -200,40 +224,33 @@ export class ArcGISContextManager {
|
|
|
200
224
|
return this._context;
|
|
201
225
|
}
|
|
202
226
|
/**
|
|
203
|
-
*
|
|
204
|
-
* in
|
|
205
|
-
*
|
|
206
|
-
* @
|
|
227
|
+
* Update the User's Hub Settings
|
|
228
|
+
* Stores in the user-app-resource associated with the `hubforarcgis` clientId
|
|
229
|
+
* and updates the context
|
|
230
|
+
* @param settings
|
|
207
231
|
*/
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
serviceStatus: this._serviceStatus,
|
|
212
|
-
featureFlags: this._featureFlags,
|
|
213
|
-
properties: this._properties,
|
|
214
|
-
resourceConfigs: this._resourceConfigs,
|
|
215
|
-
resourceTokens: this._resourceTokens,
|
|
216
|
-
};
|
|
217
|
-
if (this._authentication) {
|
|
218
|
-
state.session = this._authentication.serialize();
|
|
219
|
-
}
|
|
220
|
-
if (this._portalSelf) {
|
|
221
|
-
state.portal = this._portalSelf;
|
|
222
|
-
}
|
|
223
|
-
if (this._currentUser) {
|
|
224
|
-
state.currentUser = this._currentUser;
|
|
232
|
+
async updateUserHubSettings(settings) {
|
|
233
|
+
if (!this._authentication) {
|
|
234
|
+
throw new Error("Cannot update user hub settings without an authenticated user");
|
|
225
235
|
}
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
}
|
|
232
|
-
|
|
236
|
+
// update the user-app-resource
|
|
237
|
+
await updateUserHubSettings(settings, this.context);
|
|
238
|
+
// update the context
|
|
239
|
+
this._userHubSettings = settings;
|
|
240
|
+
// update the feature flags
|
|
241
|
+
Object.keys(getWithDefault(settings, "preview", {})).forEach((key) => {
|
|
242
|
+
// only set the flag if it's true, otherwise delete the flag so we revert to default behavior
|
|
243
|
+
if (getProp(settings, `preview.${key}`)) {
|
|
244
|
+
this._featureFlags[`hub:feature:${key}`] = true;
|
|
245
|
+
}
|
|
246
|
+
else {
|
|
247
|
+
delete this._featureFlags[`hub:feature:${key}`];
|
|
248
|
+
}
|
|
249
|
+
});
|
|
250
|
+
this._context = new ArcGISContext(this.contextOpts);
|
|
233
251
|
}
|
|
234
252
|
/**
|
|
235
|
-
* If we have a UserSession, fetch
|
|
236
|
-
* store that along with current user
|
|
253
|
+
* If we have a UserSession, fetch other resources to populate the context
|
|
237
254
|
*/
|
|
238
255
|
async initialize() {
|
|
239
256
|
// setup array to hold promises and one to track promise index
|
|
@@ -248,7 +265,7 @@ export class ArcGISContextManager {
|
|
|
248
265
|
// and we only want to fetch the info, if it was not passed in
|
|
249
266
|
if (this._authentication) {
|
|
250
267
|
const token = await this._authentication.getToken(this._authentication.portal);
|
|
251
|
-
if (!this.
|
|
268
|
+
if (!this._portal) {
|
|
252
269
|
promises.push(getSelf({ authentication: this._authentication }));
|
|
253
270
|
promiseKeys.push("portal");
|
|
254
271
|
}
|
|
@@ -257,16 +274,17 @@ export class ArcGISContextManager {
|
|
|
257
274
|
promises.push(getUser({ username, authentication: this._authentication }));
|
|
258
275
|
promiseKeys.push("user");
|
|
259
276
|
}
|
|
260
|
-
if (!this._trustedOrgs) {
|
|
277
|
+
if (!this._trustedOrgs.length) {
|
|
261
278
|
promises.push(getTrustedOrgs(this._portalUrl, this._authentication));
|
|
262
279
|
promiseKeys.push("trustedOrgs");
|
|
263
280
|
}
|
|
264
|
-
if
|
|
281
|
+
// if we don't have the tokens but we have resource configs, fetch them
|
|
282
|
+
if (!this._userResourceTokens.length && this._resourceConfigs.length) {
|
|
265
283
|
promises.push(getUserResourceTokens(this._resourceConfigs, token, this._portalUrl + "/sharing/rest"));
|
|
266
284
|
promiseKeys.push("tokens");
|
|
267
285
|
}
|
|
268
|
-
// always add "self" to resourceTokens
|
|
269
|
-
this.
|
|
286
|
+
// always add "self" to resourceTokens, associated with the app's clientId
|
|
287
|
+
this._userResourceTokens.push({
|
|
270
288
|
app: "self",
|
|
271
289
|
token,
|
|
272
290
|
clientId: this._authentication.clientId || "self",
|
|
@@ -289,7 +307,7 @@ export class ArcGISContextManager {
|
|
|
289
307
|
const result = results[idx];
|
|
290
308
|
switch (key) {
|
|
291
309
|
case "portal":
|
|
292
|
-
this.
|
|
310
|
+
this._portal = result;
|
|
293
311
|
break;
|
|
294
312
|
case "user":
|
|
295
313
|
this._currentUser = result;
|
|
@@ -299,8 +317,8 @@ export class ArcGISContextManager {
|
|
|
299
317
|
this._trustedOrgIds = getTrustedOrgIds(this._trustedOrgs);
|
|
300
318
|
break;
|
|
301
319
|
case "tokens":
|
|
302
|
-
this.
|
|
303
|
-
...this.
|
|
320
|
+
this._userResourceTokens = [
|
|
321
|
+
...this._userResourceTokens,
|
|
304
322
|
...result,
|
|
305
323
|
];
|
|
306
324
|
break;
|
|
@@ -309,6 +327,21 @@ export class ArcGISContextManager {
|
|
|
309
327
|
break;
|
|
310
328
|
}
|
|
311
329
|
});
|
|
330
|
+
// if we are auth'd and have a hubforarcgis token,
|
|
331
|
+
// fetch the users IUserHubSettings extract out the
|
|
332
|
+
// preview properties and cross-walk to permissions
|
|
333
|
+
const hubAppToken = this._userResourceTokens.find((e) => e.app === "hubforarcgis");
|
|
334
|
+
if (this._authentication && hubAppToken) {
|
|
335
|
+
this._userHubSettings = await fetchAndMigrateUserHubSettings(this._authentication.username, this._portalUrl, hubAppToken.token);
|
|
336
|
+
// Check for preview settings and walk the into feature flags
|
|
337
|
+
Object.keys(getWithDefault(this._userHubSettings, "preview", {})).forEach((key) => {
|
|
338
|
+
// only set the flag if it's true, otherwise we can override
|
|
339
|
+
// feature flag query params
|
|
340
|
+
if (getProp(this._userHubSettings, `preview.${key}`)) {
|
|
341
|
+
this._featureFlags[`hub:feature:${key}`] = true;
|
|
342
|
+
}
|
|
343
|
+
});
|
|
344
|
+
}
|
|
312
345
|
Logger.debug(`ArcGISContextManager-${this.id}: updating context`);
|
|
313
346
|
// update the context
|
|
314
347
|
this._context = new ArcGISContext(this.contextOpts);
|
|
@@ -317,33 +350,41 @@ export class ArcGISContextManager {
|
|
|
317
350
|
* Getter to streamline the creation of updated Context instances
|
|
318
351
|
*/
|
|
319
352
|
get contextOpts() {
|
|
320
|
-
|
|
353
|
+
// Prop names for the IArcGISContextOptions interface do not match
|
|
354
|
+
// up exactly with the prop names on the serialized context so we have to define
|
|
355
|
+
// separate arrays here
|
|
356
|
+
const anonProps = ["hubUrl", ...CONTEXT_SERIALIZABLE_PROPS];
|
|
357
|
+
const authdProps = ["currentUser", "userResourceTokens", "userHubSettings"];
|
|
358
|
+
let contextOpts = {
|
|
321
359
|
id: this.id,
|
|
322
360
|
portalUrl: this._portalUrl,
|
|
323
|
-
hubUrl: this._hubUrl,
|
|
324
|
-
properties: this._properties,
|
|
325
|
-
serviceStatus: this._serviceStatus,
|
|
326
|
-
featureFlags: this._featureFlags,
|
|
327
361
|
};
|
|
362
|
+
// iterate the anon props...
|
|
363
|
+
anonProps.forEach((prop) => {
|
|
364
|
+
contextOpts = maybeAdd(prop, getProp(this, `_${prop}`), contextOpts);
|
|
365
|
+
});
|
|
366
|
+
// If user is authenticated, we can add other props
|
|
328
367
|
if (this._authentication) {
|
|
368
|
+
authdProps.forEach((prop) => {
|
|
369
|
+
contextOpts = maybeAdd(prop, getProp(this, `_${prop}`), contextOpts);
|
|
370
|
+
});
|
|
371
|
+
// CRTITICAL: .authentication must be attached after the maybeAdd calls above
|
|
372
|
+
// as those return clones of the opts object, and cloneObject
|
|
373
|
+
// does not support cloning a UserSession
|
|
329
374
|
contextOpts.authentication = this._authentication;
|
|
330
375
|
}
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
if (this._currentUser) {
|
|
335
|
-
contextOpts.currentUser = this._currentUser;
|
|
336
|
-
}
|
|
337
|
-
if (this._trustedOrgIds) {
|
|
338
|
-
contextOpts.trustedOrgIds = this._trustedOrgIds;
|
|
339
|
-
}
|
|
340
|
-
if (this._trustedOrgs) {
|
|
341
|
-
contextOpts.trustedOrgs = this._trustedOrgs;
|
|
342
|
-
}
|
|
343
|
-
contextOpts.userResourceTokens = this._resourceTokens;
|
|
376
|
+
// Handle some special cases where the prop names don't map cleanly
|
|
377
|
+
// and would require a breaking change to fix
|
|
378
|
+
contextOpts.portalSelf = this._portal;
|
|
344
379
|
return contextOpts;
|
|
345
380
|
}
|
|
346
381
|
}
|
|
382
|
+
/**
|
|
383
|
+
* @internal
|
|
384
|
+
* Fetch the service status for the given portalUrl
|
|
385
|
+
* @param portalUrl
|
|
386
|
+
* @returns
|
|
387
|
+
*/
|
|
347
388
|
function getServiceStatus(portalUrl) {
|
|
348
389
|
let status = HUB_SERVICE_STATUS;
|
|
349
390
|
const isPortal = portalUrl.indexOf("arcgis.com") === -1;
|
|
@@ -356,6 +397,7 @@ function getServiceStatus(portalUrl) {
|
|
|
356
397
|
return Promise.resolve(status);
|
|
357
398
|
}
|
|
358
399
|
/**
|
|
400
|
+
* @internal
|
|
359
401
|
* Get trusted orgs w/ a failSafe to return an empty array
|
|
360
402
|
*/
|
|
361
403
|
async function getTrustedOrgs(_portalUrl, _authentication) {
|
|
@@ -368,11 +410,20 @@ async function getTrustedOrgs(_portalUrl, _authentication) {
|
|
|
368
410
|
return trustedOrgs.trustedOrgs;
|
|
369
411
|
}
|
|
370
412
|
/**
|
|
413
|
+
* @internal
|
|
371
414
|
* Extract trustedOrg ids from trustedOrgs response
|
|
372
415
|
*/
|
|
373
416
|
function getTrustedOrgIds(trustedOrgs) {
|
|
374
417
|
return trustedOrgs.map((org) => org.to.orgId);
|
|
375
418
|
}
|
|
419
|
+
/**
|
|
420
|
+
* @internal
|
|
421
|
+
* Get a set of tokens for the given configs
|
|
422
|
+
* @param configs
|
|
423
|
+
* @param currentToken
|
|
424
|
+
* @param portalUrl
|
|
425
|
+
* @returns
|
|
426
|
+
*/
|
|
376
427
|
async function getUserResourceTokens(configs, currentToken, portalUrl) {
|
|
377
428
|
// failSafe exchangeToken so we don't have to catch
|
|
378
429
|
const failSafeExchange = failSafe(exchangeToken, null);
|
|
@@ -383,7 +434,9 @@ async function getUserResourceTokens(configs, currentToken, portalUrl) {
|
|
|
383
434
|
}
|
|
384
435
|
});
|
|
385
436
|
});
|
|
386
|
-
|
|
437
|
+
const results = await Promise.all(promises);
|
|
438
|
+
// remove any null entries so downstream code doesn't have to check
|
|
439
|
+
return results.filter((e) => !!e);
|
|
387
440
|
}
|
|
388
441
|
const HUB_SERVICE_STATUS = {
|
|
389
442
|
portal: "online",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ArcGISContextManager.js","sourceRoot":"","sources":["../../src/ArcGISContextManager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ArcGISContextManager.js","sourceRoot":"","sources":["../../src/ArcGISContextManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { getWithDefault } from "../../../../objects";
|
|
1
2
|
import { cloneObject } from "../../../../util";
|
|
2
3
|
/**
|
|
3
4
|
* Sets a given metric and metricDisplayConfig on an entity's metric and view.metricDisplays props.
|
|
@@ -13,17 +14,25 @@ export function setMetricAndDisplay(entity, metric, displayConfig) {
|
|
|
13
14
|
const entityCopy = cloneObject(entity);
|
|
14
15
|
const metricId = metric.id;
|
|
15
16
|
const mIndex = entityCopy.metrics.findIndex((m) => m.id === metricId);
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
// get array in case of undefined
|
|
18
|
+
const displays = getWithDefault(entityCopy, "view.metricDisplays", []);
|
|
19
|
+
const dIndex = displays.findIndex((d) => d.metricId === metricId);
|
|
20
|
+
// existing vs new metric
|
|
21
|
+
if (mIndex > -1) {
|
|
19
22
|
entityCopy.metrics[mIndex] = metric;
|
|
20
|
-
entityCopy.view.metricDisplays[dIndex] = displayConfig;
|
|
21
23
|
}
|
|
22
|
-
// new metric and display
|
|
23
24
|
else {
|
|
24
25
|
entityCopy.metrics.push(metric);
|
|
25
|
-
entityCopy.view.metricDisplays.push(displayConfig);
|
|
26
26
|
}
|
|
27
|
+
// existing vs new display
|
|
28
|
+
if (dIndex > -1) {
|
|
29
|
+
displays[dIndex] = displayConfig;
|
|
30
|
+
}
|
|
31
|
+
else {
|
|
32
|
+
displays.push(displayConfig);
|
|
33
|
+
}
|
|
34
|
+
// reset the displays array
|
|
35
|
+
entityCopy.view.metricDisplays = displays;
|
|
27
36
|
return entityCopy;
|
|
28
37
|
}
|
|
29
38
|
//# sourceMappingURL=setMetricAndDisplay.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setMetricAndDisplay.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/setMetricAndDisplay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI/C;;;;;;;;;GASG;AACH,MAAM,UAAU,mBAAmB,CACjC,MAAmB,EACnB,MAAe,EACf,aAAmC;IAEnC,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,QAAQ,GAAG,MAAM,CAAC,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"setMetricAndDisplay.js","sourceRoot":"","sources":["../../../../../../src/core/schemas/internal/metrics/setMetricAndDisplay.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAI/C;;;;;;;;;GASG;AACH,MAAM,UAAU,mBAAmB,CACjC,MAAmB,EACnB,MAAe,EACf,aAAmC;IAEnC,MAAM,UAAU,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC;IACvC,MAAM,QAAQ,GAAG,MAAM,CAAC,EAAE,CAAC;IAC3B,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC;IAEtE,iCAAiC;IACjC,MAAM,QAAQ,GAAG,cAAc,CAAC,UAAU,EAAE,qBAAqB,EAAE,EAAE,CAAC,CAAC;IACvE,MAAM,MAAM,GAAG,QAAQ,CAAC,SAAS,CAC/B,CAAC,CAAuB,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,KAAK,QAAQ,CACrD,CAAC;IAEF,yBAAyB;IACzB,IAAI,MAAM,GAAG,CAAC,CAAC,EAAE;QACf,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;KACrC;SAAM;QACL,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KACjC;IAED,0BAA0B;IAC1B,IAAI,MAAM,GAAG,CAAC,CAAC,EAAE;QACf,QAAQ,CAAC,MAAM,CAAC,GAAG,aAAa,CAAC;KAClC;SAAM;QACL,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;KAC9B;IAED,2BAA2B;IAC3B,UAAU,CAAC,IAAI,CAAC,cAAc,GAAG,QAAQ,CAAC;IAE1C,OAAO,UAAU,CAAC;AACpB,CAAC"}
|
|
@@ -84,7 +84,14 @@ export function checkPermission(permission, context, entityOrOptions) {
|
|
|
84
84
|
access: false,
|
|
85
85
|
response: respValue,
|
|
86
86
|
code: getPolicyResponseCode(respValue),
|
|
87
|
-
checks
|
|
87
|
+
// checks are needed so the aggregations in checkParents function works
|
|
88
|
+
checks: [
|
|
89
|
+
{
|
|
90
|
+
response: respValue,
|
|
91
|
+
code: getPolicyResponseCode(respValue),
|
|
92
|
+
name: `Feature Flag: ${permission}`,
|
|
93
|
+
},
|
|
94
|
+
],
|
|
88
95
|
};
|
|
89
96
|
logResponse(disabledByFlagResponse, label);
|
|
90
97
|
return disabledByFlagResponse;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkPermission.js","sourceRoot":"","sources":["../../../src/permissions/checkPermission.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"checkPermission.js","sourceRoot":"","sources":["../../../src/permissions/checkPermission.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ import { projectToCardModel } from "./view";
|
|
|
10
10
|
import { camelize, cloneObject, createId } from "../util";
|
|
11
11
|
import { createProject, editorToProject, updateProject } from "./edit";
|
|
12
12
|
import { enrichEntity } from "../core/enrichEntity";
|
|
13
|
-
import { getProp } from "../objects";
|
|
13
|
+
import { getProp, getWithDefault } from "../objects";
|
|
14
14
|
import { metricToEditor } from "../core/schemas/internal/metrics/metricToEditor";
|
|
15
15
|
import { editorToMetric } from "../core/schemas/internal/metrics/editorToMetric";
|
|
16
16
|
import { setMetricAndDisplay } from "../core/schemas/internal/metrics/setMetricAndDisplay";
|
|
@@ -159,7 +159,8 @@ export class HubProject extends HubItemEntity {
|
|
|
159
159
|
// handle metrics
|
|
160
160
|
const metrics = getEntityMetrics(this.entity);
|
|
161
161
|
const metric = metrics.find((m) => m.id === editorContext.metricId);
|
|
162
|
-
const
|
|
162
|
+
const displays = getWithDefault(this.entity, "view.metricDisplays", []);
|
|
163
|
+
const displayConfig = displays.find((display) => display.metricId === editorContext.metricId) || {};
|
|
163
164
|
editor._metric = metricToEditor(metric, displayConfig);
|
|
164
165
|
return editor;
|
|
165
166
|
}
|