Merge pull request #772 from jetstreamapp/bug/764

Fix currency length/precision issue
jetstreamapp · Mar 10, 2024 · a03a132 · a03a132
2 parents 2546100 + 49e8d99
commit a03a132
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/apps/jetstream/src/app/components/shared/create-fields/create-fields-utils.tsx b/apps/jetstream/src/app/components/shared/create-fields/create-fields-utils.tsx
@@ -172,27 +172,29 @@ export const fieldDefinitions: FieldDefinitions = {
   precision: {
     label: 'Length',
     type: 'text', // number
+    labelHelp: 'Number of digits to the left of the decimal point',
     validate: (value: string) => {
       if (!value || !/^[0-9]+$/.test(value)) {
         return false;
       }
       const numValue = Number(value);
-      return isFinite(numValue) && numValue >= 0 && numValue <= 18;
+      return isFinite(numValue) && numValue >= 1 && numValue <= 18;
     },
     invalidErrorMessage: 'Must be between 0 and 18',
     required: true,
   },
   scale: {
     label: 'Decimal Places',
     type: 'text',
+    labelHelp: 'Number of digits to the right of the decimal point',
     validate: (value: string) => {
       if (!value || !/^[0-9]+$/.test(value)) {
         return false;
       }
       const numValue = Number(value);
-      return isFinite(numValue) && numValue >= 0 && numValue <= 18;
+      return isFinite(numValue) && numValue >= 0 && numValue <= 17;
     },
-    invalidErrorMessage: 'Must be between 0 and 18',
+    invalidErrorMessage: 'Must be between 0 and 17',
     required: true,
   },
   required: {
@@ -819,6 +821,15 @@ function prepareFieldPayload(sobject: string, fieldValues: FieldValues, orgNames
   const fieldApiName = orgNamespace ? `${orgNamespace}__${fieldMetadata.fullName}__c` : `${fieldMetadata.fullName}__c`;
   fieldMetadata.fullName = `${sobject}.${fieldApiName}`;
 
+  if (fieldMetadata.scale && fieldMetadata.precision) {
+    const scale = Number(fieldMetadata.scale);
+    const precision = Number(fieldMetadata.precision);
+    if (!Number.isNaN(scale) && !Number.isNaN(precision)) {
+      fieldMetadata.scale = scale;
+      fieldMetadata.precision = scale + precision;
+    }
+  }
+
   if (fieldValues.type.value === 'Formula') {
     fieldMetadata.type = fieldValues.secondaryType.value;
     fieldMetadata.secondaryType = undefined;