scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(SW-543): clean up

Browse Source
This commit is contained in:
Fredrik Thorsson
2025-01-02 13:07:02 +01:00
parent eab1386ee7
commit aee238761f
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
components/Sidebar/JoinLoyalty/Contact/ContactRow/index.tsx
View File

@@ -16,8 +16,10 @@ export default async function ContactRow({ contact }: ContactRowProps) {
return null return null
} }
const val = getValueFromContactConfig(data, contact.contact_field) const val = getValueFromContactConfig(contact.contact_field, data)
const footnote = getValueFromContactConfig(data, contact.phoneFootnote) const footnote = contact.phoneFootnote
? getValueFromContactConfig(contact.phoneFootnote, data)
: null
if (!val) { if (!val) {
return null return null

4
server/routers/contentstack/base/utils.ts
View File

@@ -112,9 +112,9 @@ export function getAlertPhoneContactData(
return { return {
displayText, displayText,
phoneNumber: getValueFromContactConfig(contactConfig, phoneNumber), phoneNumber: getValueFromContactConfig(phoneNumber, contactConfig),
footnote: footnote footnote: footnote
? getValueFromContactConfig(contactConfig, footnote) ? getValueFromContactConfig(footnote, contactConfig)
: null, : null,
} }
} }

7
utils/contactConfig.ts
View File

@@ -4,12 +4,9 @@ import type {
} from "@/server/routers/contentstack/base/output" } from "@/server/routers/contentstack/base/output"
export function getValueFromContactConfig( export function getValueFromContactConfig(
data: ContactConfig, keyString: string,
keyString?: string | null data: ContactConfig
): string | undefined { ): string | undefined {
if (!keyString) {
return undefined
}
const [groupName, key] = keyString.split(".") as [ const [groupName, key] = keyString.split(".") as [
ContactFieldGroups, ContactFieldGroups,
keyof ContactConfig[ContactFieldGroups], keyof ContactConfig[ContactFieldGroups],