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

feat(SW-543): update contact config function

Browse Source
This commit is contained in:
Fredrik Thorsson
2025-01-02 11:29:09 +01:00
parent 584bcccb77
commit eab1386ee7
6 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,8 +16,8 @@ export default async function ContactRow({ contact }: ContactRowProps) {
return null return null
} }
const val = getValueFromContactConfig(contact.contact_field, data) const val = getValueFromContactConfig(data, contact.contact_field)
const footnote = getValueFromContactConfig(contact.selectTest, data) const footnote = getValueFromContactConfig(data, contact.phoneFootnote)
if (!val) { if (!val) {
return null return null
@@ -54,7 +54,9 @@ export default async function ContactRow({ contact }: ContactRowProps) {
{val} {val}
</Link> </Link>
</div> </div>
{footnote && <Footnote color="burgundy">{footnote}</Footnote>} {footnote && contact.contact_field.includes("phone") && (
<Footnote color="burgundy">{footnote}</Footnote>
)}
</div> </div>
) )
} }

3
lib/graphql/Fragments/Sidebar/JoinLoyaltyContact.graphql
View File

@@ -13,8 +13,7 @@
fragment ContactFields on ContactFields { fragment ContactFields on ContactFields {
display_text display_text
contact_field contact_field
footnote phone_footnote
select_test
} }
fragment JoinLoyaltyContactSidebar_ContentPage on ContentPageSidebarJoinLoyaltyContact { fragment JoinLoyaltyContactSidebar_ContentPage on ContentPageSidebarJoinLoyaltyContact {

3
server/routers/contentstack/base/output.ts
View File

@@ -77,8 +77,7 @@ export type ContactConfig = ContactConfigData["all_contact_config"]["items"][0]
export type ContactFields = { export type ContactFields = {
display_text: string | null display_text: string | null
contact_field: string contact_field: string
footnote: string | null phoneFootnote?: string | null
selectTest: string
} }
export const validateCurrentHeaderConfigSchema = z export const validateCurrentHeaderConfigSchema = z

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

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

6
server/routers/contentstack/schemas/sidebar/joinLoyaltyContact.ts
View File

@@ -22,8 +22,7 @@ export const contactSchema = z.object({
contact: z.object({ contact: z.object({
contact_field: z.string(), contact_field: z.string(),
display_text: z.string().optional().nullable().default(null), display_text: z.string().optional().nullable().default(null),
footnote: z.string().optional().nullable().default(null), phone_footnote: z.string().optional().nullable(),
select_test: z.string(),
}), }),
}) })
.transform((data) => { .transform((data) => {
@@ -32,8 +31,7 @@ export const contactSchema = z.object({
typename: data.typename, typename: data.typename,
contact_field: data.contact.contact_field, contact_field: data.contact.contact_field,
display_text: data.contact.display_text, display_text: data.contact.display_text,
footnote: data.contact.footnote, phoneFootnote: data.contact.phone_footnote,
selectTest: data.contact.select_test,
} }
}) })
), ),

7
utils/contactConfig.ts
View File

@@ -4,9 +4,12 @@ import type {
} from "@/server/routers/contentstack/base/output" } from "@/server/routers/contentstack/base/output"
export function getValueFromContactConfig( export function getValueFromContactConfig(
keyString: string, data: ContactConfig,
data: ContactConfig keyString?: string | null
): 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],