Merge pull request Expensify#46961 from rezkiy37/fix/45166-report-fie…

…ld-list-values-pattern-a Use Offline Pattern A for report field list values
brunovjk · Aug 13, 2024 · f185c4d · f185c4d
2 parents 213c15d + 4cb0191
commit f185c4d
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 301 deletions.
diff --git a/src/libs/actions/Policy/ReportField.ts b/src/libs/actions/Policy/ReportField.ts
@@ -390,46 +390,21 @@ function updateReportFieldListValueEnabled(policyID: string, reportFieldID: stri
         }
     });
 
+    // We are using the offline pattern A (optimistic without feedback)
     const onyxData: OnyxData = {
         optimisticData: [
             {
                 key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
                 onyxMethod: Onyx.METHOD.MERGE,
                 value: {
                     fieldList: {
-                        [fieldKey]: {...updatedReportField, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE},
-                    },
-                    errorFields: null,
-                },
-            },
-        ],
-        successData: [
-            {
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                onyxMethod: Onyx.METHOD.MERGE,
-                value: {
-                    fieldList: {
-                        [fieldKey]: {pendingAction: null},
-                    },
-                    errorFields: null,
-                },
-            },
-        ],
-        failureData: [
-            {
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                onyxMethod: Onyx.METHOD.MERGE,
-                value: {
-                    fieldList: {
-                        [fieldKey]: {...reportField, pendingAction: null},
-                    },
-                    errorFields: {
-                        [fieldKey]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.reportFields.genericFailureMessage'),
+                        [fieldKey]: updatedReportField,
                     },
                 },
             },
         ],
     };
+
     const parameters: EnableWorkspaceReportFieldListValueParams = {
         policyID,
         reportFields: JSON.stringify([updatedReportField]),
@@ -450,44 +425,15 @@ function addReportFieldListValue(policyID: string, reportFieldID: string, valueN
     updatedReportField.values.push(valueName);
     updatedReportField.disabledOptions.push(false);
 
+    // We are using the offline pattern A (optimistic without feedback)
     const onyxData: OnyxData = {
         optimisticData: [
             {
                 key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
                 onyxMethod: Onyx.METHOD.MERGE,
                 value: {
                     fieldList: {
-                        [reportFieldKey]: {
-                            ...updatedReportField,
-                            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
-                        },
-                    },
-                    errorFields: null,
-                },
-            },
-        ],
-        successData: [
-            {
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                onyxMethod: Onyx.METHOD.MERGE,
-                value: {
-                    fieldList: {
-                        [reportFieldKey]: {pendingAction: null},
-                    },
-                    errorFields: null,
-                },
-            },
-        ],
-        failureData: [
-            {
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                onyxMethod: Onyx.METHOD.MERGE,
-                value: {
-                    fieldList: {
-                        [reportFieldKey]: {...reportField, pendingAction: null},
-                    },
-                    errorFields: {
-                        [reportFieldKey]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.reportFields.genericFailureMessage'),
+                        [reportFieldKey]: updatedReportField,
                     },
                 },
             },
@@ -524,44 +470,15 @@ function removeReportFieldListValue(policyID: string, reportFieldID: string, val
             updatedReportField.disabledOptions.splice(valueIndex, 1);
         });
 
+    // We are using the offline pattern A (optimistic without feedback)
     const onyxData: OnyxData = {
         optimisticData: [
             {
                 key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
                 onyxMethod: Onyx.METHOD.MERGE,
                 value: {
                     fieldList: {
-                        [reportFieldKey]: {
-                            ...updatedReportField,
-                            pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE,
-                        },
-                    },
-                    errorFields: null,
-                },
-            },
-        ],
-        successData: [
-            {
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                onyxMethod: Onyx.METHOD.MERGE,
-                value: {
-                    fieldList: {
-                        [reportFieldKey]: {pendingAction: null},
-                    },
-                    errorFields: null,
-                },
-            },
-        ],
-        failureData: [
-            {
-                key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`,
-                onyxMethod: Onyx.METHOD.MERGE,
-                value: {
-                    fieldList: {
-                        [reportFieldKey]: {...reportField, pendingAction: null},
-                    },
-                    errorFields: {
-                        [reportFieldKey]: ErrorUtils.getMicroSecondOnyxErrorWithTranslationKey('workspace.reportFields.genericFailureMessage'),
+                        [reportFieldKey]: updatedReportField,
                     },
                 },
             },

diff --git a/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx b/src/pages/workspace/reportFields/ReportFieldsListValuesPage.tsx
@@ -94,7 +94,6 @@ function ReportFieldsListValuesPage({
                 keyForList: value,
                 isSelected: selectedValues[value] && canSelectMultiple,
                 enabled: !disabledListValues[index] ?? true,
-                pendingAction: reportFieldID ? policy?.fieldList?.[ReportUtils.getReportFieldKey(reportFieldID)]?.pendingAction : null,
                 rightElement: (
                     <ListItemRightCaretWithLabel
                         shouldShowCaret={false}
@@ -104,7 +103,7 @@ function ReportFieldsListValuesPage({
             }))
             .sort((a, b) => localeCompare(a.value, b.value));
         return [{data, isDisabled: false}];
-    }, [disabledListValues, listValues, policy?.fieldList, reportFieldID, selectedValues, canSelectMultiple, translate]);
+    }, [canSelectMultiple, disabledListValues, listValues, selectedValues, translate]);
 
     const shouldShowEmptyState = Object.values(listValues ?? {}).length <= 0;
     const selectedValuesArray = Object.keys(selectedValues).filter((key) => selectedValues[key]);