Update

Provincie-Zuid-Holland · Jun 18, 2024 · 9b25396 · 9b25396
1 parent 1b6c33e
commit 9b25396
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/components/Modals/ObjectModals/ObjectPersonModal/ObjectPersonModal.tsx b/src/components/Modals/ObjectModals/ObjectPersonModal/ObjectPersonModal.tsx
@@ -90,7 +90,7 @@ const ObjectPersonModal = ({ model }: ObjectPersonModalProps) => {
                 )}
                 validateOnChange
                 enableReinitialize>
-                {({ isValid, isSubmitting }) => (
+                {({ isValid, isSubmitting, dirty }) => (
                     <Form>
                         <div className="space-y-4">
                             {staticData.map(item => {
@@ -147,7 +147,7 @@ const ObjectPersonModal = ({ model }: ObjectPersonModalProps) => {
                             <Button
                                 variant="cta"
                                 type="submit"
-                                isDisabled={!isValid || isSubmitting}
+                                isDisabled={!isValid || isSubmitting || !dirty}
                                 isLoading={isSubmitting}>
                                 Opslaan
                             </Button>

diff --git a/src/utils/dynamicObject.tsx b/src/utils/dynamicObject.tsx
@@ -50,12 +50,12 @@ export const getStaticDataPropertyRequired = (
     key: keyof ModelPatchStaticType
 ) => {
     switch (key) {
-        case 'Client_1_UUID':
         case 'Owner_2_UUID':
-        case 'Portfolio_Holder_1_UUID':
         case 'Portfolio_Holder_2_UUID':
             return false
         case 'Owner_1_UUID':
+        case 'Client_1_UUID':
+        case 'Portfolio_Holder_1_UUID':
             return true
         default:
             throw new Error(

diff --git a/src/validation/objectGeneralInformation.ts b/src/validation/objectGeneralInformation.ts
@@ -3,10 +3,10 @@ import { object } from 'zod'
 import { schemaDefaults } from '@/validation/zodSchema'
 
 export const SCHEMA_GENERAL_INFORMATION = object({
-    Client_1_UUID: schemaDefaults.optionalString,
+    Client_1_UUID: schemaDefaults.requiredString(),
     Owner_1_UUID: schemaDefaults.requiredString(),
     Owner_2_UUID: schemaDefaults.optionalString,
-    Portfolio_Holder_1_UUID: schemaDefaults.optionalString,
+    Portfolio_Holder_1_UUID: schemaDefaults.requiredString(),
     Portfolio_Holder_2_UUID: schemaDefaults.optionalString,
 }).superRefine(
     (