@esri/hub-common 14.19.2 → 14.21.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/discussions/api/types.js +1 -0
- package/dist/esm/discussions/api/types.js.map +1 -1
- package/dist/esm/discussions/utils.js +134 -0
- package/dist/esm/discussions/utils.js.map +1 -1
- package/dist/esm/projects/HubProject.js +18 -4
- package/dist/esm/projects/HubProject.js.map +1 -1
- package/dist/esm/search/_internal/portalSearchGroupMembers.js +1 -1
- package/dist/esm/search/_internal/portalSearchGroupMembers.js.map +1 -1
- package/dist/esm/search/_internal/portalSearchUsers.js +108 -22
- package/dist/esm/search/_internal/portalSearchUsers.js.map +1 -1
- package/dist/esm/search/hubSearch.js +4 -2
- package/dist/esm/search/hubSearch.js.map +1 -1
- package/dist/esm/search/serializeQueryForPortal.js +14 -4
- package/dist/esm/search/serializeQueryForPortal.js.map +1 -1
- package/dist/esm/users/HubUsers.js +1 -7
- package/dist/esm/users/HubUsers.js.map +1 -1
- package/dist/node/discussions/api/types.js +1 -0
- package/dist/node/discussions/api/types.js.map +1 -1
- package/dist/node/discussions/utils.js +142 -1
- package/dist/node/discussions/utils.js.map +1 -1
- package/dist/node/projects/HubProject.js +17 -3
- package/dist/node/projects/HubProject.js.map +1 -1
- package/dist/node/search/_internal/portalSearchGroupMembers.js +1 -1
- package/dist/node/search/_internal/portalSearchGroupMembers.js.map +1 -1
- package/dist/node/search/_internal/portalSearchUsers.js +111 -23
- package/dist/node/search/_internal/portalSearchUsers.js.map +1 -1
- package/dist/node/search/hubSearch.js +3 -1
- package/dist/node/search/hubSearch.js.map +1 -1
- package/dist/node/search/serializeQueryForPortal.js +14 -4
- package/dist/node/search/serializeQueryForPortal.js.map +1 -1
- package/dist/node/users/HubUsers.js +1 -7
- package/dist/node/users/HubUsers.js.map +1 -1
- package/dist/types/discussions/api/types.d.ts +2 -1
- package/dist/types/discussions/utils.d.ts +53 -0
- package/dist/types/search/_internal/portalSearchUsers.d.ts +49 -5
- package/dist/types/search/types/IHubCatalog.d.ts +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/discussions/api/types.ts"],"names":[],"mappings":";;;AAQA;;;;;GAKG;AACH,IAAY,SAGX;AAHD,WAAY,SAAS;IACnB,wBAAW,CAAA;IACX,0BAAa,CAAA;AACf,CAAC,EAHW,SAAS,GAAT,iBAAS,KAAT,iBAAS,QAGpB;AAED;;;;;GAKG;AACH,IAAY,YA0BX;AA1BD,WAAY,YAAY;IACtB,iDAAiC,CAAA;IACjC,qCAAqB,CAAA;IACrB,yCAAyB,CAAA;IACzB,6BAAa,CAAA;IACb,iEAAiD,CAAA;IACjD,6BAAa,CAAA;IACb,qCAAqB,CAAA;IACrB,+BAAe,CAAA;IACf,+BAAe,CAAA;IACf,2CAA2B,CAAA;IAC3B,qCAAqB,CAAA;IACrB,6CAA6B,CAAA;IAC7B,+CAA+B,CAAA;IAC/B,iCAAiB,CAAA;IACjB,2BAAW,CAAA;IACX,qDAAqC,CAAA;IACrC,uCAAuB,CAAA;IACvB,qCAAqB,CAAA;IACrB,uCAAuB,CAAA;IACvB,2CAA2B,CAAA;IAC3B,iCAAiB,CAAA;IACjB,qCAAqB,CAAA;IACrB,2CAA2B,CAAA;IAC3B,mCAAmB,CAAA;IACnB,uCAAuB,CAAA;AACzB,CAAC,EA1BW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QA0BvB;AAED;;;;;GAKG;AACH,IAAY,aAIX;AAJD,WAAY,aAAa;IACvB,kCAAiB,CAAA;IACjB,4BAAW,CAAA;IACX,oCAAmB,CAAA;AACrB,CAAC,EAJW,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAIxB;AAcD;;;;;GAKG;AACH,IAAY,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/discussions/api/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.setDiscussableKeyword = exports.isDiscussable = void 0;
|
|
3
|
+
exports.getChannelUsersQuery = exports.getChannelGroupIds = exports.getChannelOrgIds = exports.getChannelAccess = exports.isPrivateChannel = exports.isOrgChannel = exports.isPublicChannel = exports.setDiscussableKeyword = exports.isDiscussable = void 0;
|
|
4
4
|
const constants_1 = require("./constants");
|
|
5
|
+
const types_1 = require("./api/types");
|
|
5
6
|
/**
|
|
6
7
|
* Utility to determine if a given IGroup, IItem, IHubContent, or IHubItemEntity
|
|
7
8
|
* is discussable.
|
|
@@ -27,4 +28,144 @@ function setDiscussableKeyword(typeKeywords, discussable) {
|
|
|
27
28
|
return updatedTypeKeywords;
|
|
28
29
|
}
|
|
29
30
|
exports.setDiscussableKeyword = setDiscussableKeyword;
|
|
31
|
+
/**
|
|
32
|
+
* Determines if the given channel is considered to be a `public` channel, supporting both
|
|
33
|
+
* legacy permissions and V2 ACL model.
|
|
34
|
+
* @param channel An IChannel record
|
|
35
|
+
* @returns true if the channel is considered `public`
|
|
36
|
+
*/
|
|
37
|
+
function isPublicChannel(channel) {
|
|
38
|
+
return channel.channelAcl
|
|
39
|
+
? channel.channelAcl.some(({ category }) => category === types_1.AclCategory.AUTHENTICATED_USER)
|
|
40
|
+
: channel.access === types_1.SharingAccess.PUBLIC;
|
|
41
|
+
}
|
|
42
|
+
exports.isPublicChannel = isPublicChannel;
|
|
43
|
+
/**
|
|
44
|
+
* Determines if the given channel is considered to be an `org` channel, supporting both
|
|
45
|
+
* legacy permissions and V2 ACL model.
|
|
46
|
+
* @param channel An IChannel record
|
|
47
|
+
* @returns true if the channel is considered `org`
|
|
48
|
+
*/
|
|
49
|
+
function isOrgChannel(channel) {
|
|
50
|
+
return channel.channelAcl
|
|
51
|
+
? !isPublicChannel(channel) &&
|
|
52
|
+
channel.channelAcl.some(({ category, subCategory }) => category === types_1.AclCategory.ORG &&
|
|
53
|
+
subCategory === types_1.AclSubCategory.MEMBER)
|
|
54
|
+
: channel.access === types_1.SharingAccess.ORG;
|
|
55
|
+
}
|
|
56
|
+
exports.isOrgChannel = isOrgChannel;
|
|
57
|
+
/**
|
|
58
|
+
* Determines if the given channel is considered to be a `private` channel, supporting both
|
|
59
|
+
* legacy permissions and V2 ACL model.
|
|
60
|
+
* @param channel An IChannel record
|
|
61
|
+
* @returns true if the channel is considered `private`
|
|
62
|
+
*/
|
|
63
|
+
function isPrivateChannel(channel) {
|
|
64
|
+
return !isPublicChannel(channel) && !isOrgChannel(channel);
|
|
65
|
+
}
|
|
66
|
+
exports.isPrivateChannel = isPrivateChannel;
|
|
67
|
+
/**
|
|
68
|
+
* Determines the given channel's access, supporting both legacy permissions and V2 ACL
|
|
69
|
+
* model.
|
|
70
|
+
* @param channel An IChannel record
|
|
71
|
+
* @returns `public`, `org` or `private`
|
|
72
|
+
*/
|
|
73
|
+
function getChannelAccess(channel) {
|
|
74
|
+
let access = types_1.SharingAccess.PRIVATE;
|
|
75
|
+
if (isPublicChannel(channel)) {
|
|
76
|
+
access = types_1.SharingAccess.PUBLIC;
|
|
77
|
+
}
|
|
78
|
+
else if (isOrgChannel(channel)) {
|
|
79
|
+
access = types_1.SharingAccess.ORG;
|
|
80
|
+
}
|
|
81
|
+
return access;
|
|
82
|
+
}
|
|
83
|
+
exports.getChannelAccess = getChannelAccess;
|
|
84
|
+
/**
|
|
85
|
+
* Returns an array of org ids configured for the channel, supporting both legacy permissions
|
|
86
|
+
* and V2 ACL model.
|
|
87
|
+
* @param channel An IChannel record
|
|
88
|
+
* @returns an array of org ids for the given channel
|
|
89
|
+
*/
|
|
90
|
+
function getChannelOrgIds(channel) {
|
|
91
|
+
return channel.channelAcl
|
|
92
|
+
? channel.channelAcl.reduce((acc, permission) => permission.category === types_1.AclCategory.ORG &&
|
|
93
|
+
permission.subCategory === types_1.AclSubCategory.MEMBER
|
|
94
|
+
? [...acc, permission.key]
|
|
95
|
+
: acc, [])
|
|
96
|
+
: channel.orgs;
|
|
97
|
+
}
|
|
98
|
+
exports.getChannelOrgIds = getChannelOrgIds;
|
|
99
|
+
/**
|
|
100
|
+
* Returns an array of group ids configured for the channel, supporting both legacy permissions
|
|
101
|
+
* and V2 ACL model.
|
|
102
|
+
* @param channel An IChannel record
|
|
103
|
+
* @returns an array of group ids for the given channel
|
|
104
|
+
*/
|
|
105
|
+
function getChannelGroupIds(channel) {
|
|
106
|
+
return channel.channelAcl
|
|
107
|
+
? channel.channelAcl.reduce((acc, permission) => permission.category === types_1.AclCategory.GROUP &&
|
|
108
|
+
permission.subCategory === types_1.AclSubCategory.MEMBER
|
|
109
|
+
? [...acc, permission.key]
|
|
110
|
+
: acc, [])
|
|
111
|
+
: channel.groups;
|
|
112
|
+
}
|
|
113
|
+
exports.getChannelGroupIds = getChannelGroupIds;
|
|
114
|
+
/**
|
|
115
|
+
* A utility method used to build an IQuery to search for users that are permitted to be at-mentioned for the given channel.
|
|
116
|
+
* @param input An array of strings to search for. Each string is mapped to `username` and `fullname`, filters as an OR condition
|
|
117
|
+
* @param channel An IChannel record
|
|
118
|
+
* @param currentUsername The currently authenticated user's username
|
|
119
|
+
* @param options An IHubSearchOptions object
|
|
120
|
+
* @returns a promise that resolves an IHubSearchResponse<IHubSearchResult>
|
|
121
|
+
*/
|
|
122
|
+
function getChannelUsersQuery(inputs, channel, currentUsername) {
|
|
123
|
+
const groupIds = getChannelGroupIds(channel);
|
|
124
|
+
const orgIds = getChannelOrgIds(channel);
|
|
125
|
+
const groupsPredicate = { group: groupIds };
|
|
126
|
+
let filters;
|
|
127
|
+
if (isPublicChannel(channel)) {
|
|
128
|
+
filters = [
|
|
129
|
+
{
|
|
130
|
+
operation: "OR",
|
|
131
|
+
predicates: [{ orgid: { from: "0", to: "{" } }],
|
|
132
|
+
},
|
|
133
|
+
];
|
|
134
|
+
}
|
|
135
|
+
else if (isOrgChannel(channel)) {
|
|
136
|
+
const additional = groupIds.length ? [groupsPredicate] : [];
|
|
137
|
+
filters = [
|
|
138
|
+
{
|
|
139
|
+
operation: "OR",
|
|
140
|
+
predicates: [{ orgid: orgIds }, ...additional],
|
|
141
|
+
},
|
|
142
|
+
];
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
filters = [
|
|
146
|
+
{
|
|
147
|
+
operation: "AND",
|
|
148
|
+
predicates: [groupsPredicate],
|
|
149
|
+
},
|
|
150
|
+
];
|
|
151
|
+
}
|
|
152
|
+
if (currentUsername) {
|
|
153
|
+
filters.push({
|
|
154
|
+
operation: "AND",
|
|
155
|
+
predicates: [{ username: { not: currentUsername } }],
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
const query = {
|
|
159
|
+
targetEntity: "communityUser",
|
|
160
|
+
filters: [
|
|
161
|
+
{
|
|
162
|
+
operation: "OR",
|
|
163
|
+
predicates: inputs.reduce((acc, input) => [...acc, { username: input }, { fullname: input }], []),
|
|
164
|
+
},
|
|
165
|
+
...filters,
|
|
166
|
+
],
|
|
167
|
+
};
|
|
168
|
+
return query;
|
|
169
|
+
}
|
|
170
|
+
exports.getChannelUsersQuery = getChannelUsersQuery;
|
|
30
171
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/discussions/utils.ts"],"names":[],"mappings":";;;AAEA,2CAA6C;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/discussions/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,7 @@ const view_1 = require("./view");
|
|
|
13
13
|
const util_1 = require("../util");
|
|
14
14
|
const edit_1 = require("./edit");
|
|
15
15
|
const enrichEntity_1 = require("../core/enrichEntity");
|
|
16
|
+
const objects_1 = require("../objects");
|
|
16
17
|
/**
|
|
17
18
|
* Hub Project Class
|
|
18
19
|
*/
|
|
@@ -135,12 +136,25 @@ class HubProject extends HubItemEntity_1.HubItemEntity {
|
|
|
135
136
|
* on project creation, we want to pre-populate the sharing
|
|
136
137
|
* field with the core and collaboration groups if the user
|
|
137
138
|
* has the appropriate shareToGroup portal privilege
|
|
139
|
+
*
|
|
140
|
+
* TODO: we should re-evaluate this "auto-populate" pattern
|
|
138
141
|
*/
|
|
139
142
|
const { access: canShare } = this.checkPermission("platform:portal:user:shareToGroup");
|
|
140
143
|
if (!editor.id && canShare) {
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
+
const currentUserGroups = objects_1.getProp(this.context, "currentUser.groups") || [];
|
|
145
|
+
const defaultShareWithGroups = [
|
|
146
|
+
editorContext.contentGroupId,
|
|
147
|
+
editorContext.collaborationGroupId,
|
|
148
|
+
].reduce((acc, groupId) => {
|
|
149
|
+
const group = currentUserGroups.find((g) => g.id === groupId);
|
|
150
|
+
const canShareToGroup = !!group &&
|
|
151
|
+
(!group.isViewOnly ||
|
|
152
|
+
(group.isViewOnly &&
|
|
153
|
+
["owner", "admin"].includes(group.memberType)));
|
|
154
|
+
canShareToGroup && acc.push(groupId);
|
|
155
|
+
return acc;
|
|
156
|
+
}, []);
|
|
157
|
+
editor._groups = [...editor._groups, ...defaultShareWithGroups];
|
|
144
158
|
}
|
|
145
159
|
return editor;
|
|
146
160
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HubProject.js","sourceRoot":"","sources":["../../../src/projects/HubProject.ts"],"names":[],"mappings":";;;AAAA,yCAA6C;AAa7C,+CAA4C;AAE5C,yDAAsD;AAMtD,qEAAkE;AAElE,8DAA8D;AAC9D,mCAAuC;AAGvC,kEAA+D;AAC/D,4DAAyD;AAKzD,iCAA4C;AAC5C,kCAAiD;AACjD,iCAAuE;AAEvE,uDAAoD;
|
|
1
|
+
{"version":3,"file":"HubProject.js","sourceRoot":"","sources":["../../../src/projects/HubProject.ts"],"names":[],"mappings":"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"}
|
|
@@ -161,6 +161,6 @@ async function memberToSearchResult(member, include = [], requestOptions) {
|
|
|
161
161
|
objects_1.setProp(key, fetchedUser[key], user);
|
|
162
162
|
}
|
|
163
163
|
});
|
|
164
|
-
return users_1.enrichUserSearchResult(user, include, requestOptions);
|
|
164
|
+
return users_1.enrichUserSearchResult(user, ["org.name as OrgName", ...include], requestOptions);
|
|
165
165
|
}
|
|
166
166
|
//# sourceMappingURL=portalSearchGroupMembers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portalSearchGroupMembers.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchGroupMembers.ts"],"names":[],"mappings":";;;AAAA,wEAAqE;AAOrE,iEAKkC;AAClC,uDAAoD;AACpD,oCAA2C;AAC3C,6CAAsC;AAEtC,uCAAqD;AACrD,uCAAuC;AACvC,2CAA4D;AAE5D;;;;;;;;;;;;;;GAcG;AACI,KAAK,UAAU,wBAAwB,CAC5C,KAAa,EACb,OAA0B;IAE1B,+DAA+D;IAC/D,IAAI,OAAe,CAAC;IACpB,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAC/B,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YACtC,MAAM,IAAI,GAAG,iBAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;YACzC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACvB,6BAA6B;gBAC7B,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;aACnB;iBAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;gBACnC,4BAA4B;gBAC5B,OAAO,GAAG,IAAI,CAAC;aAChB;iBAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE;gBACnC,gCAAgC;gBAChC,wCAAwC;gBACxC,OAAO,GAAG,iBAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,iBAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;aAC9D;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,CAAC,OAAO,EAAE;QACZ,MAAM,IAAI,kBAAQ,CAChB,0BAA0B,EAC1B,6DAA6D,CAC9D,CAAC;KACH;IAED,kDAAkD;IAClD,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QAC3C,uDAAuD;QACvD,MAAM,kBAAkB,GAAG,CAAC,MAAM,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;QAC5D,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU;aAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,2BAA2B;YAC3B,IAAI,CAAC,CAAC,IAAI,EAAE;gBACV,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC;gBAChB,OAAO,CAAC,CAAC,IAAI,CAAC;aACf;YACD,OAAO,CAAC,CAAC;QACX,CAAC,CAAC;YACF,wCAAwC;aACvC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,OAAO,mBAAS,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC;QAC1C,CAAC,CAAC;YACF,8BAA8B;aAC7B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;YACZ,OAAO,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;QACtC,CAAC,CAAC;YACF,kCAAkC;aACjC,GAAG,CAAC,iCAAe,CAAC,CAAC;QACxB,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,0CAA0C;IAC1C,MAAM,EAAE,GAAG,iDAAuB,CAAC,KAAK,CAAC,CAAC;IAC1C,mFAAmF;IACnF,MAAM,KAAK,GAAmC;QAC5C,KAAK;QACL,WAAW;QACX,WAAW;QACX,SAAS;QACT,OAAO;KACR,CAAC;IACF,sBAAsB;IACtB,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;YAChC,EAAE,CAAC,IAAsC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;SAC5D;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,OAAO,GAAG,OAAO,CAAC;IACrB,EAAE,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;IAE3C,iBAAiB;IACjB,OAAO,kBAAkB,CAAC,EAA8B,CAAC,CAAC;AAC5D,CAAC;AA9ED,4DA8EC;AAED;;;;GAIG;AACH,KAAK,UAAU,kBAAkB,CAC/B,aAAuC;IAEvC,iEAAiE;IACjE,MAAM,IAAI,GAAG,gCACR,aAAa,GACb,aAAa,CAAC,cAAc,CACJ,CAAC;IAC9B,MAAM,IAAI,GAAG,MAAM,qCAAgB,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAEjE,qCAAqC;IACrC,uCAAuC;IACvC,MAAM,EAAE,GAAG,CAAC,MAAoB,EAAE,EAAE;QAClC,OAAO,oBAAoB,iCACpB,MAAM,KAAE,YAAY,EAAE,IAAI,CAAC,KAAK,CAAC,QAAQ,KAAK,MAAM,CAAC,QAAQ,KAClE,aAAa,CAAC,OAAO,EACrB,aAAa,CAAC,cAAc,CAC7B,CAAC;IACJ,CAAC,CAAC;IAEF,mBAAmB;IACnB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAEtD,OAAO;QACL,KAAK,EAAE,IAAI,CAAC,KAAK;QACjB,OAAO;QACP,OAAO,EAAE,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;QAC5B,IAAI,EAAE,uBAAe,CACnB,aAAa,EACb,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,KAAK,EACV,kBAAkB,CACnB;KACF,CAAC;AACJ,CAAC;AAgBD;;;;;;;;GAQG;AACH,KAAK,UAAU,oBAAoB,CACjC,MAAgD,EAChD,UAAoB,EAAE,EACtB,cAAmC;IAEnC,mDAAmD;IACnD,yDAAyD;IACzD,MAAM,IAAI,GAAgC;QACxC,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,UAAU,EAAE,MAAM,CAAC,UAAU,IAAI,QAAQ;QACzC,MAAM,EAAE,SAAS;QACjB,QAAQ,EAAE,IAAI;QACd,SAAS,EAAE,IAAI;QACf,QAAQ,EAAE,IAAI;QACd,WAAW,EAAE,IAAI;QACjB,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,EAAE;QACV,IAAI,EAAE,EAAE;QACR,SAAS,EAAE,IAAI;QACf,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,IAAI;QACd,YAAY,EAAE,MAAM,CAAC,YAAY;KAClC,CAAC;IAEF,MAAM,SAAS,GAAG,gBAAQ,CAAC,4BAAO,EAAE,IAAI,CAAC,CAAC;IAC1C,MAAM,WAAW,GAAG,MAAM,SAAS,CAAC;QAClC,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,cAAc,EAAE,cAAc,CAAC,cAAc;QAC7C,MAAM,EAAE,cAAc,CAAC,MAAM;KAC9B,CAAC,CAAC;IACH,iDAAiD;IACjD,mFAAmF;IACnF,2EAA2E;IAC3E,oBAAoB;IACpB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAChC,IAAI,WAAW,CAAC,cAAc,CAAC,GAAG,CAAC,IAAI,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE;YAC9D,iBAAO,CAAC,GAAG,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,IAAI,CAAC,CAAC;SACtC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,8BAAsB,
|
|
1
|
+
{"version":3,"file":"portalSearchGroupMembers.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchGroupMembers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,34 +1,29 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.searchCommunityUsers = exports.searchPortalUsers = exports.searchPortalUsersLegacy = void 0;
|
|
4
4
|
const arcgis_rest_portal_1 = require("@esri/arcgis-rest-portal");
|
|
5
5
|
const users_1 = require("../../users");
|
|
6
6
|
const serializeQueryForPortal_1 = require("../serializeQueryForPortal");
|
|
7
7
|
const HubError_1 = require("../../HubError");
|
|
8
8
|
const utils_1 = require("../utils");
|
|
9
9
|
const expandPredicate_1 = require("./expandPredicate");
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
* Portal Search Implementation for Users
|
|
13
|
-
* @param filterGroups
|
|
14
|
-
* @param options
|
|
15
|
-
* @returns
|
|
16
|
-
*/
|
|
17
|
-
async function portalSearchUsers(query, options) {
|
|
10
|
+
const util_1 = require("../../util");
|
|
11
|
+
function buildSearchOptions(query, options, operation) {
|
|
18
12
|
// requestOptions is always required and user must be authd
|
|
19
13
|
if (!options.requestOptions) {
|
|
20
|
-
throw new HubError_1.default(
|
|
14
|
+
throw new HubError_1.default(operation, "requestOptions: IHubRequestOptions is required.");
|
|
21
15
|
}
|
|
22
16
|
if (!options.requestOptions.authentication) {
|
|
23
|
-
throw new HubError_1.default(
|
|
17
|
+
throw new HubError_1.default(operation, "requestOptions must pass authentication.");
|
|
24
18
|
}
|
|
19
|
+
const clonedQuery = util_1.cloneObject(query);
|
|
25
20
|
// Expand the individual predicates in each filter
|
|
26
|
-
|
|
21
|
+
clonedQuery.filters = clonedQuery.filters.map((filter) => {
|
|
27
22
|
filter.predicates = filter.predicates.map(expandPredicate_1.expandPredicate);
|
|
28
23
|
return filter;
|
|
29
24
|
});
|
|
30
25
|
// Serialize the all the groups for portal
|
|
31
|
-
const so = serializeQueryForPortal_1.serializeQueryForPortal(
|
|
26
|
+
const so = serializeQueryForPortal_1.serializeQueryForPortal(clonedQuery);
|
|
32
27
|
// Array of properties we want to copy from IHubSearchOptions to the ISearchOptions
|
|
33
28
|
const props = [
|
|
34
29
|
"num",
|
|
@@ -47,27 +42,99 @@ async function portalSearchUsers(query, options) {
|
|
|
47
42
|
// Unlike Groups and Item, the Users api *requires* authentication
|
|
48
43
|
// so we set it directly
|
|
49
44
|
so.authentication = options.requestOptions.authentication;
|
|
45
|
+
return so;
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
48
|
+
* @private
|
|
49
|
+
*
|
|
50
|
+
* Portal Search Implementation for Users within the currently authenticated user's organization.
|
|
51
|
+
* Automatically adds "org.name as OrgName" enrichment
|
|
52
|
+
*
|
|
53
|
+
* DEPRECATED: This method will be deprecated in a future release, as it's not ideal to impose default enrichments in all
|
|
54
|
+
* cases. When this method is depreated, all places that currently call `hubSearch` with a `targetEntity` of `user` will
|
|
55
|
+
* need to be updated to use the `portalUser` `targetEntity` and explicitly pass `"org.name as OrgName"` in `inclues` to
|
|
56
|
+
* preserve that enrichment, if needed. E.g.
|
|
57
|
+
*
|
|
58
|
+
* ```js
|
|
59
|
+
* // before
|
|
60
|
+
* await hubSearch(
|
|
61
|
+
* { targetEntity: "user", ... },
|
|
62
|
+
* { start: 1, ... },
|
|
63
|
+
* );
|
|
64
|
+
*
|
|
65
|
+
* // after
|
|
66
|
+
* await hubSearch(
|
|
67
|
+
* { targetEntity: "portalUser", ... },
|
|
68
|
+
* { start: 1, include: ["org.name as OrgName", ...], ... },
|
|
69
|
+
* );
|
|
70
|
+
* ```
|
|
71
|
+
*
|
|
72
|
+
* @param query An IQuery object representing the query to serialize
|
|
73
|
+
* @param options An IHubSearchOptions of search options
|
|
74
|
+
* @returns a promise that resolves an IHubSearchResponse<IHubSearchResult> of users results
|
|
75
|
+
*/
|
|
76
|
+
function searchPortalUsersLegacy(query, options) {
|
|
77
|
+
const searchOptions = buildSearchOptions(query, options, "searchPortalUsersLegacy");
|
|
78
|
+
// Execute search
|
|
79
|
+
return searchPortal(Object.assign(Object.assign({}, searchOptions), { include: ["org.name as OrgName", ...(searchOptions.include || [])] }));
|
|
80
|
+
}
|
|
81
|
+
exports.searchPortalUsersLegacy = searchPortalUsersLegacy;
|
|
82
|
+
/**
|
|
83
|
+
* @private
|
|
84
|
+
*
|
|
85
|
+
* Portal Search Implementation for Users within the currently authenticated user's organization.
|
|
86
|
+
* No enrichments added by default.
|
|
87
|
+
*
|
|
88
|
+
* @param query An IQuery object representing the query to serialize
|
|
89
|
+
* @param options An IHubSearchOptions of search options
|
|
90
|
+
* @returns a promise that resolves an IHubSearchResponse<IHubSearchResult> of users results
|
|
91
|
+
*/
|
|
92
|
+
function searchPortalUsers(query, options) {
|
|
93
|
+
const searchOptions = buildSearchOptions(query, options, "searchPortalUsers");
|
|
94
|
+
// Execute search
|
|
95
|
+
return searchPortal(searchOptions);
|
|
96
|
+
}
|
|
97
|
+
exports.searchPortalUsers = searchPortalUsers;
|
|
98
|
+
/**
|
|
99
|
+
* @private
|
|
100
|
+
*
|
|
101
|
+
* Community Search Implementation for Users within in any organization.
|
|
102
|
+
* No enrichments added by default.
|
|
103
|
+
*
|
|
104
|
+
* @param query An IQuery object representing the query to serialize
|
|
105
|
+
* @param options An IHubSearchOptions of search options
|
|
106
|
+
* @returns a promise that resolves an IHubSearchResponse<IHubSearchResult> of users results
|
|
107
|
+
*/
|
|
108
|
+
function searchCommunityUsers(query, options) {
|
|
109
|
+
const searchOptions = buildSearchOptions(query, options, "searchCommunityUsers");
|
|
50
110
|
// Execute search
|
|
51
|
-
return
|
|
111
|
+
return searchCommunity(searchOptions);
|
|
112
|
+
}
|
|
113
|
+
exports.searchCommunityUsers = searchCommunityUsers;
|
|
114
|
+
/**
|
|
115
|
+
* @private
|
|
116
|
+
* @param searchOptions An IUserSearchOptions object
|
|
117
|
+
* @param searchResponse A ISearchResult<IUser> object
|
|
118
|
+
* @returns
|
|
119
|
+
*/
|
|
120
|
+
function mapUsersToSearchResults(searchOptions, searchResponse) {
|
|
121
|
+
// create mappable fn that will close
|
|
122
|
+
// over the includes and requestOptions
|
|
123
|
+
const fn = (user) => userToSearchResult(user, searchOptions.include, searchOptions.requestOptions);
|
|
124
|
+
return Promise.all(searchResponse.results.map(fn));
|
|
52
125
|
}
|
|
53
|
-
exports.portalSearchUsers = portalSearchUsers;
|
|
54
126
|
/**
|
|
55
127
|
* Internal portal search, which then converts `IGroup`s to `IHubSearchResult`s
|
|
56
128
|
* handling enrichments & includes along the way
|
|
57
129
|
*
|
|
58
130
|
* @param searchOptions
|
|
59
|
-
* @returns
|
|
131
|
+
* @returns a promise that resolves enriched internal portal user search results
|
|
60
132
|
*/
|
|
61
133
|
async function searchPortal(searchOptions) {
|
|
62
134
|
// Execute portal search
|
|
63
135
|
const resp = await arcgis_rest_portal_1.searchUsers(searchOptions);
|
|
64
|
-
// create mappable fn that will close
|
|
65
|
-
// over the includes and requestOptions
|
|
66
|
-
const fn = (user) => {
|
|
67
|
-
return userToSearchResult(user, searchOptions.include, searchOptions.requestOptions);
|
|
68
|
-
};
|
|
69
136
|
// map over results
|
|
70
|
-
const results = await
|
|
137
|
+
const results = await mapUsersToSearchResults(searchOptions, resp);
|
|
71
138
|
// Group Search does not support aggregations
|
|
72
139
|
// Construct the return
|
|
73
140
|
return {
|
|
@@ -77,6 +144,27 @@ async function searchPortal(searchOptions) {
|
|
|
77
144
|
next: utils_1.getNextFunction(searchOptions, resp.nextStart, resp.total, searchPortal),
|
|
78
145
|
};
|
|
79
146
|
}
|
|
147
|
+
/**
|
|
148
|
+
* Community search, which then converts `IGroup`s to `IHubSearchResult`s
|
|
149
|
+
* handling enrichments & includes along the way
|
|
150
|
+
*
|
|
151
|
+
* @param searchOptions
|
|
152
|
+
* @returns a promise that resolves enriched community user search results
|
|
153
|
+
*/
|
|
154
|
+
async function searchCommunity(searchOptions) {
|
|
155
|
+
// Execute portal search
|
|
156
|
+
const resp = await arcgis_rest_portal_1.searchCommunityUsers(searchOptions);
|
|
157
|
+
// map over results
|
|
158
|
+
const results = await mapUsersToSearchResults(searchOptions, resp);
|
|
159
|
+
// Group Search does not support aggregations
|
|
160
|
+
// Construct the return
|
|
161
|
+
return {
|
|
162
|
+
total: resp.total,
|
|
163
|
+
results,
|
|
164
|
+
hasNext: resp.nextStart > -1,
|
|
165
|
+
next: utils_1.getNextFunction(searchOptions, resp.nextStart, resp.total, searchCommunity),
|
|
166
|
+
};
|
|
167
|
+
}
|
|
80
168
|
/**
|
|
81
169
|
* Convert an Item to a IHubSearchResult
|
|
82
170
|
* Fetches the includes and attaches them to the item
|
|
@@ -85,7 +173,7 @@ async function searchPortal(searchOptions) {
|
|
|
85
173
|
* @param requestOptions
|
|
86
174
|
* @returns
|
|
87
175
|
*/
|
|
88
|
-
|
|
176
|
+
function userToSearchResult(user, include = [], requestOptions) {
|
|
89
177
|
// Delegate to HubUsers module
|
|
90
178
|
// This layer of indirection is not necessary but
|
|
91
179
|
// aligns with how the items search works and
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portalSearchUsers.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchUsers.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"portalSearchUsers.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchUsers.ts"],"names":[],"mappings":"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"}
|
|
@@ -53,7 +53,9 @@ async function hubSearch(query, options) {
|
|
|
53
53
|
arcgis: {
|
|
54
54
|
item: portalSearchItems_1.portalSearchItems,
|
|
55
55
|
group: portalSearchGroups_1.portalSearchGroups,
|
|
56
|
-
user: portalSearchUsers_1.
|
|
56
|
+
user: portalSearchUsers_1.searchPortalUsersLegacy,
|
|
57
|
+
portalUser: portalSearchUsers_1.searchPortalUsers,
|
|
58
|
+
communityUser: portalSearchUsers_1.searchCommunityUsers,
|
|
57
59
|
groupMember: portalSearchGroupMembers_1.portalSearchGroupMembers,
|
|
58
60
|
},
|
|
59
61
|
"arcgis-hub": {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hubSearch.js","sourceRoot":"","sources":["../../../src/search/hubSearch.ts"],"names":[],"mappings":";;;;AAAA,0CAAmC;AACnC,wCAAqC;AACrC,kCAAsC;AAOtC,6DAA0D;
|
|
1
|
+
{"version":3,"file":"hubSearch.js","sourceRoot":"","sources":["../../../src/search/hubSearch.ts"],"names":[],"mappings":";;;;AAAA,0CAAmC;AACnC,wCAAqC;AACrC,kCAAsC;AAOtC,6DAA0D;AAC1D,mFAAgF;AAChF,qEAAkE;AAClE,uEAAoE;AACpE,qEAAiH;AACjH,+DAA4D;AAC5D,qEAAkE;AAElE;;;;;;;;GAQG;AACI,KAAK,UAAU,SAAS,CAC7B,KAAa,EACb,OAA0B;IAE1B,kBAAkB;IAClB,IAAI,CAAC,KAAK,EAAE;QACV,MAAM,IAAI,kBAAQ,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;KACvD;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;QACjC,MAAM,IAAI,kBAAQ,CAAC,WAAW,EAAE,kCAAkC,CAAC,CAAC;KACrE;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE;QAC9C,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,yDAAyD,CAC1D,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,KAAK,CAAC,YAAY,CAAC;IAEtC,+EAA+E;IAC/E,8EAA8E;IAC9E,4EAA4E;IAC5E,iDAAiD;IACjD,MAAM,EAAE,cAAc,KAAmB,OAAO,EAArB,SAAS,kBAAK,OAAO,EAA1C,kBAAgC,CAAU,CAAC;IACjD,MAAM,gBAAgB,GAAsB,kBAAW,CAAC,SAAS,CAAC,CAAC;IACnE,gBAAgB,CAAC,cAAc,GAAG,cAAc,CAAC;IAEjD,gBAAgB,CAAC,GAAG,GAAG,eAAM,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;IAE5D,MAAM,MAAM,GAAG;QACb,MAAM,EAAE;YACN,IAAI,EAAE,qCAAiB;YACvB,KAAK,EAAE,uCAAkB;YACzB,IAAI,EAAE,2CAAuB;YAC7B,UAAU,EAAE,qCAAiB;YAC7B,aAAa,EAAE,wCAAoB;YACnC,WAAW,EAAE,mDAAwB;SACtC;QACD,YAAY,EAAE;YACZ,IAAI,EAAE,+BAAc;YACpB,OAAO,EAAE,qCAAiB;SAC3B;KACF,CAAC;IAEF,MAAM,EAAE,GAAG,iBAAO,CAAC,MAAM,EAAE,GAAG,gBAAgB,CAAC,GAAG,CAAC,IAAI,IAAI,UAAU,EAAE,CAAC,CAAC;IACzE,IAAI,CAAC,EAAE,EAAE;QACP,MAAM,IAAI,kBAAQ,CAChB,WAAW,EACX,eAAe,UAAU,qBAAqB,gBAAgB,CAAC,GAAG,CAAC,IAAI,iFAAiF,CACzJ,CAAC;KACH;IACD,OAAO,EAAE,CAAC,kBAAW,CAAC,KAAK,CAAC,EAAE,gBAAgB,CAAC,CAAC;AAClD,CAAC;AApED,8BAoEC"}
|
|
@@ -145,8 +145,8 @@ function serializePredicate(predicate) {
|
|
|
145
145
|
if (!specialProps.includes(key) && key !== "term") {
|
|
146
146
|
so.q = serializeMatchOptions(key, value);
|
|
147
147
|
}
|
|
148
|
-
if (dateProps.includes(key)) {
|
|
149
|
-
so.q =
|
|
148
|
+
if (dateProps.includes(key) || isRange(value)) {
|
|
149
|
+
so.q = serializeRange(key, value);
|
|
150
150
|
}
|
|
151
151
|
if (boolProps.includes(key)) {
|
|
152
152
|
so.q = `${key}:${value}`;
|
|
@@ -206,12 +206,12 @@ function serializeMatchOptions(key, value) {
|
|
|
206
206
|
return result;
|
|
207
207
|
}
|
|
208
208
|
/**
|
|
209
|
-
* Serialize a
|
|
209
|
+
* Serialize a range into Portal syntax
|
|
210
210
|
* @param key
|
|
211
211
|
* @param range
|
|
212
212
|
* @returns
|
|
213
213
|
*/
|
|
214
|
-
function
|
|
214
|
+
function serializeRange(key, range) {
|
|
215
215
|
return `${key}:[${range.from} TO ${range.to}]`;
|
|
216
216
|
}
|
|
217
217
|
/**
|
|
@@ -234,4 +234,14 @@ function serializeStringOrArray(join, key, value) {
|
|
|
234
234
|
}
|
|
235
235
|
return q;
|
|
236
236
|
}
|
|
237
|
+
/**
|
|
238
|
+
* Determines if the given value is a range object
|
|
239
|
+
* @param value A search param value
|
|
240
|
+
* @returns true when the value is a range object, e.g. { from: '0', to: '{' }
|
|
241
|
+
*/
|
|
242
|
+
function isRange(value) {
|
|
243
|
+
return (typeof value === "object" &&
|
|
244
|
+
value !== null &&
|
|
245
|
+
["from", "to"].every((key) => typeof value[key] !== "undefined"));
|
|
246
|
+
}
|
|
237
247
|
//# sourceMappingURL=serializeQueryForPortal.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"serializeQueryForPortal.js","sourceRoot":"","sources":["../../../src/search/serializeQueryForPortal.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"serializeQueryForPortal.js","sourceRoot":"","sources":["../../../src/search/serializeQueryForPortal.ts"],"names":[],"mappings":"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"}
|
|
@@ -50,14 +50,8 @@ async function enrichUserSearchResult(user, include, requestOptions) {
|
|
|
50
50
|
result.memberType = user.memberType;
|
|
51
51
|
result.isGroupOwner = user.isGroupOwner;
|
|
52
52
|
}
|
|
53
|
-
// Informal Enrichments - basically adding type-specific props
|
|
54
|
-
// derived directly from the entity
|
|
55
|
-
// default includes
|
|
56
|
-
const DEFAULTS = ["org.name AS orgName"];
|
|
57
|
-
// merge includes
|
|
58
|
-
include = [...DEFAULTS, ...include].filter(util_1.unique);
|
|
59
53
|
// Parse the includes into a valid set of enrichments
|
|
60
|
-
const specs = include.map(parseInclude_1.parseInclude);
|
|
54
|
+
const specs = include.filter(util_1.unique).map(parseInclude_1.parseInclude);
|
|
61
55
|
// Extract out the low-level enrichments needed
|
|
62
56
|
const enrichments = utils_2.mapBy("enrichment", specs).filter(util_1.unique);
|
|
63
57
|
// fetch the enrichments
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HubUsers.js","sourceRoot":"","sources":["../../../src/users/HubUsers.ts"],"names":[],"mappings":";;;AACA,yDAA+D;AAC/D,wCAAqC;AACrC,2CAAsD;AACtD,mEAAgE;AAEhE,kCAAyC;AACzC,kCAAiC;AACjC,oCAAiC;AAIjC;;;;;;GAMG;AACI,KAAK,UAAU,sBAAsB,CAC1C,IAAiC,EACjC,OAAiB,EACjB,cAAkC;;IAElC,6BAA6B;IAC7B,MAAM,MAAM,GAAqB;QAC/B,MAAM,EAAE,IAAI,CAAC,MAAqB;QAClC,EAAE,EAAE,IAAI,CAAC,QAAQ;QACjB,IAAI,EAAE,MAAM;QACZ;;;;;;WAMG;QACH,IAAI,EAAE,IAAI,CAAC,QAAQ;QACnB,KAAK,EAAE,IAAI,CAAC,QAAQ;QACpB,yDAAyD;QACzD,4FAA4F;QAC5F,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;QAC1E,WAAW,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;QACnC,iBAAiB,EAAE,cAAc;QACjC,WAAW,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;QACpC,iBAAiB,EAAE,eAAe;QAClC,MAAM,EAAE,QAAQ;QAChB,KAAK,EAAE;YACL,IAAI,EAAE,iBAAiB;YACvB,YAAY,EAAE,iBAAiB;YAC/B,SAAS,EAAE,IAAI;SAChB;KACF,CAAC;IACF,qDAAqD;IACrD,IAAI,IAAI,CAAC,UAAU,EAAE;QACnB,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACpC,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;KACzC;IAED,
|
|
1
|
+
{"version":3,"file":"HubUsers.js","sourceRoot":"","sources":["../../../src/users/HubUsers.ts"],"names":[],"mappings":";;;AACA,yDAA+D;AAC/D,wCAAqC;AACrC,2CAAsD;AACtD,mEAAgE;AAEhE,kCAAyC;AACzC,kCAAiC;AACjC,oCAAiC;AAIjC;;;;;;GAMG;AACI,KAAK,UAAU,sBAAsB,CAC1C,IAAiC,EACjC,OAAiB,EACjB,cAAkC;;IAElC,6BAA6B;IAC7B,MAAM,MAAM,GAAqB;QAC/B,MAAM,EAAE,IAAI,CAAC,MAAqB;QAClC,EAAE,EAAE,IAAI,CAAC,QAAQ;QACjB,IAAI,EAAE,MAAM;QACZ;;;;;;WAMG;QACH,IAAI,EAAE,IAAI,CAAC,QAAQ;QACnB,KAAK,EAAE,IAAI,CAAC,QAAQ;QACpB,yDAAyD;QACzD,4FAA4F;QAC5F,OAAO,EAAE,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;QAC1E,WAAW,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC;QACnC,iBAAiB,EAAE,cAAc;QACjC,WAAW,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;QACpC,iBAAiB,EAAE,eAAe;QAClC,MAAM,EAAE,QAAQ;QAChB,KAAK,EAAE;YACL,IAAI,EAAE,iBAAiB;YACvB,YAAY,EAAE,iBAAiB;YAC/B,SAAS,EAAE,IAAI;SAChB;KACF,CAAC;IACF,qDAAqD;IACrD,IAAI,IAAI,CAAC,UAAU,EAAE;QACnB,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACpC,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;KACzC;IAED,qDAAqD;IACrD,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,aAAM,CAAC,CAAC,GAAG,CAAC,2BAAY,CAAC,CAAC;IACvD,+CAA+C;IAC/C,MAAM,WAAW,GAAG,aAAK,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,aAAM,CAAC,CAAC;IAC9D,wBAAwB;IACxB,IAAI,QAAQ,GAAG,EAAE,CAAC;IAClB,6EAA6E;IAC7E,2DAA2D;IAC3D,0BAA0B;IAC1B,IAAI,WAAW,CAAC,MAAM,EAAE;QACtB,QAAQ,GAAG,MAAM,kCAAoB,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,CAAC,CAAC;KAC1E;IAED,yCAAyC;IACzC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,iBAAO,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,MAAM,KAAK,SAAG,cAAc,CAAC,cAAc,0CAAE,KAAK,CAAC;IAEnD,4DAA4D;IAC5D,qDAAqD;IACrD,IAAI,IAAI,CAAC,SAAS,EAAE;QAClB,MAAM,CAAC,KAAK,CAAC,SAAS,GAAG,2BAAmB,CAC1C,cAAc,CAAC,MAAM,EACrB,IAAI,EACJ,KAAK,CACN,CAAC;KACH;IACD,MAAM,CAAC,KAAK,CAAC,IAAI,GAAG,qBAAc,CAAC,MAAM,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;IAC9D,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,WAAW,MAAM,CAAC,EAAE,EAAE,CAAC;IAEnD,OAAO,MAAM,CAAC;AAChB,CAAC;AAxED,wDAwEC"}
|
|
@@ -78,7 +78,8 @@ export declare enum PostStatus {
|
|
|
78
78
|
APPROVED = "approved",
|
|
79
79
|
REJECTED = "rejected",
|
|
80
80
|
DELETED = "deleted",
|
|
81
|
-
HIDDEN = "hidden"
|
|
81
|
+
HIDDEN = "hidden",
|
|
82
|
+
BLOCKED = "blocked"
|
|
82
83
|
}
|
|
83
84
|
/**
|
|
84
85
|
* possible discussionn content types, i.e. a post can be about an item, dataset, or group
|