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

Jump to bottom

chore(inao): Make inao applications share code #16473

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

chore(inao): Make inao applications share code #16473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4938e1a
chore: make logo shared
jonnigs Oct 18, 2024
c81c7b0
chore: make aboutOverview and ValueLine shared
jonnigs Oct 18, 2024
f537fb5
chore: add conditions for phoneNumber
jonnigs Oct 18, 2024
c697766
chore: make bottomBar shared
jonnigs Oct 18, 2024
965b458
chore: make fileValueLine shared
jonnigs Oct 18, 2024
70e7f47
chore: make totals shared
jonnigs Oct 18, 2024
f6a8cac
chore: make CapitalNumbersOverview shared
jonnigs Oct 18, 2024
6ee2687
fix: CapitalNumberOverview
jonnigs Oct 21, 2024
3af4055
chore: make constant shared
jonnigs Oct 21, 2024
398e498
chore: make helper functions shared
jonnigs Oct 21, 2024
e888f11
chore: remove log
jonnigs Oct 21, 2024
945268f
chore: move formatCurrency into helpers
jonnigs Oct 21, 2024
64f5872
fix: use @ for imports from the shared folder
jonnigs Oct 21, 2024
55ffd7a
fix: update imports again
jonnigs Oct 22, 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
20 changes: 0 additions & 20 deletions libs/application/templates/inao/financial-statement-cemetery/src/components/Logo.tsx
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions ...cation/templates/inao/financial-statement-cemetery/src/fields/CemeteryCareteker/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ import {
APPLICANTASMEMBER,
ACTORASCARETAKER,
ACTORLONEBOARDMEMBER,
} from '../../utils/constants'

} from '@island.is/application/templates/inao/shared'
import { getBoardmembersAndCaretakers } from '../../utils/helpers'
import { CaretakerRepeaterItem } from './CemeteryCaretakerRepeaterItem'
import { BoardMember } from '../../types/types'
Expand Down
8 changes: 4 additions & 4 deletions ...ication/templates/inao/financial-statement-cemetery/src/fields/CemeteryEquities/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,17 @@ import { useLocale } from '@island.is/localization'
import { FieldBaseProps } from '@island.is/application/types'
import { InputController } from '@island.is/shared/form-fields'
import { m } from '../../lib/messages'
import { Total } from '../KeyNumbers'
import { getErrorViaPath, getValueViaPath } from '@island.is/application/core'
import {
CAPITALNUMBERS,
CEMETERYEQUITIESANDLIABILITIESIDS,
INPUTCHANGEINTERVAL,
OPERATINGCOST,
VALIDATOR,
} from '../../utils/constants'
Total,
getTotal,
} from '@island.is/application/templates/inao/shared'
import { CEMETERYEQUITIESANDLIABILITIESIDS } from '../../utils/constants'
import { useTotals } from '../../hooks/useTotals'
import { getTotal } from '../../utils/helpers'

export const CemeteryEquities = ({
application,
Expand Down
7 changes: 2 additions & 5 deletions ...lates/inao/financial-statement-cemetery/src/fields/CemeteryOperation/CemeteryExpenses.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,9 @@ import { RecordObject } from '@island.is/application/types'
import debounce from 'lodash/debounce'
import { useFormContext } from 'react-hook-form'
import { m } from '../../lib/messages'

import { FinancialStatementsInaoTaxInfo } from '@island.is/api/schema'
import {
CEMETERYOPERATIONIDS,
INPUTCHANGEINTERVAL,
} from '../../utils/constants'
import { CEMETERYOPERATIONIDS } from '../../utils/constants'
import { INPUTCHANGEINTERVAL } from '@island.is/application/templates/inao/shared'
type Props = {
data?: {
financialStatementsInaoTaxInfo: FinancialStatementsInaoTaxInfo[]
Expand Down
7 changes: 2 additions & 5 deletions ...mplates/inao/financial-statement-cemetery/src/fields/CemeteryOperation/CemeteryIncome.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@ import { useFormContext } from 'react-hook-form'
import { getErrorViaPath, getValueViaPath } from '@island.is/application/core'
import { m } from '../../lib/messages'
import { FinancialStatementsInaoTaxInfo } from '@island.is/api/schema'
import {
CEMETERYOPERATIONIDS,
INPUTCHANGEINTERVAL,
TaxInfoTypes,
} from '../../utils/constants'
import { CEMETERYOPERATIONIDS, TaxInfoTypes } from '../../utils/constants'
import { INPUTCHANGEINTERVAL } from '@island.is/application/templates/inao/shared'

type Props = {
data?: {
Expand Down
7 changes: 5 additions & 2 deletions ...cation/templates/inao/financial-statement-cemetery/src/fields/CemeteryOperation/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,18 @@ import {
import { Application } from '@island.is/application/types'
import { useLocale } from '@island.is/localization'
import { m } from '../../lib/messages'
import { Total } from '../KeyNumbers'
import { CemetryIncome } from './CemeteryIncome'
import { CemeteryExpenses } from './CemeteryExpenses'
import { CemeteryIncomeLimit } from '../CemeteryIncomeLimit/index'
import { useQuery } from '@apollo/client'
import { getValueViaPath } from '@island.is/application/core'
import { taxInfoQuery } from '../../graphql'
import { CEMETERYOPERATIONIDS, OPERATINGCOST } from '../../utils/constants'
import { CEMETERYOPERATIONIDS } from '../../utils/constants'
import { useTotals } from '../../hooks/useTotals'
import {
Total,
OPERATINGCOST,
} from '@island.is/application/templates/inao/shared'

export const CemeteryOperation = ({
application,
Expand Down
63 changes: 0 additions & 63 deletions ...templates/inao/financial-statement-cemetery/src/fields/CemeteryOverview/AboutOverview.tsx
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions ...ion/templates/inao/financial-statement-cemetery/src/fields/CemeteryOverview/BottomBar.tsx
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions .../inao/financial-statement-cemetery/src/fields/CemeteryOverview/CapitalNumbersOverview.tsx
View file
Open in desktop

This file was deleted.

30 changes: 0 additions & 30 deletions ...templates/inao/financial-statement-cemetery/src/fields/CemeteryOverview/FileValueLine.tsx
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions ...ion/templates/inao/financial-statement-cemetery/src/fields/CemeteryOverview/ValueLine.tsx
View file
Open in desktop

This file was deleted.

42 changes: 33 additions & 9 deletions ...ication/templates/inao/financial-statement-cemetery/src/fields/CemeteryOverview/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,21 @@ import { format as formatNationalId } from 'kennitala'
import { useSubmitApplication } from '../../hooks/useSubmitApplication'
import { m } from '../../lib/messages'
import { FinancialStatementCemetery } from '../../lib/dataSchema'
import { currencyStringToNumber, formatCurrency } from '../../utils/helpers'
import { AboutOverview } from './AboutOverview'
import { ValueLine } from './ValueLine'
import { CapitalNumberOverview } from './CapitalNumbersOverview'
import { BOARDMEMEBER } from '../../utils/constants'
import { FileValueLine } from './FileValueLine'
import BottomBar from './BottomBar'
import {
columnStyle,
sectionColumn,
starterColumnStyle,
} from './overviewStyles.css'
import {
AboutOverview,
CapitalNumberOverview,
ValueLine,
BottomBar,
FileValueLine,
formatCurrency,
currencyStringToNumber,
} from '@island.is/application/templates/inao/shared'

export const CemeteryOverview = ({
application,
Expand Down Expand Up @@ -86,7 +89,15 @@ export const CemeteryOverview = ({
<Box marginBottom={2}>
<Divider />
<Box paddingY={3}>
<AboutOverview answers={answers} />
<AboutOverview
about={answers.about}
fullName={m.fullName}
nationalId={m.nationalId}
powerOfAttorneyName={m.powerOfAttorneyName}
powerOfAttorneyNationalId={m.powerOfAttorneyNationalId}
email={m.email}
phoneNumber={m.phoneNumber}
/>
</Box>
<Divider />
<Box paddingY={3}>
Expand Down Expand Up @@ -175,7 +186,15 @@ export const CemeteryOverview = ({
<Divider />

<Box paddingY={3}>
<CapitalNumberOverview answers={answers} />
<CapitalNumberOverview
capitalNumbersMessage={m.capitalNumbers}
capitalIncomeMessage={m.capitalIncome}
capitalIncome={answers.capitalNumbers.capitalIncome}
capitalCostMessage={m.capitalCost}
capitalCost={answers.capitalNumbers.capitalCost}
totalCapitalMessage={m.totalCapital}
total={answers.capitalNumbers.total}
/>
</Box>
<Divider />
<Box paddingY={3}>
Expand Down Expand Up @@ -309,7 +328,10 @@ export const CemeteryOverview = ({
) : null}
{fileName ? (
<>
<FileValueLine label={answers.attachments?.file?.[0]?.name} />
<FileValueLine
label={answers.attachments?.file?.[0]?.name}
files={m.files}
Comment on lines +332 to +333
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CodeRabbit has some valid concerns here, for example this; shouldn't it be the other way around?
Also other things Coderabbit mentioned

/>
Comment on lines +331 to +334
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Possible mismatch in props for <FileValueLine> component

The label prop is set to answers.attachments?.file?.[0]?.name, which is likely a string, while the files prop is set to m.files, which appears to be a message object. Ensure that files prop receives the correct file data array and that m.files is the intended value.

Apply this diff if files should be the array of files:

<FileValueLine
  label={answers.attachments?.file?.[0]?.name}
- files={m.files}
+ files={answers.attachments?.file}

Committable suggestion was skipped due to low confidence.

<Divider />
</>
) : null}
Expand Down Expand Up @@ -372,6 +394,8 @@ export const CemeteryOverview = ({
loading={loading}
onSendButtonClick={onSendButtonClick}
onBackButtonClick={onBackButtonClick}
goBack={m.goBack}
send={m.send}
/>
</Box>
)
Expand Down
Loading
Loading