@esri/hub-common 9.13.2 → 9.14.0

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.
Files changed (70) hide show
  1. package/dist/es2017/ArcGISContext.js +158 -147
  2. package/dist/es2017/ArcGISContext.js.map +1 -1
  3. package/dist/es2017/ArcGISContextManager.js +160 -0
  4. package/dist/es2017/ArcGISContextManager.js.map +1 -0
  5. package/dist/es2017/index.js +1 -0
  6. package/dist/es2017/index.js.map +1 -1
  7. package/dist/es2017/search/_searchContent.js +18 -7
  8. package/dist/es2017/search/_searchContent.js.map +1 -1
  9. package/dist/es2017/search/_searchGroups.js +1 -11
  10. package/dist/es2017/search/_searchGroups.js.map +1 -1
  11. package/dist/es2017/search/utils.js +1 -1
  12. package/dist/es2017/urls/getHubApiFromPortalUrl.js +21 -0
  13. package/dist/es2017/urls/getHubApiFromPortalUrl.js.map +1 -0
  14. package/dist/es2017/urls/getPortalBaseFromOrgUrl.js +25 -0
  15. package/dist/es2017/urls/getPortalBaseFromOrgUrl.js.map +1 -0
  16. package/dist/es2017/urls/index.js +2 -0
  17. package/dist/es2017/urls/index.js.map +1 -1
  18. package/dist/esm/ArcGISContext.js +251 -202
  19. package/dist/esm/ArcGISContext.js.map +1 -1
  20. package/dist/esm/ArcGISContextManager.js +204 -0
  21. package/dist/esm/ArcGISContextManager.js.map +1 -0
  22. package/dist/esm/index.js +1 -0
  23. package/dist/esm/index.js.map +1 -1
  24. package/dist/esm/search/_searchContent.js +18 -7
  25. package/dist/esm/search/_searchContent.js.map +1 -1
  26. package/dist/esm/search/_searchGroups.js +3 -13
  27. package/dist/esm/search/_searchGroups.js.map +1 -1
  28. package/dist/esm/search/utils.js +1 -1
  29. package/dist/esm/urls/getHubApiFromPortalUrl.js +21 -0
  30. package/dist/esm/urls/getHubApiFromPortalUrl.js.map +1 -0
  31. package/dist/esm/urls/getPortalBaseFromOrgUrl.js +25 -0
  32. package/dist/esm/urls/getPortalBaseFromOrgUrl.js.map +1 -0
  33. package/dist/esm/urls/index.js +2 -0
  34. package/dist/esm/urls/index.js.map +1 -1
  35. package/dist/node/ArcGISContext.js +158 -147
  36. package/dist/node/ArcGISContext.js.map +1 -1
  37. package/dist/node/ArcGISContextManager.js +164 -0
  38. package/dist/node/ArcGISContextManager.js.map +1 -0
  39. package/dist/node/index.js +1 -0
  40. package/dist/node/index.js.map +1 -1
  41. package/dist/node/search/_searchContent.js +17 -6
  42. package/dist/node/search/_searchContent.js.map +1 -1
  43. package/dist/node/search/_searchGroups.js +1 -11
  44. package/dist/node/search/_searchGroups.js.map +1 -1
  45. package/dist/node/search/utils.js +1 -1
  46. package/dist/node/urls/getHubApiFromPortalUrl.js +25 -0
  47. package/dist/node/urls/getHubApiFromPortalUrl.js.map +1 -0
  48. package/dist/node/urls/getPortalBaseFromOrgUrl.js +29 -0
  49. package/dist/node/urls/getPortalBaseFromOrgUrl.js.map +1 -0
  50. package/dist/node/urls/index.js +2 -0
  51. package/dist/node/urls/index.js.map +1 -1
  52. package/dist/types/ArcGISContext.d.ts +103 -77
  53. package/dist/types/ArcGISContextManager.d.ts +113 -0
  54. package/dist/types/index.d.ts +1 -0
  55. package/dist/types/search/utils.d.ts +1 -1
  56. package/dist/types/urls/getHubApiFromPortalUrl.d.ts +8 -0
  57. package/dist/types/urls/getPortalBaseFromOrgUrl.d.ts +9 -0
  58. package/dist/types/urls/index.d.ts +2 -0
  59. package/dist/umd/common.umd.js +144 -125
  60. package/dist/umd/common.umd.js.map +1 -1
  61. package/dist/umd/common.umd.min.js +1 -1
  62. package/dist/umd/common.umd.min.js.map +1 -1
  63. package/package.json +1 -1
  64. package/dist/es2017/ArcGISContextState.js +0 -203
  65. package/dist/es2017/ArcGISContextState.js.map +0 -1
  66. package/dist/esm/ArcGISContextState.js +0 -285
  67. package/dist/esm/ArcGISContextState.js.map +0 -1
  68. package/dist/node/ArcGISContextState.js +0 -207
  69. package/dist/node/ArcGISContextState.js.map +0 -1
  70. package/dist/types/ArcGISContextState.d.ts +0 -129
@@ -1,194 +1,205 @@
1
- import { getSelf, getUser } from "@esri/arcgis-rest-portal";
2
- import { ArcGISContextState, } from "./ArcGISContextState";
3
- import { cloneObject } from ".";
1
+ import { getProp, getWithDefault } from ".";
4
2
  /**
5
- * Application Context Object
3
+ * Hash of Hub API end points so updates
4
+ * are centralized
5
+ */
6
+ const hubApiEndpoints = {
7
+ domains: "/api/v3/domains",
8
+ search: "/api/v3/datasets",
9
+ discussions: "/api/discussions/v1",
10
+ };
11
+ /**
12
+ * ArcGISContext
6
13
  *
7
- * Abstraction that combines a `UserSession` with
8
- * the `portal/self` and `user/self` responses to
9
- * provide a central lookup of platform information.
14
+ * Abstraction that holds a UserSession, along with
15
+ * getters to streamline access to various platform
16
+ * urls, and common constructs like IRequestOptions
10
17
  *
11
- * This is a work-in-progress, and will likely expand over time.
18
+ * Thin class just used to enable getters
12
19
  *
13
- * `ArcGISContext` is used in conjuction with the `arcgis-app-identity`
14
- * component to orchestrate oAuth.
20
+ * This class should not be used by anything other than
21
+ * the ArcGISContextManager class
15
22
  */
16
23
  export class ArcGISContext {
17
- /**
18
- * Private constructor. Use `ArcGISContext.create(...)` to
19
- * instantiate an instance
20
- * @param opts
21
- */
22
24
  constructor(opts) {
23
25
  this._portalUrl = "https://www.arcgis.com";
24
- this._debug = false;
25
- // Having a unique id makes debugging easier
26
- this.id = new Date().getTime();
27
- if (opts.debug) {
28
- this._debug = opts.debug;
29
- }
30
- this.log(`ArcGISContext:ctor: Creating ${this.id}`);
26
+ this.id = opts.id;
27
+ this._portalUrl = opts.portalUrl;
28
+ this._hubUrl = opts.hubUrl;
31
29
  if (opts.authentication) {
32
30
  this._authentication = opts.authentication;
33
- this._portalUrl = this._authentication.portal.replace("/sharing/rest", "");
34
- this._hubUrl = getHubApiFromPortalUrl(this._portalUrl);
35
- }
36
- else if (opts.portalUrl) {
37
- this._portalUrl = opts.portalUrl;
38
- this._hubUrl = getHubApiFromPortalUrl(this._portalUrl);
39
31
  }
40
- else {
41
- this._hubUrl = getHubApiFromPortalUrl(this._portalUrl);
42
- }
43
- if (opts.portal) {
44
- this._portalSelf = cloneObject(opts.portal);
32
+ if (opts.portalSelf) {
33
+ this._portalSelf = opts.portalSelf;
45
34
  }
46
35
  if (opts.currentUser) {
47
- this._currentUser = cloneObject(opts.currentUser);
36
+ this._currentUser = opts.currentUser;
48
37
  }
49
38
  }
50
39
  /**
51
- * Static async Factory
52
- * @param opts
53
- * @returns
40
+ * Return the UserSession if authenticated
54
41
  */
55
- static async create(opts = {}) {
56
- const ctx = new ArcGISContext(opts);
57
- await ctx.initialize();
58
- return ctx;
42
+ get session() {
43
+ return this._authentication;
59
44
  }
60
45
  /**
61
- * Set the Authentication (UserSession) for the context.
62
- * This should be called when a user signs into a running
63
- * application.
64
- * @param auth
46
+ * Return boolean indicating if authenticatio is present
65
47
  */
66
- async setAuthentication(auth) {
67
- this._authentication = auth;
68
- this._portalUrl = auth.portal.replace("/sharing/rest", "");
69
- await this.initialize();
48
+ get isAuthenticated() {
49
+ return !!this._authentication;
70
50
  }
71
51
  /**
72
- * Clear the Authentication (UserSession). This should be
73
- * called when a user signs out of an application, but
74
- * the application continues running
52
+ * Return `IUserRequestOptions`, which is used for REST-JS
53
+ * functions which require authentication information.
54
+ *
55
+ * If context is not authenticated, this function will throw
75
56
  */
76
- clearAuthentication() {
77
- // Reset the portalUrl from the org url to the base url
78
- // for ArcGIS Enterprise, we just leave the _portalUrl as-is
79
- if (!this._state.isPortal) {
80
- this._portalUrl = getPortalBaseFromOrgUrl(this._portalUrl);
57
+ get userRequestOptions() {
58
+ if (this.isAuthenticated) {
59
+ return {
60
+ authentication: this._authentication,
61
+ portal: this.sharingApiUrl,
62
+ };
81
63
  }
82
- // Clear the auth, portalSelf and currentUser props
83
- this._authentication = null;
84
- this._portalSelf = null;
85
- this._currentUser = null;
86
- this._state = new ArcGISContextState({
87
- id: this.id,
88
- portalUrl: this._portalUrl,
89
- hubUrl: this._hubUrl,
90
- });
91
64
  }
92
65
  /**
93
- * Return a reference to the current state.
94
- * When `.setAuthentication()` or `.clearAuthenentication()` are
95
- * called, the state will be re-created. This is done so frameworks
96
- * like React or Ember can detect changes.
66
+ * Return `IRequestOptions`, which is used by REST-JS functions
67
+ * which *may* use authentication information if provided.
68
+ *
69
+ * If context is not authenticated, this function just returns
70
+ * the `portal` property, which informs REST-JS what Sharing API
71
+ * instance to use (i.e. AGO, Enterprise etc)
97
72
  */
98
- get state() {
99
- return this._state;
73
+ get requestOptions() {
74
+ let ro = {
75
+ portal: this.sharingApiUrl,
76
+ };
77
+ if (this.isAuthenticated) {
78
+ ro = {
79
+ authentication: this._authentication,
80
+ portal: this.sharingApiUrl,
81
+ };
82
+ }
83
+ return ro;
100
84
  }
101
85
  /**
102
- * @internal
103
- * Log debugging messages to the console
104
- * @param message
86
+ * Return a `IHubRequestOptions` object
105
87
  */
106
- log(message) {
107
- if (this._debug) {
108
- // tslint:disable-next-line:no-console
109
- console.info(message);
110
- }
88
+ get hubRequestOptions() {
89
+ // We may add more logic around what is returned in some corner cases
90
+ return {
91
+ authentication: this.session,
92
+ isPortal: this.isPortal,
93
+ portalSelf: this.portal,
94
+ hubApiUrl: this.hubUrl,
95
+ };
111
96
  }
112
97
  /**
113
- * If we have a UserSession, fetch portal/self and
114
- * store that along with current user
98
+ * Return the portal url.
99
+ *
100
+ * If authenticated @ ArcGIS Online, it will return
101
+ * the https://org.env.arcgis.com
102
+ *
103
+ * If authenticated @ ArcGIS Enterprise, it will return
104
+ * https://portalHostname, which includes the web adaptor
115
105
  */
116
- async initialize() {
117
- // if we have auth, and don't have portalSelf or currentUser, fetch them
118
- if (this._authentication && (!this._portalSelf || !this._currentUser)) {
119
- this.log(`ArcGISContext-${this.id}: Initializing`);
120
- const username = this._authentication.username;
121
- const requests = [
122
- getSelf({ authentication: this._authentication }),
123
- getUser({ username, authentication: this._authentication }),
124
- ];
125
- try {
126
- const [portal, user] = await Promise.all(requests);
127
- this._portalSelf = portal;
128
- this._currentUser = user;
106
+ get portalUrl() {
107
+ if (this.isAuthenticated) {
108
+ if (this.isPortal) {
109
+ return `https://${this._portalSelf.portalHostname}`;
129
110
  }
130
- catch (ex) {
131
- const msg = `ArcGISContext could not fetch portal & user for "${this._authentication.username}" using ${this._authentication.portal}.`;
132
- // tslint:disable-next-line:no-console
133
- console.error(msg);
134
- throw ex;
111
+ else {
112
+ return `https://${this._portalSelf.urlKey}.${this._portalSelf.customBaseUrl}`;
135
113
  }
136
114
  }
137
- // update the state
138
- this._state = new ArcGISContextState(this.stateOpts);
139
- }
140
- get stateOpts() {
141
- const stateOpts = {
142
- id: this.id,
143
- portalUrl: this._portalUrl,
144
- hubUrl: this._hubUrl,
145
- };
146
- if (this._authentication) {
147
- stateOpts.authentication = this._authentication;
115
+ else {
116
+ return this._portalUrl;
148
117
  }
149
- if (this._portalSelf) {
150
- stateOpts.portalSelf = this._portalSelf;
118
+ }
119
+ /**
120
+ * Returns the url to the sharing api
121
+ * i.e. https://myorg.maps.arcgis.com/sharing/rest
122
+ */
123
+ get sharingApiUrl() {
124
+ return `${this.portalUrl}/sharing/rest`;
125
+ }
126
+ get hubUrl() {
127
+ return this._hubUrl;
128
+ }
129
+ /**
130
+ * Returns boolean indicating if the backing system
131
+ * is ArcGIS Enterprise (formerly ArcGIS Portal) or not
132
+ */
133
+ get isPortal() {
134
+ return this._portalSelf
135
+ ? this._portalSelf.isPortal
136
+ : this._portalUrl.indexOf("arcgis.com") === -1;
137
+ }
138
+ // Hub APIs
139
+ // ----------
140
+ // Discussions
141
+ get discussionsServiceUrl() {
142
+ if (this._hubUrl) {
143
+ return `${this._hubUrl}${hubApiEndpoints.discussions}`;
151
144
  }
152
- if (this._currentUser) {
153
- stateOpts.currentUser = this._currentUser;
145
+ }
146
+ // Hub Search
147
+ get hubSearchServiceUrl() {
148
+ if (this._hubUrl) {
149
+ return `${this._hubUrl}${hubApiEndpoints.search}`;
154
150
  }
155
- return stateOpts;
156
151
  }
157
- }
158
- /**
159
- * Cross-walk from a portalUrl to the corresponding Hub.
160
- *
161
- * If the passed url is not recognized, then this will return `undefined`
162
- * @param portalUrl
163
- * @returns
164
- */
165
- function getHubApiFromPortalUrl(portalUrl) {
166
- let result;
167
- if (portalUrl.match(/(qaext|\.mapsqa)\.arcgis.com/)) {
168
- result = "https://hubqa.arcgis.com";
152
+ // Domain
153
+ get domainServiceUrl() {
154
+ if (this._hubUrl) {
155
+ return `${this._hubUrl}${hubApiEndpoints.domains}`;
156
+ }
169
157
  }
170
- else if (portalUrl.match(/(devext|\.mapsdevext)\.arcgis.com/)) {
171
- result = "https://hubdev.arcgis.com";
158
+ // Events
159
+ // returns `{serviceId: '3ef..', publicViewId: 'bc3...'}
160
+ get eventsConfig() {
161
+ if (this._portalSelf) {
162
+ return getProp(this._portalSelf, "portalProperties.hub.settings.events");
163
+ }
172
164
  }
173
- else if (portalUrl.match(/(www|\.maps)\.arcgis.com/)) {
174
- result = "https://hub.arcgis.com";
165
+ /**
166
+ * Returns boolean indicating if the current user
167
+ * belongs to an organization that has licensed
168
+ * ArcGIS Hub
169
+ */
170
+ get hubEnabled() {
171
+ return getWithDefault(this._portalSelf, "portalProperties.hub.enabled", false);
175
172
  }
176
- return result;
177
- }
178
- function getPortalBaseFromOrgUrl(orgUrl) {
179
- let result;
180
- if (orgUrl.match(/(qaext|\.mapsqa)\.arcgis.com/)) {
181
- result = "https://qaext.arcgis.com";
182
- }
183
- else if (orgUrl.match(/(devext|\.mapsdevext)\.arcgis.com/)) {
184
- result = "https://devext.arcgis.com";
185
- }
186
- else {
187
- /* istanbul ignore else */
188
- if (orgUrl.match(/(www|\.maps)\.arcgis.com/)) {
189
- result = "https://www.arcgis.com";
173
+ /**
174
+ * Return Hub Community Org Id, if defined
175
+ */
176
+ get communityOrgId() {
177
+ if (this._portalSelf) {
178
+ return getProp(this._portalSelf, "portalProperties.hub.settings.communityOrg.orgId");
179
+ }
180
+ }
181
+ get communityOrgHostname() {
182
+ if (this._portalSelf) {
183
+ return getProp(this._portalSelf, "portalProperties.hub.settings.communityOrg.portalHostname");
184
+ }
185
+ }
186
+ get communityOrgUrl() {
187
+ if (this.communityOrgHostname) {
188
+ return `https://${this.communityOrgHostname}`;
190
189
  }
191
190
  }
192
- return result;
191
+ // Platform API service urls are all in helperServices
192
+ // and not consistent to expose as urls
193
+ get helperServices() {
194
+ if (this._portalSelf) {
195
+ return this._portalSelf.helperServices;
196
+ }
197
+ }
198
+ get currentUser() {
199
+ return this._currentUser;
200
+ }
201
+ get portal() {
202
+ return this._portalSelf;
203
+ }
193
204
  }
194
205
  //# sourceMappingURL=ArcGISContext.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"ArcGISContext.js","sourceRoot":"","sources":["../../src/ArcGISContext.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ArcGISContext.js","sourceRoot":"","sources":["../../src/ArcGISContext.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,160 @@
1
+ import { getSelf, getUser } from "@esri/arcgis-rest-portal";
2
+ import { ArcGISContext, } from "./ArcGISContext";
3
+ import { cloneObject, Logger, Level } from ".";
4
+ import { getHubApiFromPortalUrl } from "./urls/getHubApiFromPortalUrl";
5
+ import { getPortalBaseFromOrgUrl } from "./urls/getPortalBaseFromOrgUrl";
6
+ /**
7
+ * ArcGIS Context Manager
8
+ *
9
+ * The manager exposes context (`IArcGISContext`), which combines a `UserSession` with
10
+ * the `portal/self` and `user/self` responses to provide a central lookup for platform
11
+ * information, api urls, and other useful properties for developers such as IRequestOptions
12
+ * IUserRequestOptions, IHubRequestOptions etc.
13
+ *
14
+ * The context is exposed on gthe `.context` property, and as the authentication changes
15
+ * the `.context` is re-created. This is done to allow web frameworks to watch for
16
+ * changes on that single property, instead of having to leverage observers or events
17
+ * for change detection.
18
+ *
19
+ * This is a work-in-progress, and will likely expand over time.
20
+ *
21
+ */
22
+ export class ArcGISContextManager {
23
+ /**
24
+ * Private constructor. Use `ArcGISContextManager.create(...)` to
25
+ * instantiate an instance
26
+ * @param opts
27
+ */
28
+ constructor(opts) {
29
+ this._portalUrl = "https://www.arcgis.com";
30
+ this._logLevel = Level.error;
31
+ // Having a unique id makes debugging easier
32
+ this.id = new Date().getTime();
33
+ if (opts.logLevel) {
34
+ this._logLevel = opts.logLevel;
35
+ }
36
+ Logger.setLogLevel(this._logLevel);
37
+ Logger.debug(`ArcGISContextManager:ctor: Creating ${this.id}`);
38
+ if (opts.authentication) {
39
+ this._authentication = opts.authentication;
40
+ this._portalUrl = this._authentication.portal.replace("/sharing/rest", "");
41
+ this._hubUrl = getHubApiFromPortalUrl(this._portalUrl);
42
+ }
43
+ else if (opts.portalUrl) {
44
+ this._portalUrl = opts.portalUrl;
45
+ this._hubUrl = getHubApiFromPortalUrl(this._portalUrl);
46
+ }
47
+ else {
48
+ this._hubUrl = getHubApiFromPortalUrl(this._portalUrl);
49
+ }
50
+ if (opts.portal) {
51
+ this._portalSelf = cloneObject(opts.portal);
52
+ }
53
+ if (opts.currentUser) {
54
+ this._currentUser = cloneObject(opts.currentUser);
55
+ }
56
+ }
57
+ /**
58
+ * Static async Factory
59
+ * @param opts
60
+ * @returns
61
+ */
62
+ static async create(opts = {}) {
63
+ const ctx = new ArcGISContextManager(opts);
64
+ await ctx.initialize();
65
+ return ctx;
66
+ }
67
+ /**
68
+ * Set the Authentication (UserSession) for the context.
69
+ * This should be called when a user signs into a running
70
+ * application.
71
+ * @param auth
72
+ */
73
+ async setAuthentication(auth) {
74
+ this._authentication = auth;
75
+ this._portalUrl = auth.portal.replace("/sharing/rest", "");
76
+ await this.initialize();
77
+ }
78
+ /**
79
+ * Clear the Authentication (UserSession). This should be
80
+ * called when a user signs out of an application, but
81
+ * the application continues running
82
+ */
83
+ clearAuthentication() {
84
+ // Reset the portalUrl from the org url to the base url
85
+ // for ArcGIS Enterprise, we just leave the _portalUrl as-is
86
+ if (!this._context.isPortal) {
87
+ this._portalUrl = getPortalBaseFromOrgUrl(this._portalUrl);
88
+ }
89
+ // Clear the auth, portalSelf and currentUser props
90
+ this._authentication = null;
91
+ this._portalSelf = null;
92
+ this._currentUser = null;
93
+ this._context = new ArcGISContext({
94
+ id: this.id,
95
+ portalUrl: this._portalUrl,
96
+ hubUrl: this._hubUrl,
97
+ });
98
+ }
99
+ /**
100
+ * Return a reference to the current state.
101
+ * When `.setAuthentication()` or `.clearAuthenentication()` are
102
+ * called, the state will be re-created. This is done so frameworks
103
+ * like React or Ember can detect changes.
104
+ */
105
+ get context() {
106
+ return this._context;
107
+ }
108
+ /**
109
+ * If we have a UserSession, fetch portal/self and
110
+ * store that along with current user
111
+ */
112
+ async initialize() {
113
+ // if we have auth, and don't have portalSelf or currentUser, fetch them
114
+ if (this._authentication && (!this._portalSelf || !this._currentUser)) {
115
+ Logger.debug(`ArcGISContextManager-${this.id}: Initializing`);
116
+ const username = this._authentication.username;
117
+ const requests = [
118
+ getSelf({ authentication: this._authentication }),
119
+ getUser({ username, authentication: this._authentication }),
120
+ ];
121
+ try {
122
+ const [portal, user] = await Promise.all(requests);
123
+ this._portalSelf = portal;
124
+ this._currentUser = user;
125
+ Logger.debug(`ArcGISContextManager-${this.id}: received portalSelf and currentUser`);
126
+ }
127
+ catch (ex) {
128
+ const msg = `ArcGISContextManager could not fetch portal & user for "${this._authentication.username}" using ${this._authentication.portal}.`;
129
+ Logger.error(msg);
130
+ // tslint:disable-next-line:no-console
131
+ console.error(msg);
132
+ throw ex;
133
+ }
134
+ }
135
+ Logger.debug(`ArcGISContextManager-${this.id}: updating context`);
136
+ // update the context
137
+ this._context = new ArcGISContext(this.contextOpts);
138
+ }
139
+ /**
140
+ * Getter to streamline the creation of updated Context instances
141
+ */
142
+ get contextOpts() {
143
+ const contextOpts = {
144
+ id: this.id,
145
+ portalUrl: this._portalUrl,
146
+ hubUrl: this._hubUrl,
147
+ };
148
+ if (this._authentication) {
149
+ contextOpts.authentication = this._authentication;
150
+ }
151
+ if (this._portalSelf) {
152
+ contextOpts.portalSelf = this._portalSelf;
153
+ }
154
+ if (this._currentUser) {
155
+ contextOpts.currentUser = this._currentUser;
156
+ }
157
+ return contextOpts;
158
+ }
159
+ }
160
+ //# sourceMappingURL=ArcGISContextManager.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"ArcGISContextManager.js","sourceRoot":"","sources":["../../src/ArcGISContextManager.ts"],"names":[],"mappings":"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"}
@@ -20,6 +20,7 @@ export * from "./utils";
20
20
  export * from "./i18n";
21
21
  export * from "./request";
22
22
  export * from "./surveys";
23
+ export * from "./ArcGISContextManager";
23
24
  export * from "./ArcGISContext";
24
25
  import OperationStack from "./OperationStack";
25
26
  import OperationError from "./OperationError";
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;gBACgB;AAEhB,cAAc,UAAU,CAAC;AACzB,cAAc,OAAO,CAAC;AACtB,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,iBAAiB,CAAC;AAEhC,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,aAAa;AACb,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;gBACgB;AAEhB,cAAc,UAAU,CAAC;AACzB,cAAc,OAAO,CAAC;AACtB,cAAc,QAAQ,CAAC;AACvB,cAAc,cAAc,CAAC;AAC7B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAEhC,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAC9C,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAE9C,aAAa;AACb,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC"}
@@ -1,7 +1,7 @@
1
1
  import { expandContentFilter, serializeContentFilterForPortal, convertPortalResponseToFacets, } from "./content-utils";
2
2
  import { searchItems } from "@esri/arcgis-rest-portal";
3
3
  import { expandApi, getNextFunction } from ".";
4
- import { cloneObject, itemToContent, setContentSiteUrls, } from "..";
4
+ import { cloneObject, getItemThumbnailUrl, itemToContent, setContentSiteUrls, } from "..";
5
5
  /**
6
6
  * Search for content via the Portal or Hub API
7
7
  * @param filter
@@ -14,13 +14,12 @@ export async function _searchContent(filter, options) {
14
14
  // API
15
15
  const api = expandApi(options.api || "arcgis");
16
16
  let searchPromise;
17
- // map over the apis, depending on the type we issue the queries
18
- // const searchPromises = apis.map((api) => {
19
17
  // Portal Search
20
18
  if (api.type === "arcgis") {
21
19
  // serialize for portal
22
20
  const so = serializeContentFilterForPortal(expanded);
23
- // pass auth forward
21
+ // if we have auth, pass it forward
22
+ // otherwise set the portal property
24
23
  if (options.authentication) {
25
24
  so.authentication = options.authentication;
26
25
  }
@@ -33,7 +32,6 @@ export async function _searchContent(filter, options) {
33
32
  so.countSize = 200;
34
33
  }
35
34
  // copy over various options
36
- // TODO: Dry this up - typscript makes this... inconvenient
37
35
  if (options.num) {
38
36
  so.num = options.num;
39
37
  }
@@ -61,8 +59,6 @@ export async function _searchContent(filter, options) {
61
59
  },
62
60
  });
63
61
  }
64
- // });
65
- // return for results
66
62
  return searchPromise;
67
63
  }
68
64
  /**
@@ -74,12 +70,27 @@ export async function _searchContent(filter, options) {
74
70
  * @returns
75
71
  */
76
72
  function searchPortal(searchOptions) {
73
+ var _a;
74
+ const portalUrl = ((_a = searchOptions.authentication) === null || _a === void 0 ? void 0 : _a.portal) || searchOptions.portal;
75
+ let token;
76
+ if (searchOptions.authentication) {
77
+ const us = searchOptions.authentication;
78
+ token = us.token;
79
+ }
80
+ const thumbnailify = (content) => {
81
+ content.thumbnailUrl = getItemThumbnailUrl(content, portalUrl, token);
82
+ return content;
83
+ };
77
84
  return searchItems(searchOptions).then((resp) => {
78
85
  const hasNext = resp.nextStart > -1;
86
+ // convert items to IHubContent's
79
87
  let content = resp.results.map(itemToContent);
88
+ // if we have a site, add those urls
80
89
  if (searchOptions.site) {
81
90
  content = content.map((entry) => setContentSiteUrls(entry, searchOptions.site));
82
91
  }
92
+ // add thumbnailUrl
93
+ content = content.map(thumbnailify);
83
94
  // convert aggregations into facets
84
95
  const facets = convertPortalResponseToFacets(resp);
85
96
  return {
@@ -1 +1 @@
1
- {"version":3,"file":"_searchContent.js","sourceRoot":"","sources":["../../../src/search/_searchContent.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"_searchContent.js","sourceRoot":"","sources":["../../../src/search/_searchContent.ts"],"names":[],"mappings":"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"}