Update contants names

CruGlobal · Jun 28, 2024 · 8375d61 · 8375d61
1 parent b3e0d9a
commit 8375d61
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 22 deletions.
diff --git a/src/components/Constants/LoadConstants.graphql b/src/components/Constants/LoadConstants.graphql
@@ -13,7 +13,7 @@ query LoadConstants {
       nativeName
       shortName
     }
-    likelyToGiveOptions {
+    likelyToGive {
       id
       value
     }
@@ -24,12 +24,12 @@ query LoadConstants {
     #   id
     #   value
     # }
-    pledgeCurrencies {
+    pledgeCurrency {
       codeSymbolString
       name
       code
     }
-    pledgeFrequencies {
+    pledgeFrequency {
       id
       key
       value
@@ -46,11 +46,11 @@ query LoadConstants {
       id
       value
     }
-    sendNewsletterOptions {
+    newsletter {
       id
       value
     }
-    statuses {
+    status {
       id
       value
     }

diff --git a/src/components/Constants/UseApiConstants.test.tsx b/src/components/Constants/UseApiConstants.test.tsx
@@ -12,7 +12,7 @@ describe('LoadConstants', () => {
 
     expect(result.current?.activities).toBeTruthy();
     expect(result.current?.languages).toBeTruthy();
-    expect(result.current?.likelyToGiveOptions).toBeTruthy();
+    expect(result.current?.likelyToGive).toBeTruthy();
     expect(result.current?.locations).toBeTruthy();
   });
 });
diff --git a/...ctDonationsTab/PartnershipInfo/EditPartnershipInfoModal/EditPartnershipInfoModal.test.tsx b/...ctDonationsTab/PartnershipInfo/EditPartnershipInfoModal/EditPartnershipInfoModal.test.tsx
@@ -368,7 +368,7 @@ describe('EditPartnershipInfoModal', () => {
               mocks={{
                 LoadConstants: {
                   constant: {
-                    pledgeCurrencies: [
+                    pledgeCurrency: [
                       {
                         code: 'CAD',
                         codeSymbolString: 'CAD ($)',
@@ -470,7 +470,7 @@ describe('EditPartnershipInfoModal', () => {
               mocks={{
                 LoadConstants: {
                   constant: {
-                    pledgeCurrencies: [
+                    pledgeCurrency: [
                       {
                         id: 'CAD',
                         value: 'CAD ($)',
@@ -696,7 +696,7 @@ describe('EditPartnershipInfoModal', () => {
               mocks={{
                 LoadConstants: {
                   constant: {
-                    pledgeCurrencies: [
+                    pledgeCurrency: [
                       {
                         id: 'CAD',
                         value: 'CAD ($)',

diff --git a/...ContactDonationsTab/PartnershipInfo/EditPartnershipInfoModal/EditPartnershipInfoModal.tsx b/...ContactDonationsTab/PartnershipInfo/EditPartnershipInfoModal/EditPartnershipInfoModal.tsx
@@ -141,7 +141,7 @@ export const EditPartnershipInfoModal: React.FC<
 
   const [updateContactPartnership, { loading: updating }] =
     useUpdateContactPartnershipMutation();
-  const pledgeCurrencies = constants?.pledgeCurrencies;
+  const pledgeCurrencies = constants?.pledgeCurrency;
 
   const onSubmit = async (attributes: Attributes) => {
     const removedReferrals = contact.contactReferralsToMe.nodes

diff --git a/...ents/Contacts/ContactDetails/ContactDonationsTab/PartnershipInfo/PartnershipInfo.test.tsx b/...ents/Contacts/ContactDetails/ContactDonationsTab/PartnershipInfo/PartnershipInfo.test.tsx
@@ -61,7 +61,7 @@ describe('PartnershipInfo', () => {
                   result: {
                     data: {
                       constant: {
-                        statuses: [
+                        status: [
                           {
                             id: StatusEnum.PartnerFinancial,
                             value: 'Principal - Financial',

diff --git a/...omponents/Contacts/ContactDetails/ContactDonationsTab/PartnershipInfo/PartnershipInfo.tsx b/...omponents/Contacts/ContactDetails/ContactDonationsTab/PartnershipInfo/PartnershipInfo.tsx
@@ -71,11 +71,11 @@ export const PartnershipInfo: React.FC<PartnershipInfoProp> = ({ contact }) => {
   const { data } = useLoadConstantsQuery();
   const constants = data?.constant;
   const [status, setStatus] = React.useState(
-    constants?.statuses?.find(({ id }) => id === contact?.status),
+    constants?.status?.find(({ id }) => id === contact?.status),
   );
 
   React.useEffect(() => {
-    setStatus(constants?.statuses?.find(({ id }) => id === contact?.status));
+    setStatus(constants?.status?.find(({ id }) => id === contact?.status));
   }, [data?.constant]);
 
   const [editPartnershipModalOpen, setEditPartnershipModalOpen] =

diff --git a/src/components/Contacts/ContactFlow/ContactFlowColumn/ContactFlowColumn.tsx b/src/components/Contacts/ContactFlow/ContactFlowColumn/ContactFlowColumn.tsx
@@ -79,7 +79,7 @@ export const ContactFlowColumn: React.FC<Props> = ({
   const { data: constants } = useLoadConstantsQuery({});
   const statusesStructured =
     statuses.map((status) =>
-      constants?.constant.statuses?.find((constant) => constant.id === status),
+      constants?.constant.status?.find((constant) => constant.id === status),
     ) || [];
 
   const cardContentRef = useRef<HTMLDivElement>();
@@ -157,7 +157,7 @@ export const ContactFlowColumn: React.FC<Props> = ({
                 id={contact.id}
                 name={contact.name}
                 status={
-                  constants?.constant.statuses?.find(
+                  constants?.constant.status?.find(
                     (constant) => constant.id === contact.status,
                   ) || nullStatus
                 }

diff --git a/src/components/Contacts/MassActions/EditFields/MassActionsEditFieldsModal.tsx b/src/components/Contacts/MassActions/EditFields/MassActionsEditFieldsModal.tsx
@@ -319,7 +319,7 @@ export const MassActionsEditFieldsModal: React.FC<
                       </MenuItem>
                       {!loadingConstants &&
                         getPledgeCurrencyOptions(
-                          constants?.constant?.pledgeCurrencies,
+                          constants?.constant?.pledgeCurrency,
                         )}
                     </Select>
                   </FormControl>

diff --git a/src/components/EditDonationModal/EditDonationModal.tsx b/src/components/EditDonationModal/EditDonationModal.tsx
@@ -71,7 +71,7 @@ export const EditDonationModal: React.FC<EditDonationModalProps> = ({
   const accountListId = useAccountListId() ?? '';
   const constants = useApiConstants();
 
-  const pledgeCurrencies = constants?.pledgeCurrencies;
+  const pledgeCurrencies = constants?.pledgeCurrency;
 
   const {
     data: appeals,

diff --git a/src/components/Layouts/Primary/TopBar/Items/AddMenu/Items/AddDonation/AddDonation.tsx b/src/components/Layouts/Primary/TopBar/Items/AddMenu/Items/AddDonation/AddDonation.tsx
@@ -130,7 +130,7 @@ export const AddDonation = ({
     ],
   });
 
-  const pledgeCurrencies = constants?.pledgeCurrencies;
+  const pledgeCurrencies = constants?.pledgeCurrency;
 
   const designationAccounts =
     designationAccountsData?.designationAccounts?.flatMap(

diff --git a/src/components/Reports/FourteenMonthReports/FourteenMonthReport.tsx b/src/components/Reports/FourteenMonthReports/FourteenMonthReport.tsx
@@ -178,7 +178,7 @@ export const FourteenMonthReport: React.FC<Props> = ({
           contact.status ?? '',
           contact.pledgeAmount ?? '',
           contact.pledgeCurrency ?? '',
-          apiConstants?.pledgeFrequencies?.find(
+          apiConstants?.pledgeFrequency?.find(
             ({ key }) => key === contact.pledgeFrequency,
           )?.value ?? '',
           pledgedMonthlyEquivalent,

diff --git a/src/components/Reports/FourteenMonthReports/Layout/Table/Table.tsx b/src/components/Reports/FourteenMonthReports/Layout/Table/Table.tsx
@@ -146,7 +146,7 @@ export const FourteenMonthReportTable: React.FC<
                           Math.round(contact.pledgeAmount),
                           locale,
                         )} ${contact.pledgeCurrency} ${
-                          apiConstants?.pledgeFrequencies?.find(
+                          apiConstants?.pledgeFrequency?.find(
                             ({ key }) => key === contact.pledgeFrequency,
                           )?.value ?? ''
                         }`}

diff --git a/src/components/Settings/preferences/accordions/CurrencyAccordion/CurrencyAccordion.test.tsx b/src/components/Settings/preferences/accordions/CurrencyAccordion/CurrencyAccordion.test.tsx
@@ -46,7 +46,7 @@ const Components: React.FC<ComponentsProps> = ({ currency, expandedPanel }) => (
           mocks={{
             LoadConstants: {
               constant: {
-                pledgeCurrencies: [
+                pledgeCurrency: [
                   {
                     code: 'CAD',
                     codeSymbolString: 'CAD ($)',

diff --git a/src/components/Settings/preferences/accordions/CurrencyAccordion/CurrencyAccordion.tsx b/src/components/Settings/preferences/accordions/CurrencyAccordion/CurrencyAccordion.tsx
@@ -34,7 +34,7 @@ export const CurrencyAccordion: React.FC<CurrencyAccordionProps> = ({
   const { enqueueSnackbar } = useSnackbar();
   const [updateAccountPreferences] = useUpdateAccountPreferencesMutation();
   const constants = useApiConstants();
-  const currencies = constants?.pledgeCurrencies ?? [];
+  const currencies = constants?.pledgeCurrency ?? [];
   const label = t('Default Currency');
 
   const onSubmit = async (