Cleanup types

island-is · Dec 13, 2024 · 61f7f17 · 61f7f17
1 parent a5ce555
commit 61f7f17
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/libs/application/templates/reference-template/src/forms/ExampleForm.ts b/libs/application/templates/reference-template/src/forms/ExampleForm.ts
@@ -51,9 +51,9 @@ export const ExampleForm: Form = buildForm({
               phoneLabel: 'Símanúmer',
               emailLabel: 'Netfang',
               required: true,
-              phone: true,
+              showPhoneField: true,
               phoneRequired: true,
-              email: true,
+              showEmailField: true,
               emailRequired: true,
             },
           },

diff --git a/libs/application/types/src/lib/Fields.ts b/libs/application/types/src/lib/Fields.ts
@@ -101,9 +101,9 @@ export type RepeaterItem = {
     activeField?: Record<string, string>,
   ) => boolean
   dataTestId?: string
-  phone?: boolean
+  showPhoneField?: boolean
   phoneRequired?: boolean
-  email?: boolean
+  showEmailField?: boolean
   emailRequired?: boolean
   readonly?:
     | boolean
@@ -627,8 +627,6 @@ export type TableRepeaterField = BaseField & {
   marginBottom?: ResponsiveProp<Space>
   titleVariant?: TitleVariants
   fields: Record<string, RepeaterItem>
-  phone?: boolean
-  email?: boolean
   /**
    * Maximum rows that can be added to the table.
    * When the maximum is reached, the button to add a new row is disabled.

diff --git a/libs/application/ui-components/src/components/NationalIdWithName/NationalIdWithName.tsx b/libs/application/ui-components/src/components/NationalIdWithName/NationalIdWithName.tsx
@@ -40,8 +40,8 @@ interface NationalIdWithNameProps {
   minAgePerson?: number
   searchPersons?: boolean
   searchCompanies?: boolean
-  phone?: boolean
-  email?: boolean
+  showPhoneField?: boolean
+  showEmailField?: boolean
   error?: string
 }
 
@@ -69,8 +69,8 @@ export const NationalIdWithName: FC<
   minAgePerson,
   searchPersons = true,
   searchCompanies = false,
-  phone = false,
-  email = false,
+  showPhoneField = false,
+  showEmailField = false,
   error,
 }) => {
   const fieldId = customId.length > 0 ? customId : id
@@ -269,9 +269,9 @@ export const NationalIdWithName: FC<
           />
         </GridColumn>
       </GridRow>
-      {(phone || email) && (
+      {(showPhoneField || showEmailField) && (
         <GridRow>
-          {phone && (
+          {showPhoneField && (
             <GridColumn span={['1/1', '1/1', '1/1', '1/2']} paddingTop={2}>
               <PhoneInputController
                 id={phoneField}
@@ -284,7 +284,7 @@ export const NationalIdWithName: FC<
               />
             </GridColumn>
           )}
-          {email && (
+          {showEmailField && (
             <GridColumn span={['1/1', '1/1', '1/1', '1/2']} paddingTop={2}>
               <InputController
                 id={emailField}