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.

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(j-s): Enable setting civil claimants #15996

Merged
merged 111 commits into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from 110 commits
Commits
Show all changes
111 commits
Select commit Hold shift + click to select a range
93b1c82
Started working on extracting nationalId input to component
oddsson Sep 10, 2024
17e058c
Merge branch 'main' of github.com:island-is/island.is into j-s/civil…
oddsson Sep 10, 2024
851c7cf
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 11, 2024
6d03291
Use InputNationalId in DefendantInfo
oddsson Sep 11, 2024
a3206b1
Create name input
oddsson Sep 11, 2024
2106123
Checkpoint
oddsson Sep 11, 2024
abe64da
Add AddDefender button to Claimant section
oddsson Sep 12, 2024
98ad16e
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 12, 2024
535b411
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 12, 2024
d7e3519
Add defender info
oddsson Sep 12, 2024
4c8330c
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 12, 2024
8a53873
Refactor
oddsson Sep 13, 2024
167f418
feat(j-s): Added controller and service for civilclaimant
unakb Sep 13, 2024
9d751eb
Checkpoint
oddsson Sep 13, 2024
7d99546
Merge branch 'j-s/civil-claimant' of github.com:island-is/island.is i…
oddsson Sep 13, 2024
9ce0696
fix(j-s): Dtos
unakb Sep 13, 2024
44a401d
Merge branch 'j-s/civil-claimant' of https://github.com/island-is/isl…
unakb Sep 13, 2024
a47ef4c
feat(j-s): Civil claimant API layer
unakb Sep 13, 2024
547b52d
Add addClaimant functionality
oddsson Sep 13, 2024
d2afd92
fix(j-s): backend usage
unakb Sep 13, 2024
12025b6
Merge branch 'j-s/civil-claimant' of github.com:island-is/island.is i…
oddsson Sep 13, 2024
7da0435
Checkpoint
oddsson Sep 13, 2024
b92b50a
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 13, 2024
0a10beb
Revert framer motion update
oddsson Sep 13, 2024
cde64f4
fix(j-s): Remove defendant and rename defender to spokesperson
unakb Sep 13, 2024
a2fb660
Merge branch 'j-s/civil-claimant' of https://github.com/island-is/isl…
unakb Sep 13, 2024
5264eac
Cleanup
oddsson Sep 13, 2024
ed15916
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 13, 2024
8548628
feat(j-s): Connect civil claimant to case
unakb Sep 13, 2024
e676333
Merge branch 'j-s/civil-claimant' of https://github.com/island-is/isl…
unakb Sep 13, 2024
806d257
fix(j-s): Remove required from name
unakb Sep 13, 2024
3e90c25
Remove unused imports
oddsson Sep 16, 2024
7be845f
Merge branch 'j-s/civil-claimant' of github.com:island-is/island.is i…
oddsson Sep 16, 2024
e863795
Layout
oddsson Sep 16, 2024
a702d3a
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 16, 2024
2a7554f
feat(j-s): Add hasCivilClaims
unakb Sep 16, 2024
38bf5af
feat(j-s): Fix boolean
unakb Sep 16, 2024
8c5c7b4
chore(j-s): Add update civil claimant mutation to resolver
unakb Sep 16, 2024
a454ada
chore(j-s): Added role guards and write guards to civil claimant cont…
unakb Sep 16, 2024
8bdb4b3
chore(j-s): Added delete civil claimant to resolver
unakb Sep 16, 2024
84e16aa
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 16, 2024
1645d86
Save hasCivilClaims choise to server
oddsson Sep 16, 2024
5ff0e7b
Create new civil claimant when needd
oddsson Sep 16, 2024
2cda305
CRUD operations on civil claimant
oddsson Sep 16, 2024
f12bc16
Fix lint
oddsson Sep 16, 2024
f9a8f1e
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 17, 2024
4515376
Merge branch 'j-s/civil-claimant' of github.com:island-is/island.is i…
oddsson Sep 17, 2024
bfe123a
chore: nx format:write update dirty files
andes-it Sep 17, 2024
c108e1b
Create and delete civil claimant
oddsson Sep 17, 2024
09c7ca0
Merge branch 'j-s/civil-claimant' of github.com:island-is/island.is i…
oddsson Sep 17, 2024
3d06e69
Create and delete civil claimant
oddsson Sep 17, 2024
adc391b
Lookup nationalId with national registry
oddsson Sep 17, 2024
4866005
Checkpoint
oddsson Sep 17, 2024
dd1b3cb
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 17, 2024
8f95219
Autofill name when national id is set
oddsson Sep 17, 2024
793d6cf
Prevent double civil claimant creation
oddsson Sep 17, 2024
36c5ec3
Implement noNationalId
oddsson Sep 17, 2024
c4b8457
Remove redunant boolean check
oddsson Sep 18, 2024
a6aafa0
Checkpoint
oddsson Sep 18, 2024
5fdeabc
Rename defendantId to clientId in DefenderInput component to make it …
oddsson Sep 18, 2024
d3232b6
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 18, 2024
7ea08d4
Enable lawyer lookup
oddsson Sep 18, 2024
749c25a
Add ability to share case files with defender
oddsson Sep 18, 2024
04d442f
Reset lawyer when he is deleted
oddsson Sep 18, 2024
3bc0e6d
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 18, 2024
246065b
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 18, 2024
4004bb9
Merge branch 'j-s/civil-claimant' of github.com:island-is/island.is i…
oddsson Sep 18, 2024
8be4d8e
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 19, 2024
38372f9
Remove unused code
oddsson Sep 19, 2024
77d8ebc
Remove unused code
oddsson Sep 19, 2024
04dec4e
Remove unused code
oddsson Sep 19, 2024
ac5ffa8
Remove unused code
oddsson Sep 19, 2024
c1b36d9
Remove unused code
oddsson Sep 19, 2024
4b9a92e
Remove unused code
oddsson Sep 19, 2024
7c2551b
Remove unused code
oddsson Sep 19, 2024
b71a84f
Merge
oddsson Sep 23, 2024
d500c1d
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 23, 2024
7615b8f
Merge
oddsson Sep 23, 2024
e4f1a4a
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 23, 2024
28190b3
Refactor DefenderInput
oddsson Sep 23, 2024
3ab8aa6
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 23, 2024
d868878
Clear nationalId when noNationalId is selcted
oddsson Sep 23, 2024
613b3fd
Checkpoint
oddsson Sep 23, 2024
8217b95
Clear nationalId
oddsson Sep 23, 2024
d73e270
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 23, 2024
7ac863c
Refactor DefenderInput
oddsson Sep 23, 2024
502e98e
Fix lint
oddsson Sep 24, 2024
e5a3e23
Allow clear defender
oddsson Sep 24, 2024
daa89a7
Validation
oddsson Sep 24, 2024
830d934
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 24, 2024
30495bb
Remove console.log
oddsson Sep 24, 2024
2fc0372
Reset caseFilesSharedWithSpokesperson when advocate is set
oddsson Sep 24, 2024
574d3a0
Add tooltip
oddsson Sep 24, 2024
6a1d3a7
Validate name
oddsson Sep 24, 2024
6a56197
Validate
oddsson Sep 24, 2024
6375333
Fix input name bug
oddsson Sep 24, 2024
2fbe57c
Remove DefenderInput
oddsson Sep 24, 2024
223e109
Reorder imports
oddsson Sep 24, 2024
6e6b801
Remove commented out code
oddsson Sep 24, 2024
57f41c4
Validate
oddsson Sep 24, 2024
146c775
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 24, 2024
be62b6a
Fix strings
oddsson Sep 24, 2024
dd74f3f
Cleanup
oddsson Sep 24, 2024
bdeea67
Cleanup
oddsson Sep 24, 2024
6b5ac2e
Cleanup
oddsson Sep 24, 2024
ca577e3
Cleanup
oddsson Sep 24, 2024
be4b972
Cleanup
oddsson Sep 24, 2024
b7618b7
Use barrel file for import
oddsson Sep 24, 2024
0678a90
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 24, 2024
608339b
Merge branch 'main' of github.com:island-is/island.is into j-s/civil-…
oddsson Sep 25, 2024
7da5d73
Fix typo
oddsson Sep 25, 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
18 changes: 18 additions & 0 deletions apps/judicial-system/web/messages/Core/errors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,36 @@ export const errors = defineMessages({
description:
'Notaður sem villuskilaboð þegar ekki gengur að uppfæra varnaraðila',
},
updateCivilClaimant: {
id: 'judicial.system.core:errors.update_civil_claimant',
defaultMessage: 'Upp kom villa við að uppfæra kröfuhafa',
description:
'Notaður sem villuskilaboð þegar ekki gengur að uppfæra kröfuhafa',
},
createDefendant: {
id: 'judicial.system.core:errors.create_defendant',
defaultMessage: 'Upp kom villa við að stofna nýjan varnaraðila',
description:
'Notaður sem villuskilaboð þegar ekki gengur að stofna varnaraðila',
},
createCivilClaimant: {
id: 'judicial.system.core:errors.create_civil_claimant',
defaultMessage: 'Upp kom villa við að stofna nýjan kröfuhafa',
description:
'Notaður sem villuskilaboð þegar ekki gengur að stofna kröfuhafa',
},
deleteDefendant: {
id: 'judicial.system.core:errors.delete_defendant',
defaultMessage: 'Upp kom villa við að eyða varnaraðila',
description:
'Notaður sem villuskilaboð þegar ekki gengur að eyða varnaraðila',
},
deleteCivilClaimant: {
id: 'judicial.system.core:errors.delete_civil_claimant',
defaultMessage: 'Upp kom villa við að eyða kröfuhafa',
description:
'Notaður sem villuskilaboð þegar ekki gengur að eyða kröfuhafa',
},
createCase: {
id: 'judicial.system.core:errors.create_case',
defaultMessage: 'Upp kom villa við að stofnun máls',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ import { TempCase as Case } from '@island.is/judicial-system-web/src/types'
import { useCase } from '../../utils/hooks'
import RequiredStar from '../RequiredStar/RequiredStar'
import { UserContext } from '../UserProvider/UserProvider'
import { BlueBox, SectionHeading } from '..'
import DefenderInput from './DefenderInput'
import { BlueBox, InputAdvocate, SectionHeading } from '..'
import DefenderNotFound from './DefenderNotFound'
import { defenderInfo } from './DefenderInfo.strings'

Expand Down Expand Up @@ -94,7 +93,7 @@ const DefenderInfo: FC<Props> = ({ workingCase, setWorkingCase }) => {
/>
{defenderNotFound && <DefenderNotFound />}
<BlueBox>
<DefenderInput onDefenderNotFound={setDefenderNotFound} />
<InputAdvocate onAdvocateNotFound={setDefenderNotFound} />
{isProsecutionUser(user) && (
<>
<Text variant="h4" marginTop={2} marginBottom={2}>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
import { defineMessages } from 'react-intl'

export const defenderInput = defineMessages({
export const strings = defineMessages({
nameLabel: {
id: 'judicial.system.core:defender_input.name_label',
defaultMessage:
'Nafn {sessionArrangements, select, ALL_PRESENT_SPOKESPERSON {talsmanns} other {verjanda}}',
description: 'Notaður sem titill á inputi fyrir skipaðan verjanda.',
},
spokespersonNameLabel: {
id: 'judicial.system.core:defender_input.spokesperson_name_label',
defaultMessage: 'Nafn réttargæslumanns',
description: 'Notaður sem titill á inputi fyrir skipaðan verjanda.',
},
namePlaceholder: {
id: 'judicial.system.core:defender_input.name_placeholder',
defaultMessage: 'Fult nafn',
Expand All @@ -19,6 +24,11 @@ export const defenderInput = defineMessages({
description:
'Notaður sem titill á inputi fyrir netfang skipaðans verjanda.',
},
spokespersonEmailLabel: {
id: 'judicial.system.core:defender_input.spokesperson_email_label',
defaultMessage: 'Netfang réttargæslumanns',
description: 'Notaður sem titill á inputi fyrir skipaðan verjanda.',
},
emailPlaceholder: {
id: 'judicial.system.core:defender_input.email_placeholder',
defaultMessage: 'Netfang',
Expand All @@ -32,6 +42,11 @@ export const defenderInput = defineMessages({
description:
'Notaður sem titill á inputi fyrir símanúmer skipaðans verjanda.',
},
spokespersonPhoneNumberLabel: {
id: 'judicial.system.core:defender_input.spokesperson_phone_number_label',
defaultMessage: 'Símanúmer réttargæslumanns',
description: 'Notaður sem titill á inputi fyrir skipaðan verjanda.',
},
phoneNumberPlaceholder: {
id: 'judicial.system.core:defender_input.phone_number_placeholder',
defaultMessage: 'Símanúmer',
Expand Down
Loading
Loading