@esri/hub-common 9.23.3 → 9.24.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/es2017/content/fetch.js +14 -8
- package/dist/es2017/content/fetch.js.map +1 -1
- package/dist/esm/content/fetch.js +19 -11
- package/dist/esm/content/fetch.js.map +1 -1
- package/dist/node/content/fetch.js +14 -8
- package/dist/node/content/fetch.js.map +1 -1
- package/dist/types/search/types.d.ts +2 -0
- package/dist/umd/common.umd.js +19 -11
- 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
|
@@ -79,15 +79,21 @@ const fetchContentBySlug = async (fullyQualifiedSlug, options) => {
|
|
|
79
79
|
searchDescription,
|
|
80
80
|
statistics }));
|
|
81
81
|
};
|
|
82
|
-
const fetchContentRecordCount = async (content) => {
|
|
82
|
+
const fetchContentRecordCount = async (content, requestOptions) => {
|
|
83
83
|
const { url, viewDefinition } = content;
|
|
84
84
|
const where = viewDefinition === null || viewDefinition === void 0 ? void 0 : viewDefinition.definitionExpression;
|
|
85
|
-
|
|
86
|
-
url,
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
}
|
|
90
|
-
|
|
85
|
+
try {
|
|
86
|
+
const response = await queryFeatures(Object.assign(Object.assign({}, requestOptions), { url,
|
|
87
|
+
where, returnCountOnly: true }));
|
|
88
|
+
return response.count;
|
|
89
|
+
}
|
|
90
|
+
catch (_a) {
|
|
91
|
+
// swallow the error and return Infinity as a flag that the caller can act on
|
|
92
|
+
// NOTE: this is what the -ui app currently expects, see:
|
|
93
|
+
// https://github.com/ArcGIS/opendata-ui/blob/300601918eb2dee79a89314880541ecd60f21e68/packages/opendata-ui/app/utils/composer.js#L273-L279
|
|
94
|
+
// however, we should probably push the error message into content.errors instead
|
|
95
|
+
return Infinity;
|
|
96
|
+
}
|
|
91
97
|
};
|
|
92
98
|
/**
|
|
93
99
|
* Fetch enriched content from the Portal and Hub APIs.
|
|
@@ -109,7 +115,7 @@ export const fetchContent = async (identifier, options) => {
|
|
|
109
115
|
const { layer, type } = content;
|
|
110
116
|
content.recordCount =
|
|
111
117
|
!!layer && hasFeatures(type)
|
|
112
|
-
? await fetchContentRecordCount(content)
|
|
118
|
+
? await fetchContentRecordCount(content, options)
|
|
113
119
|
: undefined;
|
|
114
120
|
return content;
|
|
115
121
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/content/fetch.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAEL,oBAAoB,GAErB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACnE,OAAO,EAEL,uBAAuB,EACvB,yBAAyB,EACzB,qBAAqB,GACtB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/content/fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -113,21 +113,29 @@ var fetchContentBySlug = function (fullyQualifiedSlug, options) { return __await
|
|
|
113
113
|
}
|
|
114
114
|
});
|
|
115
115
|
}); };
|
|
116
|
-
var fetchContentRecordCount = function (content) { return __awaiter(void 0, void 0, void 0, function () {
|
|
117
|
-
var url, viewDefinition, where, response;
|
|
118
|
-
return __generator(this, function (
|
|
119
|
-
switch (
|
|
116
|
+
var fetchContentRecordCount = function (content, requestOptions) { return __awaiter(void 0, void 0, void 0, function () {
|
|
117
|
+
var url, viewDefinition, where, response, _a;
|
|
118
|
+
return __generator(this, function (_b) {
|
|
119
|
+
switch (_b.label) {
|
|
120
120
|
case 0:
|
|
121
121
|
url = content.url, viewDefinition = content.viewDefinition;
|
|
122
122
|
where = viewDefinition === null || viewDefinition === void 0 ? void 0 : viewDefinition.definitionExpression;
|
|
123
|
-
|
|
124
|
-
url: url,
|
|
125
|
-
where: where,
|
|
126
|
-
returnCountOnly: true,
|
|
127
|
-
})];
|
|
123
|
+
_b.label = 1;
|
|
128
124
|
case 1:
|
|
129
|
-
|
|
125
|
+
_b.trys.push([1, 3, , 4]);
|
|
126
|
+
return [4 /*yield*/, queryFeatures(__assign(__assign({}, requestOptions), { url: url,
|
|
127
|
+
where: where, returnCountOnly: true }))];
|
|
128
|
+
case 2:
|
|
129
|
+
response = _b.sent();
|
|
130
130
|
return [2 /*return*/, response.count];
|
|
131
|
+
case 3:
|
|
132
|
+
_a = _b.sent();
|
|
133
|
+
// swallow the error and return Infinity as a flag that the caller can act on
|
|
134
|
+
// NOTE: this is what the -ui app currently expects, see:
|
|
135
|
+
// https://github.com/ArcGIS/opendata-ui/blob/300601918eb2dee79a89314880541ecd60f21e68/packages/opendata-ui/app/utils/composer.js#L273-L279
|
|
136
|
+
// however, we should probably push the error message into content.errors instead
|
|
137
|
+
return [2 /*return*/, Infinity];
|
|
138
|
+
case 4: return [2 /*return*/];
|
|
131
139
|
}
|
|
132
140
|
});
|
|
133
141
|
}); };
|
|
@@ -162,7 +170,7 @@ export var fetchContent = function (identifier, options) { return __awaiter(void
|
|
|
162
170
|
layer = content.layer, type = content.type;
|
|
163
171
|
_b = content;
|
|
164
172
|
if (!(!!layer && hasFeatures(type))) return [3 /*break*/, 6];
|
|
165
|
-
return [4 /*yield*/, fetchContentRecordCount(content)];
|
|
173
|
+
return [4 /*yield*/, fetchContentRecordCount(content, options)];
|
|
166
174
|
case 5:
|
|
167
175
|
_c = _d.sent();
|
|
168
176
|
return [3 /*break*/, 7];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/content/fetch.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD,OAAO,EAEL,oBAAoB,GAErB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACnE,OAAO,EAEL,uBAAuB,EACvB,yBAAyB,EACzB,qBAAqB,GACtB,MAAM,UAAU,CAAC;AAClB,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/content/fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -82,15 +82,21 @@ const fetchContentBySlug = async (fullyQualifiedSlug, options) => {
|
|
|
82
82
|
searchDescription,
|
|
83
83
|
statistics }));
|
|
84
84
|
};
|
|
85
|
-
const fetchContentRecordCount = async (content) => {
|
|
85
|
+
const fetchContentRecordCount = async (content, requestOptions) => {
|
|
86
86
|
const { url, viewDefinition } = content;
|
|
87
87
|
const where = viewDefinition === null || viewDefinition === void 0 ? void 0 : viewDefinition.definitionExpression;
|
|
88
|
-
|
|
89
|
-
url,
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
}
|
|
93
|
-
|
|
88
|
+
try {
|
|
89
|
+
const response = await arcgis_rest_feature_layer_1.queryFeatures(Object.assign(Object.assign({}, requestOptions), { url,
|
|
90
|
+
where, returnCountOnly: true }));
|
|
91
|
+
return response.count;
|
|
92
|
+
}
|
|
93
|
+
catch (_a) {
|
|
94
|
+
// swallow the error and return Infinity as a flag that the caller can act on
|
|
95
|
+
// NOTE: this is what the -ui app currently expects, see:
|
|
96
|
+
// https://github.com/ArcGIS/opendata-ui/blob/300601918eb2dee79a89314880541ecd60f21e68/packages/opendata-ui/app/utils/composer.js#L273-L279
|
|
97
|
+
// however, we should probably push the error message into content.errors instead
|
|
98
|
+
return Infinity;
|
|
99
|
+
}
|
|
94
100
|
};
|
|
95
101
|
/**
|
|
96
102
|
* Fetch enriched content from the Portal and Hub APIs.
|
|
@@ -112,7 +118,7 @@ exports.fetchContent = async (identifier, options) => {
|
|
|
112
118
|
const { layer, type } = content;
|
|
113
119
|
content.recordCount =
|
|
114
120
|
!!layer && hasFeatures(type)
|
|
115
|
-
? await fetchContentRecordCount(content)
|
|
121
|
+
? await fetchContentRecordCount(content, options)
|
|
116
122
|
: undefined;
|
|
117
123
|
return content;
|
|
118
124
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/content/fetch.ts"],"names":[],"mappings":";;;;AAAA,+EAAgE;AAChE,iEAAmD;AAEnD,wDAI+B;AAE/B,kCAAgC;AAChC,mCAAmE;AACnE,qCAKkB;AAClB,2CAAkD;AAClD,uCAAsE;
|
|
1
|
+
{"version":3,"file":"fetch.js","sourceRoot":"","sources":["../../../src/content/fetch.ts"],"names":[],"mappings":"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"}
|
|
@@ -144,6 +144,8 @@ export interface IFacet {
|
|
|
144
144
|
attribute?: string;
|
|
145
145
|
type: "single-select" | "multi-select" | "date-range" | "histogram";
|
|
146
146
|
options?: IFacetOption[];
|
|
147
|
+
accordionClosed?: boolean;
|
|
148
|
+
pageSize?: number;
|
|
147
149
|
}
|
|
148
150
|
export interface IFacetOption {
|
|
149
151
|
label: string;
|
package/dist/umd/common.umd.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/* @preserve
|
|
2
|
-
* @esri/hub-common - v9.
|
|
2
|
+
* @esri/hub-common - v9.24.1 - Tue Mar 22 2022 00:10:34 GMT+0000 (Coordinated Universal Time)
|
|
3
3
|
* Copyright (c) 2022 Environmental Systems Research Institute, Inc.
|
|
4
4
|
* Apache-2.0
|
|
5
5
|
*/
|
|
@@ -9069,21 +9069,29 @@
|
|
|
9069
9069
|
}
|
|
9070
9070
|
});
|
|
9071
9071
|
}); };
|
|
9072
|
-
var fetchContentRecordCount = function (content) { return __awaiter(void 0, void 0, void 0, function () {
|
|
9072
|
+
var fetchContentRecordCount = function (content, requestOptions) { return __awaiter(void 0, void 0, void 0, function () {
|
|
9073
9073
|
var url, viewDefinition, where, response;
|
|
9074
|
-
return __generator(this, function (
|
|
9075
|
-
switch (
|
|
9074
|
+
return __generator(this, function (_b) {
|
|
9075
|
+
switch (_b.label) {
|
|
9076
9076
|
case 0:
|
|
9077
9077
|
url = content.url, viewDefinition = content.viewDefinition;
|
|
9078
9078
|
where = viewDefinition === null || viewDefinition === void 0 ? void 0 : viewDefinition.definitionExpression;
|
|
9079
|
-
|
|
9080
|
-
url: url,
|
|
9081
|
-
where: where,
|
|
9082
|
-
returnCountOnly: true,
|
|
9083
|
-
})];
|
|
9079
|
+
_b.label = 1;
|
|
9084
9080
|
case 1:
|
|
9085
|
-
|
|
9081
|
+
_b.trys.push([1, 3, , 4]);
|
|
9082
|
+
return [4 /*yield*/, queryFeatures(__assign(__assign({}, requestOptions), { url: url,
|
|
9083
|
+
where: where, returnCountOnly: true }))];
|
|
9084
|
+
case 2:
|
|
9085
|
+
response = _b.sent();
|
|
9086
9086
|
return [2 /*return*/, response.count];
|
|
9087
|
+
case 3:
|
|
9088
|
+
_b.sent();
|
|
9089
|
+
// swallow the error and return Infinity as a flag that the caller can act on
|
|
9090
|
+
// NOTE: this is what the -ui app currently expects, see:
|
|
9091
|
+
// https://github.com/ArcGIS/opendata-ui/blob/300601918eb2dee79a89314880541ecd60f21e68/packages/opendata-ui/app/utils/composer.js#L273-L279
|
|
9092
|
+
// however, we should probably push the error message into content.errors instead
|
|
9093
|
+
return [2 /*return*/, Infinity];
|
|
9094
|
+
case 4: return [2 /*return*/];
|
|
9087
9095
|
}
|
|
9088
9096
|
});
|
|
9089
9097
|
}); };
|
|
@@ -9118,7 +9126,7 @@
|
|
|
9118
9126
|
layer = content.layer, type = content.type;
|
|
9119
9127
|
_b = content;
|
|
9120
9128
|
if (!(!!layer && hasFeatures(type))) return [3 /*break*/, 6];
|
|
9121
|
-
return [4 /*yield*/, fetchContentRecordCount(content)];
|
|
9129
|
+
return [4 /*yield*/, fetchContentRecordCount(content, options)];
|
|
9122
9130
|
case 5:
|
|
9123
9131
|
_c = _d.sent();
|
|
9124
9132
|
return [3 /*break*/, 7];
|