Skip to content

Commit d34d094

Browse files
Add error message if no matching refName found
1 parent 8558ac6 commit d34d094

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

packages/core/data_adapters/BaseAdapter.ts

+10-1
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,11 @@ export abstract class BaseFeatureDataAdapter extends BaseAdapter {
168168
const hasData = await this.hasDataForRefName(region.refName, opts)
169169
checkAbortSignal(opts.signal)
170170
if (!hasData) {
171-
observer.complete()
171+
observer.error(
172+
new Error(
173+
`refName "${region.refName}" not found. You may need to configure refName aliases.`,
174+
),
175+
)
172176
} else {
173177
this.getFeatures(region, opts).subscribe(observer)
174178
}
@@ -208,6 +212,11 @@ export abstract class BaseFeatureDataAdapter extends BaseAdapter {
208212
*/
209213
public async hasDataForRefName(refName: string, opts: BaseOptions = {}) {
210214
const refNames = await this.getRefNames(opts)
215+
// If refNames are not available, fall back to `true` since `false` may
216+
// cause errors even if a refName is available
217+
if (!refNames.length) {
218+
return true
219+
}
211220
return refNames.includes(refName)
212221
}
213222

packages/core/pluggableElementTypes/renderers/FeatureRendererType.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ export default class FeatureRendererType extends ServerSideRendererType {
171171

172172
const featureObservable =
173173
requestRegions.length === 1
174-
? dataAdapter.getFeatures(
174+
? dataAdapter.getFeaturesInRegion(
175175
this.getExpandedRegion(region, renderArgs),
176176
renderArgs,
177177
)

0 commit comments

Comments
 (0)