Revert "feat: Use country-state-city to populate state dropdown in StateProvi…" (#855)

This reverts commit 58cde5d.

Author: julianajlk

package-lock.json

@@ -47,7 +47,6 @@
     "bootstrap": "4.6.1",
     "classnames": "^2.3.1",
     "core-js": "^3.23.5",
-    "country-state-city": "^3.2.1",
     "form-urlencoded": "^6.0.6",
     "lodash.camelcase": "^4.3.0",
     "lodash.snakecase": "^4.1.1",

package.json

@@ -3,16 +3,16 @@ import PropTypes from 'prop-types';
 import { Field } from 'redux-form';
 import { injectIntl, intlShape, FormattedMessage } from '@edx/frontend-platform/i18n';
 
-import { getCountryStatesMap } from './utils/form-validators';
 import FormInput from './FormInput';
 import FormSelect from './FormSelect';
+import getStates from './utils/countryStatesMap';
 import messages from './StateProvinceFormInput.messages';
 
 class StateProvinceFormInput extends React.Component {
   getOptions() {
     const options = [];
     const { country } = this.props;
-    const states = getCountryStatesMap(country);
+    const states = getStates(country);
 
     if (states) {
       options.push([(

src/payment/checkout/payment-form/StateProvinceFormInput.jsx

@@ -128,35 +128,16 @@ describe('<StripePaymentForm />', () => {
           lastName: '',
           address: '',
           city: '',
-          country: 'AQ', // Antarctica does not have states, postal code not required
-          optionalField: '',
-        },
-        {
-          firstName: '',
-          lastName: '',
-          address: '',
-          city: '',
-          country: 'GB', // United Kingdom has states, state becomes required, postal code is required
+          country: 'GB',
           postalCode: '',
-          state: '',
-          optionalField: '',
-        },
-        {
-          firstName: '',
-          lastName: '',
-          address: '',
-          city: '',
-          country: 'CA', // Canada state and postal code are required
-          postalCode: '',
-          state: '',
           optionalField: '',
         },
         {
           firstName: '',
           lastName: '',
           address: '',
           city: '',
-          country: 'US', // United States state and postal code are required
+          country: 'US',
           postalCode: '',
           state: '',
           optionalField: '',
@@ -166,7 +147,7 @@ describe('<StripePaymentForm />', () => {
           lastName: '',
           address: '',
           city: '',
-          country: 'IN', // India state is required
+          country: 'IN',
           state: '',
           optionalField: '',
         },

src/payment/checkout/payment-form/StripePaymentForm.test.jsx

@@ -0,0 +1,115 @@
+const COUNTRY_STATES_MAP = {
+  CA: {
+    AB: 'Alberta',
+    BC: 'British Columbia',
+    MB: 'Manitoba',
+    NB: 'New Brunswick',
+    NL: 'Newfoundland and Labrador',
+    NS: 'Nova Scotia',
+    NT: 'Northwest Territories',
+    NU: 'Nunavut',
+    ON: 'Ontario',
+    PE: 'Prince Edward Island',
+    QC: 'Québec',
+    SK: 'Saskatchewan',
+    YT: 'Yukon',
+  },
+  IN: {
+    AN: 'Andaman and Nicobar Islands',
+    AP: 'Andhra Pradesh',
+    AR: 'Arunachal Pradesh',
+    AS: 'Assam',
+    BR: 'Bihar',
+    CH: 'Chandigarh',
+    CT: 'Chhattisgarh',
+    DN: 'Dadra and Nagar Haveli',
+    DD: 'Daman and Diu',
+    DL: 'Delhi',
+    GA: 'Goa',
+    GJ: 'Gujarat',
+    HR: 'Haryana',
+    HP: 'Himachal Pradesh',
+    JK: 'Jammu and Kashmir',
+    JH: 'Jharkhand',
+    KA: 'Karnataka',
+    KL: 'Kerala',
+    LD: 'Lakshadweep',
+    MP: 'Madhya Pradesh',
+    MH: 'Maharashtra',
+    MN: 'Manipur',
+    ML: 'Meghalaya',
+    MZ: 'Mizoram',
+    NL: 'Nagaland',
+    OR: 'Odisha',
+    PY: 'Puducherry',
+    PB: 'Punjab',
+    RJ: 'Rajasthan',
+    SK: 'Sikkim',
+    TN: 'Tamil Nadu',
+    TG: 'Telangana',
+    TR: 'Tripura',
+    UP: 'Uttar Pradesh',
+    UT: 'Uttarakhand',
+    WB: 'West Bengal',
+  },
+  US: {
+    AL: 'Alabama',
+    AK: 'Alaska',
+    AZ: 'Arizona',
+    AR: 'Arkansas',
+    AA: 'Armed Forces Americas',
+    AE: 'Armed Forces Europe',
+    AP: 'Armed Forces Pacific',
+    CA: 'California',
+    CO: 'Colorado',
+    CT: 'Connecticut',
+    DE: 'Delaware',
+    DC: 'District Of Columbia',
+    FL: 'Florida',
+    GA: 'Georgia',
+    HI: 'Hawaii',
+    ID: 'Idaho',
+    IL: 'Illinois',
+    IN: 'Indiana',
+    IA: 'Iowa',
+    KS: 'Kansas',
+    KY: 'Kentucky',
+    LA: 'Louisiana',
+    ME: 'Maine',
+    MD: 'Maryland',
+    MA: 'Massachusetts',
+    MI: 'Michigan',
+    MN: 'Minnesota',
+    MS: 'Mississippi',
+    MO: 'Missouri',
+    MT: 'Montana',
+    NE: 'Nebraska',
+    NV: 'Nevada',
+    NH: 'New Hampshire',
+    NJ: 'New Jersey',
+    NM: 'New Mexico',
+    NY: 'New York',
+    NC: 'North Carolina',
+    ND: 'North Dakota',
+    OH: 'Ohio',
+    OK: 'Oklahoma',
+    OR: 'Oregon',
+    PA: 'Pennsylvania',
+    RI: 'Rhode Island',
+    SC: 'South Carolina',
+    SD: 'South Dakota',
+    TN: 'Tennessee',
+    TX: 'Texas',
+    UT: 'Utah',
+    VT: 'Vermont',
+    VA: 'Virginia',
+    WA: 'Washington',
+    WV: 'West Virginia',
+    WI: 'Wisconsin',
+    WY: 'Wyoming',
+  },
+};
+
+export default function getStates(country) {
+  return country && COUNTRY_STATES_MAP[country.toUpperCase()];
+}

src/payment/checkout/payment-form/utils/countryStatesMap.js

@@ -1,18 +1,4 @@
-// eslint-disable-next-line import/no-extraneous-dependencies
-import { State } from 'country-state-city';
-
-export const getCountryStatesMap = (country) => {
-  const states = State.getStatesOfCountry(country);
-
-  if (!states.length) {
-    return null;
-  }
-  const statesMap = {};
-  states.forEach((state) => {
-    statesMap[state.isoCode] = state.name;
-  });
-  return country && statesMap;
-};
+import getStates from './countryStatesMap';
 
 // eslint-disable-next-line import/prefer-default-export
 export function isPostalCodeRequired(selectedCountry) {
@@ -53,9 +39,7 @@ export function getRequiredFields(fieldValues, isBulkOrder = false, enableStripe
     requiredFields.postalCode = postalCode;
   }
 
-  // By using the country-state-city library to populate states, every country that
-  //  has states from the ISO 3166-2 list will have states as a required field
-  if (getCountryStatesMap(country)) {
+  if (getStates(country)) {
     requiredFields.state = state;
   }