@esri/hub-common 13.38.1 → 13.39.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.
- package/dist/esm/search/_internal/hubSearchChannels.js +16 -12
- package/dist/esm/search/_internal/hubSearchChannels.js.map +1 -1
- package/dist/esm/search/utils.js +10 -0
- package/dist/esm/search/utils.js.map +1 -1
- package/dist/node/search/_internal/hubSearchChannels.js +16 -12
- package/dist/node/search/_internal/hubSearchChannels.js.map +1 -1
- package/dist/node/search/utils.js +10 -0
- package/dist/node/search/utils.js.map +1 -1
- package/package.json +1 -1
|
@@ -22,11 +22,9 @@ export const processSearchParams = (options, query) => {
|
|
|
22
22
|
"sortOrder",
|
|
23
23
|
];
|
|
24
24
|
// Map ISearchOptions key to ISearchChannels key
|
|
25
|
-
const
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
}
|
|
29
|
-
return key;
|
|
25
|
+
const keyMappings = {
|
|
26
|
+
sortField: "sortBy",
|
|
27
|
+
term: "name",
|
|
30
28
|
};
|
|
31
29
|
// Map any values that originated from ISearchOptions
|
|
32
30
|
// into a correct ISearchChannels value
|
|
@@ -46,22 +44,28 @@ export const processSearchParams = (options, query) => {
|
|
|
46
44
|
};
|
|
47
45
|
allowedPaginationProps.forEach((prop) => {
|
|
48
46
|
if (options.hasOwnProperty(prop)) {
|
|
49
|
-
const key =
|
|
50
|
-
const
|
|
47
|
+
const { [prop]: key = prop } = keyMappings;
|
|
48
|
+
const _key = key;
|
|
49
|
+
const value = mapValue(_key, options[prop]);
|
|
51
50
|
if (key && value) {
|
|
52
|
-
paginationProps[
|
|
51
|
+
paginationProps[_key] = value;
|
|
53
52
|
}
|
|
54
53
|
}
|
|
55
54
|
});
|
|
56
55
|
// Acceptable fields to use as filters
|
|
57
56
|
const filterProps = {};
|
|
58
|
-
const allowedFilterProps = [
|
|
57
|
+
const allowedFilterProps = [
|
|
58
|
+
"access",
|
|
59
|
+
"groups",
|
|
60
|
+
"name",
|
|
61
|
+
];
|
|
59
62
|
// Find predicates that match acceptable filter fields
|
|
60
63
|
query.filters.forEach((filter) => {
|
|
61
64
|
filter.predicates.forEach((predicate) => {
|
|
62
65
|
Object.keys(predicate).forEach((key) => {
|
|
63
|
-
|
|
64
|
-
|
|
66
|
+
const { [key]: _key = key } = keyMappings;
|
|
67
|
+
if (allowedFilterProps.includes(_key)) {
|
|
68
|
+
filterProps[_key] = [...(filterProps[_key] || []), predicate[key]];
|
|
65
69
|
}
|
|
66
70
|
});
|
|
67
71
|
});
|
|
@@ -110,7 +114,7 @@ export const hubSearchChannels = async (query, options) => {
|
|
|
110
114
|
const searchOptions = processSearchParams(options, query);
|
|
111
115
|
// Call to searchChannels
|
|
112
116
|
const channelsResponse = await searchChannels(searchOptions);
|
|
113
|
-
// Parse into <IHubSearchResponse<
|
|
117
|
+
// Parse into <IHubSearchResponse<IHubSearchResult>>
|
|
114
118
|
return toHubSearchResult(channelsResponse, query, options);
|
|
115
119
|
};
|
|
116
120
|
//# sourceMappingURL=hubSearchChannels.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hubSearchChannels.js","sourceRoot":"","sources":["../../../../src/search/_internal/hubSearchChannels.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"hubSearchChannels.js","sourceRoot":"","sources":["../../../../src/search/_internal/hubSearchChannels.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/search/utils.js
CHANGED
|
@@ -148,12 +148,22 @@ export function getNextFunction(request, nextStart, total, fn) {
|
|
|
148
148
|
// clone will not handle authentication so we do it manually
|
|
149
149
|
if (request.authentication) {
|
|
150
150
|
clonedRequest.authentication = UserSession.deserialize(request.authentication.serialize());
|
|
151
|
+
// ensure that if we have requestOptions, we have also update the authentication on it
|
|
152
|
+
if (request.requestOptions) {
|
|
153
|
+
clonedRequest.requestOptions.authentication =
|
|
154
|
+
clonedRequest.authentication;
|
|
155
|
+
}
|
|
151
156
|
}
|
|
152
157
|
// figure out the start
|
|
153
158
|
clonedRequest.start = nextStart > -1 ? nextStart : total + 1;
|
|
154
159
|
return (authentication) => {
|
|
155
160
|
if (authentication) {
|
|
156
161
|
clonedRequest.authentication = authentication;
|
|
162
|
+
// ensure that if we have requestOptions, we have also update the authentication on it
|
|
163
|
+
if (clonedRequest.requestOptions) {
|
|
164
|
+
clonedRequest.requestOptions.authentication =
|
|
165
|
+
clonedRequest.authentication;
|
|
166
|
+
}
|
|
157
167
|
}
|
|
158
168
|
return fn(clonedRequest);
|
|
159
169
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/search/utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/search/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,11 +25,9 @@ exports.processSearchParams = (options, query) => {
|
|
|
25
25
|
"sortOrder",
|
|
26
26
|
];
|
|
27
27
|
// Map ISearchOptions key to ISearchChannels key
|
|
28
|
-
const
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
}
|
|
32
|
-
return key;
|
|
28
|
+
const keyMappings = {
|
|
29
|
+
sortField: "sortBy",
|
|
30
|
+
term: "name",
|
|
33
31
|
};
|
|
34
32
|
// Map any values that originated from ISearchOptions
|
|
35
33
|
// into a correct ISearchChannels value
|
|
@@ -49,22 +47,28 @@ exports.processSearchParams = (options, query) => {
|
|
|
49
47
|
};
|
|
50
48
|
allowedPaginationProps.forEach((prop) => {
|
|
51
49
|
if (options.hasOwnProperty(prop)) {
|
|
52
|
-
const key =
|
|
53
|
-
const
|
|
50
|
+
const { [prop]: key = prop } = keyMappings;
|
|
51
|
+
const _key = key;
|
|
52
|
+
const value = mapValue(_key, options[prop]);
|
|
54
53
|
if (key && value) {
|
|
55
|
-
paginationProps[
|
|
54
|
+
paginationProps[_key] = value;
|
|
56
55
|
}
|
|
57
56
|
}
|
|
58
57
|
});
|
|
59
58
|
// Acceptable fields to use as filters
|
|
60
59
|
const filterProps = {};
|
|
61
|
-
const allowedFilterProps = [
|
|
60
|
+
const allowedFilterProps = [
|
|
61
|
+
"access",
|
|
62
|
+
"groups",
|
|
63
|
+
"name",
|
|
64
|
+
];
|
|
62
65
|
// Find predicates that match acceptable filter fields
|
|
63
66
|
query.filters.forEach((filter) => {
|
|
64
67
|
filter.predicates.forEach((predicate) => {
|
|
65
68
|
Object.keys(predicate).forEach((key) => {
|
|
66
|
-
|
|
67
|
-
|
|
69
|
+
const { [key]: _key = key } = keyMappings;
|
|
70
|
+
if (allowedFilterProps.includes(_key)) {
|
|
71
|
+
filterProps[_key] = [...(filterProps[_key] || []), predicate[key]];
|
|
68
72
|
}
|
|
69
73
|
});
|
|
70
74
|
});
|
|
@@ -113,7 +117,7 @@ exports.hubSearchChannels = async (query, options) => {
|
|
|
113
117
|
const searchOptions = exports.processSearchParams(options, query);
|
|
114
118
|
// Call to searchChannels
|
|
115
119
|
const channelsResponse = await channels_1.searchChannels(searchOptions);
|
|
116
|
-
// Parse into <IHubSearchResponse<
|
|
120
|
+
// Parse into <IHubSearchResponse<IHubSearchResult>>
|
|
117
121
|
return exports.toHubSearchResult(channelsResponse, query, options);
|
|
118
122
|
};
|
|
119
123
|
//# sourceMappingURL=hubSearchChannels.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hubSearchChannels.js","sourceRoot":"","sources":["../../../../src/search/_internal/hubSearchChannels.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"hubSearchChannels.js","sourceRoot":"","sources":["../../../../src/search/_internal/hubSearchChannels.ts"],"names":[],"mappings":";;;AAOA,6CAAsC;AACtC,6DAAgE;AAQhE;;;;;;;;GAQG;AACU,QAAA,mBAAmB,GAAG,CACjC,OAA0B,EAC1B,KAAa,EACU,EAAE;IACzB,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC3B,MAAM,IAAI,kBAAQ,CAChB,mBAAmB,EACnB,oCAAoC,CACrC,CAAC;KACH;IACD,oFAAoF;IACpF,MAAM,eAAe,GAAgD,EAAE,CAAC;IACxE,MAAM,sBAAsB,GAAmC;QAC7D,KAAK;QACL,OAAO;QACP,WAAW;QACX,WAAW;KACZ,CAAC;IACF,gDAAgD;IAChD,MAAM,WAAW,GAGb;QACF,SAAS,EAAE,QAAQ;QACnB,IAAI,EAAE,MAAM;KACb,CAAC;IACF,qDAAqD;IACrD,uCAAuC;IACvC,MAAM,QAAQ,GAAG,CAAC,GAA0B,EAAE,KAAU,EAAU,EAAE;QAClE,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,GAAG,KAAK,WAAW,EAAE;YACvB,MAAM,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,EAAE,CAAC;SAC/B;aAAM,IAAI,GAAG,KAAK,QAAQ,EAAE;YAC3B,MAAM,GAAG;gBACP,OAAO,EAAE,WAAW;gBACpB,QAAQ,EAAE,WAAW;gBACrB,KAAK,EAAE,IAAI;aACZ,CAAC,KAAyC,CAAC,CAAC;SAC9C;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IACF,sBAAsB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACtC,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;YAChC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE,GAAG,GAAG,IAAW,EAAE,GAAG,WAAW,CAAC;YAClD,MAAM,IAAI,GAAG,GAA4B,CAAC;YAC1C,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YAC5C,IAAI,GAAG,IAAI,KAAK,EAAE;gBAChB,eAAe,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;aAC/B;SACF;IACH,CAAC,CAAC,CAAC;IACH,sCAAsC;IACtC,MAAM,WAAW,GAA6B,EAAE,CAAC;IACjD,MAAM,kBAAkB,GAAiC;QACvD,QAAQ;QACR,QAAQ;QACR,MAAM;KACP,CAAC;IACF,sDAAsD;IACtD,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAC/B,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YACtC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,GAAQ,EAAE,EAAE;gBAC1C,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,IAAI,GAAG,GAAG,EAAE,GAAG,WAAW,CAAC;gBAC1C,IAAI,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;oBACrC,WAAW,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;iBACpE;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IACH,kCAAkC;IAClC,uCACK,OAAO,CAAC,cAAc,KACzB,IAAI,kCACC,eAAe,GACf,WAAW,KAEhB;AACJ,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACU,QAAA,iBAAiB,GAAG,CAC/B,gBAA0C,EAC1C,KAAa,EACb,OAA0B,EACY,EAAE;IACxC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,gBAAgB,CAAC;IACrD,uCAAuC;IACvC,MAAM,qBAAqB,GAAG,CAAC,OAAiB,EAAoB,EAAE;QACpE,uCACK,OAAO,KACV,EAAE,EAAE,OAAO,CAAC,EAAE,EACd,IAAI,EAAE,OAAO,CAAC,IAAI,EAClB,WAAW,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EACxC,iBAAiB,EAAE,SAAS,EAC5B,WAAW,EAAE,IAAI,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EACxC,iBAAiB,EAAE,SAAS,EAC5B,IAAI,EAAE,SAAS,EACf,MAAM,EAAE,OAAO,CAAC,MAAM,EACtB,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,OAAO,CAAC,OAAO,EACtB,KAAK,EAAE;gBACL,mBAAmB;gBACnB,SAAS,EAAE,IAAI;gBACf,IAAI,EAAE,IAAI;gBACV,YAAY,EAAE,IAAI;aACnB,IACD;IACJ,CAAC,CAAC;IACF,OAAO;QACL,KAAK;QACL,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,qBAAqB,CAAC;QACzC,OAAO,EAAE,SAAS,GAAG,CAAC,CAAC;QACvB,IAAI,EAAE,GAAG,EAAE;YACT,OAAO,yBAAiB,CAAC,KAAK,kCACzB,OAAO,KACV,KAAK,EAAE,SAAS,IAChB,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF;;;;;;GAMG;AACU,QAAA,iBAAiB,GAAG,KAAK,EACpC,KAAa,EACb,OAA0B,EACqB,EAAE;IACjD,gCAAgC;IAChC,MAAM,aAAa,GAAG,2BAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC1D,yBAAyB;IACzB,MAAM,gBAAgB,GAAG,MAAM,yBAAc,CAAC,aAAa,CAAC,CAAC;IAC7D,oDAAoD;IACpD,OAAO,yBAAiB,CAAC,gBAAgB,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AAC7D,CAAC,CAAC"}
|
|
@@ -155,12 +155,22 @@ function getNextFunction(request, nextStart, total, fn) {
|
|
|
155
155
|
// clone will not handle authentication so we do it manually
|
|
156
156
|
if (request.authentication) {
|
|
157
157
|
clonedRequest.authentication = arcgis_rest_auth_1.UserSession.deserialize(request.authentication.serialize());
|
|
158
|
+
// ensure that if we have requestOptions, we have also update the authentication on it
|
|
159
|
+
if (request.requestOptions) {
|
|
160
|
+
clonedRequest.requestOptions.authentication =
|
|
161
|
+
clonedRequest.authentication;
|
|
162
|
+
}
|
|
158
163
|
}
|
|
159
164
|
// figure out the start
|
|
160
165
|
clonedRequest.start = nextStart > -1 ? nextStart : total + 1;
|
|
161
166
|
return (authentication) => {
|
|
162
167
|
if (authentication) {
|
|
163
168
|
clonedRequest.authentication = authentication;
|
|
169
|
+
// ensure that if we have requestOptions, we have also update the authentication on it
|
|
170
|
+
if (clonedRequest.requestOptions) {
|
|
171
|
+
clonedRequest.requestOptions.authentication =
|
|
172
|
+
clonedRequest.authentication;
|
|
173
|
+
}
|
|
164
174
|
}
|
|
165
175
|
return fn(clonedRequest);
|
|
166
176
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/search/utils.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/search/utils.ts"],"names":[],"mappings":"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"}
|