@esri/hub-common 15.25.0 → 15.26.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/hubEventsHelpers/getUniquePredicateValuesByKey.js +6 -0
- package/dist/esm/search/_internal/hubEventsHelpers/getUniquePredicateValuesByKey.js.map +1 -0
- package/dist/esm/search/_internal/hubEventsHelpers/processFilters.js +42 -42
- package/dist/esm/search/_internal/hubEventsHelpers/processFilters.js.map +1 -1
- package/dist/esm/search/_internal/hubEventsHelpers/processOptions.js +4 -4
- package/dist/esm/search/_internal/hubEventsHelpers/processOptions.js.map +1 -1
- package/dist/esm/search/_internal/hubEventsHelpers/toEnumConverters.js +20 -0
- package/dist/esm/search/_internal/hubEventsHelpers/toEnumConverters.js.map +1 -0
- package/dist/esm/search/_internal/hubSearchEvents.js +5 -5
- package/dist/esm/search/_internal/hubSearchEvents.js.map +1 -1
- package/dist/esm/sites/feeds/_internal/defaults.js +1 -1
- package/dist/esm/sites/feeds/_internal/defaults.js.map +1 -1
- package/dist/esm/sites/feeds/getFeedTemplate.js +12 -1
- package/dist/esm/sites/feeds/getFeedTemplate.js.map +1 -1
- package/dist/node/search/_internal/hubEventsHelpers/getUniquePredicateValuesByKey.js +9 -0
- package/dist/node/search/_internal/hubEventsHelpers/getUniquePredicateValuesByKey.js.map +1 -0
- package/dist/node/search/_internal/hubEventsHelpers/processFilters.js +41 -41
- package/dist/node/search/_internal/hubEventsHelpers/processFilters.js.map +1 -1
- package/dist/node/search/_internal/hubEventsHelpers/processOptions.js +4 -4
- package/dist/node/search/_internal/hubEventsHelpers/processOptions.js.map +1 -1
- package/dist/node/search/_internal/hubEventsHelpers/toEnumConverters.js +25 -0
- package/dist/node/search/_internal/hubEventsHelpers/toEnumConverters.js.map +1 -0
- package/dist/node/search/_internal/hubSearchEvents.js +4 -4
- package/dist/node/search/_internal/hubSearchEvents.js.map +1 -1
- package/dist/node/sites/feeds/_internal/defaults.js +1 -1
- package/dist/node/sites/feeds/_internal/defaults.js.map +1 -1
- package/dist/node/sites/feeds/getFeedTemplate.js +12 -1
- package/dist/node/sites/feeds/getFeedTemplate.js.map +1 -1
- package/dist/types/search/_internal/hubEventsHelpers/getUniquePredicateValuesByKey.d.ts +2 -0
- package/dist/types/search/_internal/hubEventsHelpers/processFilters.d.ts +4 -4
- package/dist/types/search/_internal/hubEventsHelpers/processOptions.d.ts +4 -4
- package/dist/types/search/_internal/hubEventsHelpers/toEnumConverters.d.ts +12 -0
- package/dist/types/search/_internal/hubSearchEvents.d.ts +1 -2
- package/package.json +1 -1
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import { unique } from "../../../util";
|
|
2
|
+
import { getPredicateValuesByKey } from "./getPredicateValuesByKey";
|
|
3
|
+
export const getUniquePredicateValuesByKey = (filters, predicateKey) => {
|
|
4
|
+
return getPredicateValuesByKey(filters, predicateKey).filter(unique);
|
|
5
|
+
};
|
|
6
|
+
//# sourceMappingURL=getUniquePredicateValuesByKey.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getUniquePredicateValuesByKey.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubEventsHelpers/getUniquePredicateValuesByKey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAC3C,OAAkB,EAClB,YAAoB,EACf,EAAE;IACP,OAAO,uBAAuB,CAAI,OAAO,EAAE,YAAY,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC1E,CAAC,CAAC"}
|
|
@@ -1,33 +1,34 @@
|
|
|
1
|
-
import { EventStatus, } from "../../../events/api/orval/api/orval-events";
|
|
2
|
-
import { getOptionalPredicateStringsByKey } from "./getOptionalPredicateStringsByKey";
|
|
1
|
+
import { EventAccess, EventAssociationEntityType, EventAttendanceType, EventStatus, } from "../../../events/api/orval/api/orval-events";
|
|
3
2
|
import { getPredicateValuesByKey } from "./getPredicateValuesByKey";
|
|
3
|
+
import { getUniquePredicateValuesByKey } from "./getUniquePredicateValuesByKey";
|
|
4
4
|
import { searchGroups } from "@esri/arcgis-rest-portal";
|
|
5
5
|
import { isUpdateGroup } from "../../../utils/is-update-group";
|
|
6
|
+
import { toEnums } from "./toEnumConverters";
|
|
6
7
|
/**
|
|
7
|
-
* Builds a Partial<
|
|
8
|
+
* Builds a Partial<ISearchEvents> given an Array of IFilter objects
|
|
8
9
|
* @param filters An Array of IFilter
|
|
9
|
-
* @returns a Partial<
|
|
10
|
+
* @returns a Partial<ISearchEvents> for the given Array of IFilter objects
|
|
10
11
|
*/
|
|
11
12
|
export async function processFilters(filters, requestOptions) {
|
|
12
13
|
const processedFilters = {};
|
|
13
|
-
const access =
|
|
14
|
-
if (access
|
|
15
|
-
processedFilters.access = access;
|
|
14
|
+
const access = getUniquePredicateValuesByKey(filters, "access");
|
|
15
|
+
if (access.length) {
|
|
16
|
+
processedFilters.access = toEnums(access, EventAccess);
|
|
16
17
|
}
|
|
17
18
|
const canEdit = getPredicateValuesByKey(filters, "canEdit");
|
|
18
19
|
if (canEdit.length) {
|
|
19
|
-
processedFilters.canEdit = canEdit[0]
|
|
20
|
+
processedFilters.canEdit = canEdit[0];
|
|
20
21
|
}
|
|
21
|
-
const entityIds =
|
|
22
|
-
if (entityIds
|
|
22
|
+
const entityIds = getUniquePredicateValuesByKey(filters, "entityId");
|
|
23
|
+
if (entityIds.length) {
|
|
23
24
|
processedFilters.entityIds = entityIds;
|
|
24
25
|
}
|
|
25
|
-
const entityTypes =
|
|
26
|
-
if (entityTypes
|
|
27
|
-
processedFilters.entityTypes = entityTypes;
|
|
26
|
+
const entityTypes = getUniquePredicateValuesByKey(filters, "entityType");
|
|
27
|
+
if (entityTypes.length) {
|
|
28
|
+
processedFilters.entityTypes = toEnums(entityTypes, EventAssociationEntityType);
|
|
28
29
|
}
|
|
29
|
-
const eventIds =
|
|
30
|
-
if (eventIds
|
|
30
|
+
const eventIds = getUniquePredicateValuesByKey(filters, "id");
|
|
31
|
+
if (eventIds.length) {
|
|
31
32
|
processedFilters.eventIds = eventIds;
|
|
32
33
|
}
|
|
33
34
|
const term = getPredicateValuesByKey(filters, "term");
|
|
@@ -38,35 +39,35 @@ export async function processFilters(filters, requestOptions) {
|
|
|
38
39
|
if (orgId.length) {
|
|
39
40
|
processedFilters.orgId = orgId[0];
|
|
40
41
|
}
|
|
41
|
-
const categories =
|
|
42
|
-
if (categories
|
|
42
|
+
const categories = getUniquePredicateValuesByKey(filters, "categories");
|
|
43
|
+
if (categories.length) {
|
|
43
44
|
processedFilters.categories = categories;
|
|
44
45
|
}
|
|
45
|
-
const tags =
|
|
46
|
-
if (tags
|
|
46
|
+
const tags = getUniquePredicateValuesByKey(filters, "tags");
|
|
47
|
+
if (tags.length) {
|
|
47
48
|
processedFilters.tags = tags;
|
|
48
49
|
}
|
|
49
|
-
const groupIds =
|
|
50
|
+
const groupIds = getUniquePredicateValuesByKey(filters, "group");
|
|
50
51
|
// if a group was provided, we prioritize that over individual readGroupId or editGroupId
|
|
51
52
|
// filters to prevent collisions
|
|
52
|
-
if (groupIds
|
|
53
|
+
if (groupIds.length) {
|
|
53
54
|
// We are explicitly sending groupIds to sharedToGroups
|
|
54
55
|
processedFilters.sharedToGroups = groupIds;
|
|
55
56
|
}
|
|
56
57
|
else {
|
|
57
58
|
// individual readGroupId & editGroupId filters
|
|
58
|
-
const readGroupIds =
|
|
59
|
-
if (readGroupIds
|
|
59
|
+
const readGroupIds = getUniquePredicateValuesByKey(filters, "readGroupId");
|
|
60
|
+
if (readGroupIds.length) {
|
|
60
61
|
processedFilters.readGroups = readGroupIds;
|
|
61
62
|
}
|
|
62
|
-
const editGroupIds =
|
|
63
|
-
if (editGroupIds
|
|
63
|
+
const editGroupIds = getUniquePredicateValuesByKey(filters, "editGroupId");
|
|
64
|
+
if (editGroupIds.length) {
|
|
64
65
|
processedFilters.editGroups = editGroupIds;
|
|
65
66
|
}
|
|
66
67
|
}
|
|
67
68
|
// NOTE: previously notGroup was an inverse of group, but now they are subtly different
|
|
68
69
|
// We do not yet have an inverse of sharedToGroups.
|
|
69
|
-
const notGroupIds =
|
|
70
|
+
const notGroupIds = getUniquePredicateValuesByKey(filters, "notGroup");
|
|
70
71
|
// if a notGroup was provided, we prioritize that over individual notReadGroupId or notEditGroupId
|
|
71
72
|
// filters to prevent collisions
|
|
72
73
|
if (notGroupIds.length) {
|
|
@@ -78,36 +79,35 @@ export async function processFilters(filters, requestOptions) {
|
|
|
78
79
|
return Object.assign(Object.assign({}, acc), { [key]: [...acc[key], group.id] });
|
|
79
80
|
}, { notReadGroupIds: [], notEditGroupIds: [] });
|
|
80
81
|
if (notReadGroupIds.length) {
|
|
81
|
-
processedFilters.withoutReadGroups = notReadGroupIds
|
|
82
|
+
processedFilters.withoutReadGroups = notReadGroupIds;
|
|
82
83
|
}
|
|
83
84
|
if (notEditGroupIds.length) {
|
|
84
|
-
processedFilters.withoutEditGroups = notEditGroupIds
|
|
85
|
+
processedFilters.withoutEditGroups = notEditGroupIds;
|
|
85
86
|
}
|
|
86
87
|
}
|
|
87
88
|
else {
|
|
88
89
|
// individual notReadGroupId & notEditGroupId filters
|
|
89
|
-
const notReadGroupIds =
|
|
90
|
-
if (notReadGroupIds
|
|
90
|
+
const notReadGroupIds = getUniquePredicateValuesByKey(filters, "notReadGroupId");
|
|
91
|
+
if (notReadGroupIds.length) {
|
|
91
92
|
processedFilters.withoutReadGroups = notReadGroupIds;
|
|
92
93
|
}
|
|
93
|
-
const notEditGroupIds =
|
|
94
|
-
if (notEditGroupIds
|
|
94
|
+
const notEditGroupIds = getUniquePredicateValuesByKey(filters, "notEditGroupId");
|
|
95
|
+
if (notEditGroupIds.length) {
|
|
95
96
|
processedFilters.withoutEditGroups = notEditGroupIds;
|
|
96
97
|
}
|
|
97
98
|
}
|
|
98
|
-
const attendanceType =
|
|
99
|
-
if (attendanceType
|
|
100
|
-
processedFilters.attendanceTypes = attendanceType;
|
|
99
|
+
const attendanceType = getUniquePredicateValuesByKey(filters, "attendanceType");
|
|
100
|
+
if (attendanceType.length) {
|
|
101
|
+
processedFilters.attendanceTypes = toEnums(attendanceType, EventAttendanceType);
|
|
101
102
|
}
|
|
102
|
-
const createdByIds =
|
|
103
|
-
if (createdByIds
|
|
103
|
+
const createdByIds = getUniquePredicateValuesByKey(filters, "owner");
|
|
104
|
+
if (createdByIds.length) {
|
|
104
105
|
processedFilters.createdByIds = createdByIds;
|
|
105
106
|
}
|
|
106
|
-
const status =
|
|
107
|
-
processedFilters.status =
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
.join(",");
|
|
107
|
+
const status = getUniquePredicateValuesByKey(filters, "status");
|
|
108
|
+
processedFilters.status = status.length
|
|
109
|
+
? toEnums(status, EventStatus)
|
|
110
|
+
: [EventStatus.PLANNED, EventStatus.CANCELED];
|
|
111
111
|
const startDateRange = getPredicateValuesByKey(filters, "startDateRange");
|
|
112
112
|
// if a startDateRange was provided, we prioritize that over individual startDateBefore or startDateAfter
|
|
113
113
|
// filters to prevent collisions
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processFilters.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubEventsHelpers/processFilters.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,GAEZ,MAAM,4CAA4C,CAAC;AACpD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"processFilters.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubEventsHelpers/processFilters.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import { EventSort, EventSortOrder, } from "../../../events/api/orval/api/orval-events";
|
|
2
2
|
/**
|
|
3
|
-
* Builds a Partial<
|
|
3
|
+
* Builds a Partial<ISearchEvents> for the given IHubSearchOptions
|
|
4
4
|
* @param options An IHubSearchOptions object
|
|
5
|
-
* @returns a Partial<
|
|
5
|
+
* @returns a Partial<ISearchEvents> for the given IHubSearchOptions
|
|
6
6
|
*/
|
|
7
7
|
export function processOptions(options) {
|
|
8
8
|
const processedOptions = {};
|
|
9
9
|
if (options.num > 0) {
|
|
10
|
-
processedOptions.num = options.num
|
|
10
|
+
processedOptions.num = options.num;
|
|
11
11
|
}
|
|
12
12
|
if (options.start > 1) {
|
|
13
|
-
processedOptions.start = options.start
|
|
13
|
+
processedOptions.start = options.start;
|
|
14
14
|
}
|
|
15
15
|
if (options.sortField === "modified") {
|
|
16
16
|
processedOptions.sortBy = EventSort.updatedAt;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processOptions.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubEventsHelpers/processOptions.ts"],"names":[],"mappings":"AACA,OAAO,EACL,SAAS,EAET,cAAc,GACf,MAAM,4CAA4C,CAAC;AAEpD;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAC5B,OAA0B;IAE1B,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"processOptions.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubEventsHelpers/processOptions.ts"],"names":[],"mappings":"AACA,OAAO,EACL,SAAS,EAET,cAAc,GACf,MAAM,4CAA4C,CAAC;AAEpD;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAC5B,OAA0B;IAE1B,MAAM,gBAAgB,GAA2B,EAAE,CAAC;IACpD,IAAI,OAAO,CAAC,GAAG,GAAG,CAAC,EAAE;QACnB,gBAAgB,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;KACpC;IACD,IAAI,OAAO,CAAC,KAAK,GAAG,CAAC,EAAE;QACrB,gBAAgB,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;KACxC;IACD,IAAI,OAAO,CAAC,SAAS,KAAK,UAAU,EAAE;QACpC,gBAAgB,CAAC,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC;KAC/C;SAAM,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,EAAE;QAC1C,gBAAgB,CAAC,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC;KAC/C;SAAM,IAAI,OAAO,CAAC,SAAS,KAAK,OAAO,EAAE;QACxC,gBAAgB,CAAC,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC;KAC3C;SAAM,IAAI,OAAO,CAAC,SAAS,KAAK,WAAW,EAAE;QAC5C,gBAAgB,CAAC,MAAM,GAAG,SAAS,CAAC,aAAa,CAAC;KACnD;IACD,gBAAgB,CAAC,SAAS;QACxB,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC;IAC1E,OAAO,gBAAgB,CAAC;AAC1B,CAAC"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Converts a string to an enum value
|
|
3
|
+
*
|
|
4
|
+
* strings not in the enum will be returned as the original string
|
|
5
|
+
*/
|
|
6
|
+
export function toEnum(value, enumType) {
|
|
7
|
+
return (enumType[value] ||
|
|
8
|
+
enumType[value.toUpperCase()] ||
|
|
9
|
+
enumType[value.toLowerCase()] ||
|
|
10
|
+
value);
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Converts an array of strings to an array of enum values
|
|
14
|
+
*
|
|
15
|
+
* strings not in the enum will be returned as the original string
|
|
16
|
+
*/
|
|
17
|
+
export function toEnums(values, enumType) {
|
|
18
|
+
return values.map((value) => toEnum(value, enumType));
|
|
19
|
+
}
|
|
20
|
+
//# sourceMappingURL=toEnumConverters.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"toEnumConverters.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubEventsHelpers/toEnumConverters.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,MAAM,CAAI,KAAa,EAAE,QAAW;IAClD,OAAO,CACJ,QAAgB,CAAC,KAAK,CAAC;QACvB,QAAgB,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QACrC,QAAgB,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QACtC,KAAK,CACN,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,OAAO,CAAI,MAAgB,EAAE,QAAW;IACtD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAI,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;AAC3D,CAAC"}
|
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { searchEvents } from "../../events/api/events";
|
|
2
|
+
import { GetEventsInclude, } from "../../events/api/orval/api/orval-events";
|
|
2
3
|
import { eventToSearchResult } from "./hubEventsHelpers/eventToSearchResult";
|
|
3
4
|
import { processOptions } from "./hubEventsHelpers/processOptions";
|
|
4
5
|
import { processFilters } from "./hubEventsHelpers/processFilters";
|
|
5
6
|
/**
|
|
6
7
|
* Searches for events against the Events 3 API using the given `query` and `options`.
|
|
7
8
|
* Currently supported filters include:
|
|
8
|
-
* - access: 'public' | 'private' | 'org' | Array<'public' | 'org' | '
|
|
9
|
+
* - access: 'public' | 'private' | 'org' | Array<'public' | 'org' | 'private'>;
|
|
9
10
|
* - canEdit: boolean
|
|
10
11
|
* - entityId: string | string[];
|
|
11
12
|
* - entityType: string | string[];
|
|
12
13
|
* - id: string | string[];
|
|
13
|
-
* - userId: string;
|
|
14
14
|
* - term: string;
|
|
15
15
|
* - categories: string | string[];
|
|
16
16
|
* - tags: string | string[];
|
|
@@ -42,8 +42,8 @@ import { processFilters } from "./hubEventsHelpers/processFilters";
|
|
|
42
42
|
export async function hubSearchEvents(query, options) {
|
|
43
43
|
const processedFilters = await processFilters(query.filters, options.requestOptions);
|
|
44
44
|
const processedOptions = processOptions(options);
|
|
45
|
-
const data = Object.assign(Object.assign(Object.assign({}, processedFilters), processedOptions), { include:
|
|
46
|
-
const { items, nextStart, total } = await
|
|
45
|
+
const data = Object.assign(Object.assign(Object.assign({}, processedFilters), processedOptions), { include: [GetEventsInclude.creator, GetEventsInclude.location] });
|
|
46
|
+
const { items, nextStart, total } = await searchEvents(Object.assign(Object.assign({}, options.requestOptions), { data }));
|
|
47
47
|
const results = await Promise.all(items.map((event) => eventToSearchResult(event, options)));
|
|
48
48
|
const hasNext = nextStart > -1;
|
|
49
49
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hubSearchEvents.js","sourceRoot":"","sources":["../../../../src/search/_internal/hubSearchEvents.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"hubSearchEvents.js","sourceRoot":"","sources":["../../../../src/search/_internal/hubSearchEvents.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EACL,gBAAgB,GAGjB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,wCAAwC,CAAC;AAC7E,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEnE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,KAAa,EACb,OAA0B;IAE1B,MAAM,gBAAgB,GAAG,MAAM,cAAc,CAC3C,KAAK,CAAC,OAAO,EACb,OAAO,CAAC,cAAc,CACvB,CAAC;IACF,MAAM,gBAAgB,GAAG,cAAc,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,IAAI,iDACL,gBAAgB,GAChB,gBAAgB,KACnB,OAAO,EAAE,CAAC,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,CAAC,QAAQ,CAAC,GAC/D,CAAC;IACF,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,MAAM,YAAY,iCACjD,OAAO,CAAC,cAAc,KACzB,IAAI,IACJ,CAAC;IACH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAC1D,CAAC;IACF,MAAM,OAAO,GAAG,SAAS,GAAG,CAAC,CAAC,CAAC;IAC/B,OAAO;QACL,KAAK;QACL,OAAO;QACP,OAAO;QACP,IAAI,EAAE,GAAG,EAAE;YACT,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;aACvE;YACD,OAAO,eAAe,CAAC,KAAK,kCACvB,OAAO,KACV,KAAK,EAAE,SAAS,IAChB,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../../../../src/sites/feeds/_internal/defaults.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,mBAAmB;IACjC,OAAO;QACL,SAAS,EAAE;YACT,GAAG,EAAE,kBAAkB;YACvB,GAAG,EAAE,kBAAkB;SACxB;QACD,SAAS,EAAE;YACT,GAAG,EAAE,mBAAmB;SACzB;QACD,GAAG,EAAE;YACH,GAAG,EAAE,cAAc;SACpB;KACF,CAAC;AACJ,CAAC;AAED,MAAM,kBAAkB,GAAG;IACzB,KAAK,EAAE,UAAU;IACjB,WAAW,EAAE,iBAAiB;IAC9B,OAAO,EAAE,UAAU;IACnB,MAAM,EAAE,mBAAmB;IAC3B,QAAQ,EAAE,oBAAoB;IAC9B,SAAS,EAAE;QACT,IAAI,EAAE,YAAY;KACnB;IACD,YAAY,EAAE;QACZ,EAAE,EAAE,WAAW;QACf,QAAQ,EAAE,qBAAqB;KAChC;IACD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../../../../src/sites/feeds/_internal/defaults.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,MAAM,UAAU,mBAAmB;IACjC,OAAO;QACL,SAAS,EAAE;YACT,GAAG,EAAE,kBAAkB;YACvB,GAAG,EAAE,kBAAkB;SACxB;QACD,SAAS,EAAE;YACT,GAAG,EAAE,mBAAmB;SACzB;QACD,GAAG,EAAE;YACH,GAAG,EAAE,cAAc;SACpB;KACF,CAAC;AACJ,CAAC;AAED,MAAM,kBAAkB,GAAG;IACzB,KAAK,EAAE,UAAU;IACjB,WAAW,EAAE,iBAAiB;IAC9B,OAAO,EAAE,UAAU;IACnB,MAAM,EAAE,mBAAmB;IAC3B,QAAQ,EAAE,oBAAoB;IAC9B,SAAS,EAAE;QACT,IAAI,EAAE,YAAY;KACnB;IACD,YAAY,EAAE;QACZ,EAAE,EAAE,WAAW;QACf,QAAQ,EAAE,qBAAqB;KAChC;IACD,OAAO,EAAE,mCAAmC;CAC7C,CAAC;AAEF,MAAM,kBAAkB,GAAG;IACzB,WAAW,EAAE,WAAW;IACxB,iBAAiB,EAAE,kBAAkB;IACrC,YAAY,EAAE;QACZ,QAAQ,EACN,oJAAoJ;QACtJ,OAAO,EAAE,cAAc;KACxB;CACF,CAAC;AAEF,MAAM,mBAAmB,GAAG;IAC1B,WAAW,EAAE,UAAU;IACvB,iBAAiB,EAAE,iBAAiB;IACpC,mBAAmB,EAAE;QACnB,UAAU,EAAE,WAAW;QACvB,gBAAgB,EAAE,qBAAqB;KACxC;CACF,CAAC;AAEF,MAAM,cAAc,GAAG;IACrB,OAAO,EAAE;QACP,KAAK,EAAE,UAAU;QACjB,WAAW,EAAE,uBAAuB;QACpC,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,aAAa;QACvB,QAAQ,EAAE,gBAAgB;QAC1B,IAAI,EAAE;YACJ,KAAK,EAAE,UAAU;YACjB,WAAW,EAAE,uBAAuB;YACpC,MAAM,EAAE,qBAAqB;YAC7B,QAAQ,EAAE,gBAAgB;YAC1B,OAAO,EAAE,mBAAmB;SAC7B;KACF;CACF,CAAC"}
|
|
@@ -39,7 +39,18 @@ function getDcatApConfig(feedsConfig, version) {
|
|
|
39
39
|
}
|
|
40
40
|
function getDcatUsConfig(feedsConfig, version) {
|
|
41
41
|
if (getMajorVersion(version) === "1") {
|
|
42
|
-
|
|
42
|
+
const dcatUsConfig = feedsConfig.dcatUS1X || feedsConfig.dcatUS11;
|
|
43
|
+
// Some sites may have dcat us config with invalid
|
|
44
|
+
// extent value for spatial property i.e. '{{extent}}'
|
|
45
|
+
//
|
|
46
|
+
// Following fixes that by replacing invalid default extent
|
|
47
|
+
// value to valid one i.e. '{{{extent:computeSpatialProperty}}'
|
|
48
|
+
if (dcatUsConfig &&
|
|
49
|
+
typeof dcatUsConfig.spatial === "string" &&
|
|
50
|
+
dcatUsConfig.spatial.replace(/\s/g, "") === "{{extent}}") {
|
|
51
|
+
dcatUsConfig.spatial = "{{extent:computeSpatialProperty}}";
|
|
52
|
+
}
|
|
53
|
+
return dcatUsConfig;
|
|
43
54
|
}
|
|
44
55
|
if (getMajorVersion(version) === "3") {
|
|
45
56
|
return feedsConfig.dcatUS3X;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFeedTemplate.js","sourceRoot":"","sources":["../../../../src/sites/feeds/getFeedTemplate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAS3D;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAC7B,IAA6B;IAE7B,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAE9C,IAAI,kBAAkB,CAAC;IACvB,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,kBAAkB,GAAG,eAAe,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;KAC5D;SAAM,IAAI,MAAM,KAAK,SAAS,EAAE;QAC/B,kBAAkB,GAAG,eAAe,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;KAC5D;SAAM,IAAI,MAAM,KAAK,KAAK,EAAE;QAC3B,kBAAkB,GAAG,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;KAC5C;IAED,OAAO,kBAAkB,IAAI,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACnE,CAAC;AAED,SAAS,kBAAkB,CACzB,MAAkB,EAClB,OAAe;IAEf,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,gBAAgB,GAAG,mBAAmB,EAAE,CAAC;IAE/C,OAAO,WAAW,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,eAAe,CAAC,WAAgC,EAAE,OAAe;IACxE,IAAI,eAAe,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE;QACpC,OAAO,WAAW,CAAC,SAAS,IAAI,WAAW,CAAC,SAAS,CAAC;KACvD;IAED,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,eAAe,CAAC,WAAgC,EAAE,OAAe;IACxE,IAAI,eAAe,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE;QACpC,
|
|
1
|
+
{"version":3,"file":"getFeedTemplate.js","sourceRoot":"","sources":["../../../../src/sites/feeds/getFeedTemplate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AAE9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAS3D;;;;;;;GAOG;AACH,MAAM,UAAU,eAAe,CAC7B,IAA6B;IAE7B,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAE9C,IAAI,kBAAkB,CAAC;IACvB,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,kBAAkB,GAAG,eAAe,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;KAC5D;SAAM,IAAI,MAAM,KAAK,SAAS,EAAE;QAC/B,kBAAkB,GAAG,eAAe,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;KAC5D;SAAM,IAAI,MAAM,KAAK,KAAK,EAAE;QAC3B,kBAAkB,GAAG,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;KAC5C;IAED,OAAO,kBAAkB,IAAI,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACnE,CAAC;AAED,SAAS,kBAAkB,CACzB,MAAkB,EAClB,OAAe;IAEf,MAAM,YAAY,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,gBAAgB,GAAG,mBAAmB,EAAE,CAAC;IAE/C,OAAO,WAAW,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,eAAe,CAAC,WAAgC,EAAE,OAAe;IACxE,IAAI,eAAe,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE;QACpC,OAAO,WAAW,CAAC,SAAS,IAAI,WAAW,CAAC,SAAS,CAAC;KACvD;IAED,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,eAAe,CAAC,WAAgC,EAAE,OAAe;IACxE,IAAI,eAAe,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE;QACpC,MAAM,YAAY,GAAG,WAAW,CAAC,QAAQ,IAAI,WAAW,CAAC,QAAQ,CAAC;QAClE,kDAAkD;QAClD,sDAAsD;QACtD,EAAE;QACF,2DAA2D;QAC3D,+DAA+D;QAC/D,IACE,YAAY;YACZ,OAAO,YAAY,CAAC,OAAO,KAAK,QAAQ;YACxC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,YAAY,EACxD;YACA,YAAY,CAAC,OAAO,GAAG,mCAAmC,CAAC;SAC5D;QACD,OAAO,YAAY,CAAC;KACrB;IAED,IAAI,eAAe,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE;QACpC,OAAO,WAAW,CAAC,QAAQ,CAAC;KAC7B;IAED,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,YAAY,CAAC,WAAgC,EAAE,OAAe;IACrE,IAAI,eAAe,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE;QACpC,OAAO,WAAW,CAAC,IAAI,CAAC;KACzB;IAED,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;AAC7C,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getUniquePredicateValuesByKey = void 0;
|
|
4
|
+
const util_1 = require("../../../util");
|
|
5
|
+
const getPredicateValuesByKey_1 = require("./getPredicateValuesByKey");
|
|
6
|
+
exports.getUniquePredicateValuesByKey = (filters, predicateKey) => {
|
|
7
|
+
return getPredicateValuesByKey_1.getPredicateValuesByKey(filters, predicateKey).filter(util_1.unique);
|
|
8
|
+
};
|
|
9
|
+
//# sourceMappingURL=getUniquePredicateValuesByKey.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getUniquePredicateValuesByKey.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubEventsHelpers/getUniquePredicateValuesByKey.ts"],"names":[],"mappings":";;;AAAA,wCAAuC;AAEvC,uEAAoE;AAEvD,QAAA,6BAA6B,GAAG,CAC3C,OAAkB,EAClB,YAAoB,EACf,EAAE;IACP,OAAO,iDAAuB,CAAI,OAAO,EAAE,YAAY,CAAC,CAAC,MAAM,CAAC,aAAM,CAAC,CAAC;AAC1E,CAAC,CAAC"}
|
|
@@ -2,35 +2,36 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.processFilters = void 0;
|
|
4
4
|
const orval_events_1 = require("../../../events/api/orval/api/orval-events");
|
|
5
|
-
const getOptionalPredicateStringsByKey_1 = require("./getOptionalPredicateStringsByKey");
|
|
6
5
|
const getPredicateValuesByKey_1 = require("./getPredicateValuesByKey");
|
|
6
|
+
const getUniquePredicateValuesByKey_1 = require("./getUniquePredicateValuesByKey");
|
|
7
7
|
const arcgis_rest_portal_1 = require("@esri/arcgis-rest-portal");
|
|
8
8
|
const is_update_group_1 = require("../../../utils/is-update-group");
|
|
9
|
+
const toEnumConverters_1 = require("./toEnumConverters");
|
|
9
10
|
/**
|
|
10
|
-
* Builds a Partial<
|
|
11
|
+
* Builds a Partial<ISearchEvents> given an Array of IFilter objects
|
|
11
12
|
* @param filters An Array of IFilter
|
|
12
|
-
* @returns a Partial<
|
|
13
|
+
* @returns a Partial<ISearchEvents> for the given Array of IFilter objects
|
|
13
14
|
*/
|
|
14
15
|
async function processFilters(filters, requestOptions) {
|
|
15
16
|
const processedFilters = {};
|
|
16
|
-
const access =
|
|
17
|
-
if (access
|
|
18
|
-
processedFilters.access = access;
|
|
17
|
+
const access = getUniquePredicateValuesByKey_1.getUniquePredicateValuesByKey(filters, "access");
|
|
18
|
+
if (access.length) {
|
|
19
|
+
processedFilters.access = toEnumConverters_1.toEnums(access, orval_events_1.EventAccess);
|
|
19
20
|
}
|
|
20
21
|
const canEdit = getPredicateValuesByKey_1.getPredicateValuesByKey(filters, "canEdit");
|
|
21
22
|
if (canEdit.length) {
|
|
22
|
-
processedFilters.canEdit = canEdit[0]
|
|
23
|
+
processedFilters.canEdit = canEdit[0];
|
|
23
24
|
}
|
|
24
|
-
const entityIds =
|
|
25
|
-
if (entityIds
|
|
25
|
+
const entityIds = getUniquePredicateValuesByKey_1.getUniquePredicateValuesByKey(filters, "entityId");
|
|
26
|
+
if (entityIds.length) {
|
|
26
27
|
processedFilters.entityIds = entityIds;
|
|
27
28
|
}
|
|
28
|
-
const entityTypes =
|
|
29
|
-
if (entityTypes
|
|
30
|
-
processedFilters.entityTypes = entityTypes;
|
|
29
|
+
const entityTypes = getUniquePredicateValuesByKey_1.getUniquePredicateValuesByKey(filters, "entityType");
|
|
30
|
+
if (entityTypes.length) {
|
|
31
|
+
processedFilters.entityTypes = toEnumConverters_1.toEnums(entityTypes, orval_events_1.EventAssociationEntityType);
|
|
31
32
|
}
|
|
32
|
-
const eventIds =
|
|
33
|
-
if (eventIds
|
|
33
|
+
const eventIds = getUniquePredicateValuesByKey_1.getUniquePredicateValuesByKey(filters, "id");
|
|
34
|
+
if (eventIds.length) {
|
|
34
35
|
processedFilters.eventIds = eventIds;
|
|
35
36
|
}
|
|
36
37
|
const term = getPredicateValuesByKey_1.getPredicateValuesByKey(filters, "term");
|
|
@@ -41,35 +42,35 @@ async function processFilters(filters, requestOptions) {
|
|
|
41
42
|
if (orgId.length) {
|
|
42
43
|
processedFilters.orgId = orgId[0];
|
|
43
44
|
}
|
|
44
|
-
const categories =
|
|
45
|
-
if (categories
|
|
45
|
+
const categories = getUniquePredicateValuesByKey_1.getUniquePredicateValuesByKey(filters, "categories");
|
|
46
|
+
if (categories.length) {
|
|
46
47
|
processedFilters.categories = categories;
|
|
47
48
|
}
|
|
48
|
-
const tags =
|
|
49
|
-
if (tags
|
|
49
|
+
const tags = getUniquePredicateValuesByKey_1.getUniquePredicateValuesByKey(filters, "tags");
|
|
50
|
+
if (tags.length) {
|
|
50
51
|
processedFilters.tags = tags;
|
|
51
52
|
}
|
|
52
|
-
const groupIds =
|
|
53
|
+
const groupIds = getUniquePredicateValuesByKey_1.getUniquePredicateValuesByKey(filters, "group");
|
|
53
54
|
// if a group was provided, we prioritize that over individual readGroupId or editGroupId
|
|
54
55
|
// filters to prevent collisions
|
|
55
|
-
if (groupIds
|
|
56
|
+
if (groupIds.length) {
|
|
56
57
|
// We are explicitly sending groupIds to sharedToGroups
|
|
57
58
|
processedFilters.sharedToGroups = groupIds;
|
|
58
59
|
}
|
|
59
60
|
else {
|
|
60
61
|
// individual readGroupId & editGroupId filters
|
|
61
|
-
const readGroupIds =
|
|
62
|
-
if (readGroupIds
|
|
62
|
+
const readGroupIds = getUniquePredicateValuesByKey_1.getUniquePredicateValuesByKey(filters, "readGroupId");
|
|
63
|
+
if (readGroupIds.length) {
|
|
63
64
|
processedFilters.readGroups = readGroupIds;
|
|
64
65
|
}
|
|
65
|
-
const editGroupIds =
|
|
66
|
-
if (editGroupIds
|
|
66
|
+
const editGroupIds = getUniquePredicateValuesByKey_1.getUniquePredicateValuesByKey(filters, "editGroupId");
|
|
67
|
+
if (editGroupIds.length) {
|
|
67
68
|
processedFilters.editGroups = editGroupIds;
|
|
68
69
|
}
|
|
69
70
|
}
|
|
70
71
|
// NOTE: previously notGroup was an inverse of group, but now they are subtly different
|
|
71
72
|
// We do not yet have an inverse of sharedToGroups.
|
|
72
|
-
const notGroupIds =
|
|
73
|
+
const notGroupIds = getUniquePredicateValuesByKey_1.getUniquePredicateValuesByKey(filters, "notGroup");
|
|
73
74
|
// if a notGroup was provided, we prioritize that over individual notReadGroupId or notEditGroupId
|
|
74
75
|
// filters to prevent collisions
|
|
75
76
|
if (notGroupIds.length) {
|
|
@@ -81,36 +82,35 @@ async function processFilters(filters, requestOptions) {
|
|
|
81
82
|
return Object.assign(Object.assign({}, acc), { [key]: [...acc[key], group.id] });
|
|
82
83
|
}, { notReadGroupIds: [], notEditGroupIds: [] });
|
|
83
84
|
if (notReadGroupIds.length) {
|
|
84
|
-
processedFilters.withoutReadGroups = notReadGroupIds
|
|
85
|
+
processedFilters.withoutReadGroups = notReadGroupIds;
|
|
85
86
|
}
|
|
86
87
|
if (notEditGroupIds.length) {
|
|
87
|
-
processedFilters.withoutEditGroups = notEditGroupIds
|
|
88
|
+
processedFilters.withoutEditGroups = notEditGroupIds;
|
|
88
89
|
}
|
|
89
90
|
}
|
|
90
91
|
else {
|
|
91
92
|
// individual notReadGroupId & notEditGroupId filters
|
|
92
|
-
const notReadGroupIds =
|
|
93
|
-
if (notReadGroupIds
|
|
93
|
+
const notReadGroupIds = getUniquePredicateValuesByKey_1.getUniquePredicateValuesByKey(filters, "notReadGroupId");
|
|
94
|
+
if (notReadGroupIds.length) {
|
|
94
95
|
processedFilters.withoutReadGroups = notReadGroupIds;
|
|
95
96
|
}
|
|
96
|
-
const notEditGroupIds =
|
|
97
|
-
if (notEditGroupIds
|
|
97
|
+
const notEditGroupIds = getUniquePredicateValuesByKey_1.getUniquePredicateValuesByKey(filters, "notEditGroupId");
|
|
98
|
+
if (notEditGroupIds.length) {
|
|
98
99
|
processedFilters.withoutEditGroups = notEditGroupIds;
|
|
99
100
|
}
|
|
100
101
|
}
|
|
101
|
-
const attendanceType =
|
|
102
|
-
if (attendanceType
|
|
103
|
-
processedFilters.attendanceTypes = attendanceType;
|
|
102
|
+
const attendanceType = getUniquePredicateValuesByKey_1.getUniquePredicateValuesByKey(filters, "attendanceType");
|
|
103
|
+
if (attendanceType.length) {
|
|
104
|
+
processedFilters.attendanceTypes = toEnumConverters_1.toEnums(attendanceType, orval_events_1.EventAttendanceType);
|
|
104
105
|
}
|
|
105
|
-
const createdByIds =
|
|
106
|
-
if (createdByIds
|
|
106
|
+
const createdByIds = getUniquePredicateValuesByKey_1.getUniquePredicateValuesByKey(filters, "owner");
|
|
107
|
+
if (createdByIds.length) {
|
|
107
108
|
processedFilters.createdByIds = createdByIds;
|
|
108
109
|
}
|
|
109
|
-
const status =
|
|
110
|
-
processedFilters.status =
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
.join(",");
|
|
110
|
+
const status = getUniquePredicateValuesByKey_1.getUniquePredicateValuesByKey(filters, "status");
|
|
111
|
+
processedFilters.status = status.length
|
|
112
|
+
? toEnumConverters_1.toEnums(status, orval_events_1.EventStatus)
|
|
113
|
+
: [orval_events_1.EventStatus.PLANNED, orval_events_1.EventStatus.CANCELED];
|
|
114
114
|
const startDateRange = getPredicateValuesByKey_1.getPredicateValuesByKey(filters, "startDateRange");
|
|
115
115
|
// if a startDateRange was provided, we prioritize that over individual startDateBefore or startDateAfter
|
|
116
116
|
// filters to prevent collisions
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processFilters.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubEventsHelpers/processFilters.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"processFilters.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubEventsHelpers/processFilters.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,17 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.processOptions = void 0;
|
|
4
4
|
const orval_events_1 = require("../../../events/api/orval/api/orval-events");
|
|
5
5
|
/**
|
|
6
|
-
* Builds a Partial<
|
|
6
|
+
* Builds a Partial<ISearchEvents> for the given IHubSearchOptions
|
|
7
7
|
* @param options An IHubSearchOptions object
|
|
8
|
-
* @returns a Partial<
|
|
8
|
+
* @returns a Partial<ISearchEvents> for the given IHubSearchOptions
|
|
9
9
|
*/
|
|
10
10
|
function processOptions(options) {
|
|
11
11
|
const processedOptions = {};
|
|
12
12
|
if (options.num > 0) {
|
|
13
|
-
processedOptions.num = options.num
|
|
13
|
+
processedOptions.num = options.num;
|
|
14
14
|
}
|
|
15
15
|
if (options.start > 1) {
|
|
16
|
-
processedOptions.start = options.start
|
|
16
|
+
processedOptions.start = options.start;
|
|
17
17
|
}
|
|
18
18
|
if (options.sortField === "modified") {
|
|
19
19
|
processedOptions.sortBy = orval_events_1.EventSort.updatedAt;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"processOptions.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubEventsHelpers/processOptions.ts"],"names":[],"mappings":";;;AACA,6EAIoD;AAEpD;;;;GAIG;AACH,SAAgB,cAAc,CAC5B,OAA0B;IAE1B,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"processOptions.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubEventsHelpers/processOptions.ts"],"names":[],"mappings":";;;AACA,6EAIoD;AAEpD;;;;GAIG;AACH,SAAgB,cAAc,CAC5B,OAA0B;IAE1B,MAAM,gBAAgB,GAA2B,EAAE,CAAC;IACpD,IAAI,OAAO,CAAC,GAAG,GAAG,CAAC,EAAE;QACnB,gBAAgB,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;KACpC;IACD,IAAI,OAAO,CAAC,KAAK,GAAG,CAAC,EAAE;QACrB,gBAAgB,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;KACxC;IACD,IAAI,OAAO,CAAC,SAAS,KAAK,UAAU,EAAE;QACpC,gBAAgB,CAAC,MAAM,GAAG,wBAAS,CAAC,SAAS,CAAC;KAC/C;SAAM,IAAI,OAAO,CAAC,SAAS,KAAK,SAAS,EAAE;QAC1C,gBAAgB,CAAC,MAAM,GAAG,wBAAS,CAAC,SAAS,CAAC;KAC/C;SAAM,IAAI,OAAO,CAAC,SAAS,KAAK,OAAO,EAAE;QACxC,gBAAgB,CAAC,MAAM,GAAG,wBAAS,CAAC,KAAK,CAAC;KAC3C;SAAM,IAAI,OAAO,CAAC,SAAS,KAAK,WAAW,EAAE;QAC5C,gBAAgB,CAAC,MAAM,GAAG,wBAAS,CAAC,aAAa,CAAC;KACnD;IACD,gBAAgB,CAAC,SAAS;QACxB,OAAO,CAAC,SAAS,KAAK,MAAM,CAAC,CAAC,CAAC,6BAAc,CAAC,IAAI,CAAC,CAAC,CAAC,6BAAc,CAAC,GAAG,CAAC;IAC1E,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAtBD,wCAsBC"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.toEnums = exports.toEnum = void 0;
|
|
4
|
+
/**
|
|
5
|
+
* Converts a string to an enum value
|
|
6
|
+
*
|
|
7
|
+
* strings not in the enum will be returned as the original string
|
|
8
|
+
*/
|
|
9
|
+
function toEnum(value, enumType) {
|
|
10
|
+
return (enumType[value] ||
|
|
11
|
+
enumType[value.toUpperCase()] ||
|
|
12
|
+
enumType[value.toLowerCase()] ||
|
|
13
|
+
value);
|
|
14
|
+
}
|
|
15
|
+
exports.toEnum = toEnum;
|
|
16
|
+
/**
|
|
17
|
+
* Converts an array of strings to an array of enum values
|
|
18
|
+
*
|
|
19
|
+
* strings not in the enum will be returned as the original string
|
|
20
|
+
*/
|
|
21
|
+
function toEnums(values, enumType) {
|
|
22
|
+
return values.map((value) => toEnum(value, enumType));
|
|
23
|
+
}
|
|
24
|
+
exports.toEnums = toEnums;
|
|
25
|
+
//# sourceMappingURL=toEnumConverters.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"toEnumConverters.js","sourceRoot":"","sources":["../../../../../src/search/_internal/hubEventsHelpers/toEnumConverters.ts"],"names":[],"mappings":";;;AAAA;;;;GAIG;AACH,SAAgB,MAAM,CAAI,KAAa,EAAE,QAAW;IAClD,OAAO,CACJ,QAAgB,CAAC,KAAK,CAAC;QACvB,QAAgB,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QACrC,QAAgB,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;QACtC,KAAK,CACN,CAAC;AACJ,CAAC;AAPD,wBAOC;AAED;;;;GAIG;AACH,SAAgB,OAAO,CAAI,MAAgB,EAAE,QAAW;IACtD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAI,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;AAC3D,CAAC;AAFD,0BAEC"}
|
|
@@ -2,18 +2,18 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.hubSearchEvents = void 0;
|
|
4
4
|
const events_1 = require("../../events/api/events");
|
|
5
|
+
const orval_events_1 = require("../../events/api/orval/api/orval-events");
|
|
5
6
|
const eventToSearchResult_1 = require("./hubEventsHelpers/eventToSearchResult");
|
|
6
7
|
const processOptions_1 = require("./hubEventsHelpers/processOptions");
|
|
7
8
|
const processFilters_1 = require("./hubEventsHelpers/processFilters");
|
|
8
9
|
/**
|
|
9
10
|
* Searches for events against the Events 3 API using the given `query` and `options`.
|
|
10
11
|
* Currently supported filters include:
|
|
11
|
-
* - access: 'public' | 'private' | 'org' | Array<'public' | 'org' | '
|
|
12
|
+
* - access: 'public' | 'private' | 'org' | Array<'public' | 'org' | 'private'>;
|
|
12
13
|
* - canEdit: boolean
|
|
13
14
|
* - entityId: string | string[];
|
|
14
15
|
* - entityType: string | string[];
|
|
15
16
|
* - id: string | string[];
|
|
16
|
-
* - userId: string;
|
|
17
17
|
* - term: string;
|
|
18
18
|
* - categories: string | string[];
|
|
19
19
|
* - tags: string | string[];
|
|
@@ -45,8 +45,8 @@ const processFilters_1 = require("./hubEventsHelpers/processFilters");
|
|
|
45
45
|
async function hubSearchEvents(query, options) {
|
|
46
46
|
const processedFilters = await processFilters_1.processFilters(query.filters, options.requestOptions);
|
|
47
47
|
const processedOptions = processOptions_1.processOptions(options);
|
|
48
|
-
const data = Object.assign(Object.assign(Object.assign({}, processedFilters), processedOptions), { include:
|
|
49
|
-
const { items, nextStart, total } = await events_1.
|
|
48
|
+
const data = Object.assign(Object.assign(Object.assign({}, processedFilters), processedOptions), { include: [orval_events_1.GetEventsInclude.creator, orval_events_1.GetEventsInclude.location] });
|
|
49
|
+
const { items, nextStart, total } = await events_1.searchEvents(Object.assign(Object.assign({}, options.requestOptions), { data }));
|
|
50
50
|
const results = await Promise.all(items.map((event) => eventToSearchResult_1.eventToSearchResult(event, options)));
|
|
51
51
|
const hasNext = nextStart > -1;
|
|
52
52
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hubSearchEvents.js","sourceRoot":"","sources":["../../../../src/search/_internal/hubSearchEvents.ts"],"names":[],"mappings":";;;AAIA,
|
|
1
|
+
{"version":3,"file":"hubSearchEvents.js","sourceRoot":"","sources":["../../../../src/search/_internal/hubSearchEvents.ts"],"names":[],"mappings":";;;AAIA,oDAAuD;AACvD,0EAIiD;AACjD,gFAA6E;AAC7E,sEAAmE;AACnE,sEAAmE;AAEnE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACI,KAAK,UAAU,eAAe,CACnC,KAAa,EACb,OAA0B;IAE1B,MAAM,gBAAgB,GAAG,MAAM,+BAAc,CAC3C,KAAK,CAAC,OAAO,EACb,OAAO,CAAC,cAAc,CACvB,CAAC;IACF,MAAM,gBAAgB,GAAG,+BAAc,CAAC,OAAO,CAAC,CAAC;IACjD,MAAM,IAAI,iDACL,gBAAgB,GAChB,gBAAgB,KACnB,OAAO,EAAE,CAAC,+BAAgB,CAAC,OAAO,EAAE,+BAAgB,CAAC,QAAQ,CAAC,GAC/D,CAAC;IACF,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,MAAM,qBAAY,iCACjD,OAAO,CAAC,cAAc,KACzB,IAAI,IACJ,CAAC;IACH,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,yCAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAC1D,CAAC;IACF,MAAM,OAAO,GAAG,SAAS,GAAG,CAAC,CAAC,CAAC;IAC/B,OAAO;QACL,KAAK;QACL,OAAO;QACP,OAAO;QACP,IAAI,EAAE,GAAG,EAAE;YACT,IAAI,CAAC,OAAO,EAAE;gBACZ,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;aACvE;YACD,OAAO,eAAe,CAAC,KAAK,kCACvB,OAAO,KACV,KAAK,EAAE,SAAS,IAChB,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC;AApCD,0CAoCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../../../../src/sites/feeds/_internal/defaults.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,SAAgB,mBAAmB;IACjC,OAAO;QACL,SAAS,EAAE;YACT,GAAG,EAAE,kBAAkB;YACvB,GAAG,EAAE,kBAAkB;SACxB;QACD,SAAS,EAAE;YACT,GAAG,EAAE,mBAAmB;SACzB;QACD,GAAG,EAAE;YACH,GAAG,EAAE,cAAc;SACpB;KACF,CAAC;AACJ,CAAC;AAbD,kDAaC;AAED,MAAM,kBAAkB,GAAG;IACzB,KAAK,EAAE,UAAU;IACjB,WAAW,EAAE,iBAAiB;IAC9B,OAAO,EAAE,UAAU;IACnB,MAAM,EAAE,mBAAmB;IAC3B,QAAQ,EAAE,oBAAoB;IAC9B,SAAS,EAAE;QACT,IAAI,EAAE,YAAY;KACnB;IACD,YAAY,EAAE;QACZ,EAAE,EAAE,WAAW;QACf,QAAQ,EAAE,qBAAqB;KAChC;IACD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"defaults.js","sourceRoot":"","sources":["../../../../../src/sites/feeds/_internal/defaults.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,SAAgB,mBAAmB;IACjC,OAAO;QACL,SAAS,EAAE;YACT,GAAG,EAAE,kBAAkB;YACvB,GAAG,EAAE,kBAAkB;SACxB;QACD,SAAS,EAAE;YACT,GAAG,EAAE,mBAAmB;SACzB;QACD,GAAG,EAAE;YACH,GAAG,EAAE,cAAc;SACpB;KACF,CAAC;AACJ,CAAC;AAbD,kDAaC;AAED,MAAM,kBAAkB,GAAG;IACzB,KAAK,EAAE,UAAU;IACjB,WAAW,EAAE,iBAAiB;IAC9B,OAAO,EAAE,UAAU;IACnB,MAAM,EAAE,mBAAmB;IAC3B,QAAQ,EAAE,oBAAoB;IAC9B,SAAS,EAAE;QACT,IAAI,EAAE,YAAY;KACnB;IACD,YAAY,EAAE;QACZ,EAAE,EAAE,WAAW;QACf,QAAQ,EAAE,qBAAqB;KAChC;IACD,OAAO,EAAE,mCAAmC;CAC7C,CAAC;AAEF,MAAM,kBAAkB,GAAG;IACzB,WAAW,EAAE,WAAW;IACxB,iBAAiB,EAAE,kBAAkB;IACrC,YAAY,EAAE;QACZ,QAAQ,EACN,oJAAoJ;QACtJ,OAAO,EAAE,cAAc;KACxB;CACF,CAAC;AAEF,MAAM,mBAAmB,GAAG;IAC1B,WAAW,EAAE,UAAU;IACvB,iBAAiB,EAAE,iBAAiB;IACpC,mBAAmB,EAAE;QACnB,UAAU,EAAE,WAAW;QACvB,gBAAgB,EAAE,qBAAqB;KACxC;CACF,CAAC;AAEF,MAAM,cAAc,GAAG;IACrB,OAAO,EAAE;QACP,KAAK,EAAE,UAAU;QACjB,WAAW,EAAE,uBAAuB;QACpC,IAAI,EAAE,aAAa;QACnB,QAAQ,EAAE,aAAa;QACvB,QAAQ,EAAE,gBAAgB;QAC1B,IAAI,EAAE;YACJ,KAAK,EAAE,UAAU;YACjB,WAAW,EAAE,uBAAuB;YACpC,MAAM,EAAE,qBAAqB;YAC7B,QAAQ,EAAE,gBAAgB;YAC1B,OAAO,EAAE,mBAAmB;SAC7B;KACF;CACF,CAAC"}
|
|
@@ -43,7 +43,18 @@ function getDcatApConfig(feedsConfig, version) {
|
|
|
43
43
|
}
|
|
44
44
|
function getDcatUsConfig(feedsConfig, version) {
|
|
45
45
|
if (getMajorVersion_1.getMajorVersion(version) === "1") {
|
|
46
|
-
|
|
46
|
+
const dcatUsConfig = feedsConfig.dcatUS1X || feedsConfig.dcatUS11;
|
|
47
|
+
// Some sites may have dcat us config with invalid
|
|
48
|
+
// extent value for spatial property i.e. '{{extent}}'
|
|
49
|
+
//
|
|
50
|
+
// Following fixes that by replacing invalid default extent
|
|
51
|
+
// value to valid one i.e. '{{{extent:computeSpatialProperty}}'
|
|
52
|
+
if (dcatUsConfig &&
|
|
53
|
+
typeof dcatUsConfig.spatial === "string" &&
|
|
54
|
+
dcatUsConfig.spatial.replace(/\s/g, "") === "{{extent}}") {
|
|
55
|
+
dcatUsConfig.spatial = "{{extent:computeSpatialProperty}}";
|
|
56
|
+
}
|
|
57
|
+
return dcatUsConfig;
|
|
47
58
|
}
|
|
48
59
|
if (getMajorVersion_1.getMajorVersion(version) === "3") {
|
|
49
60
|
return feedsConfig.dcatUS3X;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getFeedTemplate.js","sourceRoot":"","sources":["../../../../src/sites/feeds/getFeedTemplate.ts"],"names":[],"mappings":";;;AACA,qCAAyC;AACzC,iEAA8D;AAE9D,mDAA2D;AAS3D;;;;;;;GAOG;AACH,SAAgB,eAAe,CAC7B,IAA6B;IAE7B,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAE9C,IAAI,kBAAkB,CAAC;IACvB,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,kBAAkB,GAAG,eAAe,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;KAC5D;SAAM,IAAI,MAAM,KAAK,SAAS,EAAE;QAC/B,kBAAkB,GAAG,eAAe,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;KAC5D;SAAM,IAAI,MAAM,KAAK,KAAK,EAAE;QAC3B,kBAAkB,GAAG,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;KAC5C;IAED,OAAO,kBAAkB,IAAI,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACnE,CAAC;AAjBD,0CAiBC;AAED,SAAS,kBAAkB,CACzB,MAAkB,EAClB,OAAe;IAEf,MAAM,YAAY,GAAG,iCAAe,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,gBAAgB,GAAG,8BAAmB,EAAE,CAAC;IAE/C,OAAO,kBAAW,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,eAAe,CAAC,WAAgC,EAAE,OAAe;IACxE,IAAI,iCAAe,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE;QACpC,OAAO,WAAW,CAAC,SAAS,IAAI,WAAW,CAAC,SAAS,CAAC;KACvD;IAED,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,eAAe,CAAC,WAAgC,EAAE,OAAe;IACxE,IAAI,iCAAe,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE;QACpC,
|
|
1
|
+
{"version":3,"file":"getFeedTemplate.js","sourceRoot":"","sources":["../../../../src/sites/feeds/getFeedTemplate.ts"],"names":[],"mappings":";;;AACA,qCAAyC;AACzC,iEAA8D;AAE9D,mDAA2D;AAS3D;;;;;;;GAOG;AACH,SAAgB,eAAe,CAC7B,IAA6B;IAE7B,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAE9C,IAAI,kBAAkB,CAAC;IACvB,IAAI,MAAM,KAAK,SAAS,EAAE;QACxB,kBAAkB,GAAG,eAAe,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;KAC5D;SAAM,IAAI,MAAM,KAAK,SAAS,EAAE;QAC/B,kBAAkB,GAAG,eAAe,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;KAC5D;SAAM,IAAI,MAAM,KAAK,KAAK,EAAE;QAC3B,kBAAkB,GAAG,YAAY,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;KACzD;SAAM;QACL,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;KAC5C;IAED,OAAO,kBAAkB,IAAI,kBAAkB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACnE,CAAC;AAjBD,0CAiBC;AAED,SAAS,kBAAkB,CACzB,MAAkB,EAClB,OAAe;IAEf,MAAM,YAAY,GAAG,iCAAe,CAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,gBAAgB,GAAG,8BAAmB,EAAE,CAAC;IAE/C,OAAO,kBAAW,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC;AAC7D,CAAC;AAED,SAAS,eAAe,CAAC,WAAgC,EAAE,OAAe;IACxE,IAAI,iCAAe,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE;QACpC,OAAO,WAAW,CAAC,SAAS,IAAI,WAAW,CAAC,SAAS,CAAC;KACvD;IAED,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,eAAe,CAAC,WAAgC,EAAE,OAAe;IACxE,IAAI,iCAAe,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE;QACpC,MAAM,YAAY,GAAG,WAAW,CAAC,QAAQ,IAAI,WAAW,CAAC,QAAQ,CAAC;QAClE,kDAAkD;QAClD,sDAAsD;QACtD,EAAE;QACF,2DAA2D;QAC3D,+DAA+D;QAC/D,IACE,YAAY;YACZ,OAAO,YAAY,CAAC,OAAO,KAAK,QAAQ;YACxC,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,YAAY,EACxD;YACA,YAAY,CAAC,OAAO,GAAG,mCAAmC,CAAC;SAC5D;QACD,OAAO,YAAY,CAAC;KACrB;IAED,IAAI,iCAAe,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE;QACpC,OAAO,WAAW,CAAC,QAAQ,CAAC;KAC7B;IAED,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;AACjD,CAAC;AAED,SAAS,YAAY,CAAC,WAAgC,EAAE,OAAe;IACrE,IAAI,iCAAe,CAAC,OAAO,CAAC,KAAK,GAAG,EAAE;QACpC,OAAO,WAAW,CAAC,IAAI,CAAC;KACzB;IAED,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;AAC7C,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { IFilter } from "../../types/IHubCatalog";
|
|
2
|
-
import {
|
|
2
|
+
import { ISearchEvents } from "../../../events/api/orval/api/orval-events";
|
|
3
3
|
import { IHubRequestOptions } from "../../../types";
|
|
4
4
|
/**
|
|
5
|
-
* Builds a Partial<
|
|
5
|
+
* Builds a Partial<ISearchEvents> given an Array of IFilter objects
|
|
6
6
|
* @param filters An Array of IFilter
|
|
7
|
-
* @returns a Partial<
|
|
7
|
+
* @returns a Partial<ISearchEvents> for the given Array of IFilter objects
|
|
8
8
|
*/
|
|
9
|
-
export declare function processFilters(filters: IFilter[], requestOptions: IHubRequestOptions): Promise<Partial<
|
|
9
|
+
export declare function processFilters(filters: IFilter[], requestOptions: IHubRequestOptions): Promise<Partial<ISearchEvents>>;
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { IHubSearchOptions } from "../../types/IHubSearchOptions";
|
|
2
|
-
import {
|
|
2
|
+
import { ISearchEvents } from "../../../events/api/orval/api/orval-events";
|
|
3
3
|
/**
|
|
4
|
-
* Builds a Partial<
|
|
4
|
+
* Builds a Partial<ISearchEvents> for the given IHubSearchOptions
|
|
5
5
|
* @param options An IHubSearchOptions object
|
|
6
|
-
* @returns a Partial<
|
|
6
|
+
* @returns a Partial<ISearchEvents> for the given IHubSearchOptions
|
|
7
7
|
*/
|
|
8
|
-
export declare function processOptions(options: IHubSearchOptions): Partial<
|
|
8
|
+
export declare function processOptions(options: IHubSearchOptions): Partial<ISearchEvents>;
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Converts a string to an enum value
|
|
3
|
+
*
|
|
4
|
+
* strings not in the enum will be returned as the original string
|
|
5
|
+
*/
|
|
6
|
+
export declare function toEnum<T>(value: string, enumType: T): T[keyof T];
|
|
7
|
+
/**
|
|
8
|
+
* Converts an array of strings to an array of enum values
|
|
9
|
+
*
|
|
10
|
+
* strings not in the enum will be returned as the original string
|
|
11
|
+
*/
|
|
12
|
+
export declare function toEnums<T>(values: string[], enumType: T): Array<T[keyof T]>;
|
|
@@ -5,12 +5,11 @@ import { IHubSearchResult } from "../types/IHubSearchResult";
|
|
|
5
5
|
/**
|
|
6
6
|
* Searches for events against the Events 3 API using the given `query` and `options`.
|
|
7
7
|
* Currently supported filters include:
|
|
8
|
-
* - access: 'public' | 'private' | 'org' | Array<'public' | 'org' | '
|
|
8
|
+
* - access: 'public' | 'private' | 'org' | Array<'public' | 'org' | 'private'>;
|
|
9
9
|
* - canEdit: boolean
|
|
10
10
|
* - entityId: string | string[];
|
|
11
11
|
* - entityType: string | string[];
|
|
12
12
|
* - id: string | string[];
|
|
13
|
-
* - userId: string;
|
|
14
13
|
* - term: string;
|
|
15
14
|
* - categories: string | string[];
|
|
16
15
|
* - tags: string | string[];
|