Skip to content
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

feat(my-pages): add info and deadline text #16896

Merged
merged 2 commits into from
Nov 15, 2024
Merged

feat(my-pages): add info and deadline text #16896

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c42eda
feat: add info and deadline text
disaerna Nov 15, 2024
58f733c
Merge branch 'main' into my-pages/law-and-order-summon-text
kodiakhq[bot] Nov 15, 2024
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
2 changes: 2 additions & 0 deletions libs/api/domains/law-and-order/src/lib/law-and-order.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,8 @@ export class LawAndOrderService {
(alert) => alert.type === AlertMessageTypeEnum.Success,
)?.message,
description: subpoenaData.subtitle,
information: subpoenaData.subpoenaInfoText,
deadline: subpoenaData.subpoenaNotificationDeadline,
},
}
return data
Expand Down
8 changes: 4 additions & 4 deletions libs/api/domains/law-and-order/src/models/subpoena.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ import { Group } from './group.model'

@ObjectType('LawAndOrderSubpoenaTexts')
export class Text {
@Field({ nullable: true })
intro?: string

@Field({ nullable: true })
confirmation?: string

@Field({ nullable: true })
description?: string

@Field({ nullable: true })
claim?: string
information?: string

@Field({ nullable: true })
deadline?: string
}

@ObjectType('LawAndOrderSubpoenaData')
Expand Down
4 changes: 4 additions & 0 deletions libs/clients/judicial-system-sp/src/clientConfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,6 +450,8 @@
"type": "object",
"properties": {
"title": { "type": "string" },
"subpoenaInfoText": { "type": "string" },
"subpoenaNotificationDeadline": { "type": "string" },
"subtitle": { "type": "string" },
"groups": {
"type": "array",
Expand All @@ -468,6 +470,8 @@
},
"required": [
"title",
"subpoenaInfoText",
"subpoenaNotificationDeadline",
disaerna marked this conversation as resolved.
Show resolved Hide resolved
"subtitle",
"groups",
"alerts",
Expand Down
2 changes: 2 additions & 0 deletions libs/portals/my-pages/law-and-order/src/screens/Subpoena/Subpoena.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ query GetSubpoena($input: LawAndOrderSubpoenaInput!, $locale: String!) {
texts {
confirmation
description
information
deadline
}
}
}
8 changes: 6 additions & 2 deletions libs/portals/my-pages/law-and-order/src/screens/Subpoena/Subpoena.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,13 @@ const Subpoena = () => {
)}
<Box paddingRight={[0, 0, 24]} marginTop={5}>
<Text marginBottom={2}>
{formatMessage(messages.subpoenaInfoText)}
{subpoena.texts?.information ??
formatMessage(messages.subpoenaInfoText)}
</Text>
<Text>
{subpoena.texts?.deadline ??
formatMessage(messages.subpoenaInfoText2)}
</Text>
<Text>{formatMessage(messages.subpoenaInfoText2)}</Text>
</Box>

{!loading && subpoena.data.hasChosen === false && (
Expand Down
Loading