diff --git a/packages/visual-editor/src/components/directory/DirectoryWrapper.tsx b/packages/visual-editor/src/components/directory/DirectoryWrapper.tsx index 3bfd464a62..5ccea94043 100644 --- a/packages/visual-editor/src/components/directory/DirectoryWrapper.tsx +++ b/packages/visual-editor/src/components/directory/DirectoryWrapper.tsx @@ -28,7 +28,18 @@ export const DirectoryList = ({ relativePrefixToRoot, }: { streamDocument: StreamDocument; - directoryChildren: any[]; + directoryChildren: { + id: string; + name: string; + slug: string; + meta?: { + entityType?: { + id: "dm_country" | "dm_region" | "dm_city"; + }; + }; + dm_addressCountryDisplayName?: string; + dm_addressRegionDisplayName?: string; + }[]; relativePrefixToRoot: string; }) => { const sortedDirectoryChildren = sortAlphabetically(directoryChildren, "name"); @@ -44,10 +55,10 @@ export const DirectoryList = ({ let label; switch (child?.meta?.entityType?.id) { case "dm_country": - label = child.c_addressCountryDisplayName ?? child.name; + label = child.dm_addressCountryDisplayName ?? child.name; break; case "dm_region": - label = child.c_addressRegionDisplayName ?? child.name; + label = child.dm_addressRegionDisplayName ?? child.name; break; case "dm_city": label = child.name; diff --git a/packages/visual-editor/src/utils/directory/utils.ts b/packages/visual-editor/src/utils/directory/utils.ts index fdd5f1c540..7a40fb15a4 100644 --- a/packages/visual-editor/src/utils/directory/utils.ts +++ b/packages/visual-editor/src/utils/directory/utils.ts @@ -7,10 +7,10 @@ export const isDirectoryGrid = (children: string | any[]): boolean => { // sortAlphabetically takes in an array of objects and sorts them alphabetically. // They are sorted by the value of the field declared by sortBy. // ex. if sortBy is name, the directoryChildren will be ordered by name alphabetically. -export const sortAlphabetically = ( - directoryChildren: any[], +export const sortAlphabetically = >( + directoryChildren: T[], sortBy: string -) => { +): T[] => { const sortFn = (p1: any, p2: any) => { const val1 = p1[sortBy] ?? ""; const val2 = p2[sortBy] ?? "";