Prevent fallback to bad slug value when rendering unconfigured relati…

…onship field
pubpub · Mar 3, 2025 · cfa81e2 · cfa81e2
1 parent 5c0536a
commit cfa81e2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/core/app/components/forms/elements/RelatedPubsElement.tsx b/core/app/components/forms/elements/RelatedPubsElement.tsx
@@ -94,8 +94,11 @@ export const ConfigureRelatedValue = ({
 	onBlur?: () => void;
 	className?: string;
 }) => {
-	const configLabel = "label" in element.config ? element.config.label : undefined;
-	const label = configLabel || element.label || slug;
+	const configLabel =
+		"relationshipConfig" in element.config
+			? element.config.relationshipConfig.label
+			: element.config.label;
+	const label = configLabel || element.label || element.slug;
 
 	const { watch, formState } = useFormContext<FormValue | FormValueSingle>();
 	const [isPopoverOpen, setPopoverIsOpen] = useState(false);

diff --git a/core/app/components/pubs/PubEditor/PubEditor.tsx b/core/app/components/pubs/PubEditor/PubEditor.tsx
@@ -1,7 +1,7 @@
 import { randomUUID } from "crypto";
 
 import type { ProcessedPub } from "contracts";
-import type { CommunitiesId, PubFieldsId, PubsId, PubTypesId, StagesId } from "db/public";
+import type { CommunitiesId, PubsId, PubTypesId, StagesId } from "db/public";
 import { expect } from "utils";
 
 import type { FormElements, PubFieldElement } from "../../forms/types";
@@ -34,7 +34,10 @@ const RelatedPubValueElement = ({
 	fieldName: string;
 	element: PubFieldElement;
 }) => {
-	const configLabel = "label" in element.config ? element.config.label : undefined;
+	const configLabel =
+		"relationshipConfig" in element.config
+			? element.config.relationshipConfig.label
+			: element.config.label;
 	const label = configLabel || element.label || element.slug;
 
 	return (