Skip to content

Commit

Permalink
Prettier formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
randimays committed Oct 29, 2024
1 parent 2b88c93 commit 09ffdac
Show file tree
Hide file tree
Showing 30 changed files with 194 additions and 1,739 deletions.
16 changes: 10 additions & 6 deletions playwright/tests/checklist.spec.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,22 @@
import { test, expect } from '../utils/next-test'

test.describe('Checklist', () => {
test('Checklist page renders', async ({
page,
}) => {
await page.goto('/resources/what-to-bring-to-create-your-online-sign-in-account')
await expect(page).toHaveURL('/resources/what-to-bring-to-create-your-online-sign-in-account')
test('Checklist page renders', async ({ page }) => {
await page.goto(
'/resources/what-to-bring-to-create-your-online-sign-in-account'
)
await expect(page).toHaveURL(
'/resources/what-to-bring-to-create-your-online-sign-in-account'
)
})

test('Should render without a11y errors', async ({
page,
makeAxeBuilder,
}) => {
await page.goto('/resources/what-to-bring-to-create-your-online-sign-in-account')
await page.goto(
'/resources/what-to-bring-to-create-your-online-sign-in-account'
)

const accessibilityScanResults = await makeAxeBuilder().analyze()

Expand Down
11 changes: 5 additions & 6 deletions src/data/queries/audienceTopics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const params: QueryParams<null> = () => {
])
}

const formatBeneficiariesData = beneficiaries => {
const formatBeneficiariesData = (beneficiaries) => {
if (!beneficiaries || beneficiaries.length === 0) {
return []
}
Expand All @@ -34,7 +34,9 @@ export const getTagsList = (
field_non_beneficiares: fieldNonBeneficiares,
} = entity

const audienceBeneficiaries = formatBeneficiariesData(fieldAudienceBeneficiares)
const audienceBeneficiaries = formatBeneficiariesData(
fieldAudienceBeneficiares
)
const nonBeneficiaries = formatBeneficiariesData(fieldNonBeneficiares)

const topics = fieldTopics.map((topic) => ({
Expand All @@ -44,10 +46,7 @@ export const getTagsList = (
categoryLabel: 'Topics',
}))

const audiences = [
...audienceBeneficiaries,
...nonBeneficiaries,
]
const audiences = [...audienceBeneficiaries, ...nonBeneficiaries]
.filter((tag) => !!tag)
.map((audience) => ({
id: audience.id,
Expand Down
2 changes: 1 addition & 1 deletion src/data/queries/benefitsHubLinks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const params: QueryParams<null> = () => {
export const formatter: QueryFormatter<NodeLandingPage[], RelatedLink[]> = (
entities: NodeLandingPage[]
) => {
return entities.map(entity => {
return entities.map((entity) => {
return {
uri: entity.path?.alias,
title: entity.field_home_page_hub_label,
Expand Down
20 changes: 10 additions & 10 deletions src/data/queries/checklist.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ import { QueryData, QueryFormatter, QueryParams } from 'next-drupal-query'
import { DrupalJsonApiParams } from 'drupal-jsonapi-params'
import { queries } from '.'
import { formatParagraph } from '@/lib/drupal/paragraphs'
import { PARAGRAPH_RESOURCE_TYPES, RESOURCE_TYPES } from '@/lib/constants/resourceTypes'
import {
PARAGRAPH_RESOURCE_TYPES,
RESOURCE_TYPES,
} from '@/lib/constants/resourceTypes'
import { ExpandedStaticPropsContext } from '@/lib/drupal/staticProps'
import {
entityBaseFields,
Expand Down Expand Up @@ -48,7 +51,7 @@ export type ChecklistDataOpts = {
export const data: QueryData<ChecklistDataOpts, NodeChecklist> = async (
opts
): Promise<NodeChecklist> => {
const entity = (await fetchSingleEntityOrPreview(
const entity = (await fetchSingleEntityOrPreview(
opts,
RESOURCE_TYPES.CHECKLIST,
params
Expand All @@ -61,10 +64,10 @@ export const formatter: QueryFormatter<NodeChecklist, Checklist> = (
entity: NodeChecklist
) => {
const formatRelatedLinks = (links): RelatedLink[] =>
links?.map(link => ({
links?.map((link) => ({
uri: link?.field_link?.uri,
title: link?.field_link?.title,
summary: link.field_link_summary
summary: link.field_link_summary,
}))

return {
Expand All @@ -75,18 +78,15 @@ export const formatter: QueryFormatter<NodeChecklist, Checklist> = (
entity.field_related_benefit_hubs
),
buttons: entity.field_buttons.map?.(formatParagraph) as Button[],
checklist: entity.field_checklist.field_checklist_sections?.map(section =>
queries.formatData(
PARAGRAPH_RESOURCE_TYPES.CHECKLIST,
section
)
checklist: entity.field_checklist.field_checklist_sections?.map((section) =>
queries.formatData(PARAGRAPH_RESOURCE_TYPES.CHECKLIST, section)
) as ChecklistItem[],
contactInformation: formatParagraph(
entity.field_contact_information
) as ContactInfo,
intro: entity.field_intro_text_limited_html.processed,
relatedInformation: formatRelatedLinks(entity.field_related_information),
repeatButtons: entity.field_buttons_repeat,
tags: formatParagraph(entity.field_tags) as AudienceTopics
tags: formatParagraph(entity.field_tags) as AudienceTopics,
}
}
9 changes: 5 additions & 4 deletions src/data/queries/checklistItem.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ import { QueryFormatter } from 'next-drupal-query'
import { ParagraphChecklistItem } from '@/types/drupal/paragraph'
import { ChecklistItem } from '@/types/formatted/checklist'

export const formatter: QueryFormatter<ParagraphChecklistItem, ChecklistItem> = (
entity: ParagraphChecklistItem
) => {
export const formatter: QueryFormatter<
ParagraphChecklistItem,
ChecklistItem
> = (entity: ParagraphChecklistItem) => {
return {
type: entity.type as ChecklistItem['type'],
id: entity.id,
items: entity.field_checklist_items,
header: entity.field_section_header,
intro: entity.field_section_intro
intro: entity.field_section_intro,
}
}
2 changes: 1 addition & 1 deletion src/data/queries/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import * as AudienceTopics from './audienceTopics'
import * as Banners from './banners'
import * as BenefitsHub from './benefitsHubLinks'
import * as Button from './button'
import * as Checklist from './checklist';
import * as Checklist from './checklist'
import * as ChecklistItem from './checklistItem'
import * as CollapsiblePanel from './collapsiblePanel'
import * as CollapsiblePanelItem from './collapsiblePanelItem'
Expand Down
23 changes: 0 additions & 23 deletions src/data/queries/tests/__snapshots__/contactInfo.test.tsx.snap

This file was deleted.

Loading

0 comments on commit 09ffdac

Please sign in to comment.