@esri/hub-common 9.27.0 → 9.28.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/es2017/search/_internal/searchContentEntities.js +15 -5
- package/dist/es2017/search/_internal/searchContentEntities.js.map +1 -1
- package/dist/es2017/search/_searchGroups.js.map +1 -1
- package/dist/esm/search/_internal/searchContentEntities.js +15 -6
- package/dist/esm/search/_internal/searchContentEntities.js.map +1 -1
- package/dist/esm/search/_searchGroups.js.map +1 -1
- package/dist/node/search/_internal/searchContentEntities.js +14 -4
- package/dist/node/search/_internal/searchContentEntities.js.map +1 -1
- package/dist/node/search/_searchGroups.js.map +1 -1
- package/dist/types/search/_internal/searchContentEntities.d.ts +1 -1
- package/dist/types/search/_searchGroups.d.ts +1 -2
- package/dist/umd/common.umd.js +15 -6
- package/dist/umd/common.umd.js.map +1 -1
- package/dist/umd/common.umd.min.js +1 -1
- package/dist/umd/common.umd.min.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { searchItems } from "@esri/arcgis-rest-portal";
|
|
2
2
|
import { expandApi, getNextFunction } from "../../search/utils";
|
|
3
|
-
import { expandContentFilter, serializeContentFilterForPortal, } from "../../search/content-utils";
|
|
3
|
+
import { convertPortalResponseToFacets, expandContentFilter, serializeContentFilterForPortal, } from "../../search/content-utils";
|
|
4
4
|
/**
|
|
5
5
|
* Generic search that returns Hub Entity types converted from items
|
|
6
6
|
* by the passed in `ItemToEntityFunction`
|
|
@@ -15,14 +15,22 @@ import { expandContentFilter, serializeContentFilterForPortal, } from "../../sea
|
|
|
15
15
|
* @returns
|
|
16
16
|
*/
|
|
17
17
|
export function searchContentEntities(filter, convertFn, options) {
|
|
18
|
-
var _a;
|
|
18
|
+
var _a, _b;
|
|
19
19
|
// expand filter so we can serialize to either api
|
|
20
20
|
const expanded = expandContentFilter(filter);
|
|
21
21
|
const searchOptions = serializeContentFilterForPortal(expanded);
|
|
22
|
-
//
|
|
22
|
+
// DEPRECATION
|
|
23
|
+
/* istanbul ignore next */
|
|
23
24
|
if ((_a = options.aggregations) === null || _a === void 0 ? void 0 : _a.length) {
|
|
25
|
+
// tslint:disable-next-line:no-console
|
|
26
|
+
console.warn(`IHubSearchOptions.aggregations is deprecated. Please use .aggFields instead.`);
|
|
24
27
|
searchOptions.countFields = options.aggregations.join(",");
|
|
25
|
-
searchOptions.countSize =
|
|
28
|
+
searchOptions.countSize = options.aggLimit || 10;
|
|
29
|
+
}
|
|
30
|
+
// Aggregations
|
|
31
|
+
if ((_b = options.aggFields) === null || _b === void 0 ? void 0 : _b.length) {
|
|
32
|
+
searchOptions.countFields = options.aggFields.join(",");
|
|
33
|
+
searchOptions.countSize = options.aggLimit || 10;
|
|
26
34
|
}
|
|
27
35
|
// properties to copy from IHubSearchOptions to the ISearchOptions
|
|
28
36
|
const props = [
|
|
@@ -67,10 +75,12 @@ export function createContentEntitySearchFn(convertFn) {
|
|
|
67
75
|
const entities = await Promise.all(response.results.map((itm) => {
|
|
68
76
|
return convertFn(itm, searchOptions);
|
|
69
77
|
}));
|
|
78
|
+
// convert aggregations into facets
|
|
79
|
+
const facets = convertPortalResponseToFacets(response);
|
|
70
80
|
return {
|
|
71
81
|
total: response.total,
|
|
72
82
|
results: entities,
|
|
73
|
-
facets
|
|
83
|
+
facets,
|
|
74
84
|
hasNext: response.nextStart > -1,
|
|
75
85
|
next: getNextFunction(searchOptions, response.nextStart, response.total, searchEntities),
|
|
76
86
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"searchContentEntities.js","sourceRoot":"","sources":["../../../../src/search/_internal/searchContentEntities.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAMvE,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EACL,mBAAmB,EACnB,+BAA+B,GAChC,MAAM,4BAA4B,CAAC;AAUpC;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,qBAAqB,CACnC,MAAyB,EACzB,SAAkC,EAClC,OAA0B;;IAE1B,kDAAkD;IAClD,MAAM,QAAQ,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC7C,MAAM,aAAa,GAAG,+BAA+B,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"searchContentEntities.js","sourceRoot":"","sources":["../../../../src/search/_internal/searchContentEntities.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_searchGroups.js","sourceRoot":"","sources":["../../../src/search/_searchGroups.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"_searchGroups.js","sourceRoot":"","sources":["../../../src/search/_searchGroups.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { __awaiter, __generator } from "tslib";
|
|
2
2
|
import { searchItems } from "@esri/arcgis-rest-portal";
|
|
3
3
|
import { expandApi, getNextFunction } from "../../search/utils";
|
|
4
|
-
import { expandContentFilter, serializeContentFilterForPortal, } from "../../search/content-utils";
|
|
4
|
+
import { convertPortalResponseToFacets, expandContentFilter, serializeContentFilterForPortal, } from "../../search/content-utils";
|
|
5
5
|
/**
|
|
6
6
|
* Generic search that returns Hub Entity types converted from items
|
|
7
7
|
* by the passed in `ItemToEntityFunction`
|
|
@@ -16,14 +16,22 @@ import { expandContentFilter, serializeContentFilterForPortal, } from "../../sea
|
|
|
16
16
|
* @returns
|
|
17
17
|
*/
|
|
18
18
|
export function searchContentEntities(filter, convertFn, options) {
|
|
19
|
-
var _a;
|
|
19
|
+
var _a, _b;
|
|
20
20
|
// expand filter so we can serialize to either api
|
|
21
21
|
var expanded = expandContentFilter(filter);
|
|
22
22
|
var searchOptions = serializeContentFilterForPortal(expanded);
|
|
23
|
-
//
|
|
23
|
+
// DEPRECATION
|
|
24
|
+
/* istanbul ignore next */
|
|
24
25
|
if ((_a = options.aggregations) === null || _a === void 0 ? void 0 : _a.length) {
|
|
26
|
+
// tslint:disable-next-line:no-console
|
|
27
|
+
console.warn("IHubSearchOptions.aggregations is deprecated. Please use .aggFields instead.");
|
|
25
28
|
searchOptions.countFields = options.aggregations.join(",");
|
|
26
|
-
searchOptions.countSize =
|
|
29
|
+
searchOptions.countSize = options.aggLimit || 10;
|
|
30
|
+
}
|
|
31
|
+
// Aggregations
|
|
32
|
+
if ((_b = options.aggFields) === null || _b === void 0 ? void 0 : _b.length) {
|
|
33
|
+
searchOptions.countFields = options.aggFields.join(",");
|
|
34
|
+
searchOptions.countSize = options.aggLimit || 10;
|
|
27
35
|
}
|
|
28
36
|
// properties to copy from IHubSearchOptions to the ISearchOptions
|
|
29
37
|
var props = [
|
|
@@ -65,7 +73,7 @@ export function createContentEntitySearchFn(convertFn) {
|
|
|
65
73
|
// referenced in the `next` section below
|
|
66
74
|
return function searchEntities(searchOptions) {
|
|
67
75
|
return __awaiter(this, void 0, void 0, function () {
|
|
68
|
-
var response, entities;
|
|
76
|
+
var response, entities, facets;
|
|
69
77
|
return __generator(this, function (_a) {
|
|
70
78
|
switch (_a.label) {
|
|
71
79
|
case 0: return [4 /*yield*/, searchItems(searchOptions)];
|
|
@@ -76,10 +84,11 @@ export function createContentEntitySearchFn(convertFn) {
|
|
|
76
84
|
}))];
|
|
77
85
|
case 2:
|
|
78
86
|
entities = _a.sent();
|
|
87
|
+
facets = convertPortalResponseToFacets(response);
|
|
79
88
|
return [2 /*return*/, {
|
|
80
89
|
total: response.total,
|
|
81
90
|
results: entities,
|
|
82
|
-
facets:
|
|
91
|
+
facets: facets,
|
|
83
92
|
hasNext: response.nextStart > -1,
|
|
84
93
|
next: getNextFunction(searchOptions, response.nextStart, response.total, searchEntities),
|
|
85
94
|
}];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"searchContentEntities.js","sourceRoot":"","sources":["../../../../src/search/_internal/searchContentEntities.ts"],"names":[],"mappings":";AAAA,OAAO,EAAkB,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAMvE,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAChE,OAAO,EACL,mBAAmB,EACnB,+BAA+B,GAChC,MAAM,4BAA4B,CAAC;AAUpC;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,qBAAqB,CACnC,MAAyB,EACzB,SAAkC,EAClC,OAA0B;;IAE1B,kDAAkD;IAClD,IAAM,QAAQ,GAAG,mBAAmB,CAAC,MAAM,CAAC,CAAC;IAC7C,IAAM,aAAa,GAAG,+BAA+B,CAAC,QAAQ,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"searchContentEntities.js","sourceRoot":"","sources":["../../../../src/search/_internal/searchContentEntities.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_searchGroups.js","sourceRoot":"","sources":["../../../src/search/_searchGroups.ts"],"names":[],"mappings":";
|
|
1
|
+
{"version":3,"file":"_searchGroups.js","sourceRoot":"","sources":["../../../src/search/_searchGroups.ts"],"names":[],"mappings":"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"}
|
|
@@ -18,14 +18,22 @@ const content_utils_1 = require("../../search/content-utils");
|
|
|
18
18
|
* @returns
|
|
19
19
|
*/
|
|
20
20
|
function searchContentEntities(filter, convertFn, options) {
|
|
21
|
-
var _a;
|
|
21
|
+
var _a, _b;
|
|
22
22
|
// expand filter so we can serialize to either api
|
|
23
23
|
const expanded = content_utils_1.expandContentFilter(filter);
|
|
24
24
|
const searchOptions = content_utils_1.serializeContentFilterForPortal(expanded);
|
|
25
|
-
//
|
|
25
|
+
// DEPRECATION
|
|
26
|
+
/* istanbul ignore next */
|
|
26
27
|
if ((_a = options.aggregations) === null || _a === void 0 ? void 0 : _a.length) {
|
|
28
|
+
// tslint:disable-next-line:no-console
|
|
29
|
+
console.warn(`IHubSearchOptions.aggregations is deprecated. Please use .aggFields instead.`);
|
|
27
30
|
searchOptions.countFields = options.aggregations.join(",");
|
|
28
|
-
searchOptions.countSize =
|
|
31
|
+
searchOptions.countSize = options.aggLimit || 10;
|
|
32
|
+
}
|
|
33
|
+
// Aggregations
|
|
34
|
+
if ((_b = options.aggFields) === null || _b === void 0 ? void 0 : _b.length) {
|
|
35
|
+
searchOptions.countFields = options.aggFields.join(",");
|
|
36
|
+
searchOptions.countSize = options.aggLimit || 10;
|
|
29
37
|
}
|
|
30
38
|
// properties to copy from IHubSearchOptions to the ISearchOptions
|
|
31
39
|
const props = [
|
|
@@ -71,10 +79,12 @@ function createContentEntitySearchFn(convertFn) {
|
|
|
71
79
|
const entities = await Promise.all(response.results.map((itm) => {
|
|
72
80
|
return convertFn(itm, searchOptions);
|
|
73
81
|
}));
|
|
82
|
+
// convert aggregations into facets
|
|
83
|
+
const facets = content_utils_1.convertPortalResponseToFacets(response);
|
|
74
84
|
return {
|
|
75
85
|
total: response.total,
|
|
76
86
|
results: entities,
|
|
77
|
-
facets
|
|
87
|
+
facets,
|
|
78
88
|
hasNext: response.nextStart > -1,
|
|
79
89
|
next: utils_1.getNextFunction(searchOptions, response.nextStart, response.total, searchEntities),
|
|
80
90
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"searchContentEntities.js","sourceRoot":"","sources":["../../../../src/search/_internal/searchContentEntities.ts"],"names":[],"mappings":";;;AAAA,iEAAuE;AAMvE,8CAAgE;AAChE,
|
|
1
|
+
{"version":3,"file":"searchContentEntities.js","sourceRoot":"","sources":["../../../../src/search/_internal/searchContentEntities.ts"],"names":[],"mappings":";;;AAAA,iEAAuE;AAMvE,8CAAgE;AAChE,8DAIoC;AAUpC;;;;;;;;;;;;GAYG;AACH,SAAgB,qBAAqB,CACnC,MAAyB,EACzB,SAAkC,EAClC,OAA0B;;IAE1B,kDAAkD;IAClD,MAAM,QAAQ,GAAG,mCAAmB,CAAC,MAAM,CAAC,CAAC;IAC7C,MAAM,aAAa,GAAG,+CAA+B,CAAC,QAAQ,CAAC,CAAC;IAEhE,cAAc;IACd,0BAA0B;IAC1B,UAAI,OAAO,CAAC,YAAY,0CAAE,MAAM,EAAE;QAChC,sCAAsC;QACtC,OAAO,CAAC,IAAI,CACV,8EAA8E,CAC/E,CAAC;QACF,aAAa,CAAC,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3D,aAAa,CAAC,SAAS,GAAG,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;KAClD;IAED,eAAe;IACf,UAAI,OAAO,CAAC,SAAS,0CAAE,MAAM,EAAE;QAC7B,aAAa,CAAC,WAAW,GAAG,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACxD,aAAa,CAAC,SAAS,GAAG,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;KAClD;IACD,kEAAkE;IAClE,MAAM,KAAK,GAAmC;QAC5C,gBAAgB;QAChB,KAAK;QACL,WAAW;QACX,WAAW;QACX,MAAM;QACN,OAAO;KACR,CAAC;IAEF,uBAAuB;IACvB,sBAAsB;IACtB,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE;YAChC,aAAa,CAAC,IAA4B,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;SAC7D;IACH,CAAC,CAAC,CAAC;IACH,4BAA4B;IAC5B,MAAM,QAAQ,GAAG,2BAA2B,CAAC,SAAS,CAAC,CAAC;IACxD,qBAAqB;IACrB,iBAAiB;IACjB,IAAI,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE;QAC1C,MAAM,WAAW,GAAG,iBAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC3C,aAAa,CAAC,MAAM,GAAG,WAAW,CAAC,GAAG,CAAC;KACxC;IACD,OAAO,QAAQ,CAAC,aAAa,CAAC,CAAC;AACjC,CAAC;AAnDD,sDAmDC;AAED;;;;;;;GAOG;AACH,SAAgB,2BAA2B,CACzC,SAAkC;IAElC,kEAAkE;IAClE,iEAAiE;IACjE,yCAAyC;IACzC,OAAO,KAAK,UAAU,cAAc,CAClC,aAA6B;QAE7B,MAAM,QAAQ,GAAG,MAAM,gCAAW,CAAC,aAAa,CAAC,CAAC;QAElD,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,GAAG,CAChC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YAC3B,OAAO,SAAS,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QACvC,CAAC,CAAC,CACH,CAAC;QAEF,mCAAmC;QACnC,MAAM,MAAM,GAAG,6CAA6B,CAAC,QAAQ,CAAC,CAAC;QAEvD,OAAO;YACL,KAAK,EAAE,QAAQ,CAAC,KAAK;YACrB,OAAO,EAAE,QAAQ;YACjB,MAAM;YACN,OAAO,EAAE,QAAQ,CAAC,SAAS,GAAG,CAAC,CAAC;YAChC,IAAI,EAAE,uBAAe,CACnB,aAAa,EACb,QAAQ,CAAC,SAAS,EAClB,QAAQ,CAAC,KAAK,EACd,cAAc,CACf;SACF,CAAC;IACJ,CAAC,CAAC;AACJ,CAAC;AAjCD,kEAiCC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_searchGroups.js","sourceRoot":"","sources":["../../../src/search/_searchGroups.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"_searchGroups.js","sourceRoot":"","sources":["../../../src/search/_searchGroups.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { ISearchOptions } from "@esri/arcgis-rest-portal";
|
|
|
2
2
|
import { IRequestOptions } from "@esri/arcgis-rest-request";
|
|
3
3
|
import { IItem } from "@esri/arcgis-rest-types";
|
|
4
4
|
import { ISearchResponse } from "../../types";
|
|
5
|
-
import { Filter, IHubSearchOptions } from "../types
|
|
5
|
+
import { Filter, IHubSearchOptions } from "../types";
|
|
6
6
|
/**
|
|
7
7
|
* Definition of `convertItemTo<T>` functions
|
|
8
8
|
*/
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { IGroup } from "@esri/arcgis-rest-portal";
|
|
2
|
-
import { Filter, IHubSearchOptions } from "./types
|
|
3
|
-
import { IFacet } from "./types/IFacet";
|
|
2
|
+
import { Filter, IHubSearchOptions, IFacet } from "./types";
|
|
4
3
|
import { ISearchResponse } from "..";
|
|
5
4
|
export interface IGroupSearchResult {
|
|
6
5
|
groups: IGroup[];
|
package/dist/umd/common.umd.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/* @preserve
|
|
2
|
-
* @esri/hub-common - v9.
|
|
2
|
+
* @esri/hub-common - v9.27.0 - Tue Apr 12 2022 05:32:00 GMT+0000 (Coordinated Universal Time)
|
|
3
3
|
* Copyright (c) 2022 Environmental Systems Research Institute, Inc.
|
|
4
4
|
* Apache-2.0
|
|
5
5
|
*/
|
|
@@ -12414,14 +12414,22 @@
|
|
|
12414
12414
|
* @returns
|
|
12415
12415
|
*/
|
|
12416
12416
|
function searchContentEntities(filter, convertFn, options) {
|
|
12417
|
-
var _a;
|
|
12417
|
+
var _a, _b;
|
|
12418
12418
|
// expand filter so we can serialize to either api
|
|
12419
12419
|
var expanded = expandContentFilter(filter);
|
|
12420
12420
|
var searchOptions = serializeContentFilterForPortal(expanded);
|
|
12421
|
-
//
|
|
12421
|
+
// DEPRECATION
|
|
12422
|
+
/* istanbul ignore next */
|
|
12422
12423
|
if ((_a = options.aggregations) === null || _a === void 0 ? void 0 : _a.length) {
|
|
12424
|
+
// tslint:disable-next-line:no-console
|
|
12425
|
+
console.warn("IHubSearchOptions.aggregations is deprecated. Please use .aggFields instead.");
|
|
12423
12426
|
searchOptions.countFields = options.aggregations.join(",");
|
|
12424
|
-
searchOptions.countSize =
|
|
12427
|
+
searchOptions.countSize = options.aggLimit || 10;
|
|
12428
|
+
}
|
|
12429
|
+
// Aggregations
|
|
12430
|
+
if ((_b = options.aggFields) === null || _b === void 0 ? void 0 : _b.length) {
|
|
12431
|
+
searchOptions.countFields = options.aggFields.join(",");
|
|
12432
|
+
searchOptions.countSize = options.aggLimit || 10;
|
|
12425
12433
|
}
|
|
12426
12434
|
// properties to copy from IHubSearchOptions to the ISearchOptions
|
|
12427
12435
|
var props = [
|
|
@@ -12463,7 +12471,7 @@
|
|
|
12463
12471
|
// referenced in the `next` section below
|
|
12464
12472
|
return function searchEntities(searchOptions) {
|
|
12465
12473
|
return __awaiter(this, void 0, void 0, function () {
|
|
12466
|
-
var response, entities;
|
|
12474
|
+
var response, entities, facets;
|
|
12467
12475
|
return __generator(this, function (_a) {
|
|
12468
12476
|
switch (_a.label) {
|
|
12469
12477
|
case 0: return [4 /*yield*/, searchItems(searchOptions)];
|
|
@@ -12474,10 +12482,11 @@
|
|
|
12474
12482
|
}))];
|
|
12475
12483
|
case 2:
|
|
12476
12484
|
entities = _a.sent();
|
|
12485
|
+
facets = convertPortalResponseToFacets(response);
|
|
12477
12486
|
return [2 /*return*/, {
|
|
12478
12487
|
total: response.total,
|
|
12479
12488
|
results: entities,
|
|
12480
|
-
facets:
|
|
12489
|
+
facets: facets,
|
|
12481
12490
|
hasNext: response.nextStart > -1,
|
|
12482
12491
|
next: getNextFunction(searchOptions, response.nextStart, response.total, searchEntities),
|
|
12483
12492
|
}];
|