Skip to content

fix: hide disabled list report fields #57923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neil-marcellini merged 4 commits into from
Mar 27, 2025
Merged

fix: hide disabled list report fields #57923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9641b55
fix: hide disabled list report fields
daledah Mar 6, 2025
1e71655
fix: test
daledah Mar 6, 2025
569a17c
refactor: remove duplicate code
daledah Mar 7, 2025
1a58a8c
Merge branch 'main' into fix/56949
daledah Mar 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/components/ReportActionItem/MoneyReportView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import {
} from '@libs/ReportUtils';
import AnimatedEmptyStateBackground from '@pages/home/report/AnimatedEmptyStateBackground';
import variables from '@styles/variables';
import CONST from '@src/CONST';
import {clearReportFieldKeyErrors} from '@src/libs/actions/Report';
import ONYXKEYS from '@src/ONYXKEYS';
import ROUTES from '@src/ROUTES';
Expand Down Expand Up @@ -95,7 +96,19 @@ function MoneyReportView({report, policy, isCombinedReport = false, shouldShowTo
const isClosedExpenseReportWithNoExpenses = isClosedExpenseReportWithNoExpensesReportUtils(report);
const isPaidGroupPolicyExpenseReport = isPaidGroupPolicyExpenseReportUtils(report);
const isInvoiceReport = isInvoiceReportUtils(report);
const shouldShowReportField = !isClosedExpenseReportWithNoExpenses && (isPaidGroupPolicyExpenseReport || isInvoiceReport) && (!isCombinedReport || !isOnlyTitleFieldEnabled);

const shouldHideSingleReportField = (reportField: PolicyReportField) => {
const fieldValue = reportField.value ?? reportField.defaultValue;
const hasEnableOption = reportField.type !== CONST.REPORT_FIELD_TYPES.LIST || reportField.disabledOptions.some((option) => !option);

return isReportFieldOfTypeTitle(reportField) || (!fieldValue && !hasEnableOption);
};

const shouldShowReportField =
!isClosedExpenseReportWithNoExpenses &&
(isPaidGroupPolicyExpenseReport || isInvoiceReport) &&
(!isCombinedReport || !isOnlyTitleFieldEnabled) &&
!sortedPolicyReportFields.every(shouldHideSingleReportField);

const renderThreadDivider = useMemo(
() =>
Expand Down Expand Up @@ -123,7 +136,7 @@ function MoneyReportView({report, policy, isCombinedReport = false, shouldShowTo
policy?.areReportFieldsEnabled &&
(!isCombinedReport || !isOnlyTitleFieldEnabled) &&
sortedPolicyReportFields.map((reportField) => {
if (isReportFieldOfTypeTitle(reportField)) {
if (shouldHideSingleReportField(reportField)) {
return null;
}

Expand Down
11 changes: 3 additions & 8 deletions src/libs/actions/Policy/ReportField.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ function createReportField(policyID: string, {name, type, initialValue}: CreateR
const previousFieldList = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]?.fieldList ?? {};
const fieldID = WorkspaceReportFieldUtils.generateFieldID(name);
const fieldKey = ReportUtils.getReportFieldKey(fieldID);
const newReportField: Omit<OnyxValueWithOfflineFeedback<PolicyReportField>, 'value'> = {
const optimisticReportFieldDataForPolicy: Omit<OnyxValueWithOfflineFeedback<PolicyReportField>, 'value'> = {
name,
type,
defaultValue: initialValue,
Expand All @@ -182,11 +182,6 @@ function createReportField(policyID: string, {name, type, initialValue}: CreateR
isTax: false,
};

const optimisticReportFieldDataForPolicy: OnyxValueWithOfflineFeedback<PolicyReportField> = {
...newReportField,
value: type === CONST.REPORT_FIELD_TYPES.LIST ? CONST.REPORT_FIELD_TYPES.LIST : null,
};

const policyExpenseReports = Object.values(allReports ?? {}).filter((report) => report?.policyID === policyID && report.type === CONST.REPORT.TYPE.EXPENSE) as Report[];

const optimisticData = [
Expand All @@ -205,7 +200,7 @@ function createReportField(policyID: string, {name, type, initialValue}: CreateR
onyxMethod: Onyx.METHOD.MERGE,
value: {
fieldList: {
[fieldKey]: {...newReportField, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
[fieldKey]: {...optimisticReportFieldDataForPolicy, pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD},
},
},
})),
Expand Down Expand Up @@ -254,7 +249,7 @@ function createReportField(policyID: string, {name, type, initialValue}: CreateR

const parameters: CreateWorkspaceReportFieldParams = {
policyID,
reportFields: JSON.stringify([newReportField]),
reportFields: JSON.stringify([optimisticReportFieldDataForPolicy]),
};

API.write(WRITE_COMMANDS.CREATE_WORKSPACE_REPORT_FIELD, parameters, onyxData);
Expand Down
1 change: 0 additions & 1 deletion tests/actions/ReportFieldTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ describe('actions/ReportField', () => {
externalIDs: [],
isTax: false,
pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD,
value: CONST.REPORT_FIELD_TYPES.LIST,
};
const createReportFieldArguments: CreateReportFieldArguments = {
name: reportFieldName,
Expand Down