@esri/hub-common 9.37.0 → 9.40.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/es2017/content/HubContent.js +68 -0
- package/dist/es2017/content/HubContent.js.map +1 -0
- package/dist/es2017/content/_internal.js +83 -0
- package/dist/es2017/content/_internal.js.map +1 -1
- package/dist/es2017/content/compose.js +7 -11
- package/dist/es2017/content/compose.js.map +1 -1
- package/dist/es2017/content/index.js +1 -0
- package/dist/es2017/content/index.js.map +1 -1
- package/dist/es2017/core/types/IHubContent.js +7 -0
- package/dist/es2017/core/types/IHubContent.js.map +1 -1
- package/dist/es2017/groups/HubGroups.js +63 -0
- package/dist/es2017/groups/HubGroups.js.map +1 -0
- package/dist/es2017/groups/_internal/enrichments.js +99 -0
- package/dist/es2017/groups/_internal/enrichments.js.map +1 -0
- package/dist/es2017/groups/index.js +2 -0
- package/dist/es2017/groups/index.js.map +1 -1
- package/dist/es2017/groups/types/IGroupMembershipSummary.js +1 -0
- package/dist/es2017/groups/types/IGroupMembershipSummary.js.map +1 -0
- package/dist/es2017/groups/types/index.js +2 -0
- package/dist/es2017/groups/types/index.js.map +1 -0
- package/dist/es2017/index.js +2 -0
- package/dist/es2017/index.js.map +1 -1
- package/dist/es2017/items/_enrichments.js +30 -1
- package/dist/es2017/items/_enrichments.js.map +1 -1
- package/dist/es2017/org/fetch-org.js +21 -0
- package/dist/es2017/org/fetch-org.js.map +1 -0
- package/dist/es2017/org/index.js +2 -0
- package/dist/es2017/org/index.js.map +1 -0
- package/dist/es2017/pages/HubPages.js +61 -0
- package/dist/es2017/pages/HubPages.js.map +1 -0
- package/dist/es2017/pages/index.js +2 -0
- package/dist/es2017/pages/index.js.map +1 -0
- package/dist/es2017/projects/HubProjects.js +56 -1
- package/dist/es2017/projects/HubProjects.js.map +1 -1
- package/dist/es2017/search/_internal/hubSearchItems.js +191 -0
- package/dist/es2017/search/_internal/hubSearchItems.js.map +1 -0
- package/dist/es2017/search/_internal/index.js +3 -0
- package/dist/es2017/search/_internal/index.js.map +1 -1
- package/dist/es2017/search/_internal/parseInclude.js +27 -0
- package/dist/es2017/search/_internal/parseInclude.js.map +1 -0
- package/dist/es2017/search/_internal/portalSearchGroups.js +100 -0
- package/dist/es2017/search/_internal/portalSearchGroups.js.map +1 -0
- package/dist/es2017/search/_internal/portalSearchItems.js +109 -0
- package/dist/es2017/search/_internal/portalSearchItems.js.map +1 -0
- package/dist/es2017/search/_searchContent.js +3 -0
- package/dist/es2017/search/_searchContent.js.map +1 -1
- package/dist/es2017/search/_searchGroups.js +3 -1
- package/dist/es2017/search/_searchGroups.js.map +1 -1
- package/dist/es2017/search/_searchUsers.js +3 -1
- package/dist/es2017/search/_searchUsers.js.map +1 -1
- package/dist/es2017/search/collectionState.js +1 -1
- package/dist/es2017/search/collectionState.js.map +1 -1
- package/dist/es2017/search/content-utils.js +36 -4
- package/dist/es2017/search/content-utils.js.map +1 -1
- package/dist/es2017/search/convertCatalog.js +14 -5
- package/dist/es2017/search/convertCatalog.js.map +1 -1
- package/dist/es2017/search/filter-utils.js +18 -3
- package/dist/es2017/search/filter-utils.js.map +1 -1
- package/dist/es2017/search/group-utils.js +8 -1
- package/dist/es2017/search/group-utils.js.map +1 -1
- package/dist/es2017/search/hubSearch.js +48 -0
- package/dist/es2017/search/hubSearch.js.map +1 -0
- package/dist/es2017/search/index.js +1 -0
- package/dist/es2017/search/index.js.map +1 -1
- package/dist/es2017/search/user-utils.js +8 -1
- package/dist/es2017/search/user-utils.js.map +1 -1
- package/dist/es2017/search/utils.js +5 -0
- package/dist/es2017/search/utils.js.map +1 -1
- package/dist/es2017/sites/HubSites.js +55 -1
- package/dist/es2017/sites/HubSites.js.map +1 -1
- package/dist/es2017/urls/getGroupHomeUrl.js +12 -0
- package/dist/es2017/urls/getGroupHomeUrl.js.map +1 -0
- package/dist/es2017/urls/index.js +1 -0
- package/dist/es2017/urls/index.js.map +1 -1
- package/dist/esm/content/HubContent.js +75 -0
- package/dist/esm/content/HubContent.js.map +1 -0
- package/dist/esm/content/_internal.js +85 -0
- package/dist/esm/content/_internal.js.map +1 -1
- package/dist/esm/content/compose.js +5 -11
- package/dist/esm/content/compose.js.map +1 -1
- package/dist/esm/content/index.js +1 -0
- package/dist/esm/content/index.js.map +1 -1
- package/dist/esm/core/types/IHubContent.js +7 -0
- package/dist/esm/core/types/IHubContent.js.map +1 -1
- package/dist/esm/groups/HubGroups.js +70 -0
- package/dist/esm/groups/HubGroups.js.map +1 -0
- package/dist/esm/groups/_internal/enrichments.js +100 -0
- package/dist/esm/groups/_internal/enrichments.js.map +1 -0
- package/dist/esm/groups/index.js +2 -0
- package/dist/esm/groups/index.js.map +1 -1
- package/dist/esm/groups/types/IGroupMembershipSummary.js +1 -0
- package/dist/esm/groups/types/IGroupMembershipSummary.js.map +1 -0
- package/dist/esm/groups/types/index.js +2 -0
- package/dist/esm/groups/types/index.js.map +1 -0
- package/dist/esm/index.js +2 -0
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/items/_enrichments.js +30 -1
- package/dist/esm/items/_enrichments.js.map +1 -1
- package/dist/esm/org/fetch-org.js +22 -0
- package/dist/esm/org/fetch-org.js.map +1 -0
- package/dist/esm/org/index.js +2 -0
- package/dist/esm/org/index.js.map +1 -0
- package/dist/esm/pages/HubPages.js +68 -0
- package/dist/esm/pages/HubPages.js.map +1 -0
- package/dist/esm/pages/index.js +2 -0
- package/dist/esm/pages/index.js.map +1 -0
- package/dist/esm/projects/HubProjects.js +63 -2
- package/dist/esm/projects/HubProjects.js.map +1 -1
- package/dist/esm/search/_internal/hubSearchItems.js +204 -0
- package/dist/esm/search/_internal/hubSearchItems.js.map +1 -0
- package/dist/esm/search/_internal/index.js +3 -0
- package/dist/esm/search/_internal/index.js.map +1 -1
- package/dist/esm/search/_internal/parseInclude.js +27 -0
- package/dist/esm/search/_internal/parseInclude.js.map +1 -0
- package/dist/esm/search/_internal/portalSearchGroups.js +114 -0
- package/dist/esm/search/_internal/portalSearchGroups.js.map +1 -0
- package/dist/esm/search/_internal/portalSearchItems.js +123 -0
- package/dist/esm/search/_internal/portalSearchItems.js.map +1 -0
- package/dist/esm/search/_searchContent.js +3 -0
- package/dist/esm/search/_searchContent.js.map +1 -1
- package/dist/esm/search/_searchGroups.js +3 -1
- package/dist/esm/search/_searchGroups.js.map +1 -1
- package/dist/esm/search/_searchUsers.js +3 -1
- package/dist/esm/search/_searchUsers.js.map +1 -1
- package/dist/esm/search/collectionState.js +1 -1
- package/dist/esm/search/collectionState.js.map +1 -1
- package/dist/esm/search/content-utils.js +38 -4
- package/dist/esm/search/content-utils.js.map +1 -1
- package/dist/esm/search/convertCatalog.js +14 -5
- package/dist/esm/search/convertCatalog.js.map +1 -1
- package/dist/esm/search/filter-utils.js +16 -3
- package/dist/esm/search/filter-utils.js.map +1 -1
- package/dist/esm/search/group-utils.js +8 -1
- package/dist/esm/search/group-utils.js.map +1 -1
- package/dist/esm/search/hubSearch.js +52 -0
- package/dist/esm/search/hubSearch.js.map +1 -0
- package/dist/esm/search/index.js +1 -0
- package/dist/esm/search/index.js.map +1 -1
- package/dist/esm/search/user-utils.js +8 -1
- package/dist/esm/search/user-utils.js.map +1 -1
- package/dist/esm/search/utils.js +5 -0
- package/dist/esm/search/utils.js.map +1 -1
- package/dist/esm/sites/HubSites.js +62 -2
- package/dist/esm/sites/HubSites.js.map +1 -1
- package/dist/esm/urls/getGroupHomeUrl.js +12 -0
- package/dist/esm/urls/getGroupHomeUrl.js.map +1 -0
- package/dist/esm/urls/index.js +1 -0
- package/dist/esm/urls/index.js.map +1 -1
- package/dist/node/content/HubContent.js +72 -0
- package/dist/node/content/HubContent.js.map +1 -0
- package/dist/node/content/_internal.js +84 -1
- package/dist/node/content/_internal.js.map +1 -1
- package/dist/node/content/compose.js +6 -10
- package/dist/node/content/compose.js.map +1 -1
- package/dist/node/content/index.js +1 -0
- package/dist/node/content/index.js.map +1 -1
- package/dist/node/core/types/IHubContent.js +8 -0
- package/dist/node/core/types/IHubContent.js.map +1 -1
- package/dist/node/groups/HubGroups.js +67 -0
- package/dist/node/groups/HubGroups.js.map +1 -0
- package/dist/node/groups/_internal/enrichments.js +103 -0
- package/dist/node/groups/_internal/enrichments.js.map +1 -0
- package/dist/node/groups/index.js +2 -0
- package/dist/node/groups/index.js.map +1 -1
- package/dist/node/groups/types/IGroupMembershipSummary.js +3 -0
- package/dist/node/groups/types/IGroupMembershipSummary.js.map +1 -0
- package/dist/node/groups/types/index.js +5 -0
- package/dist/node/groups/types/index.js.map +1 -0
- package/dist/node/index.js +2 -0
- package/dist/node/index.js.map +1 -1
- package/dist/node/items/_enrichments.js +30 -1
- package/dist/node/items/_enrichments.js.map +1 -1
- package/dist/node/org/fetch-org.js +24 -0
- package/dist/node/org/fetch-org.js.map +1 -0
- package/dist/node/org/index.js +5 -0
- package/dist/node/org/index.js.map +1 -0
- package/dist/node/pages/HubPages.js +65 -0
- package/dist/node/pages/HubPages.js.map +1 -0
- package/dist/node/pages/index.js +5 -0
- package/dist/node/pages/index.js.map +1 -0
- package/dist/node/projects/HubProjects.js +57 -1
- package/dist/node/projects/HubProjects.js.map +1 -1
- package/dist/node/search/_internal/hubSearchItems.js +198 -0
- package/dist/node/search/_internal/hubSearchItems.js.map +1 -0
- package/dist/node/search/_internal/index.js +3 -0
- package/dist/node/search/_internal/index.js.map +1 -1
- package/dist/node/search/_internal/parseInclude.js +31 -0
- package/dist/node/search/_internal/parseInclude.js.map +1 -0
- package/dist/node/search/_internal/portalSearchGroups.js +104 -0
- package/dist/node/search/_internal/portalSearchGroups.js.map +1 -0
- package/dist/node/search/_internal/portalSearchItems.js +113 -0
- package/dist/node/search/_internal/portalSearchItems.js.map +1 -0
- package/dist/node/search/_searchContent.js +3 -0
- package/dist/node/search/_searchContent.js.map +1 -1
- package/dist/node/search/_searchGroups.js +2 -0
- package/dist/node/search/_searchGroups.js.map +1 -1
- package/dist/node/search/_searchUsers.js +2 -0
- package/dist/node/search/_searchUsers.js.map +1 -1
- package/dist/node/search/collectionState.js +1 -1
- package/dist/node/search/collectionState.js.map +1 -1
- package/dist/node/search/content-utils.js +38 -5
- package/dist/node/search/content-utils.js.map +1 -1
- package/dist/node/search/convertCatalog.js +14 -5
- package/dist/node/search/convertCatalog.js.map +1 -1
- package/dist/node/search/filter-utils.js +18 -3
- package/dist/node/search/filter-utils.js.map +1 -1
- package/dist/node/search/group-utils.js +7 -0
- package/dist/node/search/group-utils.js.map +1 -1
- package/dist/node/search/hubSearch.js +52 -0
- package/dist/node/search/hubSearch.js.map +1 -0
- package/dist/node/search/index.js +1 -0
- package/dist/node/search/index.js.map +1 -1
- package/dist/node/search/user-utils.js +7 -0
- package/dist/node/search/user-utils.js.map +1 -1
- package/dist/node/search/utils.js +5 -0
- package/dist/node/search/utils.js.map +1 -1
- package/dist/node/sites/HubSites.js +56 -1
- package/dist/node/sites/HubSites.js.map +1 -1
- package/dist/node/urls/getGroupHomeUrl.js +16 -0
- package/dist/node/urls/getGroupHomeUrl.js.map +1 -0
- package/dist/node/urls/index.js +1 -0
- package/dist/node/urls/index.js.map +1 -1
- package/dist/types/content/HubContent.d.ts +11 -0
- package/dist/types/content/_internal.d.ts +54 -5
- package/dist/types/content/index.d.ts +1 -0
- package/dist/types/core/types/IHubContent.d.ts +21 -0
- package/dist/types/groups/HubGroups.d.ts +11 -0
- package/dist/types/groups/_internal/enrichments.d.ts +30 -0
- package/dist/types/groups/index.d.ts +2 -0
- package/dist/types/groups/types/IGroupMembershipSummary.d.ts +15 -0
- package/dist/types/groups/types/index.d.ts +1 -0
- package/dist/types/index.d.ts +2 -0
- package/dist/types/org/fetch-org.d.ts +9 -0
- package/dist/types/org/index.d.ts +1 -0
- package/dist/types/pages/HubPages.d.ts +11 -0
- package/dist/types/pages/index.d.ts +1 -0
- package/dist/types/projects/HubProjects.d.ts +10 -1
- package/dist/types/search/_internal/hubSearchItems.d.ts +18 -0
- package/dist/types/search/_internal/index.d.ts +3 -0
- package/dist/types/search/_internal/parseInclude.d.ts +32 -0
- package/dist/types/search/_internal/portalSearchGroups.d.ts +9 -0
- package/dist/types/search/_internal/portalSearchItems.d.ts +9 -0
- package/dist/types/search/content-utils.d.ts +9 -1
- package/dist/types/search/hubSearch.d.ts +11 -0
- package/dist/types/search/index.d.ts +1 -0
- package/dist/types/search/types/ICatalog.d.ts +14 -3
- package/dist/types/search/types/ICollection.d.ts +17 -3
- package/dist/types/search/types/IHubSearchOptions.d.ts +46 -5
- package/dist/types/search/types/IHubSearchResult.d.ts +46 -2
- package/dist/types/search/types/types.d.ts +13 -15
- package/dist/types/sites/HubSites.d.ts +9 -1
- package/dist/types/urls/getGroupHomeUrl.d.ts +10 -0
- package/dist/types/urls/index.d.ts +1 -0
- package/dist/umd/common.umd.js +8136 -6977
- package/dist/umd/common.umd.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.convertContentFilterToSearchOptions = exports.serializeContentFilterForPortal = exports.convertContentDefinitionToFilter = exports.expandTypeField = exports.expandContentFilter = exports.mergeContentFilter = exports.convertPortalResponseToFacets = void 0;
|
|
3
|
+
exports.convertContentFilterToSearchOptions = exports.serializeContentFilterForPortal = exports.convertContentDefinitionToFilter = exports.expandTypeField = exports.expandContentFilter = exports.mergeContentFilter = exports.convertPortalItemResponseToFacets = exports.convertPortalResponseToFacets = void 0;
|
|
4
4
|
const __1 = require("..");
|
|
5
5
|
const utils_1 = require("./utils");
|
|
6
|
+
// TODO: Remove with _searchContent
|
|
6
7
|
// TODO: Implement $dataset
|
|
7
8
|
const ContentFilterExpansions = {
|
|
8
9
|
$apps: [
|
|
@@ -134,12 +135,27 @@ const ContentFilterExpansions = {
|
|
|
134
135
|
/**
|
|
135
136
|
* @private
|
|
136
137
|
* Convert portal search response to facets
|
|
137
|
-
* Note: Only applicable to
|
|
138
|
+
* Note: Only applicable to an item search
|
|
138
139
|
* @param response
|
|
139
140
|
* @returns
|
|
140
141
|
*/
|
|
142
|
+
// TODO: Remove with _searchContent
|
|
141
143
|
function convertPortalResponseToFacets(response, operation = "OR") {
|
|
144
|
+
// delegate to a more future-friendly version
|
|
145
|
+
return convertPortalItemResponseToFacets(response, operation, "filter");
|
|
146
|
+
}
|
|
147
|
+
exports.convertPortalResponseToFacets = convertPortalResponseToFacets;
|
|
148
|
+
/**
|
|
149
|
+
* @private
|
|
150
|
+
* Convert portal search response to facets
|
|
151
|
+
* Note: Only applicable to an item search
|
|
152
|
+
* @param response
|
|
153
|
+
* @returns
|
|
154
|
+
*/
|
|
155
|
+
function convertPortalItemResponseToFacets(response, operation = "OR", optionProp = "filters" // TODO: Remove with _searchContent and use `filters`
|
|
156
|
+
) {
|
|
142
157
|
var _a;
|
|
158
|
+
// TODO: move into portalSearchItems
|
|
143
159
|
const result = [];
|
|
144
160
|
if ((_a = response.aggregations) === null || _a === void 0 ? void 0 : _a.counts) {
|
|
145
161
|
response.aggregations.counts.forEach((entry) => {
|
|
@@ -152,7 +168,7 @@ function convertPortalResponseToFacets(response, operation = "OR") {
|
|
|
152
168
|
const options = [];
|
|
153
169
|
entry.fieldValues.forEach((fv) => {
|
|
154
170
|
const filter = {
|
|
155
|
-
filterType: "
|
|
171
|
+
filterType: "item",
|
|
156
172
|
};
|
|
157
173
|
// construct the filter based on the operation
|
|
158
174
|
const matchKey = operation === "OR" ? "any" : "all";
|
|
@@ -165,8 +181,17 @@ function convertPortalResponseToFacets(response, operation = "OR") {
|
|
|
165
181
|
key: fv.value,
|
|
166
182
|
count: fv.count,
|
|
167
183
|
selected: false,
|
|
168
|
-
filter,
|
|
169
184
|
};
|
|
185
|
+
// Temporary to ensure the old fn can delegate to this
|
|
186
|
+
// but we can still return the correct structure
|
|
187
|
+
// TODO: Remove with _searchContent
|
|
188
|
+
/* istanbul ignore next */
|
|
189
|
+
if (optionProp === "filter") {
|
|
190
|
+
fo.filter = filter;
|
|
191
|
+
}
|
|
192
|
+
else {
|
|
193
|
+
fo.filters = [filter];
|
|
194
|
+
}
|
|
170
195
|
options.push(fo);
|
|
171
196
|
});
|
|
172
197
|
facet.options = options;
|
|
@@ -175,7 +200,7 @@ function convertPortalResponseToFacets(response, operation = "OR") {
|
|
|
175
200
|
}
|
|
176
201
|
return result;
|
|
177
202
|
}
|
|
178
|
-
exports.
|
|
203
|
+
exports.convertPortalItemResponseToFacets = convertPortalItemResponseToFacets;
|
|
179
204
|
/**
|
|
180
205
|
* Merge `Filter<"content">` objects
|
|
181
206
|
*
|
|
@@ -186,6 +211,7 @@ exports.convertPortalResponseToFacets = convertPortalResponseToFacets;
|
|
|
186
211
|
* @returns
|
|
187
212
|
*/
|
|
188
213
|
function mergeContentFilter(filters) {
|
|
214
|
+
__1.Logger.warn(`DEPRECATION: mergeContentFilter will be removed and filters should not longer be merged. Work with IFilterGroups instead`);
|
|
189
215
|
// expand all the filters so all prop types are consistent
|
|
190
216
|
const expanded = filters.map(expandContentFilter);
|
|
191
217
|
// now we can merge based on fields
|
|
@@ -241,6 +267,7 @@ function mergeSubFilters(sf1, sf2) {
|
|
|
241
267
|
* @returns
|
|
242
268
|
*/
|
|
243
269
|
function expandContentFilter(filter) {
|
|
270
|
+
__1.Logger.warn(`DEPRECATION: expandContentFilter will be removed. Work with IFilterGroups<"item"> instead`);
|
|
244
271
|
// Expand filter.type first
|
|
245
272
|
const expandedTypeFilter = expandTypeField(filter);
|
|
246
273
|
// Expand subfilters
|
|
@@ -340,6 +367,8 @@ function lookupTypeFilters(key) {
|
|
|
340
367
|
* @returns
|
|
341
368
|
*/
|
|
342
369
|
function convertContentDefinitionToFilter(filter) {
|
|
370
|
+
// TODO: Remove with _searchContent
|
|
371
|
+
__1.Logger.warn(`DEPRECATION: convertContentDefinitionToFilter will be removed. Work with IFilterGroups<"item"> instead`);
|
|
343
372
|
const result = {};
|
|
344
373
|
if (filter.term) {
|
|
345
374
|
result.term = filter.term;
|
|
@@ -381,6 +410,8 @@ exports.convertContentDefinitionToFilter = convertContentDefinitionToFilter;
|
|
|
381
410
|
* @returns
|
|
382
411
|
*/
|
|
383
412
|
function serializeContentFilterForPortal(filter) {
|
|
413
|
+
// TODO: Remove with _searchContent
|
|
414
|
+
__1.Logger.warn(`DEPRECATION: serializeContentFilterForPortal will be removed. Work with IFilterGroups<"item"> and hubSearch() instead`);
|
|
384
415
|
let searchOptions = convertContentFilterToSearchOptions(filter);
|
|
385
416
|
if (filter.subFilters) {
|
|
386
417
|
const subFilterOptions = filter.subFilters.reduce((acc, entry) => {
|
|
@@ -411,6 +442,8 @@ exports.serializeContentFilterForPortal = serializeContentFilterForPortal;
|
|
|
411
442
|
* @returns
|
|
412
443
|
*/
|
|
413
444
|
function convertContentFilterToSearchOptions(filter) {
|
|
445
|
+
// TODO: Remove with _searchContent
|
|
446
|
+
__1.Logger.warn(`DEPRECATION: convertContentFilterToSearchOptions will be removed. Work with IFilterGroups<"item"> and hubSearch() instead`);
|
|
414
447
|
let result = {
|
|
415
448
|
q: "",
|
|
416
449
|
filter: "",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"content-utils.js","sourceRoot":"","sources":["../../../src/search/content-utils.ts"],"names":[],"mappings":";;;AAMA,
|
|
1
|
+
{"version":3,"file":"content-utils.js","sourceRoot":"","sources":["../../../src/search/content-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,19 +7,28 @@ const __1 = require("..");
|
|
|
7
7
|
* @param original
|
|
8
8
|
*/
|
|
9
9
|
function convertCatalog(original) {
|
|
10
|
-
const
|
|
11
|
-
filterType: "
|
|
10
|
+
const filterGroup = {
|
|
11
|
+
filterType: "item",
|
|
12
|
+
operation: "OR",
|
|
13
|
+
filters: [],
|
|
12
14
|
};
|
|
13
15
|
const groups = __1.getProp(original, "groups");
|
|
14
16
|
if (Array.isArray(groups) && groups.length) {
|
|
15
|
-
|
|
17
|
+
filterGroup.filters.push({
|
|
18
|
+
filterType: "item",
|
|
19
|
+
group: groups,
|
|
20
|
+
});
|
|
16
21
|
}
|
|
17
22
|
else if (typeof groups === "string") {
|
|
18
|
-
|
|
23
|
+
filterGroup.filters.push({
|
|
24
|
+
filterType: "item",
|
|
25
|
+
group: [groups],
|
|
26
|
+
});
|
|
19
27
|
}
|
|
20
28
|
const catalog = {
|
|
21
29
|
title: "Default Catalog",
|
|
22
|
-
|
|
30
|
+
scope: [filterGroup],
|
|
31
|
+
collections: [],
|
|
23
32
|
};
|
|
24
33
|
return catalog;
|
|
25
34
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convertCatalog.js","sourceRoot":"","sources":["../../../src/search/convertCatalog.ts"],"names":[],"mappings":";;;AAAA,0BAA6B;AAG7B;;;GAGG;AACH,SAAgB,cAAc,CAAC,QAAa;IAC1C,MAAM,
|
|
1
|
+
{"version":3,"file":"convertCatalog.js","sourceRoot":"","sources":["../../../src/search/convertCatalog.ts"],"names":[],"mappings":";;;AAAA,0BAA6B;AAG7B;;;GAGG;AACH,SAAgB,cAAc,CAAC,QAAa;IAC1C,MAAM,WAAW,GAAyB;QACxC,UAAU,EAAE,MAAM;QAClB,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,EAAE;KACZ,CAAC;IAEF,MAAM,MAAM,GAAG,WAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;IAE3C,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE;QAC1C,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;YACvB,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,MAAM;SACd,CAAC,CAAC;KACJ;SAAM,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QACrC,WAAW,CAAC,OAAO,CAAC,IAAI,CAAC;YACvB,UAAU,EAAE,MAAM;YAClB,KAAK,EAAE,CAAC,MAAM,CAAC;SAChB,CAAC,CAAC;KACJ;IAED,MAAM,OAAO,GAAa;QACxB,KAAK,EAAE,iBAAiB;QACxB,KAAK,EAAE,CAAC,WAAW,CAAC;QACpB,WAAW,EAAE,EAAE;KAChB,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC;AA5BD,wCA4BC"}
|
|
@@ -16,7 +16,7 @@ const utils_1 = require("./utils");
|
|
|
16
16
|
function expandFilter(filter) {
|
|
17
17
|
const result = {};
|
|
18
18
|
const dateProps = ["created", "modified", "lastlogin"];
|
|
19
|
-
const copyProps = ["filterType", "term", "searchUserAccess"];
|
|
19
|
+
const copyProps = ["filterType", "term", "searchUserAccess", "isopendata"];
|
|
20
20
|
const nonMatchOptionsFields = [...dateProps, ...copyProps];
|
|
21
21
|
// Do the conversion
|
|
22
22
|
Object.entries(filter).forEach(([key, value]) => {
|
|
@@ -65,7 +65,12 @@ exports.serializeFilterGroupsForPortal = serializeFilterGroupsForPortal;
|
|
|
65
65
|
function serializeGroup(group) {
|
|
66
66
|
const operation = group.operation || "AND";
|
|
67
67
|
const filters = group.filters.map(expandFilter);
|
|
68
|
-
|
|
68
|
+
let q = filters.map(serializeFilter).join(` ${operation} `);
|
|
69
|
+
// Wrap in parens if there is more than one filter
|
|
70
|
+
if (filters.length > 1) {
|
|
71
|
+
q = `(${q})`;
|
|
72
|
+
}
|
|
73
|
+
return q;
|
|
69
74
|
}
|
|
70
75
|
/**
|
|
71
76
|
* Serialize a Filter into a Portal Query
|
|
@@ -74,7 +79,14 @@ function serializeGroup(group) {
|
|
|
74
79
|
*/
|
|
75
80
|
function serializeFilter(filter) {
|
|
76
81
|
const dateProps = ["created", "modified"];
|
|
77
|
-
const
|
|
82
|
+
const boolProps = ["isopendata"];
|
|
83
|
+
const specialProps = [
|
|
84
|
+
"filterType",
|
|
85
|
+
"searchUserAccess",
|
|
86
|
+
"term",
|
|
87
|
+
...dateProps,
|
|
88
|
+
...boolProps,
|
|
89
|
+
];
|
|
78
90
|
// TODO: Look at using reduce vs .map and remove the `.filter`
|
|
79
91
|
const stringFilters = Object.entries(filter)
|
|
80
92
|
.map(([key, value]) => {
|
|
@@ -84,6 +96,9 @@ function serializeFilter(filter) {
|
|
|
84
96
|
if (dateProps.includes(key)) {
|
|
85
97
|
return serializeDateRange(key, value);
|
|
86
98
|
}
|
|
99
|
+
if (boolProps.includes(key)) {
|
|
100
|
+
return `${key}:${value}`;
|
|
101
|
+
}
|
|
87
102
|
if (key === "term") {
|
|
88
103
|
return value;
|
|
89
104
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-utils.js","sourceRoot":"","sources":["../../../src/search/filter-utils.ts"],"names":[],"mappings":";;;AACA,wCAA8C;AAC9C,kCAAsC;AAQtC,mCAAuE;AAEvE;;;;;;;;GAQG;AACH,SAAgB,YAAY,CAAI,MAAS;IACvC,MAAM,MAAM,GAAG,EAAmB,CAAC;IACnC,MAAM,SAAS,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,CAAC,YAAY,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"filter-utils.js","sourceRoot":"","sources":["../../../src/search/filter-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.serializeGroupFilterForPortal = exports.expandGroupFilter = exports.mergeGroupFilters = void 0;
|
|
4
4
|
const _1 = require(".");
|
|
5
5
|
const __1 = require("..");
|
|
6
|
+
// TODO: Remove with _searchContent
|
|
6
7
|
/**
|
|
7
8
|
*
|
|
8
9
|
* Merge `Filter<"group">` objects
|
|
@@ -14,6 +15,8 @@ const __1 = require("..");
|
|
|
14
15
|
* @returns
|
|
15
16
|
*/
|
|
16
17
|
function mergeGroupFilters(filters) {
|
|
18
|
+
// TODO: Remove with _searchContent
|
|
19
|
+
__1.Logger.warn(`DEPRECATION: mergeGroupFilters will be removed. Work with IFilterGroups<"group"> and hubSearch() instead`);
|
|
17
20
|
// expand all the filters so all prop types are consistent
|
|
18
21
|
const expanded = filters.map(expandGroupFilter);
|
|
19
22
|
// now we can merge based on fields
|
|
@@ -70,6 +73,8 @@ exports.mergeGroupFilters = mergeGroupFilters;
|
|
|
70
73
|
* @returns
|
|
71
74
|
*/
|
|
72
75
|
function expandGroupFilter(filter) {
|
|
76
|
+
// TODO: Remove with _searchContent
|
|
77
|
+
__1.Logger.warn(`DEPRECATION: expandGroupFilters will be removed. Work with IFilterGroups<"group"> and hubSearch() instead`);
|
|
73
78
|
const result = {};
|
|
74
79
|
const dateProps = ["created", "modified"];
|
|
75
80
|
// Some properties should not get converted to MatchOptions
|
|
@@ -111,6 +116,8 @@ exports.expandGroupFilter = expandGroupFilter;
|
|
|
111
116
|
* @returns
|
|
112
117
|
*/
|
|
113
118
|
function serializeGroupFilterForPortal(filter) {
|
|
119
|
+
// TODO: Remove with _searchContent
|
|
120
|
+
__1.Logger.warn(`DEPRECATION: serializeGroupFilterForPortal will be removed. Work with IFilterGroups<"group"> and hubSearch() instead`);
|
|
114
121
|
let result = {
|
|
115
122
|
q: "",
|
|
116
123
|
filter: "",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"group-utils.js","sourceRoot":"","sources":["../../../src/search/group-utils.ts"],"names":[],"mappings":";;;AACA,wBAUW;AACX,
|
|
1
|
+
{"version":3,"file":"group-utils.js","sourceRoot":"","sources":["../../../src/search/group-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.hubSearch = void 0;
|
|
4
|
+
const HubError_1 = require("../HubError");
|
|
5
|
+
const objects_1 = require("../objects");
|
|
6
|
+
const utils_1 = require("./utils");
|
|
7
|
+
const _internal_1 = require("./_internal");
|
|
8
|
+
/**
|
|
9
|
+
* Main Search function for ArcGIS Hub
|
|
10
|
+
*
|
|
11
|
+
* Default's to search ArcGIS Portal but can delegate
|
|
12
|
+
* to Hub API when it's available.
|
|
13
|
+
* @param filterGroups
|
|
14
|
+
* @param options
|
|
15
|
+
* @returns
|
|
16
|
+
*/
|
|
17
|
+
async function hubSearch(filterGroups, options) {
|
|
18
|
+
// Validate inputs
|
|
19
|
+
if (!filterGroups || !Array.isArray(filterGroups)) {
|
|
20
|
+
throw new HubError_1.default("hubSearch", "FilterGroups are required and must be an array.");
|
|
21
|
+
}
|
|
22
|
+
if (!filterGroups.length) {
|
|
23
|
+
throw new HubError_1.default("hubSearch", "FilterGrous array must contain at least one entry.");
|
|
24
|
+
}
|
|
25
|
+
if (!options.requestOptions) {
|
|
26
|
+
throw new HubError_1.default("hubSearch", "requestOptions: IHubRequestOptions is required.");
|
|
27
|
+
}
|
|
28
|
+
// Ensure includes is an array
|
|
29
|
+
if (!options.include) {
|
|
30
|
+
options.include = [];
|
|
31
|
+
}
|
|
32
|
+
// Get the type of the first filterGroup
|
|
33
|
+
const filterType = filterGroups[0].filterType;
|
|
34
|
+
// get the API
|
|
35
|
+
const apiType = utils_1.expandApi(options.api || "arcgis").type;
|
|
36
|
+
const fnHash = {
|
|
37
|
+
arcgis: {
|
|
38
|
+
item: _internal_1.portalSearchItems,
|
|
39
|
+
group: _internal_1.portalSearchGroups,
|
|
40
|
+
},
|
|
41
|
+
"arcgis-hub": {
|
|
42
|
+
item: _internal_1.hubSearchItems,
|
|
43
|
+
},
|
|
44
|
+
};
|
|
45
|
+
const fn = objects_1.getProp(fnHash, `${apiType}.${filterType}`);
|
|
46
|
+
if (!fn) {
|
|
47
|
+
throw new HubError_1.default(`hubSearch`, `Search via "${filterType}" filter against "${apiType}" api is not implemented`);
|
|
48
|
+
}
|
|
49
|
+
return fn(filterGroups, options);
|
|
50
|
+
}
|
|
51
|
+
exports.hubSearch = hubSearch;
|
|
52
|
+
//# sourceMappingURL=hubSearch.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"hubSearch.js","sourceRoot":"","sources":["../../../src/search/hubSearch.ts"],"names":[],"mappings":";;;AAAA,0CAAmC;AACnC,wCAAqC;AASrC,mCAAoC;AACpC,2CAIqB;AAErB;;;;;;;;GAQG;AACI,KAAK,UAAU,SAAS,CAC7B,YAA6C,EAC7C,OAA0B;IAE1B,kBAAkB;IAClB,IAAI,CAAC,YAAY,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE;QACjD,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,iDAAiD,CAClD,CAAC;KACH;IACD,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;QACxB,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,oDAAoD,CACrD,CAAC;KACH;IAED,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC3B,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,iDAAiD,CAClD,CAAC;KACH;IAED,8BAA8B;IAC9B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;QACpB,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;KACtB;IAED,wCAAwC;IACxC,MAAM,UAAU,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,UAAwB,CAAC;IAC5D,cAAc;IACd,MAAM,OAAO,GAAG,iBAAS,CAAC,OAAO,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC,IAAI,CAAC;IAExD,MAAM,MAAM,GAAG;QACb,MAAM,EAAE;YACN,IAAI,EAAE,6BAAiB;YACvB,KAAK,EAAE,8BAAkB;SAC1B;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,0BAAc;SACrB;KACF,CAAC;IAEF,MAAM,EAAE,GAAG,iBAAO,CAAC,MAAM,EAAE,GAAG,OAAO,IAAI,UAAU,EAAE,CAAC,CAAC;IACvD,IAAI,CAAC,EAAE,EAAE;QACP,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,eAAe,UAAU,qBAAqB,OAAO,0BAA0B,CAChF,CAAC;KACH;IACD,OAAO,EAAE,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC;AACnC,CAAC;AArDD,8BAqDC"}
|
|
@@ -13,4 +13,5 @@ tslib_1.__exportStar(require("./types"), exports);
|
|
|
13
13
|
tslib_1.__exportStar(require("./collectionState"), exports);
|
|
14
14
|
tslib_1.__exportStar(require("./convertCatalog"), exports);
|
|
15
15
|
tslib_1.__exportStar(require("./filter-utils"), exports);
|
|
16
|
+
tslib_1.__exportStar(require("./hubSearch"), exports);
|
|
16
17
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/search/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiC;AACjC,0DAAgC;AAChC,wDAA8B;AAC9B,uDAA6B;AAC7B,kDAAwB;AACxB,2DAAiC;AACjC,0DAAgC;AAChC,yDAA+B;AAC/B,kDAAwB;AACxB,4DAAkC;AAClC,2DAAiC;AACjC,yDAA+B"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/search/index.ts"],"names":[],"mappings":";;;AAAA,2DAAiC;AACjC,0DAAgC;AAChC,wDAA8B;AAC9B,uDAA6B;AAC7B,kDAAwB;AACxB,2DAAiC;AACjC,0DAAgC;AAChC,yDAA+B;AAC/B,kDAAwB;AACxB,4DAAkC;AAClC,2DAAiC;AACjC,yDAA+B;AAC/B,sDAA4B"}
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.serializeUserFilterForPortal = exports.expandUserFilter = exports.mergeUserFilters = void 0;
|
|
4
4
|
const __1 = require("..");
|
|
5
|
+
// TODO: Remove with _searchContent
|
|
5
6
|
/**
|
|
6
7
|
*
|
|
7
8
|
* Merge `Filter<"user">` objects
|
|
@@ -13,6 +14,8 @@ const __1 = require("..");
|
|
|
13
14
|
* @returns
|
|
14
15
|
*/
|
|
15
16
|
function mergeUserFilters(filters) {
|
|
17
|
+
// TODO: Remove with _searchContent
|
|
18
|
+
__1.Logger.warn(`DEPRECATION: mergeUserFilters will be removed. Work with IFilterGroups<"user"> and hubSearch() instead`);
|
|
16
19
|
// expand all the filters so all prop types are consistent
|
|
17
20
|
const expanded = filters.map(expandUserFilter);
|
|
18
21
|
// now we can merge based on fields
|
|
@@ -68,6 +71,8 @@ exports.mergeUserFilters = mergeUserFilters;
|
|
|
68
71
|
* @returns
|
|
69
72
|
*/
|
|
70
73
|
function expandUserFilter(filter) {
|
|
74
|
+
// TODO: Remove with _searchContent
|
|
75
|
+
__1.Logger.warn(`DEPRECATION: expandUserFilter will be removed. Work with IFilterGroups<"user"> and hubSearch() instead`);
|
|
71
76
|
const result = {};
|
|
72
77
|
const dateProps = ["created", "modified", "lastlogin"];
|
|
73
78
|
const specialProps = ["disabled", "term", ...dateProps];
|
|
@@ -107,6 +112,8 @@ exports.expandUserFilter = expandUserFilter;
|
|
|
107
112
|
* @returns
|
|
108
113
|
*/
|
|
109
114
|
function serializeUserFilterForPortal(filter) {
|
|
115
|
+
// TODO: Remove with _searchContent
|
|
116
|
+
__1.Logger.warn(`DEPRECATION: serializeUserFilterForPortal will be removed. Work with IFilterGroups<"user"> and hubSearch() instead`);
|
|
110
117
|
let result = {
|
|
111
118
|
q: "",
|
|
112
119
|
filter: "",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-utils.js","sourceRoot":"","sources":["../../../src/search/user-utils.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"user-utils.js","sourceRoot":"","sources":["../../../src/search/user-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@
|
|
|
4
4
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
5
5
|
exports.getUserThumbnailUrl = exports.getGroupThumbnailUrl = exports.getNextFunction = exports.serializeStringOrArray = exports.serializeDateRange = exports.serializeMatchOptions = exports.mergeSearchOptions = exports.relativeDateToDateRange = exports.valueToMatchOptions = exports.mergeMatchOptions = exports.mergeDateRange = exports.expandApi = exports.expandApis = exports.SEARCH_APIS = void 0;
|
|
6
6
|
const arcgis_rest_auth_1 = require("@esri/arcgis-rest-auth");
|
|
7
|
+
const __1 = require("..");
|
|
7
8
|
const util_1 = require("../util");
|
|
8
9
|
/**
|
|
9
10
|
* Well known APIs
|
|
@@ -76,6 +77,7 @@ exports.expandApi = expandApi;
|
|
|
76
77
|
* @returns
|
|
77
78
|
*/
|
|
78
79
|
function mergeDateRange(dr1, dr2) {
|
|
80
|
+
// TODO: Remove with _searchContent
|
|
79
81
|
const result = util_1.cloneObject(dr1);
|
|
80
82
|
// feels like there is a more concise way to do this...
|
|
81
83
|
if (dr2.from < dr1.from) {
|
|
@@ -98,6 +100,7 @@ exports.mergeDateRange = mergeDateRange;
|
|
|
98
100
|
* @returns
|
|
99
101
|
*/
|
|
100
102
|
function mergeMatchOptions(mo1, mo2) {
|
|
103
|
+
// TODO: Remove with _searchContent
|
|
101
104
|
const result = {};
|
|
102
105
|
// None of these props are required, so we can't just
|
|
103
106
|
// use Object.keys/.entries
|
|
@@ -219,6 +222,8 @@ exports.relativeDateToDateRange = relativeDateToDateRange;
|
|
|
219
222
|
* @returns
|
|
220
223
|
*/
|
|
221
224
|
function mergeSearchOptions(so1, so2, join) {
|
|
225
|
+
// TODO: Remove with _searchContent
|
|
226
|
+
__1.Logger.warn(`DEPRECATION: mergeSearchOptions will be removed. Work with IFilterGroups<"group"> and hubSearch() instead`);
|
|
222
227
|
const result = util_1.cloneObject(so1);
|
|
223
228
|
const { q, filter } = so2;
|
|
224
229
|
if (q) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/search/utils.ts"],"names":[],"mappings":";AAAA;gBACgB;;;AAEhB,6DAA4D;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/search/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,14 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.searchSites = exports.convertItemToSite = exports._fetchSite = exports.destroySite = exports.updateSite = exports.createSite = exports.ENTERPRISE_SITE_ITEM_TYPE = exports.HUB_SITE_ITEM_TYPE = void 0;
|
|
3
|
+
exports.enrichSiteSearchResult = exports.searchSites = exports.convertItemToSite = exports._fetchSite = exports.destroySite = exports.updateSite = exports.createSite = exports.ENTERPRISE_SITE_ITEM_TYPE = exports.HUB_SITE_ITEM_TYPE = void 0;
|
|
4
4
|
const arcgis_rest_portal_1 = require("@esri/arcgis-rest-portal");
|
|
5
5
|
const __1 = require("..");
|
|
6
6
|
const PropertyMapper_1 = require("../core/_internal/PropertyMapper");
|
|
7
7
|
const _internal_1 = require("./_internal");
|
|
8
8
|
const searchContentEntities_1 = require("../search/_internal/searchContentEntities");
|
|
9
|
+
const _enrichments_1 = require("../items/_enrichments");
|
|
10
|
+
const parseInclude_1 = require("../search/_internal/parseInclude");
|
|
11
|
+
const _internal_2 = require("../content/_internal");
|
|
9
12
|
exports.HUB_SITE_ITEM_TYPE = "Hub Site Application";
|
|
10
13
|
exports.ENTERPRISE_SITE_ITEM_TYPE = "Site Application";
|
|
11
14
|
/**
|
|
@@ -402,4 +405,56 @@ async function searchSites(filter, options) {
|
|
|
402
405
|
return searchContentEntities_1.searchContentEntities(sitesFilter, convertItemToSite, options);
|
|
403
406
|
}
|
|
404
407
|
exports.searchSites = searchSites;
|
|
408
|
+
/**
|
|
409
|
+
* Fetch Site specific enrichments
|
|
410
|
+
* @param item
|
|
411
|
+
* @param include
|
|
412
|
+
* @param requestOptions
|
|
413
|
+
* @returns
|
|
414
|
+
*/
|
|
415
|
+
async function enrichSiteSearchResult(item, include, requestOptions) {
|
|
416
|
+
// Create the basic structure
|
|
417
|
+
const result = {
|
|
418
|
+
access: item.access,
|
|
419
|
+
id: item.id,
|
|
420
|
+
type: item.type,
|
|
421
|
+
name: item.title,
|
|
422
|
+
owner: item.owner,
|
|
423
|
+
summary: item.snippet || item.description,
|
|
424
|
+
createdDate: new Date(item.created),
|
|
425
|
+
createdDateSource: "item.created",
|
|
426
|
+
updatedDate: new Date(item.modified),
|
|
427
|
+
updatedDateSource: "item.modified",
|
|
428
|
+
family: __1.getFamily(item.type),
|
|
429
|
+
links: {
|
|
430
|
+
self: "not-implemented",
|
|
431
|
+
siteRelative: "not-implemented",
|
|
432
|
+
thumbnail: "not-implemented",
|
|
433
|
+
},
|
|
434
|
+
};
|
|
435
|
+
// default includes
|
|
436
|
+
const DEFAULTS = [];
|
|
437
|
+
// merge includes
|
|
438
|
+
include = [...DEFAULTS, ...include].filter(__1.unique);
|
|
439
|
+
// Parse the includes into a valid set of enrichments
|
|
440
|
+
const specs = include.map(parseInclude_1.parseInclude);
|
|
441
|
+
// Extract out the low-level enrichments needed
|
|
442
|
+
const enrichments = __1.mapBy("enrichment", specs).filter(__1.unique);
|
|
443
|
+
// fetch the enrichments
|
|
444
|
+
let enriched = {};
|
|
445
|
+
if (enrichments.length) {
|
|
446
|
+
// TODO: Look into caching for the requests in fetchItemEnrichments
|
|
447
|
+
enriched = await _enrichments_1.fetchItemEnrichments(item, enrichments, requestOptions);
|
|
448
|
+
}
|
|
449
|
+
// map the enriched props onto the result
|
|
450
|
+
specs.forEach((spec) => {
|
|
451
|
+
result[spec.prop] = __1.getProp(enriched, spec.path);
|
|
452
|
+
});
|
|
453
|
+
// Handle links
|
|
454
|
+
result.links.thumbnail = __1.getItemThumbnailUrl(item, requestOptions);
|
|
455
|
+
result.links.self = item.url;
|
|
456
|
+
result.links.siteRelative = _internal_2.getHubRelativeUrl(result.type, result.id, item.typeKeywords);
|
|
457
|
+
return result;
|
|
458
|
+
}
|
|
459
|
+
exports.enrichSiteSearchResult = enrichSiteSearchResult;
|
|
405
460
|
//# sourceMappingURL=HubSites.js.map
|