Skip to content

Commit b0ea633

Browse files
authored
Merge pull request #3099 from specify/fix-failing-test
Fix failing frontend test
2 parents f165e88 + cf42990 commit b0ea633

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

specifyweb/frontend/js_src/lib/components/FormFields/Field.tsx

+7-6
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,13 @@ function Field({
111111
() =>
112112
field?.isRelationship === true
113113
? hasTablePermission(field.relatedModel.name, 'read')
114-
? resource?.specifyModel.getField(field?.name) === undefined
115-
? ''
116-
: resource
117-
?.rgetPromise(field.name)
118-
.then(format)
119-
.then((value) => value ?? '')
114+
? (
115+
resource?.rgetPromise(field.name) as Promise<
116+
SpecifyResource<AnySchema> | undefined
117+
>
118+
)
119+
?.then(format)
120+
.then((value) => value ?? '') ?? ''
120121
: userText.noPermission()
121122
: undefined,
122123
/*

specifyweb/frontend/js_src/lib/components/InitialContext/treeRanks.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ export function getDomainResource<
3131
console.error(
3232
`Trying to access domain resource ${level} before domain is loaded`
3333
);
34-
return;
34+
return undefined;
3535
}
3636
const model = strictGetModel(level);
3737
return new model.Resource({ id });

0 commit comments

Comments
 (0)