Merge branch 'dev' into dynamic-form-list-customization

Tom German · Tom German · commit 801bb063939e · 2023-10-09T16:57:43.000+01:00
diff --git a/CHANGELOG.json b/CHANGELOG.json
@@ -22,7 +22,8 @@
           "`DynamicForm`: New items are always created with the default content type if the list has multiple content types [#1626](https://github.com/pnp/sp-dev-fx-controls-react/pull/1626)",
           "`PeoplePicker`:PeoplePicker won't accept Multiple Users with the same name [#1620] (https://github.com/pnp/sp-dev-fx-controls-react/pull/1620)",
           "`DynamicForm`: Dynamic Form accessed TaxonomyFieldTypeMulti without considering sub-array results [#1614](https://github.com/pnp/sp-dev-fx-controls-react/pull/1614)",
-          "`DynamicForm`: Number validations are working, but the percentage values are not getting saved [#1601](https://github.com/pnp/sp-dev-fx-controls-react/pull/1601)"
+          "`DynamicForm`: Number validations are working, but the percentage values are not getting saved [#1601](https://github.com/pnp/sp-dev-fx-controls-react/pull/1601)",
+          "`DynamicForm`: Number validation is preventing form save in certain circumstances, not enabled for currency fields [#1604](https://github.com/pnp/sp-dev-fx-controls-react/issues/1604)"
         ]
       },
       "contributions": [
@@ -33,7 +34,8 @@
         "[Nishkalank Bezawada](https://github.com/NishkalankBezawada)",
         "[Rico van de Ven](https://github.com/RicoNL)",
         "[Steve Beaugé](https://github.com/stevebeauge)",
-        "[wuxiaojun514](https://github.com/wuxiaojun514)"
+        "[wuxiaojun514](https://github.com/wuxiaojun514)",
+        "[Tom G](https://github.com/t0mgerman)"
       ]
     },
     {
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,10 +25,11 @@
 - `PeoplePicker`:PeoplePicker won't accept Multiple Users with the same name [#1620] (https://github.com/pnp/sp-dev-fx-controls-react/pull/1620)
 - `DynamicForm`: Dynamic Form accessed TaxonomyFieldTypeMulti without considering sub-array results [#1614](https://github.com/pnp/sp-dev-fx-controls-react/pull/1614)
 - `DynamicForm`: Number validations are working, but the percentage values are not getting saved [#1601](https://github.com/pnp/sp-dev-fx-controls-react/pull/1601)
+- `DynamicForm`: Number validation is preventing form save in certain circumstances, not enabled for currency fields [#1604](https://github.com/pnp/sp-dev-fx-controls-react/issues/1604)
 
 ### Contributors
 
-Special thanks to our contributors (in alphabetical order): [Guido Zambarda](https://github.com/GuidoZam), [Joakim](https://github.com/daenur76), [Michaël Maillot](https://github.com/michaelmaillot), [Nils Andresen](https://github.com/nils-a), [Nishkalank Bezawada](https://github.com/NishkalankBezawada), [Rico van de Ven](https://github.com/RicoNL), [Steve Beaugé](https://github.com/stevebeauge), [wuxiaojun514](https://github.com/wuxiaojun514).
+Special thanks to our contributors (in alphabetical order): [Guido Zambarda](https://github.com/GuidoZam), [Joakim](https://github.com/daenur76), [Michaël Maillot](https://github.com/michaelmaillot), [Nils Andresen](https://github.com/nils-a), [Nishkalank Bezawada](https://github.com/NishkalankBezawada), [Rico van de Ven](https://github.com/RicoNL), [Steve Beaugé](https://github.com/stevebeauge), [wuxiaojun514](https://github.com/wuxiaojun514), [Tom G](https://github.com/t0mgerman).
 
 ## 3.15.0
 
diff --git a/docs/documentation/docs/about/release-notes.md b/docs/documentation/docs/about/release-notes.md
@@ -25,10 +25,11 @@
 - `PeoplePicker`:PeoplePicker won't accept Multiple Users with the same name [#1620] (https://github.com/pnp/sp-dev-fx-controls-react/pull/1620)
 - `DynamicForm`: Dynamic Form accessed TaxonomyFieldTypeMulti without considering sub-array results [#1614](https://github.com/pnp/sp-dev-fx-controls-react/pull/1614)
 - `DynamicForm`: Number validations are working, but the percentage values are not getting saved [#1601](https://github.com/pnp/sp-dev-fx-controls-react/pull/1601)
+- `DynamicForm`: Number validation is preventing form save in certain circumstances, not enabled for currency fields [#1604](https://github.com/pnp/sp-dev-fx-controls-react/issues/1604)
 
 ### Contributors
 
-Special thanks to our contributors (in alphabetical order): [Guido Zambarda](https://github.com/GuidoZam), [Joakim](https://github.com/daenur76), [Michaël Maillot](https://github.com/michaelmaillot), [Nils Andresen](https://github.com/nils-a), [Nishkalank Bezawada](https://github.com/NishkalankBezawada), [Rico van de Ven](https://github.com/RicoNL), [Steve Beaugé](https://github.com/stevebeauge), [wuxiaojun514](https://github.com/wuxiaojun514).
+Special thanks to our contributors (in alphabetical order): [Guido Zambarda](https://github.com/GuidoZam), [Joakim](https://github.com/daenur76), [Michaël Maillot](https://github.com/michaelmaillot), [Nils Andresen](https://github.com/nils-a), [Nishkalank Bezawada](https://github.com/NishkalankBezawada), [Rico van de Ven](https://github.com/RicoNL), [Steve Beaugé](https://github.com/stevebeauge), [wuxiaojun514](https://github.com/wuxiaojun514), [Tom G](https://github.com/t0mgerman).
 
 ## 3.15.0
 
diff --git a/src/controls/dynamicForm/CurrencyMap.ts b/src/controls/dynamicForm/CurrencyMap.ts
@@ -0,0 +1,249 @@
+export default {
+    AD: 'EUR',
+    AE: 'AED',
+    AF: 'AFN',
+    AG: 'XCD',
+    AI: 'XCD',
+    AL: 'ALL',
+    AM: 'AMD',
+    AO: 'AOA',
+    AR: 'ARS',
+    AS: 'USD',
+    AT: 'EUR',
+    AU: 'AUD',
+    AW: 'AWG',
+    AX: 'EUR',
+    AZ: 'AZN',
+    BA: 'BAM',
+    BB: 'BBD',
+    BD: 'BDT',
+    BE: 'EUR',
+    BF: 'XOF',
+    BG: 'BGN',
+    BH: 'BHD',
+    BI: 'BIF',
+    BJ: 'XOF',
+    BL: 'EUR',
+    BM: 'BMD',
+    BN: 'BND',
+    BO: 'BOB',
+    BQ: 'USD',
+    BR: 'BRL',
+    BS: 'BSD',
+    BT: 'BTN',
+    BV: 'NOK',
+    BW: 'BWP',
+    BY: 'BYN',
+    BZ: 'BZD',
+    CA: 'CAD',
+    CC: 'AUD',
+    CD: 'CDF',
+    CF: 'XAF',
+    CG: 'XAF',
+    CH: 'CHF',
+    CI: 'XOF',
+    CK: 'NZD',
+    CL: 'CLP',
+    CM: 'XAF',
+    CN: 'CNY',
+    CO: 'COP',
+    CR: 'CRC',
+    CU: 'CUP',
+    CV: 'CVE',
+    CW: 'ANG',
+    CX: 'AUD',
+    CY: 'EUR',
+    CZ: 'CZK',
+    DE: 'EUR',
+    DJ: 'DJF',
+    DK: 'DKK',
+    DM: 'XCD',
+    DO: 'DOP',
+    DZ: 'DZD',
+    EC: 'USD',
+    EE: 'EUR',
+    EG: 'EGP',
+    EH: 'MAD',
+    ER: 'ERN',
+    ES: 'EUR',
+    ET: 'ETB',
+    FI: 'EUR',
+    FJ: 'FJD',
+    FK: 'FKP',
+    FM: 'USD',
+    FO: 'DKK',
+    FR: 'EUR',
+    GA: 'XAF',
+    GB: 'GBP',
+    GD: 'XCD',
+    GE: 'GEL',
+    GF: 'EUR',
+    GG: 'GBP',
+    GH: 'GHS',
+    GI: 'GIP',
+    GL: 'DKK',
+    GM: 'GMD',
+    GN: 'GNF',
+    GP: 'EUR',
+    GQ: 'XAF',
+    GR: 'EUR',
+    GS: 'GBP',
+    GT: 'GTQ',
+    GU: 'USD',
+    GW: 'XOF',
+    GY: 'GYD',
+    HK: 'HKD',
+    HM: 'AUD',
+    HN: 'HNL',
+    HR: 'EUR',
+    HT: 'HTG',
+    HU: 'HUF',
+    ID: 'IDR',
+    IE: 'EUR',
+    IL: 'ILS',
+    IM: 'GBP',
+    IN: 'INR',
+    IO: 'USD',
+    IQ: 'IQD',
+    IR: 'IRR',
+    IS: 'ISK',
+    IT: 'EUR',
+    JE: 'GBP',
+    JM: 'JMD',
+    JO: 'JOD',
+    JP: 'JPY',
+    KE: 'KES',
+    KG: 'KGS',
+    KH: 'KHR',
+    KI: 'AUD',
+    KM: 'KMF',
+    KN: 'XCD',
+    KP: 'KPW',
+    KR: 'KRW',
+    KW: 'KWD',
+    KY: 'KYD',
+    KZ: 'KZT',
+    LA: 'LAK',
+    LB: 'LBP',
+    LC: 'XCD',
+    LI: 'CHF',
+    LK: 'LKR',
+    LR: 'LRD',
+    LS: 'LSL',
+    LT: 'EUR',
+    LU: 'EUR',
+    LV: 'EUR',
+    LY: 'LYD',
+    MA: 'MAD',
+    MC: 'EUR',
+    MD: 'MDL',
+    ME: 'EUR',
+    MF: 'EUR',
+    MG: 'MGA',
+    MH: 'USD',
+    MK: 'MKD',
+    ML: 'XOF',
+    MM: 'MMK',
+    MN: 'MNT',
+    MO: 'MOP',
+    MP: 'USD',
+    MQ: 'EUR',
+    MR: 'MRO',
+    MS: 'XCD',
+    MT: 'EUR',
+    MU: 'MUR',
+    MV: 'MVR',
+    MW: 'MWK',
+    MX: 'MXN',
+    MY: 'MYR',
+    MZ: 'MZN',
+    NA: 'NAD',
+    NC: 'XPF',
+    NE: 'XOF',
+    NF: 'AUD',
+    NG: 'NGN',
+    NI: 'NIO',
+    NL: 'EUR',
+    NO: 'NOK',
+    NP: 'NPR',
+    NR: 'AUD',
+    NU: 'NZD',
+    NZ: 'NZD',
+    OM: 'OMR',
+    PA: 'PAB',
+    PE: 'PEN',
+    PF: 'XPF',
+    PG: 'PGK',
+    PH: 'PHP',
+    PK: 'PKR',
+    PL: 'PLN',
+    PM: 'EUR',
+    PN: 'NZD',
+    PR: 'USD',
+    PS: 'ILS',
+    PT: 'EUR',
+    PW: 'USD',
+    PY: 'PYG',
+    QA: 'QAR',
+    RE: 'EUR',
+    RO: 'RON',
+    RS: 'RSD',
+    RU: 'RUB',
+    RW: 'RWF',
+    SA: 'SAR',
+    SB: 'SBD',
+    SC: 'SCR',
+    SD: 'SDG',
+    SE: 'SEK',
+    SG: 'SGD',
+    SH: 'SHP',
+    SI: 'EUR',
+    SJ: 'NOK',
+    SK: 'EUR',
+    SL: 'SLL',
+    SM: 'EUR',
+    SN: 'XOF',
+    SO: 'SOS',
+    SR: 'SRD',
+    ST: 'STD',
+    SV: 'SVC',
+    SX: 'ANG',
+    SY: 'SYP',
+    SZ: 'SZL',
+    TC: 'USD',
+    TD: 'XAF',
+    TF: 'EUR',
+    TG: 'XOF',
+    TH: 'THB',
+    TJ: 'TJS',
+    TK: 'NZD',
+    TL: 'USD',
+    TM: 'TMT',
+    TN: 'TND',
+    TO: 'TOP',
+    TR: 'TRY',
+    TT: 'TTD',
+    TV: 'AUD',
+    TW: 'TWD',
+    TZ: 'TZS',
+    UA: 'UAH',
+    UG: 'UGX',
+    UM: 'USD',
+    US: 'USD',
+    UY: 'UYU',
+    UZ: 'UZS',
+    VA: 'EUR',
+    VC: 'XCD',
+    VE: 'VEF',
+    VG: 'USD',
+    VI: 'USD',
+    VN: 'VND',
+    VU: 'VUV',
+    WF: 'XPF',
+    WS: 'WST',
+    YE: 'YER',
+    YT: 'EUR',
+    ZA: 'ZAR',
+    ZM: 'ZMW',
+    ZW: 'ZWL'
+    };
diff --git a/src/controls/dynamicForm/DynamicForm.tsx b/src/controls/dynamicForm/DynamicForm.tsx
@@ -1,4 +1,6 @@
 /* eslint-disable @microsoft/spfx/no-async-await */
+import { SPHttpClient } from "@microsoft/sp-http";
+import { IInstalledLanguageInfo, sp } from "@pnp/sp/presets/all";
 import * as strings from "ControlStrings";
 import {
   DefaultButton,
@@ -888,6 +890,12 @@ export class DynamicForm extends React.Component<
         disabledFields
       );
 
+      // Get installed languages for Currency fields
+      let installedLanguages: IInstalledLanguageInfo[];
+      if (tempFields.filter(f => f.fieldType === "Currency").length > 0) {
+        installedLanguages = await sp.web.regionalSettings.getInstalledLanguages();        
+      }
+
       this.setState({
         clientValidationFormulas,
         fieldCollection: tempFields,
diff --git a/src/controls/dynamicForm/IDynamicFormState.ts b/src/controls/dynamicForm/IDynamicFormState.ts
@@ -1,4 +1,5 @@
 
+import { IInstalledLanguageInfo } from '@pnp/sp/regional-settings';
 import { ISPField } from '../../common/SPEntities';
 import { MessageBarType } from 'office-ui-fabric-react/lib/MessageBar';
 import { ICustomFormattingBodySection, ICustomFormattingNode } from '../../common/utilities/ICustomFormatting';
@@ -10,6 +11,7 @@ export interface IDynamicFormState {
   }[];
   /** Form and List Item data */
   fieldCollection: IDynamicFieldProps[];
+  installedLanguages?: IInstalledLanguageInfo[];
   /** Validation Formulas set in List Column settings */
   validationFormulas: Record<string, Pick<ISPField, 'ValidationFormula' | 'ValidationMessage'>>;
   /** Field Show / Hide Validation Formulas, set in Edit Form > Edit Columns > Edit Conditional Formula */
diff --git a/src/controls/dynamicForm/dynamicField/DynamicField.tsx b/src/controls/dynamicForm/dynamicField/DynamicField.tsx
diff --git a/src/controls/dynamicForm/dynamicField/IDynamicFieldProps.ts b/src/controls/dynamicForm/dynamicField/IDynamicFieldProps.ts

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,8 @@`
`22`	`22`	"`DynamicForm`: New items are always created with the default content type if the list has multiple content types [#1626](https://github.com/pnp/sp-dev-fx-controls-react/pull/1626)",
`23`	`23`	"`PeoplePicker`:PeoplePicker won't accept Multiple Users with the same name [#1620] (https://github.com/pnp/sp-dev-fx-controls-react/pull/1620)",
`24`	`24`	"`DynamicForm`: Dynamic Form accessed TaxonomyFieldTypeMulti without considering sub-array results [#1614](https://github.com/pnp/sp-dev-fx-controls-react/pull/1614)",
`25`		- "`DynamicForm`: Number validations are working, but the percentage values are not getting saved [#1601](https://github.com/pnp/sp-dev-fx-controls-react/pull/1601)"
	`25`	+ "`DynamicForm`: Number validations are working, but the percentage values are not getting saved [#1601](https://github.com/pnp/sp-dev-fx-controls-react/pull/1601)",
	`26`	+ "`DynamicForm`: Number validation is preventing form save in certain circumstances, not enabled for currency fields [#1604](https://github.com/pnp/sp-dev-fx-controls-react/issues/1604)"
`26`	`27`	`]`
`27`	`28`	`},`
`28`	`29`	`"contributions": [`
`@@ -33,7 +34,8 @@`
`33`	`34`	`"[Nishkalank Bezawada](https://github.com/NishkalankBezawada)",`
`34`	`35`	`"[Rico van de Ven](https://github.com/RicoNL)",`
`35`	`36`	`"[Steve Beaugé](https://github.com/stevebeauge)",`
`36`		`- "[wuxiaojun514](https://github.com/wuxiaojun514)"`
	`37`	`+ "[wuxiaojun514](https://github.com/wuxiaojun514)",`
	`38`	`+ "[Tom G](https://github.com/t0mgerman)"`
`37`	`39`	`]`
`38`	`40`	`},`
`39`	`41`	`{`