Skip to content

fix: case where address.region doesn't exist and add support for sourceEntityPageSetTemplate #1016

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asanehisa merged 6 commits into from
Feb 2, 2026
Merged

fix: case where address.region doesn't exist and add support for sourceEntityPageSetTemplate #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
92a7a20
test
asanehisa Feb 2, 2026
7e0aaf8
log
asanehisa Feb 2, 2026
8085d9c
fix
asanehisa Feb 2, 2026
0b6bd72
fix for source template on directory page set
asanehisa Feb 2, 2026
9dab56c
adjust test
asanehisa Feb 2, 2026
1144689
fix uppercase
asanehisa Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/visual-editor/src/utils/types/StreamDocument.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,6 @@ export type PathInfoShape = {
includeLocalePrefixForPrimaryLocale?: boolean;
template?: string;
breadcrumbTemplates?: string[];
sourceEntityPageSetTemplate?: string;
[key: string]: any; // allow any other fields
};
16 changes: 13 additions & 3 deletions packages/visual-editor/src/utils/urls/resolveUrlFromPathInfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,20 @@ import { normalizeSlug } from "../slugifier";
import { StreamDocument } from "../types/StreamDocument";

// Resolves a URL from the streamDocument's __.pathInfo.template
// or __.pathInfo.sourceEntityPageSetTemplate (if isChild is true).
export const resolveUrlFromPathInfo = (
streamDocument: StreamDocument,
relativePrefixToRoot: string = ""
relativePrefixToRoot: string = "",
isChild: boolean = false
): string | undefined => {
const pathInfoJson = streamDocument.__?.pathInfo;
const urlTemplate = pathInfoJson?.template || "";

let urlTemplate;
if (isChild) {
urlTemplate = pathInfoJson?.sourceEntityPageSetTemplate || "";
} else {
urlTemplate = pathInfoJson?.template || "";
}

if (!urlTemplate) {
return;
Expand All @@ -21,7 +29,9 @@ export const resolveUrlFromPathInfo = (

const normalizedSlug = normalizeSlug(
resolveEmbeddedFieldsInString(urlTemplate, streamDocument, locale)
).replace(/\/+/g, "/");
)
.replace(/\/+/g, "/") // Collapses multiple slashes into one
.replace(/^\//, ""); // Removes a leading slash if it exists

const isPrimary = isPrimaryLocale(streamDocument);
const shouldIncludeLocalePrefix =
Expand Down
13 changes: 3 additions & 10 deletions packages/visual-editor/src/utils/urls/resolveUrlTemplate.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,8 @@ const mockDMCityDocument: StreamDocument = {
pathInfo: {
template: "directory/[[id]]",
primaryLocale: "en",
sourceEntityPageSetTemplate:
"[[address.region]]/[[address.city]]/[[address.line1]]",
},
},
_pageset: JSON.stringify({
Expand All @@ -50,15 +52,6 @@ const mockChildProfile = {
city: "Fairfax",
region: "VA",
},
__: {
pathInfo: {
template: "[[address.region]]/[[address.city]]/[[address.line1]]",
primaryLocale: "en",
},
},
_pageset: JSON.stringify({
type: "ENTITY",
}),
};

describe("resolveUrlTemplate", () => {
Expand Down Expand Up @@ -160,7 +153,7 @@ describe("resolveUrlTemplate", () => {
});

describe("resolveUrlTemplateOfChild", () => {
it("resolves child profile URL using its own pathInfo template", () => {
it("uses sourceEntityPageSetTemplate for child URL", () => {
expect(
resolveUrlTemplateOfChild(mockChildProfile, mockDMCityDocument, "")
).toBe("va/fairfax/2000-university-dr");
Expand Down
4 changes: 2 additions & 2 deletions packages/visual-editor/src/utils/urls/resolveUrlTemplate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ const resolvers: Array<
isChild,
}: urlResolverProps) => string | undefined
> = [
({ streamDocument, relativePrefixToRoot }) =>
resolveUrlFromPathInfo(streamDocument, relativePrefixToRoot),
({ streamDocument, relativePrefixToRoot, isChild }) =>
resolveUrlFromPathInfo(streamDocument, relativePrefixToRoot, isChild),
({ streamDocument, relativePrefixToRoot, isChild }) =>
legacyResolveUrlTemplate(streamDocument, relativePrefixToRoot, isChild),
({ streamDocument, relativePrefixToRoot }) =>
Expand Down
Loading