Move income statement code to lib-common

Author: akheron

frontend/src/citizen-frontend/income-statements/ChildIncomeStatementAttachments.tsx

@@ -9,7 +9,7 @@ import {
   AttachmentId,
   IncomeStatementId
 } from 'lib-common/generated/api-types/shared'
-import { IncomeStatementAttachments } from 'lib-common/income-statements'
+import { IncomeStatementAttachments } from 'lib-common/income-statements/attachments'
 import { FixedSpaceColumn } from 'lib-components/layout/flex-helpers'
 import FileUpload from 'lib-components/molecules/FileUpload'
 

frontend/src/citizen-frontend/income-statements/ChildIncomeStatementEditor.tsx

@@ -12,6 +12,9 @@ import {
   IncomeStatementId
 } from 'lib-common/generated/api-types/shared'
 import { fromUuid } from 'lib-common/id-type'
+import { fromBody } from 'lib-common/income-statements/body'
+import * as Form from 'lib-common/income-statements/form'
+import { emptyIncomeStatementForm } from 'lib-common/income-statements/form'
 import LocalDate from 'lib-common/local-date'
 import {
   constantQuery,
@@ -31,9 +34,6 @@ import {
   incomeStatementQuery,
   updateIncomeStatementMutation
 } from './queries'
-import { fromBody } from './types/body'
-import * as Form from './types/form'
-import { emptyIncomeStatementForm } from './types/form'
 
 interface EditorState {
   id: string | undefined

frontend/src/citizen-frontend/income-statements/ChildIncomeStatementForm.tsx

@@ -8,7 +8,8 @@ import styled from 'styled-components'
 import { Result } from 'lib-common/api'
 import { IncomeStatementStatus } from 'lib-common/generated/api-types/incomestatement'
 import { IncomeStatementId } from 'lib-common/generated/api-types/shared'
-import { numAttachments } from 'lib-common/income-statements'
+import { numAttachments } from 'lib-common/income-statements/attachments'
+import * as Form from 'lib-common/income-statements/form'
 import LocalDate from 'lib-common/local-date'
 import { scrollToRef } from 'lib-common/utils/scrolling'
 import { AsyncButton } from 'lib-components/atoms/buttons/AsyncButton'
@@ -42,7 +43,6 @@ import {
   useFieldDispatch,
   useFieldSetState
 } from './IncomeStatementComponents'
-import * as Form from './types/form'
 
 const OtherInfoContainer = styled.div`
   max-width: 716px;

frontend/src/citizen-frontend/income-statements/ChildIncomeStatementView.tsx

@@ -10,7 +10,11 @@ import { IncomeStatementId } from 'lib-common/generated/api-types/shared'
 import {
   collectAttachmentIds,
   toIncomeStatementAttachments
-} from 'lib-common/income-statements'
+} from 'lib-common/income-statements/attachments'
+import {
+  computeRequiredAttachments,
+  fromIncomeStatement
+} from 'lib-common/income-statements/form'
 import { useQueryResult } from 'lib-common/query'
 import { useIdRouteParam } from 'lib-common/useRouteParams'
 import HorizontalLine from 'lib-components/atoms/HorizontalLine'
@@ -36,7 +40,6 @@ import {
   incomeStatementQuery,
   updateSentIncomeStatementMutation
 } from './queries'
-import { computeRequiredAttachments, fromIncomeStatement } from './types/form'
 
 export default React.memo(function ChildIncomeStatementView() {
   const incomeStatementId =

frontend/src/citizen-frontend/income-statements/IncomeStatementAttachments.tsx

@@ -18,7 +18,7 @@ import {
 import {
   IncomeStatementAttachments,
   numAttachments
-} from 'lib-common/income-statements'
+} from 'lib-common/income-statements/attachments'
 import { scrollToElement } from 'lib-common/utils/scrolling'
 import UnorderedList from 'lib-components/atoms/UnorderedList'
 import { Button } from 'lib-components/atoms/buttons/Button'

frontend/src/citizen-frontend/income-statements/IncomeStatementEditor.tsx

@@ -9,6 +9,9 @@ import { combine, Loading, Result } from 'lib-common/api'
 import { IncomeStatementStatus } from 'lib-common/generated/api-types/incomestatement'
 import { IncomeStatementId } from 'lib-common/generated/api-types/shared'
 import { fromUuid } from 'lib-common/id-type'
+import { fromBody } from 'lib-common/income-statements/body'
+import * as Form from 'lib-common/income-statements/form'
+import { emptyIncomeStatementForm } from 'lib-common/income-statements/form'
 import LocalDate from 'lib-common/local-date'
 import {
   constantQuery,
@@ -28,9 +31,6 @@ import {
   incomeStatementStartDatesQuery,
   updateIncomeStatementMutation
 } from './queries'
-import { fromBody } from './types/body'
-import * as Form from './types/form'
-import { emptyIncomeStatementForm } from './types/form'
 
 interface EditorState {
   id: string | undefined

frontend/src/citizen-frontend/income-statements/IncomeStatementForm.tsx

@@ -18,6 +18,7 @@ import {
   otherIncomes
 } from 'lib-common/generated/api-types/incomestatement'
 import { IncomeStatementId } from 'lib-common/generated/api-types/shared'
+import * as Form from 'lib-common/income-statements/form'
 import LocalDate from 'lib-common/local-date'
 import { scrollToRef } from 'lib-common/utils/scrolling'
 import UnorderedList from 'lib-components/atoms/UnorderedList'
@@ -71,7 +72,6 @@ import {
   useFieldDispatch,
   useFieldSetState
 } from './IncomeStatementComponents'
-import * as Form from './types/form'
 
 interface Props {
   incomeStatementId: IncomeStatementId | undefined

frontend/src/citizen-frontend/income-statements/IncomeStatementView.tsx

@@ -17,7 +17,11 @@ import { IncomeStatementId } from 'lib-common/generated/api-types/shared'
 import {
   collectAttachmentIds,
   toIncomeStatementAttachments
-} from 'lib-common/income-statements'
+} from 'lib-common/income-statements/attachments'
+import {
+  computeRequiredAttachments,
+  fromIncomeStatement
+} from 'lib-common/income-statements/form'
 import { useQueryResult } from 'lib-common/query'
 import { useIdRouteParam } from 'lib-common/useRouteParams'
 import HorizontalLine from 'lib-components/atoms/HorizontalLine'
@@ -46,7 +50,6 @@ import {
   incomeStatementQuery,
   updateSentIncomeStatementMutation
 } from './queries'
-import { computeRequiredAttachments, fromIncomeStatement } from './types/form'
 
 export default React.memo(function IncomeStatementView() {
   const incomeStatementId =

frontend/src/employee-frontend/components/IncomeStatementPage.tsx

@@ -26,7 +26,7 @@ import {
 import {
   numAttachments,
   toIncomeStatementAttachments
-} from 'lib-common/income-statements'
+} from 'lib-common/income-statements/attachments'
 import { UUID } from 'lib-common/types'
 import { useIdRouteParam } from 'lib-common/useRouteParams'
 import { useApiState } from 'lib-common/utils/useRestApi'

frontend/src/lib-common/income-statements.ts frontend/src/lib-common/income-statements/attachments.ts

@@ -5,12 +5,12 @@
 import groupBy from 'lodash/groupBy'
 import partition from 'lodash/partition'
 
-import { Attachment } from './generated/api-types/attachment'
+import { Attachment } from '../generated/api-types/attachment'
 import {
   IncomeStatementAttachment,
   IncomeStatementAttachmentType
-} from './generated/api-types/incomestatement'
-import { AttachmentId } from './generated/api-types/shared'
+} from '../generated/api-types/incomestatement'
+import { AttachmentId } from '../generated/api-types/shared'
 
 export type AttachmentsByType = Partial<
   Record<IncomeStatementAttachmentType, Attachment[]>

frontend/src/citizen-frontend/income-statements/types/body.ts frontend/src/lib-common/income-statements/body.ts

@@ -3,12 +3,11 @@
 // SPDX-License-Identifier: LGPL-2.1-or-later
 
 import { IncomeStatementBody } from 'lib-common/generated/api-types/incomestatement'
-import { collectAttachmentIds } from 'lib-common/income-statements'
+import { collectAttachmentIds } from 'lib-common/income-statements/attachments'
+import * as Form from 'lib-common/income-statements/form'
 import LocalDate from 'lib-common/local-date'
 import { stringToInt } from 'lib-common/utils/number'
 
-import * as Form from './form'
-
 export function fromBody(
   personType: 'adult' | 'child',
   formData: Form.IncomeStatementForm,

frontend/src/citizen-frontend/income-statements/types/form.ts frontend/src/lib-common/income-statements/form.ts

@@ -11,7 +11,7 @@ import {
 import {
   IncomeStatementAttachments,
   toIncomeStatementAttachments
-} from 'lib-common/income-statements'
+} from 'lib-common/income-statements/attachments'
 import LocalDate from 'lib-common/local-date'
 
 export interface IncomeStatementForm {