@esri/hub-common 9.45.2 → 9.45.3
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/search/_internal/ifilter-utils.js.map +1 -1
- package/dist/es2017/search/_internal/index.js +1 -0
- package/dist/es2017/search/_internal/index.js.map +1 -1
- package/dist/es2017/search/_internal/portalSearchGroups.js +1 -56
- package/dist/es2017/search/_internal/portalSearchGroups.js.map +1 -1
- package/dist/es2017/search/_internal/portalSearchItems.js +1 -87
- package/dist/es2017/search/_internal/portalSearchItems.js.map +1 -1
- package/dist/es2017/search/_internal/portalSearchUsers.js +0 -43
- package/dist/es2017/search/_internal/portalSearchUsers.js.map +1 -1
- package/dist/es2017/search/filter-utils.js +0 -197
- package/dist/es2017/search/filter-utils.js.map +1 -1
- package/dist/es2017/search/hubSearch.js +9 -38
- package/dist/es2017/search/hubSearch.js.map +1 -1
- package/dist/esm/search/_internal/ifilter-utils.js.map +1 -1
- package/dist/esm/search/_internal/index.js +1 -0
- package/dist/esm/search/_internal/index.js.map +1 -1
- package/dist/esm/search/_internal/portalSearchGroups.js +1 -57
- package/dist/esm/search/_internal/portalSearchGroups.js.map +1 -1
- package/dist/esm/search/_internal/portalSearchItems.js +1 -88
- package/dist/esm/search/_internal/portalSearchItems.js.map +1 -1
- package/dist/esm/search/_internal/portalSearchUsers.js +0 -45
- package/dist/esm/search/_internal/portalSearchUsers.js.map +1 -1
- package/dist/esm/search/filter-utils.js +0 -198
- package/dist/esm/search/filter-utils.js.map +1 -1
- package/dist/esm/search/hubSearch.js +9 -37
- package/dist/esm/search/hubSearch.js.map +1 -1
- package/dist/node/search/_internal/ifilter-utils.js.map +1 -1
- package/dist/node/search/_internal/index.js +1 -0
- package/dist/node/search/_internal/index.js.map +1 -1
- package/dist/node/search/_internal/portalSearchGroups.js +1 -57
- package/dist/node/search/_internal/portalSearchGroups.js.map +1 -1
- package/dist/node/search/_internal/portalSearchItems.js +2 -90
- package/dist/node/search/_internal/portalSearchItems.js.map +1 -1
- package/dist/node/search/_internal/portalSearchUsers.js +1 -45
- package/dist/node/search/_internal/portalSearchUsers.js.map +1 -1
- package/dist/node/search/filter-utils.js +1 -200
- package/dist/node/search/filter-utils.js.map +1 -1
- package/dist/node/search/hubSearch.js +12 -41
- package/dist/node/search/hubSearch.js.map +1 -1
- package/dist/types/search/_internal/index.d.ts +1 -0
- package/dist/types/search/_internal/portalSearchGroups.d.ts +1 -10
- package/dist/types/search/_internal/portalSearchItems.d.ts +1 -15
- package/dist/types/search/_internal/portalSearchUsers.d.ts +1 -9
- package/dist/types/search/filter-utils.d.ts +0 -17
- package/dist/types/search/hubSearch.d.ts +7 -4
- package/dist/types/search/types/IHubCatalog.d.ts +38 -2
- package/dist/umd/common.umd.js +33 -441
- package/dist/umd/common.umd.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ifilter-utils.js","sourceRoot":"","sources":["../../../../src/search/_internal/ifilter-utils.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"ifilter-utils.js","sourceRoot":"","sources":["../../../../src/search/_internal/ifilter-utils.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAQzC,OAAO,EAAE,mBAAmB,EAAE,uBAAuB,EAAE,MAAM,UAAU,CAAC;AAExE,MAAM,UAAU,eAAe,CAAC,SAAqB;IACnD,IAAM,MAAM,GAAe,EAAE,CAAC;IAC9B,IAAM,SAAS,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;IACvD,IAAM,SAAS,GAAG;QAChB,YAAY;QACZ,MAAM;QACN,kBAAkB;QAClB,YAAY;QACZ,gBAAgB;KACjB,CAAC;IACF,IAAM,qBAAqB,kBAAO,SAAS,EAAK,SAAS,CAAC,CAAC;IAC3D,oBAAoB;IACpB,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,UAAC,EAAY;YAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QAC5C,6BAA6B;QAC7B,IAAI,CAAC,qBAAqB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACxC,OAAO,CAAC,GAAG,EAAE,mBAAmB,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC,CAAC;SAClD;QACD,qBAAqB;QACrB,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YAC3B,IAAM,cAAc,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC;YAC5D,IAAI,OAAO,CAAC,SAAS,EAAK,GAAG,UAAO,CAAC,KAAK,eAAe,EAAE;gBACzD,OAAO,CAAC,GAAG,EAAE,uBAAuB,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,CAAC;aAC/D;iBAAM;gBACL,OAAO,CAAC,GAAG,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;aACtC;SACF;QACD,6CAA6C;QAC7C,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;YAC5D,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;SAC7B;IACH,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,uBAAuB,CAAC,KAAa;IACnD,IAAM,mBAAmB,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAE/D,IAAM,MAAM,GAAG,kBAAkB,CAAC,mBAAmB,EAAE,KAAK,CAAC,CAAC;IAE9D,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,kBAAkB,CACzB,OAAyB,EACzB,SAAuB;IAEvB,IAAM,MAAM,GAAmB,OAAO,CAAC,MAAM,CAC3C,UAAC,GAAG,EAAE,KAAK;QACT,iBAAiB;QACjB,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,UAAC,EAAY;gBAAX,GAAG,QAAA,EAAE,KAAK,QAAA;YACxC,iBAAiB;YACjB,IAAI,GAAG,CAAC,GAAG,CAAC,EAAE;gBACZ,wBAAwB;gBACxB,GAAG,CAAC,GAAG,CAAC,GAAM,GAAG,CAAC,GAAG,CAAC,SAAI,SAAS,SAAI,KAAO,CAAC;aAChD;iBAAM;gBACL,sBAAsB;gBACtB,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;aAClB;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,GAAG,CAAC;IACb,CAAC,EACD,EAAE,CAAC,EAAE,EAAE,EAAE,CACV,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;GAIG;AACH,SAAS,eAAe,CAAC,MAAe;IACtC,IAAM,SAAS,GAAG,MAAM,CAAC,SAAS,IAAI,KAAK,CAAC;IAC5C,IAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IAC1D,IAAM,sBAAsB,GAAG,UAAU,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC;IAClE,8BAA8B;IAC9B,IAAM,aAAa,GAAG,kBAAkB,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC;IAC5E,oDAAoD;IACpD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE;QACzB,aAAa,CAAC,CAAC,GAAG,MAAI,aAAa,CAAC,CAAC,MAAG,CAAC;KAC1C;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AACD;;;;GAIG;AACH,SAAS,kBAAkB,CAAC,SAAqB;IAC/C,IAAM,SAAS,GAAG,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAC1C,IAAM,SAAS,GAAG,CAAC,YAAY,CAAC,CAAC;IACjC,IAAM,gBAAgB,GAAG,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAC;IAChE,IAAM,YAAY;QAChB,YAAY;QACZ,MAAM;OACH,SAAS,EACT,SAAS,EACT,gBAAgB,CACpB,CAAC;IACF,IAAM,eAAe,GAAG;QACtB,QAAQ;QACR,YAAY;QACZ,SAAS;QACT,aAAa;QACb,UAAU;QACV,OAAO;QACP,aAAa;QACb,WAAW;QACX,UAAU;QACV,OAAO;QACP,IAAI;QACJ,kBAAkB;QAClB,YAAY;QACZ,QAAQ;QACR,WAAW;QACX,UAAU;QACV,YAAY;QACZ,UAAU;QACV,MAAM;QACN,OAAO;QACP,QAAQ;QACR,OAAO;QACP,UAAU;QACV,MAAM;QACN,kBAAkB;QAClB,gBAAgB;QAChB,SAAS;QACT,MAAM;QACN,MAAM;QACN,MAAM;QACN,cAAc;QACd,iBAAiB;QACjB,UAAU;KACX,CAAC;IACF,IAAI,MAAM,GAAG,CAAC,CAAC;IACf,8DAA8D;IAC9D,IAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC;SACnC,GAAG,CAAC,UAAC,EAAY;YAAX,GAAG,QAAA,EAAE,KAAK,QAAA;QACf,+DAA+D;QAC/D,oEAAoE;QACpE,4EAA4E;QAC5E,IAAI,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACjC,IAAM,EAAE,GAAmB,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC;YACrC,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC/B,MAAM,EAAE,CAAC;gBACT,EAAE,CAAC,CAAC,GAAG,qBAAqB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;aAC1C;YACD,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC3B,MAAM,EAAE,CAAC;gBACT,EAAE,CAAC,CAAC,GAAG,kBAAkB,CACvB,GAAG,EACH,KAAsC,CACvC,CAAC;aACH;YACD,IAAI,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC3B,MAAM,EAAE,CAAC;gBACT,EAAE,CAAC,CAAC,GAAM,GAAG,SAAI,KAAO,CAAC;aAC1B;YACD,IAAI,gBAAgB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAClC,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;aACjB;YACD,IAAI,GAAG,KAAK,MAAM,EAAE;gBAClB,MAAM,EAAE,CAAC;gBACT,EAAE,CAAC,CAAC,GAAG,KAAK,CAAC;aACd;YACD,OAAO,EAAE,CAAC;SACX;IACH,CAAC,CAAC;SACD,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,KAAK,SAAS,EAAf,CAAe,CAAC,CAAC;IAElC,iCAAiC;IACjC,IAAM,aAAa,GAAG,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAEtD,IAAI,MAAM,GAAG,CAAC,EAAE;QACd,aAAa,CAAC,CAAC,GAAG,MAAI,aAAa,CAAC,CAAC,MAAG,CAAC;KAC1C;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AAED;;;;;GAKG;AACH,SAAS,qBAAqB,CAAC,GAAW,EAAE,KAAoB;IAC9D,IAAI,MAAM,GAAG,EAAE,CAAC;IAChB,IAAI,KAAK,CAAC,GAAG,EAAE;QACb,MAAM,GAAG,KAAG,sBAAsB,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,CAAG,CAAC;KAC5D;IACD,IAAI,KAAK,CAAC,GAAG,EAAE;QACb,MAAM;YACJ,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;iBAChC,KAAG,sBAAsB,CAAC,KAAK,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG,CAAG,CAAA,CAAC;KACtD;IACD,IAAI,KAAK,CAAC,GAAG,EAAE;QACb,qCAAqC;QACrC,MAAM;YACJ,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;iBAChC,KAAG,sBAAsB,CAAC,IAAI,EAAE,MAAI,GAAK,EAAE,KAAK,CAAC,GAAG,CAAG,CAAA,CAAC;KAC3D;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;GAKG;AACH,SAAS,kBAAkB,CAAC,GAAW,EAAE,KAAyB;IAChE,OAAU,GAAG,UAAK,KAAK,CAAC,IAAI,YAAO,KAAK,CAAC,EAAE,MAAG,CAAC;AACjD,CAAC;AAED;;;;;;GAMG;AACH,SAAS,sBAAsB,CAC7B,IAAkB,EAClB,GAAW,EACX,KAAwB;IAExB,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;QACxB,CAAC,GAAM,GAAG,WAAK,KAAK,CAAC,IAAI,CAAC,QAAK,IAAI,SAAI,GAAG,QAAI,CAAC,OAAG,CAAC;QACnD,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;YACpB,CAAC,GAAG,MAAI,CAAC,MAAG,CAAC;SACd;KACF;SAAM;QACL,CAAC,GAAM,GAAG,WAAK,KAAK,OAAG,CAAC;KACzB;IACD,OAAO,CAAC,CAAC;AACX,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/search/_internal/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,SAAS,CAAC;AACxB,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/search/_internal/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,SAAS,CAAC;AACxB,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,qBAAqB,CAAC"}
|
|
@@ -2,64 +2,8 @@ import { __awaiter, __generator } from "tslib";
|
|
|
2
2
|
import { searchGroups } from "@esri/arcgis-rest-portal";
|
|
3
3
|
import { HubError } from "../../index";
|
|
4
4
|
import { enrichGroupSearchResult } from "../../groups/HubGroups";
|
|
5
|
-
import { expandFilter, serializeFilterGroupsForPortal } from "../filter-utils";
|
|
6
5
|
import { expandPredicate, serializeQueryForPortal } from "./ifilter-utils";
|
|
7
|
-
import {
|
|
8
|
-
/**
|
|
9
|
-
* @private
|
|
10
|
-
* DEPRECATED: Use `portalSerchGroups`
|
|
11
|
-
* Portal Search Implementation for Groups
|
|
12
|
-
* @param filterGroups
|
|
13
|
-
* @param options
|
|
14
|
-
* @returns
|
|
15
|
-
*/
|
|
16
|
-
export function portalSearchGroupsFilterGroups(filterGroups, options) {
|
|
17
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
18
|
-
var api, expandedGroups, so, props;
|
|
19
|
-
return __generator(this, function (_a) {
|
|
20
|
-
api = expandApi(options.api || "arcgis");
|
|
21
|
-
if (!options.requestOptions) {
|
|
22
|
-
if (options.authentication) {
|
|
23
|
-
// create minimal requestOptions
|
|
24
|
-
options.requestOptions = {
|
|
25
|
-
authentication: options.authentication,
|
|
26
|
-
portal: options.authentication.portal,
|
|
27
|
-
};
|
|
28
|
-
}
|
|
29
|
-
else {
|
|
30
|
-
options.requestOptions = {
|
|
31
|
-
portal: api.url + "/sharing/rest",
|
|
32
|
-
};
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
expandedGroups = filterGroups.map(function (fg) {
|
|
36
|
-
fg.filters = fg.filters.map(expandFilter);
|
|
37
|
-
return fg;
|
|
38
|
-
});
|
|
39
|
-
so = serializeFilterGroupsForPortal(expandedGroups);
|
|
40
|
-
props = [
|
|
41
|
-
"authentication",
|
|
42
|
-
"num",
|
|
43
|
-
"sortField",
|
|
44
|
-
"sortOrder",
|
|
45
|
-
"include",
|
|
46
|
-
"start",
|
|
47
|
-
"requestOptions",
|
|
48
|
-
];
|
|
49
|
-
// copy the props over
|
|
50
|
-
props.forEach(function (prop) {
|
|
51
|
-
if (options.hasOwnProperty(prop)) {
|
|
52
|
-
so[prop] = options[prop];
|
|
53
|
-
}
|
|
54
|
-
});
|
|
55
|
-
// If we don't have auth, ensure we have .portal
|
|
56
|
-
if (!so.authentication) {
|
|
57
|
-
so.portal = so.requestOptions.portal || api.url + "/sharing/rest";
|
|
58
|
-
}
|
|
59
|
-
return [2 /*return*/, searchPortal(so)];
|
|
60
|
-
});
|
|
61
|
-
});
|
|
62
|
-
}
|
|
6
|
+
import { getNextFunction } from "../utils";
|
|
63
7
|
/**
|
|
64
8
|
* @private
|
|
65
9
|
* Portal Search Implementation for Groups
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portalSearchGroups.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchGroups.ts"],"names":[],"mappings":";AAAA,OAAO,EAAkB,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"portalSearchGroups.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchGroups.ts"],"names":[],"mappings":";AAAA,OAAO,EAAkB,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAExE,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAC;AAEjE,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAO3E,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C;;;;;;GAMG;AACH,MAAM,UAAgB,kBAAkB,CACtC,KAAa,EACb,OAA0B;;;;YAE1B,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;gBAC3B,MAAM,IAAI,QAAQ,CAChB,oBAAoB,EACpB,qCAAqC,CACtC,CAAC;aACH;YAED,kDAAkD;YAClD,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,UAAC,MAAM;gBACvC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBAC3D,OAAO,MAAM,CAAC;YAChB,CAAC,CAAC,CAAC;YAGG,EAAE,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;YAEpC,KAAK,GAAmC;gBAC5C,KAAK;gBACL,WAAW;gBACX,WAAW;gBACX,SAAS;gBACT,OAAO;gBACP,gBAAgB;aACjB,CAAC;YACF,sBAAsB;YACtB,KAAK,CAAC,OAAO,CAAC,UAAC,IAAI;gBACjB,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;oBAChC,EAAE,CAAC,IAA4B,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;iBAClD;YACH,CAAC,CAAC,CAAC;YAEH,gDAAgD;YAChD,IAAI,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE;gBACzC,EAAE,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC;aAC3D;iBAAM;gBACL,EAAE,CAAC,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC;aAC3C;YAED,sBAAO,YAAY,CAAC,EAAE,CAAC,EAAC;;;CACzB;AAED;;;;;;GAMG;AACH,SAAe,YAAY,CACzB,aAA6B;;;;;wBAGhB,qBAAM,YAAY,CAAC,aAAa,CAAC,EAAA;;oBAAxC,IAAI,GAAG,SAAiC;oBAIxC,EAAE,GAAG,UAAC,IAAY;wBACtB,OAAO,mBAAmB,CACxB,IAAI,EACJ,aAAa,CAAC,OAAO,EACrB,aAAa,CAAC,cAAc,CAC7B,CAAC;oBACJ,CAAC,CAAC;oBAGc,qBAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAA;;oBAAjD,OAAO,GAAG,SAAuC;oBAEvD,6CAA6C;oBAC7C,uBAAuB;oBACvB,sBAAO;4BACL,KAAK,EAAE,IAAI,CAAC,KAAK;4BACjB,OAAO,SAAA;4BACP,MAAM,EAAE,EAAE;4BACV,OAAO,EAAE,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;4BAC5B,IAAI,EAAE,eAAe,CACnB,aAAa,EACb,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,KAAK,EACV,YAAY,CACb;yBACF,EAAC;;;;CACH;AAED;;;;;;;GAOG;AACH,SAAe,mBAAmB,CAChC,KAAa,EACb,QAAuB,EACvB,cAAmC;IADnC,yBAAA,EAAA,aAAuB;;;YAGvB,+BAA+B;YAC/B,iDAAiD;YACjD,6CAA6C;YAC7C,mCAAmC;YACnC,sBAAO,uBAAuB,CAAC,KAAK,EAAE,QAAQ,EAAE,cAAc,CAAC,EAAC;;;CACjE"}
|
|
@@ -5,59 +5,8 @@ import { expandPredicate, serializeQueryForPortal } from "./ifilter-utils";
|
|
|
5
5
|
import { enrichPageSearchResult } from "../../pages/HubPages";
|
|
6
6
|
import { enrichProjectSearchResult } from "../../projects";
|
|
7
7
|
import { enrichSiteSearchResult } from "../../sites";
|
|
8
|
-
import { expandFilter, serializeFilterGroupsForPortal } from "../filter-utils";
|
|
9
8
|
import { getNextFunction } from "../utils";
|
|
10
9
|
import { convertPortalAggregations } from "./portalSearchUtils";
|
|
11
|
-
/**
|
|
12
|
-
* @private
|
|
13
|
-
* DEPRECATED
|
|
14
|
-
* @param filterGroups
|
|
15
|
-
* @param options
|
|
16
|
-
* @returns
|
|
17
|
-
*/
|
|
18
|
-
export function portalSearchItemsFilterGroups(filterGroups, options) {
|
|
19
|
-
var _a;
|
|
20
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
21
|
-
var replaced, expandedGroups, so, props;
|
|
22
|
-
return __generator(this, function (_b) {
|
|
23
|
-
if (!options.requestOptions) {
|
|
24
|
-
throw new HubError("hubSearch", "requestOptions: IHubRequestOptions is required.");
|
|
25
|
-
}
|
|
26
|
-
replaced = applyWellKnownItemFilterGroups(filterGroups);
|
|
27
|
-
expandedGroups = replaced.map(function (fg) {
|
|
28
|
-
fg.filters = fg.filters.map(expandFilter);
|
|
29
|
-
return fg;
|
|
30
|
-
});
|
|
31
|
-
so = serializeFilterGroupsForPortal(expandedGroups);
|
|
32
|
-
props = [
|
|
33
|
-
"num",
|
|
34
|
-
"sortField",
|
|
35
|
-
"sortOrder",
|
|
36
|
-
"include",
|
|
37
|
-
"start",
|
|
38
|
-
"requestOptions",
|
|
39
|
-
];
|
|
40
|
-
// copy the props over
|
|
41
|
-
props.forEach(function (prop) {
|
|
42
|
-
if (options.hasOwnProperty(prop)) {
|
|
43
|
-
so[prop] = options[prop];
|
|
44
|
-
}
|
|
45
|
-
});
|
|
46
|
-
if (options.requestOptions.authentication) {
|
|
47
|
-
so.authentication = options.requestOptions.authentication;
|
|
48
|
-
}
|
|
49
|
-
else {
|
|
50
|
-
so.portal = options.requestOptions.portal;
|
|
51
|
-
}
|
|
52
|
-
// Aggregations
|
|
53
|
-
if ((_a = options.aggFields) === null || _a === void 0 ? void 0 : _a.length) {
|
|
54
|
-
so.countFields = options.aggFields.join(",");
|
|
55
|
-
so.countSize = options.aggLimit || 10;
|
|
56
|
-
}
|
|
57
|
-
return [2 /*return*/, searchPortal(so)];
|
|
58
|
-
});
|
|
59
|
-
});
|
|
60
|
-
}
|
|
61
10
|
/**
|
|
62
11
|
* @private
|
|
63
12
|
* Portal Search Implementation for Items
|
|
@@ -375,39 +324,6 @@ export function applyWellKnownItemPredicates(query) {
|
|
|
375
324
|
});
|
|
376
325
|
return queryClone;
|
|
377
326
|
}
|
|
378
|
-
/**
|
|
379
|
-
* DEPRECATED
|
|
380
|
-
* @param filterGroups
|
|
381
|
-
* @returns
|
|
382
|
-
*/
|
|
383
|
-
export function applyWellKnownItemFilterGroups(filterGroups) {
|
|
384
|
-
var clone = cloneObject(filterGroups);
|
|
385
|
-
// iterate the filterGroups
|
|
386
|
-
var result = clone.map(function (filterGroup) {
|
|
387
|
-
filterGroup.filters = filterGroup.filters.reduce(function (updated, filter) {
|
|
388
|
-
// check if the filter.type is a well-known type
|
|
389
|
-
if (isWellKnownTypeFilter(filter.type)) {
|
|
390
|
-
// get the set of filters to replace the current filter with
|
|
391
|
-
var typeFilters = lookupTypeFilters(filter.type);
|
|
392
|
-
// Note: At this point we could try to "merge" in the other
|
|
393
|
-
// props on the filter, into all the filters returned from
|
|
394
|
-
// the well-known hash. The problem with this is that the
|
|
395
|
-
// combination may yield unexpected results; For now, if a filter
|
|
396
|
-
// includes `.type is keyof WellKnownItemFilters` we simply
|
|
397
|
-
// replace the entire filter with the array of filters returne
|
|
398
|
-
// from the hash
|
|
399
|
-
updated = __spreadArrays(updated, typeFilters);
|
|
400
|
-
}
|
|
401
|
-
else {
|
|
402
|
-
// filter does not have a well-known type entry so keep it
|
|
403
|
-
updated.push(filter);
|
|
404
|
-
}
|
|
405
|
-
return updated;
|
|
406
|
-
}, []);
|
|
407
|
-
return filterGroup;
|
|
408
|
-
});
|
|
409
|
-
return result;
|
|
410
|
-
}
|
|
411
327
|
/**
|
|
412
328
|
* Is the argument a well-known type "key"
|
|
413
329
|
*
|
|
@@ -425,13 +341,10 @@ export function isWellKnownTypeFilter(key) {
|
|
|
425
341
|
return result;
|
|
426
342
|
}
|
|
427
343
|
/**
|
|
428
|
-
*
|
|
344
|
+
* Return the predicates for a well-known type
|
|
429
345
|
* @param key
|
|
430
346
|
* @returns
|
|
431
347
|
*/
|
|
432
|
-
function lookupTypeFilters(key) {
|
|
433
|
-
return WellKnownItemFilters[key];
|
|
434
|
-
}
|
|
435
348
|
function lookupTypePredicates(key) {
|
|
436
349
|
var rawPredicates = WellKnownItemFilters[key];
|
|
437
350
|
// Remove the filterType property as it's not needed in an IPredicate
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portalSearchItems.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchItems.ts"],"names":[],"mappings":";AAAA,OAAO,EAAyB,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC9E,OAAO,EACL,WAAW,EACX,iCAAiC,EACjC,yBAAyB,EACzB,QAAQ,GACT,MAAM,OAAO,CAAC;AAEf,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAE3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAC9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"portalSearchItems.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchItems.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,52 +3,7 @@ import { searchUsers, } from "@esri/arcgis-rest-portal";
|
|
|
3
3
|
import { enrichUserSearchResult } from "../..";
|
|
4
4
|
import { expandPredicate, serializeQueryForPortal } from "./ifilter-utils";
|
|
5
5
|
import HubError from "../../HubError";
|
|
6
|
-
import { expandFilter, serializeFilterGroupsForPortal } from "../filter-utils";
|
|
7
6
|
import { getNextFunction } from "../utils";
|
|
8
|
-
/**
|
|
9
|
-
* @private
|
|
10
|
-
* DEPRECATED: Use `portalSearchUsers`
|
|
11
|
-
* Portal Search implementation for Users
|
|
12
|
-
* @param filterGroups
|
|
13
|
-
* @param options
|
|
14
|
-
*/
|
|
15
|
-
export function portalSearchUsersFilterGroups(filterGroups, options) {
|
|
16
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
17
|
-
var expandedGroups, so, props;
|
|
18
|
-
return __generator(this, function (_a) {
|
|
19
|
-
// requestOptions is always required and user must be authd
|
|
20
|
-
if (!options.requestOptions) {
|
|
21
|
-
throw new HubError("portalSearchUsers", "requestOptions: IHubRequestOptions is required.");
|
|
22
|
-
}
|
|
23
|
-
if (!options.requestOptions.authentication) {
|
|
24
|
-
throw new HubError("portalSearchUsers", "requestOptions must pass authentication.");
|
|
25
|
-
}
|
|
26
|
-
expandedGroups = filterGroups.map(function (fg) {
|
|
27
|
-
fg.filters = fg.filters.map(expandFilter);
|
|
28
|
-
return fg;
|
|
29
|
-
});
|
|
30
|
-
so = serializeFilterGroupsForPortal(expandedGroups);
|
|
31
|
-
props = [
|
|
32
|
-
"num",
|
|
33
|
-
"sortField",
|
|
34
|
-
"sortOrder",
|
|
35
|
-
"include",
|
|
36
|
-
"start",
|
|
37
|
-
"requestOptions",
|
|
38
|
-
];
|
|
39
|
-
// copy the props over
|
|
40
|
-
props.forEach(function (prop) {
|
|
41
|
-
if (options.hasOwnProperty(prop)) {
|
|
42
|
-
so[prop] = options[prop];
|
|
43
|
-
}
|
|
44
|
-
});
|
|
45
|
-
// Ensure authentication gets sent
|
|
46
|
-
so.authentication = options.requestOptions.authentication;
|
|
47
|
-
// Execute search
|
|
48
|
-
return [2 /*return*/, searchPortal(so)];
|
|
49
|
-
});
|
|
50
|
-
});
|
|
51
|
-
}
|
|
52
7
|
/**
|
|
53
8
|
* @private
|
|
54
9
|
* Portal Search Implementation for Users
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portalSearchUsers.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchUsers.ts"],"names":[],"mappings":";AAAA,OAAO,EAGL,WAAW,GACZ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,sBAAsB,
|
|
1
|
+
{"version":3,"file":"portalSearchUsers.js","sourceRoot":"","sources":["../../../../src/search/_internal/portalSearchUsers.ts"],"names":[],"mappings":";AAAA,OAAO,EAGL,WAAW,GACZ,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,sBAAsB,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,QAAQ,MAAM,gBAAgB,CAAC;AAQtC,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C;;;;;;GAMG;AACH,MAAM,UAAgB,iBAAiB,CACrC,KAAa,EACb,OAA0B;;;;YAE1B,2DAA2D;YAC3D,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;gBAC3B,MAAM,IAAI,QAAQ,CAChB,mBAAmB,EACnB,iDAAiD,CAClD,CAAC;aACH;YAED,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE;gBAC1C,MAAM,IAAI,QAAQ,CAChB,mBAAmB,EACnB,0CAA0C,CAC3C,CAAC;aACH;YAED,kDAAkD;YAClD,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,UAAC,MAAM;gBACvC,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;gBAC3D,OAAO,MAAM,CAAC;YAChB,CAAC,CAAC,CAAC;YAGG,EAAE,GAAG,uBAAuB,CAAC,KAAK,CAAC,CAAC;YAEpC,KAAK,GAAmC;gBAC5C,KAAK;gBACL,WAAW;gBACX,WAAW;gBACX,SAAS;gBACT,OAAO;gBACP,gBAAgB;aACjB,CAAC;YACF,sBAAsB;YACtB,KAAK,CAAC,OAAO,CAAC,UAAC,IAAI;gBACjB,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;oBAChC,EAAE,CAAC,IAA4B,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;iBAClD;YACH,CAAC,CAAC,CAAC;YAEH,kEAAkE;YAClE,wBAAwB;YACxB,EAAE,CAAC,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC,cAAc,CAAC;YAE1D,iBAAiB;YACjB,sBAAO,YAAY,CAAC,EAAwB,CAAC,EAAC;;;CAC/C;AAED;;;;;;GAMG;AACH,SAAe,YAAY,CACzB,aAAiC;;;;;wBAGpB,qBAAM,WAAW,CAAC,aAAa,CAAC,EAAA;;oBAAvC,IAAI,GAAG,SAAgC;oBAIvC,EAAE,GAAG,UAAC,IAAW;wBACrB,OAAO,kBAAkB,CACvB,IAAI,EACJ,aAAa,CAAC,OAAO,EACrB,aAAa,CAAC,cAAc,CAC7B,CAAC;oBACJ,CAAC,CAAC;oBAGc,qBAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,EAAA;;oBAAjD,OAAO,GAAG,SAAuC;oBAEvD,6CAA6C;oBAC7C,uBAAuB;oBACvB,sBAAO;4BACL,KAAK,EAAE,IAAI,CAAC,KAAK;4BACjB,OAAO,SAAA;4BACP,MAAM,EAAE,EAAE;4BACV,OAAO,EAAE,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC;4BAC5B,IAAI,EAAE,eAAe,CACnB,aAAa,EACb,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,KAAK,EACV,YAAY,CACb;yBACF,EAAC;;;;CACH;AAED;;;;;;;GAOG;AACH,SAAe,kBAAkB,CAC/B,IAAW,EACX,QAAuB,EACvB,cAAmC;IADnC,yBAAA,EAAA,aAAuB;;;YAGvB,+BAA+B;YAC/B,iDAAiD;YACjD,6CAA6C;YAC7C,mCAAmC;YACnC,sBAAO,sBAAsB,CAAC,IAAI,EAAE,QAAQ,EAAE,cAAc,CAAC,EAAC;;;CAC/D"}
|
|
@@ -1,201 +1,3 @@
|
|
|
1
|
-
import { __spreadArrays } from "tslib";
|
|
2
|
-
import { getProp, setProp } from "../objects";
|
|
3
|
-
import { cloneObject } from "../util";
|
|
4
|
-
import { relativeDateToDateRange, valueToMatchOptions } from "./utils";
|
|
5
|
-
// DEPRECATED - REMOVE THIS FILE
|
|
6
|
-
/**
|
|
7
|
-
* Expand a Filter into it's more expressive structure so it can be
|
|
8
|
-
* serialized deterministically.
|
|
9
|
-
*
|
|
10
|
-
* Props with type `string | string[] | MatchOptions` expand into `IMatchOptions`
|
|
11
|
-
* Props relative-dates are expanded into formal date-ranges
|
|
12
|
-
* @param filter
|
|
13
|
-
* @returns
|
|
14
|
-
*/
|
|
15
|
-
export function expandFilter(filter) {
|
|
16
|
-
var result = {};
|
|
17
|
-
var dateProps = ["created", "modified", "lastlogin"];
|
|
18
|
-
var copyProps = [
|
|
19
|
-
"filterType",
|
|
20
|
-
"term",
|
|
21
|
-
"searchUserAccess",
|
|
22
|
-
"isopendata",
|
|
23
|
-
"searchUserName",
|
|
24
|
-
];
|
|
25
|
-
var nonMatchOptionsFields = __spreadArrays(dateProps, copyProps);
|
|
26
|
-
// Do the conversion
|
|
27
|
-
Object.entries(filter).forEach(function (_a) {
|
|
28
|
-
var key = _a[0], value = _a[1];
|
|
29
|
-
// Handle MatchOptions fields
|
|
30
|
-
if (!nonMatchOptionsFields.includes(key)) {
|
|
31
|
-
// setProp side-steps typescript complaining
|
|
32
|
-
setProp(key, valueToMatchOptions(value), result);
|
|
33
|
-
}
|
|
34
|
-
// Handle Date fields
|
|
35
|
-
if (dateProps.includes(key)) {
|
|
36
|
-
var dateFieldValue = cloneObject(getProp(filter, key));
|
|
37
|
-
if (getProp(filter, key + ".type") === "relative-date") {
|
|
38
|
-
setProp(key, relativeDateToDateRange(dateFieldValue), result);
|
|
39
|
-
}
|
|
40
|
-
else {
|
|
41
|
-
setProp(key, dateFieldValue, result);
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
// Handle fields that are just copied forward
|
|
45
|
-
if (copyProps.includes(key) && filter.hasOwnProperty(key)) {
|
|
46
|
-
setProp(key, value, result);
|
|
47
|
-
}
|
|
48
|
-
});
|
|
49
|
-
return result;
|
|
50
|
-
}
|
|
51
|
-
/**
|
|
52
|
-
* Serialize a FilterGroup of any type for Portal
|
|
53
|
-
* @param filterGroups
|
|
54
|
-
* @returns
|
|
55
|
-
*/
|
|
56
|
-
export function serializeFilterGroupsForPortal(filterGroups) {
|
|
57
|
-
var groupSearchOptions = filterGroups.map(serializeGroup);
|
|
58
|
-
var result = mergeSearchOptions(groupSearchOptions, "AND");
|
|
59
|
-
return result;
|
|
60
|
-
}
|
|
61
|
-
/**
|
|
62
|
-
* Serialize the filters in a FitlerGroup into a Portal Query
|
|
63
|
-
* @param filterGroup
|
|
64
|
-
* @returns
|
|
65
|
-
*/
|
|
66
|
-
function serializeGroup(filterGroup) {
|
|
67
|
-
var operation = filterGroup.operation || "AND";
|
|
68
|
-
var filters = filterGroup.filters.map(expandFilter);
|
|
69
|
-
var filterSearchOptions = filters.map(serializeFilter);
|
|
70
|
-
// combine these searchOptions
|
|
71
|
-
var groupSearchOptions = mergeSearchOptions(filterSearchOptions, operation);
|
|
72
|
-
//
|
|
73
|
-
if (filters.length > 1) {
|
|
74
|
-
groupSearchOptions.q = "(" + groupSearchOptions.q + ")";
|
|
75
|
-
}
|
|
76
|
-
return groupSearchOptions;
|
|
77
|
-
}
|
|
78
|
-
/**
|
|
79
|
-
* Serialize a Filter into a Portal Query
|
|
80
|
-
* @param filter
|
|
81
|
-
* @returns
|
|
82
|
-
*/
|
|
83
|
-
function serializeFilter(filter) {
|
|
84
|
-
var dateProps = ["created", "modified"];
|
|
85
|
-
var boolProps = ["isopendata"];
|
|
86
|
-
var passThroughProps = ["searchUserAccess", "searchUserName"];
|
|
87
|
-
var specialProps = __spreadArrays([
|
|
88
|
-
"filterType",
|
|
89
|
-
"term"
|
|
90
|
-
], dateProps, boolProps, passThroughProps);
|
|
91
|
-
var qCount = 0;
|
|
92
|
-
// TODO: Look at using reduce vs .map and remove the `.filter`
|
|
93
|
-
var opts = Object.entries(filter)
|
|
94
|
-
.map(function (_a) {
|
|
95
|
-
var key = _a[0], value = _a[1];
|
|
96
|
-
var so = { q: "" };
|
|
97
|
-
if (!specialProps.includes(key)) {
|
|
98
|
-
qCount++;
|
|
99
|
-
so.q = serializeMatchOptions(key, value);
|
|
100
|
-
}
|
|
101
|
-
if (dateProps.includes(key)) {
|
|
102
|
-
qCount++;
|
|
103
|
-
so.q = serializeDateRange(key, value);
|
|
104
|
-
}
|
|
105
|
-
if (boolProps.includes(key)) {
|
|
106
|
-
qCount++;
|
|
107
|
-
so.q = key + ":" + value;
|
|
108
|
-
}
|
|
109
|
-
if (passThroughProps.includes(key)) {
|
|
110
|
-
so[key] = value;
|
|
111
|
-
}
|
|
112
|
-
if (key === "term") {
|
|
113
|
-
qCount++;
|
|
114
|
-
so.q = value;
|
|
115
|
-
}
|
|
116
|
-
return so;
|
|
117
|
-
})
|
|
118
|
-
.filter(function (e) { return e !== undefined; });
|
|
119
|
-
// merge up all the searchOptions
|
|
120
|
-
var searchOptions = mergeSearchOptions(opts, "AND");
|
|
121
|
-
if (qCount > 1) {
|
|
122
|
-
searchOptions.q = "(" + searchOptions.q + ")";
|
|
123
|
-
}
|
|
124
|
-
return searchOptions;
|
|
125
|
-
}
|
|
126
|
-
function mergeSearchOptions(options, operation) {
|
|
127
|
-
var result = options.reduce(function (acc, entry) {
|
|
128
|
-
// walk the props
|
|
129
|
-
Object.entries(entry).forEach(function (_a) {
|
|
130
|
-
var key = _a[0], value = _a[1];
|
|
131
|
-
// if prop exists
|
|
132
|
-
if (acc[key]) {
|
|
133
|
-
// combine via operation
|
|
134
|
-
acc[key] = acc[key] + " " + operation + " " + value;
|
|
135
|
-
}
|
|
136
|
-
else {
|
|
137
|
-
// just copy the value
|
|
138
|
-
acc[key] = value;
|
|
139
|
-
}
|
|
140
|
-
});
|
|
141
|
-
return acc;
|
|
142
|
-
}, { q: "" });
|
|
143
|
-
return result;
|
|
144
|
-
}
|
|
145
|
-
/**
|
|
146
|
-
* Serialize MatchOptions into portal syntax
|
|
147
|
-
* @param key
|
|
148
|
-
* @param value
|
|
149
|
-
* @returns
|
|
150
|
-
*/
|
|
151
|
-
function serializeMatchOptions(key, value) {
|
|
152
|
-
var result = "";
|
|
153
|
-
if (value.any) {
|
|
154
|
-
result = "" + serializeStringOrArray("OR", key, value.any);
|
|
155
|
-
}
|
|
156
|
-
if (value.all) {
|
|
157
|
-
result =
|
|
158
|
-
(result ? result + " AND " : "") +
|
|
159
|
-
("" + serializeStringOrArray("AND", key, value.all));
|
|
160
|
-
}
|
|
161
|
-
if (value.not) {
|
|
162
|
-
// negate the entries if they are not
|
|
163
|
-
result =
|
|
164
|
-
(result ? result + " AND " : "") +
|
|
165
|
-
("" + serializeStringOrArray("OR", "-" + key, value.not));
|
|
166
|
-
}
|
|
167
|
-
// TODO HANDLE EXACT
|
|
168
|
-
return result;
|
|
169
|
-
}
|
|
170
|
-
/**
|
|
171
|
-
* Serialize a date-range into Portal syntax
|
|
172
|
-
* @param key
|
|
173
|
-
* @param range
|
|
174
|
-
* @returns
|
|
175
|
-
*/
|
|
176
|
-
function serializeDateRange(key, range) {
|
|
177
|
-
return key + ":[" + range.from + " TO " + range.to + "]";
|
|
178
|
-
}
|
|
179
|
-
/**
|
|
180
|
-
* Serialize a `string` or `string[]` into a string
|
|
181
|
-
* @param join
|
|
182
|
-
* @param key
|
|
183
|
-
* @param value
|
|
184
|
-
* @returns
|
|
185
|
-
*/
|
|
186
|
-
function serializeStringOrArray(join, key, value) {
|
|
187
|
-
var q = "";
|
|
188
|
-
if (Array.isArray(value)) {
|
|
189
|
-
q = key + ":\"" + value.join("\" " + join + " " + key + ":\"") + "\"";
|
|
190
|
-
if (value.length > 1) {
|
|
191
|
-
q = "(" + q + ")";
|
|
192
|
-
}
|
|
193
|
-
}
|
|
194
|
-
else {
|
|
195
|
-
q = key + ":\"" + value + "\"";
|
|
196
|
-
}
|
|
197
|
-
return q;
|
|
198
|
-
}
|
|
199
1
|
/**
|
|
200
2
|
* Determine if a Filter is "empty"
|
|
201
3
|
* @param filter
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter-utils.js","sourceRoot":"","sources":["../../../src/search/filter-utils.ts"],"names":[],"mappings":"
|
|
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"}
|
|
@@ -3,10 +3,12 @@ import HubError from "../HubError";
|
|
|
3
3
|
import { getProp } from "../objects";
|
|
4
4
|
import { cloneObject } from "../util";
|
|
5
5
|
import { expandApi } from "./utils";
|
|
6
|
-
import { hubSearchItems, portalSearchItems, portalSearchGroups,
|
|
7
|
-
import { portalSearchUsers, portalSearchUsersFilterGroups, } from "./_internal/portalSearchUsers";
|
|
6
|
+
import { hubSearchItems, portalSearchItems, portalSearchGroups, portalSearchUsers, } from "./_internal";
|
|
8
7
|
/**
|
|
9
|
-
*
|
|
8
|
+
* @private
|
|
9
|
+
* TEMPORARY - this function only exists to allow incremental
|
|
10
|
+
* changes and should be removed as soon as arcgis-hub-gallery
|
|
11
|
+
* is changed to call `hubSearch(...)` directly
|
|
10
12
|
*
|
|
11
13
|
* Default's to search ArcGIS Portal but can delegate
|
|
12
14
|
* to Hub API when it's available.
|
|
@@ -14,41 +16,11 @@ import { portalSearchUsers, portalSearchUsersFilterGroups, } from "./_internal/p
|
|
|
14
16
|
* @param options
|
|
15
17
|
* @returns
|
|
16
18
|
*/
|
|
17
|
-
export function
|
|
19
|
+
export function hubSearchQuery(query, options) {
|
|
18
20
|
return __awaiter(this, void 0, void 0, function () {
|
|
19
|
-
var filterType, apiType, fnHash, fn;
|
|
20
21
|
return __generator(this, function (_a) {
|
|
21
|
-
//
|
|
22
|
-
|
|
23
|
-
throw new HubError("hubSearch", "FilterGroups are required and must be an array.");
|
|
24
|
-
}
|
|
25
|
-
if (!filterGroups.length) {
|
|
26
|
-
throw new HubError("hubSearch", "FilterGrous array must contain at least one entry.");
|
|
27
|
-
}
|
|
28
|
-
if (!options.requestOptions) {
|
|
29
|
-
throw new HubError("hubSearch", "requestOptions: IHubRequestOptions is required.");
|
|
30
|
-
}
|
|
31
|
-
// Ensure includes is an array
|
|
32
|
-
if (!options.include) {
|
|
33
|
-
options.include = [];
|
|
34
|
-
}
|
|
35
|
-
filterType = filterGroups[0].filterType;
|
|
36
|
-
apiType = expandApi(options.api || "arcgis").type;
|
|
37
|
-
fnHash = {
|
|
38
|
-
arcgis: {
|
|
39
|
-
item: portalSearchItemsFilterGroups,
|
|
40
|
-
group: portalSearchGroupsFilterGroups,
|
|
41
|
-
user: portalSearchUsersFilterGroups,
|
|
42
|
-
},
|
|
43
|
-
"arcgis-hub": {
|
|
44
|
-
item: hubSearchItems,
|
|
45
|
-
},
|
|
46
|
-
};
|
|
47
|
-
fn = getProp(fnHash, apiType + "." + filterType);
|
|
48
|
-
if (!fn) {
|
|
49
|
-
throw new HubError("hubSearch", "Search via \"" + filterType + "\" filter against \"" + apiType + "\" api is not implemented");
|
|
50
|
-
}
|
|
51
|
-
return [2 /*return*/, fn(cloneObject(filterGroups), options)];
|
|
22
|
+
// delegate
|
|
23
|
+
return [2 /*return*/, hubSearch(query, options)];
|
|
52
24
|
});
|
|
53
25
|
});
|
|
54
26
|
}
|
|
@@ -61,7 +33,7 @@ export function hubSearch(filterGroups, options) {
|
|
|
61
33
|
* @param options
|
|
62
34
|
* @returns
|
|
63
35
|
*/
|
|
64
|
-
export function
|
|
36
|
+
export function hubSearch(query, options) {
|
|
65
37
|
return __awaiter(this, void 0, void 0, function () {
|
|
66
38
|
var filterType, apiType, fnHash, fn;
|
|
67
39
|
return __generator(this, function (_a) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hubSearch.js","sourceRoot":"","sources":["../../../src/search/hubSearch.ts"],"names":[],"mappings":";AAAA,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"hubSearch.js","sourceRoot":"","sources":["../../../src/search/hubSearch.ts"],"names":[],"mappings":";AAAA,OAAO,QAAQ,MAAM,aAAa,CAAC;AACnC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAQtC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AACpC,OAAO,EACL,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,GAClB,MAAM,aAAa,CAAC;AAErB;;;;;;;;;;;GAWG;AACH,MAAM,UAAgB,cAAc,CAClC,KAAa,EACb,OAA0B;;;YAE1B,WAAW;YACX,sBAAO,SAAS,CAAC,KAAK,EAAE,OAAO,CAAC,EAAC;;;CAClC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAgB,SAAS,CAC7B,KAAa,EACb,OAA0B;;;;YAE1B,kBAAkB;YAClB,IAAI,CAAC,KAAK,EAAE;gBACV,MAAM,IAAI,QAAQ,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;aACvD;YACD,IAAI,CAAC,KAAK,CAAC,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE;gBAC3C,MAAM,IAAI,QAAQ,CAAC,WAAW,EAAE,yCAAyC,CAAC,CAAC;aAC5E;YAED,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;gBAC3B,MAAM,IAAI,QAAQ,CAChB,WAAW,EACX,iDAAiD,CAClD,CAAC;aACH;YAED,8BAA8B;YAC9B,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;gBACpB,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;aACtB;YAGK,UAAU,GAAG,KAAK,CAAC,YAAY,CAAC;YAEhC,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,IAAI,QAAQ,CAAC,CAAC,IAAI,CAAC;YAElD,MAAM,GAAG;gBACb,MAAM,EAAE;oBACN,IAAI,EAAE,iBAAiB;oBACvB,KAAK,EAAE,kBAAkB;oBACzB,IAAI,EAAE,iBAAiB;iBACxB;gBACD,YAAY,EAAE;oBACZ,IAAI,EAAE,cAAc;iBACrB;aACF,CAAC;YAEI,EAAE,GAAG,OAAO,CAAC,MAAM,EAAK,OAAO,SAAI,UAAY,CAAC,CAAC;YACvD,IAAI,CAAC,EAAE,EAAE;gBACP,MAAM,IAAI,QAAQ,CAChB,WAAW,EACX,kBAAe,UAAU,4BAAqB,OAAO,8BAA0B,CAChF,CAAC;aACH;YACD,sBAAO,EAAE,CAAC,WAAW,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC,EAAC;;;CACxC"}
|