@esri/hub-common 10.0.0-next.1 → 10.0.0-next.2
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/projects/HubProjects.js.map +1 -1
- package/dist/es2017/search/_internal/hubSearchItems.js +3 -94
- package/dist/es2017/search/_internal/hubSearchItems.js.map +1 -1
- package/dist/es2017/search/_internal/portalSearchItems.js +3 -25
- package/dist/es2017/search/_internal/portalSearchItems.js.map +1 -1
- package/dist/es2017/search/index.js +0 -7
- package/dist/es2017/search/index.js.map +1 -1
- package/dist/es2017/search/types/index.js +0 -3
- package/dist/es2017/search/types/index.js.map +1 -1
- package/dist/es2017/search/utils.js +1 -207
- package/dist/es2017/search/utils.js.map +1 -1
- package/dist/esm/projects/HubProjects.js.map +1 -1
- package/dist/esm/search/_internal/hubSearchItems.js +4 -102
- package/dist/esm/search/_internal/hubSearchItems.js.map +1 -1
- package/dist/esm/search/_internal/portalSearchItems.js +3 -25
- package/dist/esm/search/_internal/portalSearchItems.js.map +1 -1
- package/dist/esm/search/index.js +0 -7
- package/dist/esm/search/index.js.map +1 -1
- package/dist/esm/search/types/index.js +0 -3
- package/dist/esm/search/types/index.js.map +1 -1
- package/dist/esm/search/utils.js +1 -204
- package/dist/esm/search/utils.js.map +1 -1
- package/dist/node/projects/HubProjects.js.map +1 -1
- package/dist/node/search/_internal/hubSearchItems.js +3 -94
- package/dist/node/search/_internal/hubSearchItems.js.map +1 -1
- package/dist/node/search/_internal/portalSearchItems.js +4 -26
- package/dist/node/search/_internal/portalSearchItems.js.map +1 -1
- package/dist/node/search/index.js +0 -7
- package/dist/node/search/index.js.map +1 -1
- package/dist/node/search/types/index.js +0 -3
- package/dist/node/search/types/index.js.map +1 -1
- package/dist/node/search/utils.js +1 -213
- package/dist/node/search/utils.js.map +1 -1
- package/dist/types/search/_internal/hubSearchItems.d.ts +3 -3
- package/dist/types/search/_internal/portalSearchItems.d.ts +15 -15
- package/dist/types/search/index.d.ts +0 -7
- package/dist/types/search/types/index.d.ts +0 -3
- package/dist/types/search/types/types.d.ts +0 -204
- package/dist/types/search/utils.d.ts +2 -58
- package/dist/umd/common.umd.js +101 -1459
- package/dist/umd/common.umd.js.map +1 -1
- package/package.json +1 -1
- package/dist/es2017/search/_searchContent.js +0 -112
- package/dist/es2017/search/_searchContent.js.map +0 -1
- package/dist/es2017/search/_searchGroups.js +0 -88
- package/dist/es2017/search/_searchGroups.js.map +0 -1
- package/dist/es2017/search/_searchUsers.js +0 -89
- package/dist/es2017/search/_searchUsers.js.map +0 -1
- package/dist/es2017/search/content-utils.js +0 -390
- package/dist/es2017/search/content-utils.js.map +0 -1
- package/dist/es2017/search/filter-utils.js +0 -31
- package/dist/es2017/search/filter-utils.js.map +0 -1
- package/dist/es2017/search/group-utils.js +0 -142
- package/dist/es2017/search/group-utils.js.map +0 -1
- package/dist/es2017/search/types/ICatalog.js +0 -1
- package/dist/es2017/search/types/ICatalog.js.map +0 -1
- package/dist/es2017/search/types/ICollection.js +0 -1
- package/dist/es2017/search/types/ICollection.js.map +0 -1
- package/dist/es2017/search/types/IHubApiSearchRequest.js +0 -1
- package/dist/es2017/search/types/IHubApiSearchRequest.js.map +0 -1
- package/dist/es2017/search/user-utils.js +0 -139
- package/dist/es2017/search/user-utils.js.map +0 -1
- package/dist/esm/search/_searchContent.js +0 -114
- package/dist/esm/search/_searchContent.js.map +0 -1
- package/dist/esm/search/_searchGroups.js +0 -91
- package/dist/esm/search/_searchGroups.js.map +0 -1
- package/dist/esm/search/_searchUsers.js +0 -92
- package/dist/esm/search/_searchUsers.js.map +0 -1
- package/dist/esm/search/content-utils.js +0 -394
- package/dist/esm/search/content-utils.js.map +0 -1
- package/dist/esm/search/filter-utils.js +0 -31
- package/dist/esm/search/filter-utils.js.map +0 -1
- package/dist/esm/search/group-utils.js +0 -146
- package/dist/esm/search/group-utils.js.map +0 -1
- package/dist/esm/search/types/ICatalog.js +0 -1
- package/dist/esm/search/types/ICatalog.js.map +0 -1
- package/dist/esm/search/types/ICollection.js +0 -1
- package/dist/esm/search/types/ICollection.js.map +0 -1
- package/dist/esm/search/types/IHubApiSearchRequest.js +0 -1
- package/dist/esm/search/types/IHubApiSearchRequest.js.map +0 -1
- package/dist/esm/search/user-utils.js +0 -143
- package/dist/esm/search/user-utils.js.map +0 -1
- package/dist/node/search/_searchContent.js +0 -116
- package/dist/node/search/_searchContent.js.map +0 -1
- package/dist/node/search/_searchGroups.js +0 -92
- package/dist/node/search/_searchGroups.js.map +0 -1
- package/dist/node/search/_searchUsers.js +0 -93
- package/dist/node/search/_searchUsers.js.map +0 -1
- package/dist/node/search/content-utils.js +0 -399
- package/dist/node/search/content-utils.js.map +0 -1
- package/dist/node/search/filter-utils.js +0 -36
- package/dist/node/search/filter-utils.js.map +0 -1
- package/dist/node/search/group-utils.js +0 -148
- package/dist/node/search/group-utils.js.map +0 -1
- package/dist/node/search/types/ICatalog.js +0 -3
- package/dist/node/search/types/ICatalog.js.map +0 -1
- package/dist/node/search/types/ICollection.js +0 -3
- package/dist/node/search/types/ICollection.js.map +0 -1
- package/dist/node/search/types/IHubApiSearchRequest.js +0 -3
- package/dist/node/search/types/IHubApiSearchRequest.js.map +0 -1
- package/dist/node/search/user-utils.js +0 -145
- package/dist/node/search/user-utils.js.map +0 -1
- package/dist/types/search/_searchContent.d.ts +0 -9
- package/dist/types/search/_searchGroups.d.ts +0 -13
- package/dist/types/search/_searchUsers.d.ts +0 -31
- package/dist/types/search/content-utils.d.ts +0 -66
- package/dist/types/search/filter-utils.d.ts +0 -13
- package/dist/types/search/group-utils.d.ts +0 -36
- package/dist/types/search/types/ICatalog.d.ts +0 -82
- package/dist/types/search/types/ICollection.d.ts +0 -26
- package/dist/types/search/types/IHubApiSearchRequest.d.ts +0 -16
- package/dist/types/search/user-utils.d.ts +0 -35
|
@@ -1,394 +0,0 @@
|
|
|
1
|
-
import { __spreadArrays } from "tslib";
|
|
2
|
-
import { cloneObject, Logger } from "..";
|
|
3
|
-
// import { IFacetOption } from "./types/IFacetOption";
|
|
4
|
-
// import { IFacet } from "./types/IFacet";
|
|
5
|
-
import { mergeDateRange, mergeMatchOptions, mergeSearchOptions, relativeDateToDateRange, serializeDateRange, serializeMatchOptions, valueToMatchOptions, } from "./utils";
|
|
6
|
-
// TODO: Remove with _searchContent
|
|
7
|
-
// TODO: Implement $dataset
|
|
8
|
-
var ContentFilterExpansions = {
|
|
9
|
-
$apps: [
|
|
10
|
-
{
|
|
11
|
-
type: {
|
|
12
|
-
any: [
|
|
13
|
-
"Code Sample",
|
|
14
|
-
"Web Mapping Application",
|
|
15
|
-
"Mobile Application",
|
|
16
|
-
"Application",
|
|
17
|
-
"Desktop Application Template",
|
|
18
|
-
"Desktop Application",
|
|
19
|
-
"Operation View",
|
|
20
|
-
"Dashboard",
|
|
21
|
-
"Operations Dashboard Extension",
|
|
22
|
-
"Workforce Project",
|
|
23
|
-
"Insights Workbook",
|
|
24
|
-
"Insights Page",
|
|
25
|
-
"Insights Model",
|
|
26
|
-
"Hub Page",
|
|
27
|
-
"Hub Initiative",
|
|
28
|
-
"Hub Site Application",
|
|
29
|
-
"StoryMap",
|
|
30
|
-
"Web Experience",
|
|
31
|
-
"Web Experience Template",
|
|
32
|
-
"Form",
|
|
33
|
-
],
|
|
34
|
-
not: [
|
|
35
|
-
"Code Attachment",
|
|
36
|
-
"Featured Items",
|
|
37
|
-
"Symbol Set",
|
|
38
|
-
"Color Set",
|
|
39
|
-
"Windows Viewer Add In",
|
|
40
|
-
"Windows Viewer Configuration",
|
|
41
|
-
"Map Area",
|
|
42
|
-
"Indoors Map Configuration",
|
|
43
|
-
],
|
|
44
|
-
},
|
|
45
|
-
typekeywords: {
|
|
46
|
-
not: ["MapAreaPackage", "SMX"],
|
|
47
|
-
},
|
|
48
|
-
},
|
|
49
|
-
],
|
|
50
|
-
$storymap: [
|
|
51
|
-
{
|
|
52
|
-
type: "StoryMap",
|
|
53
|
-
},
|
|
54
|
-
{
|
|
55
|
-
type: "Web Mapping Application",
|
|
56
|
-
typekeywords: ["Story Map"],
|
|
57
|
-
},
|
|
58
|
-
],
|
|
59
|
-
$dashboard: [
|
|
60
|
-
{
|
|
61
|
-
type: "Dashboard",
|
|
62
|
-
typekeywords: {
|
|
63
|
-
any: ["Dashboard"],
|
|
64
|
-
not: ["ArcGIS Operation View", "Add In", "Extension"],
|
|
65
|
-
},
|
|
66
|
-
},
|
|
67
|
-
],
|
|
68
|
-
$dataset: [],
|
|
69
|
-
$experience: [
|
|
70
|
-
{
|
|
71
|
-
type: {
|
|
72
|
-
any: ["Web Experience"],
|
|
73
|
-
not: ["Web Experience Template"],
|
|
74
|
-
},
|
|
75
|
-
},
|
|
76
|
-
],
|
|
77
|
-
$site: [
|
|
78
|
-
{
|
|
79
|
-
type: ["Hub Site Application", "Site Application"],
|
|
80
|
-
},
|
|
81
|
-
{
|
|
82
|
-
type: ["Web Mapping Application"],
|
|
83
|
-
typekeywords: ["hubSite"],
|
|
84
|
-
},
|
|
85
|
-
],
|
|
86
|
-
$initiative: [
|
|
87
|
-
{
|
|
88
|
-
type: {
|
|
89
|
-
any: "Hub Initiative",
|
|
90
|
-
not: "Hub Initiative Template",
|
|
91
|
-
},
|
|
92
|
-
},
|
|
93
|
-
],
|
|
94
|
-
$document: [
|
|
95
|
-
{
|
|
96
|
-
typekeywords: {
|
|
97
|
-
any: "Document",
|
|
98
|
-
not: ["MapAreaPackage", "SMX"],
|
|
99
|
-
},
|
|
100
|
-
type: {
|
|
101
|
-
any: [
|
|
102
|
-
"Image",
|
|
103
|
-
"Layout",
|
|
104
|
-
"Desktop Style",
|
|
105
|
-
"Project Template",
|
|
106
|
-
"Report Template",
|
|
107
|
-
"Pro Report",
|
|
108
|
-
"Statistical Data Collection",
|
|
109
|
-
"360 VR Experience",
|
|
110
|
-
"netCDF",
|
|
111
|
-
"PDF",
|
|
112
|
-
"CSV",
|
|
113
|
-
"Administrative Report",
|
|
114
|
-
"Raster function template",
|
|
115
|
-
],
|
|
116
|
-
not: [
|
|
117
|
-
"Image Service",
|
|
118
|
-
"Explorer Document",
|
|
119
|
-
"Explorer Map",
|
|
120
|
-
"Globe Document",
|
|
121
|
-
"Scene Document",
|
|
122
|
-
"Code Attachment",
|
|
123
|
-
"Featured Items",
|
|
124
|
-
"Symbol Set",
|
|
125
|
-
"ColorSet",
|
|
126
|
-
"Windows Viewer Add In",
|
|
127
|
-
"Windows Viewer Configuration",
|
|
128
|
-
"Map Area",
|
|
129
|
-
"Indoors Map Configuration",
|
|
130
|
-
],
|
|
131
|
-
},
|
|
132
|
-
},
|
|
133
|
-
],
|
|
134
|
-
};
|
|
135
|
-
/**
|
|
136
|
-
* Merge `Filter<"content">` objects
|
|
137
|
-
*
|
|
138
|
-
* Useful in components which may get partial filters from a variety of
|
|
139
|
-
* sub-components, which are then combined into a single filter prior
|
|
140
|
-
* to executing the search.
|
|
141
|
-
* @param filters
|
|
142
|
-
* @returns
|
|
143
|
-
*/
|
|
144
|
-
export function mergeContentFilter(filters) {
|
|
145
|
-
Logger.warn("DEPRECATION: mergeContentFilter will be removed and filters should not longer be merged. Work with IFilterGroups instead");
|
|
146
|
-
// expand all the filters so all prop types are consistent
|
|
147
|
-
var expanded = filters.map(expandContentFilter);
|
|
148
|
-
// now we can merge based on fields
|
|
149
|
-
var dateFields = ["created", "modified"];
|
|
150
|
-
var specialFields = __spreadArrays(["filterType", "subFilters", "term"], dateFields);
|
|
151
|
-
var result = expanded.reduce(function (acc, entry) {
|
|
152
|
-
// process fields
|
|
153
|
-
Object.entries(entry).forEach(function (_a) {
|
|
154
|
-
var key = _a[0], value = _a[1];
|
|
155
|
-
if (acc.hasOwnProperty(key)) {
|
|
156
|
-
/* istanbul ignore else */
|
|
157
|
-
if (!specialFields.includes(key)) {
|
|
158
|
-
acc[key] = mergeMatchOptions(acc[key], value);
|
|
159
|
-
}
|
|
160
|
-
else if (dateFields.includes(key)) {
|
|
161
|
-
acc[key] = mergeDateRange(acc[key], value);
|
|
162
|
-
}
|
|
163
|
-
else if (key === "term") {
|
|
164
|
-
acc[key] = acc[key] + " " + value;
|
|
165
|
-
}
|
|
166
|
-
else if (key === "subFilters") {
|
|
167
|
-
acc[key] = mergeSubFilters(acc[key], value);
|
|
168
|
-
}
|
|
169
|
-
}
|
|
170
|
-
else {
|
|
171
|
-
acc[key] = cloneObject(value);
|
|
172
|
-
}
|
|
173
|
-
});
|
|
174
|
-
return acc;
|
|
175
|
-
}, {});
|
|
176
|
-
result.filterType = "content";
|
|
177
|
-
return result;
|
|
178
|
-
}
|
|
179
|
-
function mergeSubFilters(sf1, sf2) {
|
|
180
|
-
// Simplistic implementation: we just merge the arrays
|
|
181
|
-
// in the future we may try to de-dupe things as a safeguard
|
|
182
|
-
return __spreadArrays(sf1, sf2);
|
|
183
|
-
}
|
|
184
|
-
/**
|
|
185
|
-
* Prior to serialization into the query syntax for the backing APIs, we first expand [Filters](../Filter)
|
|
186
|
-
*
|
|
187
|
-
* Filter's can express their intent in a very terse form, but to ensure consistent structures
|
|
188
|
-
* we expand them into their more verbose form.
|
|
189
|
-
*
|
|
190
|
-
* i.e. `title: "Water"` expands into `title: { any: ["Water"]}`
|
|
191
|
-
*
|
|
192
|
-
* - "well known" type values are expanded
|
|
193
|
-
* - i.e. `type: "$storymap"` expands into two `subFilter` entries
|
|
194
|
-
* - Fields defined as `string | string[] | MatchOptions` will be converted to a `MatchOptions`
|
|
195
|
-
* - RelativeDate fields are converted to DateRange<number>
|
|
196
|
-
*
|
|
197
|
-
* @param filter
|
|
198
|
-
* @returns
|
|
199
|
-
*/
|
|
200
|
-
export function expandContentFilter(filter) {
|
|
201
|
-
Logger.warn("DEPRECATION: expandContentFilter will be removed. Work with IFilterGroups<\"item\"> instead");
|
|
202
|
-
// Expand filter.type first
|
|
203
|
-
var expandedTypeFilter = expandTypeField(filter);
|
|
204
|
-
// Expand subfilters
|
|
205
|
-
// Guard - JS Clients could send in anything...
|
|
206
|
-
if (Array.isArray(filter.subFilters)) {
|
|
207
|
-
// Convert any strings into the coresponding ContentFilterDefinition
|
|
208
|
-
expandedTypeFilter.subFilters = expandedTypeFilter.subFilters.reduce(function (acc, entry) {
|
|
209
|
-
if (typeof entry === "string") {
|
|
210
|
-
// if the entry is not a key of ContentFilterExpansions
|
|
211
|
-
// we just skip over it
|
|
212
|
-
if (ContentFilterExpansions[entry]) {
|
|
213
|
-
acc = acc.concat(ContentFilterExpansions[entry]);
|
|
214
|
-
}
|
|
215
|
-
}
|
|
216
|
-
else {
|
|
217
|
-
acc.push(entry); // should be a ContentFilterDefinition
|
|
218
|
-
}
|
|
219
|
-
return acc;
|
|
220
|
-
}, []);
|
|
221
|
-
}
|
|
222
|
-
// Convert all props into MatchOptions/DateRanges
|
|
223
|
-
return convertContentDefinitionToFilter(expandedTypeFilter);
|
|
224
|
-
}
|
|
225
|
-
/**
|
|
226
|
-
* @private
|
|
227
|
-
* Expand from a well-known "type" into it's longer form
|
|
228
|
-
*
|
|
229
|
-
* i.e. `type: "$storymap"` expands into two subFilters entries
|
|
230
|
-
*
|
|
231
|
-
* @param filter
|
|
232
|
-
* @returns
|
|
233
|
-
*/
|
|
234
|
-
export function expandTypeField(filter) {
|
|
235
|
-
var clone = cloneObject(filter);
|
|
236
|
-
// ensure subFilters is defined as an array
|
|
237
|
-
clone.subFilters = clone.subFilters || [];
|
|
238
|
-
if (clone.type) {
|
|
239
|
-
// if .type is an Array...
|
|
240
|
-
if (Array.isArray(clone.type)) {
|
|
241
|
-
// remove any well-known-keys and move their expansions into subfilters
|
|
242
|
-
clone.type = clone.type.reduce(function (acc, entry) {
|
|
243
|
-
if (isWellKnownType(entry)) {
|
|
244
|
-
// working with dynamic objects in typescript requires some assertions
|
|
245
|
-
var key = entry;
|
|
246
|
-
clone.subFilters = clone.subFilters.concat(lookupTypeFilters(key));
|
|
247
|
-
}
|
|
248
|
-
else {
|
|
249
|
-
acc.push(entry);
|
|
250
|
-
}
|
|
251
|
-
return acc;
|
|
252
|
-
}, []);
|
|
253
|
-
}
|
|
254
|
-
else if (isWellKnownType(clone.type)) {
|
|
255
|
-
var key = clone.type;
|
|
256
|
-
clone.subFilters = clone.subFilters.concat(lookupTypeFilters(key));
|
|
257
|
-
delete clone.type;
|
|
258
|
-
}
|
|
259
|
-
else {
|
|
260
|
-
// Future?: implement "expansions" inside MatchOptions
|
|
261
|
-
// For now, we only attempt expansions for filter.type
|
|
262
|
-
// if it's a string, or for strings inside an array
|
|
263
|
-
// Unclear if it's of value to allow short-cuts inside MatchOptions
|
|
264
|
-
}
|
|
265
|
-
}
|
|
266
|
-
return clone;
|
|
267
|
-
}
|
|
268
|
-
/**
|
|
269
|
-
* Is the argument a well-known type "key"
|
|
270
|
-
*
|
|
271
|
-
* Accepts `string`, `string[]` or `IMatchOptions`
|
|
272
|
-
* but only string values can possibly be properties
|
|
273
|
-
* on `ContentFilterExpansions`
|
|
274
|
-
* @param key
|
|
275
|
-
* @returns
|
|
276
|
-
*/
|
|
277
|
-
function isWellKnownType(key) {
|
|
278
|
-
var result = false;
|
|
279
|
-
if (typeof key === "string") {
|
|
280
|
-
result = key in ContentFilterExpansions;
|
|
281
|
-
}
|
|
282
|
-
return result;
|
|
283
|
-
}
|
|
284
|
-
function lookupTypeFilters(key) {
|
|
285
|
-
return ContentFilterExpansions[key];
|
|
286
|
-
}
|
|
287
|
-
/**
|
|
288
|
-
* @private
|
|
289
|
-
* Convert a `ContentFilterDefinition` to a `ContentFilter`
|
|
290
|
-
*
|
|
291
|
-
* ContentFilter is a narrower version of ContentFilterDefinition, without
|
|
292
|
-
* the union types. Using a ContentFilter makes working with the structure
|
|
293
|
-
* in typescript much easier.
|
|
294
|
-
*
|
|
295
|
-
* @param filter
|
|
296
|
-
* @returns
|
|
297
|
-
*/
|
|
298
|
-
export function convertContentDefinitionToFilter(filter) {
|
|
299
|
-
// TODO: Remove with _searchContent
|
|
300
|
-
Logger.warn("DEPRECATION: convertContentDefinitionToFilter will be removed. Work with IFilterGroups<\"item\"> instead");
|
|
301
|
-
var result = {};
|
|
302
|
-
if (filter.term) {
|
|
303
|
-
result.term = filter.term;
|
|
304
|
-
}
|
|
305
|
-
var dateProps = ["created", "modified"];
|
|
306
|
-
// Some properties should not get converted to MatchOptions
|
|
307
|
-
var specialProps = __spreadArrays(["filterType", "subFilters", "term"], dateProps);
|
|
308
|
-
// Do the conversion
|
|
309
|
-
Object.entries(filter).forEach(function (_a) {
|
|
310
|
-
var key = _a[0], value = _a[1];
|
|
311
|
-
if (!specialProps.includes(key)) {
|
|
312
|
-
result[key] = valueToMatchOptions(value);
|
|
313
|
-
}
|
|
314
|
-
});
|
|
315
|
-
// Special Cases
|
|
316
|
-
// subFilters; Array of ContentFilterDefinitions
|
|
317
|
-
if (filter.subFilters && Array.isArray(filter.subFilters)) {
|
|
318
|
-
// downcast - would be nice to skip this or use some other constuct
|
|
319
|
-
var sf = filter.subFilters;
|
|
320
|
-
result.subFilters = sf.map(convertContentDefinitionToFilter);
|
|
321
|
-
}
|
|
322
|
-
// Dates; Ensure they are all DateRange<number>
|
|
323
|
-
dateProps.forEach(function (fld) {
|
|
324
|
-
if (filter[fld]) {
|
|
325
|
-
if (filter[fld].type === "relative-date") {
|
|
326
|
-
result[fld] = relativeDateToDateRange(filter[fld]);
|
|
327
|
-
}
|
|
328
|
-
else {
|
|
329
|
-
result[fld] = cloneObject(filter[fld]);
|
|
330
|
-
}
|
|
331
|
-
}
|
|
332
|
-
});
|
|
333
|
-
return result;
|
|
334
|
-
}
|
|
335
|
-
/**
|
|
336
|
-
* @private
|
|
337
|
-
* Serialize a `ContentFilter` into an `ISearchOptions` for use with `searchItems`
|
|
338
|
-
* @param filter
|
|
339
|
-
* @returns
|
|
340
|
-
*/
|
|
341
|
-
export function serializeContentFilterForPortal(filter) {
|
|
342
|
-
// TODO: Remove with _searchContent
|
|
343
|
-
Logger.warn("DEPRECATION: serializeContentFilterForPortal will be removed. Work with IFilterGroups<\"item\"> and hubSearch() instead");
|
|
344
|
-
var searchOptions = convertContentFilterToSearchOptions(filter);
|
|
345
|
-
if (filter.subFilters) {
|
|
346
|
-
var subFilterOptions = filter.subFilters.reduce(function (acc, entry) {
|
|
347
|
-
// Next guard is present b/c this can be used from javascript
|
|
348
|
-
// but our tests are written in typescript which prevents us
|
|
349
|
-
// from hitting the else
|
|
350
|
-
/* istanbul ignore else */
|
|
351
|
-
if (typeof entry === "object") {
|
|
352
|
-
acc = mergeSearchOptions(acc, convertContentFilterToSearchOptions(entry), "OR");
|
|
353
|
-
}
|
|
354
|
-
return acc;
|
|
355
|
-
}, { q: "", filter: "" });
|
|
356
|
-
// merge with searchOptions using AND
|
|
357
|
-
searchOptions = mergeSearchOptions(searchOptions, subFilterOptions, "AND");
|
|
358
|
-
}
|
|
359
|
-
// term is always last, and pre-pended on searchOptions.q
|
|
360
|
-
if (filter.term) {
|
|
361
|
-
searchOptions.q = (filter.term + " " + searchOptions.q).trim();
|
|
362
|
-
}
|
|
363
|
-
return searchOptions;
|
|
364
|
-
}
|
|
365
|
-
/**
|
|
366
|
-
* @private
|
|
367
|
-
* Convert a ContentFilter to a SearchOptions
|
|
368
|
-
*
|
|
369
|
-
* @param filter
|
|
370
|
-
* @returns
|
|
371
|
-
*/
|
|
372
|
-
export function convertContentFilterToSearchOptions(filter) {
|
|
373
|
-
// TODO: Remove with _searchContent
|
|
374
|
-
Logger.warn("DEPRECATION: convertContentFilterToSearchOptions will be removed. Work with IFilterGroups<\"item\"> and hubSearch() instead");
|
|
375
|
-
var result = {
|
|
376
|
-
q: "",
|
|
377
|
-
filter: "",
|
|
378
|
-
};
|
|
379
|
-
var dateProps = ["created", "modified"];
|
|
380
|
-
var specialProps = __spreadArrays(["filterType", "subFilters", "term"], dateProps);
|
|
381
|
-
Object.entries(filter).forEach(function (_a) {
|
|
382
|
-
var key = _a[0], value = _a[1];
|
|
383
|
-
// MatchOptions may go into either q or filter
|
|
384
|
-
if (!specialProps.includes(key)) {
|
|
385
|
-
result = mergeSearchOptions(result, serializeMatchOptions(key, value), "AND");
|
|
386
|
-
}
|
|
387
|
-
// Dates only go into q
|
|
388
|
-
if (dateProps.includes(key)) {
|
|
389
|
-
result = mergeSearchOptions(result, serializeDateRange(key, value), "AND");
|
|
390
|
-
}
|
|
391
|
-
});
|
|
392
|
-
return result;
|
|
393
|
-
}
|
|
394
|
-
//# sourceMappingURL=content-utils.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"content-utils.js","sourceRoot":"","sources":["../../../src/search/content-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,31 +0,0 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* Determine if a Filter is "empty"
|
|
3
|
-
* @param filter
|
|
4
|
-
* @returns
|
|
5
|
-
*/
|
|
6
|
-
export function isEmptyFilter(filter) {
|
|
7
|
-
// if it has one property, filterType, it's empty
|
|
8
|
-
return (Object.keys(filter).length === 1 && filter.hasOwnProperty("filterType"));
|
|
9
|
-
}
|
|
10
|
-
/**
|
|
11
|
-
* Determine if a filterGroup is "empty"
|
|
12
|
-
* @param filterGroup
|
|
13
|
-
* @returns
|
|
14
|
-
*/
|
|
15
|
-
export function isEmptyFilterGroup(filterGroup) {
|
|
16
|
-
// if filters array is empty
|
|
17
|
-
if (filterGroup.filters.length === 0) {
|
|
18
|
-
return true;
|
|
19
|
-
}
|
|
20
|
-
else {
|
|
21
|
-
// if all filters are empty
|
|
22
|
-
var result = filterGroup.filters.reduce(function (acc, entry) {
|
|
23
|
-
if (acc) {
|
|
24
|
-
acc = isEmptyFilter(entry);
|
|
25
|
-
}
|
|
26
|
-
return acc;
|
|
27
|
-
}, true);
|
|
28
|
-
return result;
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
//# sourceMappingURL=filter-utils.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"filter-utils.js","sourceRoot":"","sources":["../../../src/search/filter-utils.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,UAAU,aAAa,CAAC,MAA0B;IACtD,iDAAiD;IACjD,OAAO,CACL,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,MAAM,CAAC,cAAc,CAAC,YAAY,CAAC,CACxE,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAChC,WAAqC;IAErC,4BAA4B;IAC5B,IAAI,WAAW,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACpC,OAAO,IAAI,CAAC;KACb;SAAM;QACL,2BAA2B;QAC3B,IAAM,MAAM,GAAG,WAAW,CAAC,OAAO,CAAC,MAAM,CAAC,UAAC,GAAG,EAAE,KAAK;YACnD,IAAI,GAAG,EAAE;gBACP,GAAG,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;aAC5B;YACD,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,IAAI,CAAC,CAAC;QACT,OAAO,MAAM,CAAC;KACf;AACH,CAAC"}
|
|
@@ -1,146 +0,0 @@
|
|
|
1
|
-
import { __spreadArrays } from "tslib";
|
|
2
|
-
import { mergeDateRange, mergeMatchOptions, mergeSearchOptions, relativeDateToDateRange, serializeDateRange, serializeMatchOptions, valueToMatchOptions, } from ".";
|
|
3
|
-
import { cloneObject, getProp, Logger, setProp } from "..";
|
|
4
|
-
// TODO: Remove with _searchContent
|
|
5
|
-
/**
|
|
6
|
-
*
|
|
7
|
-
* Merge `Filter<"group">` objects
|
|
8
|
-
*
|
|
9
|
-
* Useful in components which may get partial filters from a variety of
|
|
10
|
-
* sub-components, which are then combined into a single filter prior
|
|
11
|
-
* to executing the search.
|
|
12
|
-
* @param filters
|
|
13
|
-
* @returns
|
|
14
|
-
*/
|
|
15
|
-
export function mergeGroupFilters(filters) {
|
|
16
|
-
// TODO: Remove with _searchContent
|
|
17
|
-
Logger.warn("DEPRECATION: mergeGroupFilters will be removed. Work with IFilterGroups<\"group\"> and hubSearch() instead");
|
|
18
|
-
// expand all the filters so all prop types are consistent
|
|
19
|
-
var expanded = filters.map(expandGroupFilter);
|
|
20
|
-
// now we can merge based on fields
|
|
21
|
-
var dateFields = ["created", "modified"];
|
|
22
|
-
var specialFields = __spreadArrays(["filterType", "term"], dateFields);
|
|
23
|
-
// acc is initialized as Filter<group> but also needs it
|
|
24
|
-
// in the function signature... for reasons?!
|
|
25
|
-
var result = expanded.reduce(function (acc, entry) {
|
|
26
|
-
// process fields
|
|
27
|
-
Object.entries(entry).forEach(function (_a) {
|
|
28
|
-
// Note: getProp/setProp are used to get around
|
|
29
|
-
// typescript issues with string indexing
|
|
30
|
-
var key = _a[0], value = _a[1];
|
|
31
|
-
if (acc.hasOwnProperty(key)) {
|
|
32
|
-
var existingValue = getProp(acc, key);
|
|
33
|
-
// if the key is not to a special field
|
|
34
|
-
if (!specialFields.includes(key)) {
|
|
35
|
-
// treat as an IMatchOptions
|
|
36
|
-
setProp(key, mergeMatchOptions(existingValue, value), acc);
|
|
37
|
-
}
|
|
38
|
-
else if (dateFields.includes(key)) {
|
|
39
|
-
// treat as IDateRange
|
|
40
|
-
setProp(key, mergeDateRange(existingValue, value), acc);
|
|
41
|
-
}
|
|
42
|
-
else if (key === "term") {
|
|
43
|
-
// append terms
|
|
44
|
-
acc[key] = acc[key] + " " + value;
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
else {
|
|
48
|
-
// Acc does not have an entry for this yet
|
|
49
|
-
// so just clone it
|
|
50
|
-
setProp(key, cloneObject(value), acc);
|
|
51
|
-
}
|
|
52
|
-
});
|
|
53
|
-
return acc;
|
|
54
|
-
}, {
|
|
55
|
-
filterType: "group",
|
|
56
|
-
});
|
|
57
|
-
return result;
|
|
58
|
-
}
|
|
59
|
-
/**
|
|
60
|
-
* Prior to serialization into the query syntax for the backing APIs, we first expand [Filters](../Filter)
|
|
61
|
-
*
|
|
62
|
-
* Filter's can express their intent in a very terse form, but to ensure consistent structures
|
|
63
|
-
* we expand them into their more verbose form.
|
|
64
|
-
*
|
|
65
|
-
* i.e. `title: "Water"` expands into `title: { any: ["Water"]}`
|
|
66
|
-
*
|
|
67
|
-
* - Fields defined as `string | string[] | MatchOptions` will be converted to a `MatchOptions`
|
|
68
|
-
* - RelativeDate fields are converted to DateRange<number>
|
|
69
|
-
*
|
|
70
|
-
* @param filter
|
|
71
|
-
* @returns
|
|
72
|
-
*/
|
|
73
|
-
export function expandGroupFilter(filter) {
|
|
74
|
-
// TODO: Remove with _searchContent
|
|
75
|
-
Logger.warn("DEPRECATION: expandGroupFilters will be removed. Work with IFilterGroups<\"group\"> and hubSearch() instead");
|
|
76
|
-
var result = {};
|
|
77
|
-
var dateProps = ["created", "modified"];
|
|
78
|
-
// Some properties should not get converted to MatchOptions
|
|
79
|
-
var specialProps = __spreadArrays(["term", "searchUserAccess"], dateProps);
|
|
80
|
-
// Do the conversion
|
|
81
|
-
Object.entries(filter).forEach(function (_a) {
|
|
82
|
-
var key = _a[0], value = _a[1];
|
|
83
|
-
// handle Matchish fields
|
|
84
|
-
if (!specialProps.includes(key)) {
|
|
85
|
-
// setProp side-steps typescript complaining
|
|
86
|
-
setProp(key, valueToMatchOptions(value), result);
|
|
87
|
-
}
|
|
88
|
-
// Handle date fields
|
|
89
|
-
if (dateProps.includes(key)) {
|
|
90
|
-
var dateFieldValue = cloneObject(getProp(filter, key));
|
|
91
|
-
if (getProp(filter, key + ".type") === "relative-date") {
|
|
92
|
-
setProp(key, relativeDateToDateRange(dateFieldValue), result);
|
|
93
|
-
}
|
|
94
|
-
else {
|
|
95
|
-
setProp(key, dateFieldValue, result);
|
|
96
|
-
}
|
|
97
|
-
}
|
|
98
|
-
});
|
|
99
|
-
// searchUserAccess is boolean, so we check if the prop exists
|
|
100
|
-
// vs checking if the value is truthy
|
|
101
|
-
if (filter.hasOwnProperty("searchUserAccess")) {
|
|
102
|
-
result.searchUserAccess = filter.searchUserAccess;
|
|
103
|
-
}
|
|
104
|
-
if (filter.term) {
|
|
105
|
-
result.term = filter.term;
|
|
106
|
-
}
|
|
107
|
-
return result;
|
|
108
|
-
}
|
|
109
|
-
/**
|
|
110
|
-
* @private
|
|
111
|
-
* Serialize an `IGroupFilterDefinition` into an `ISearchOptions` for use
|
|
112
|
-
* with `searchGroups`
|
|
113
|
-
* @param filter
|
|
114
|
-
* @returns
|
|
115
|
-
*/
|
|
116
|
-
export function serializeGroupFilterForPortal(filter) {
|
|
117
|
-
// TODO: Remove with _searchContent
|
|
118
|
-
Logger.warn("DEPRECATION: serializeGroupFilterForPortal will be removed. Work with IFilterGroups<\"group\"> and hubSearch() instead");
|
|
119
|
-
var result = {
|
|
120
|
-
q: "",
|
|
121
|
-
filter: "",
|
|
122
|
-
};
|
|
123
|
-
var dateProps = ["created", "modified"];
|
|
124
|
-
var specialProps = __spreadArrays(["term", "searchUserAccess", "filterType"], dateProps);
|
|
125
|
-
Object.entries(filter).forEach(function (_a) {
|
|
126
|
-
var key = _a[0], value = _a[1];
|
|
127
|
-
// MatchOptions fields
|
|
128
|
-
if (!specialProps.includes(key)) {
|
|
129
|
-
result = mergeSearchOptions(result, serializeMatchOptions(key, value), "AND");
|
|
130
|
-
}
|
|
131
|
-
// Dates only go into q
|
|
132
|
-
if (dateProps.includes(key)) {
|
|
133
|
-
result = mergeSearchOptions(result, serializeDateRange(key, value), "AND");
|
|
134
|
-
}
|
|
135
|
-
});
|
|
136
|
-
// searchUserAccess is also a top-level property
|
|
137
|
-
if (filter.hasOwnProperty("searchUserAccess")) {
|
|
138
|
-
result.searchUserAccess = filter.searchUserAccess;
|
|
139
|
-
}
|
|
140
|
-
// add the term
|
|
141
|
-
if (filter.term) {
|
|
142
|
-
result.q = (filter.term + " " + result.q).trim();
|
|
143
|
-
}
|
|
144
|
-
return result;
|
|
145
|
-
}
|
|
146
|
-
//# sourceMappingURL=group-utils.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"group-utils.js","sourceRoot":"","sources":["../../../src/search/group-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
//# sourceMappingURL=ICatalog.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ICatalog.js","sourceRoot":"","sources":["../../../../src/search/types/ICatalog.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
//# sourceMappingURL=ICollection.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ICollection.js","sourceRoot":"","sources":["../../../../src/search/types/ICollection.ts"],"names":[],"mappings":""}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
//# sourceMappingURL=IHubApiSearchRequest.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"IHubApiSearchRequest.js","sourceRoot":"","sources":["../../../../src/search/types/IHubApiSearchRequest.ts"],"names":[],"mappings":""}
|