Skip to content
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

Jump to bottom

Migrate withWritableReportOrNotFound from withOnyx to useOnyx #49200

Merged
merged 10 commits into from
Sep 26, 2024
Merged

Migrate withWritableReportOrNotFound from withOnyx to useOnyx #49200

Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
90968b8
chore: migrate withWritableReportOrNotFound from withOnyx to useOnyx
abhinaybathina Sep 14, 2024
bd4712a
chore: update TypeScript types
abhinaybathina Sep 19, 2024
676c588
Merge branch 'main' of https://github.com/Expensify/App into 49110-mi…
abhinaybathina Sep 19, 2024
0415fe3
minor: refactor
abhinaybathina Sep 19, 2024
ed9659d
chore: code review changes
abhinaybathina Sep 19, 2024
185504b
chore: move useOnyx calls to top for readability and use '-1' instead…
abhinaybathina Sep 19, 2024
69aba44
fix: create a variable for reportOrDefault to pass report as it is to…
abhinaybathina Sep 20, 2024
eb18337
Merge branch 'main' of https://github.com/Expensify/App into 49110-mi…
abhinaybathina Sep 20, 2024
f616bab
chore: don't pass isLoadingApp into the wrapped component
abhinaybathina Sep 21, 2024
edf4ee7
refactor: remove reportOrDraft variable and pass default value to can…
abhinaybathina Sep 23, 2024
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
36 changes: 16 additions & 20 deletions src/pages/iou/request/step/withWritableReportOrNotFound.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type {RouteProp} from '@react-navigation/core';
import type {ComponentType, ForwardedRef, RefAttributes} from 'react';
import React, {forwardRef, useEffect} from 'react';
import type {OnyxEntry} from 'react-native-onyx';
import {withOnyx} from 'react-native-onyx';
import {useOnyx} from 'react-native-onyx';
import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView';
import FullScreenLoadingIndicator from '@components/FullscreenLoadingIndicator';
import getComponentDisplayName from '@libs/getComponentDisplayName';
Expand All @@ -18,9 +18,6 @@ type WithWritableReportOrNotFoundOnyxProps = {
/** The report corresponding to the reportID in the route params */
report: OnyxEntry<Report>;

/** Whether the reports are loading. When false it means they are ready to be used. */
isLoadingApp: OnyxEntry<boolean>;

/** The draft report corresponding to the reportID in the route params */
reportDraft: OnyxEntry<Report>;
};
Expand Down Expand Up @@ -54,16 +51,23 @@ export default function <TProps extends WithWritableReportOrNotFoundProps<MoneyR
shouldIncludeDeprecatedIOUType = false,
): React.ComponentType<Omit<TProps & RefAttributes<TRef>, keyof WithWritableReportOrNotFoundOnyxProps>> {
// eslint-disable-next-line rulesdir/no-negated-variables
function WithWritableReportOrNotFound(props: TProps, ref: ForwardedRef<TRef>) {
const {report = {reportID: ''}, route, isLoadingApp = true, reportDraft} = props;
function WithWritableReportOrNotFound(props: Omit<TProps, keyof WithWritableReportOrNotFoundOnyxProps>, ref: ForwardedRef<TRef>) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We must remove OnyxProps https://github.com/Expensify/App/blob/main/contributingGuides/STYLE.md#hooks-and-hocs

This comment was marked as outdated.

Sign in to view

const {route} = props;
const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID ?? '-1'}`);
const [isLoadingApp = true] = useOnyx(ONYXKEYS.IS_LOADING_APP);
const [reportDraft] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT_DRAFT}${route.params.reportID ?? '-1'}`);
abhinaybathina marked this conversation as resolved.
Show resolved Hide resolved

const reportOrDefault = report ?? {reportID: ''};
abhinaybathina marked this conversation as resolved.
Show resolved Hide resolved

const iouTypeParamIsInvalid = !Object.values(CONST.IOU.TYPE)
.filter((type) => shouldIncludeDeprecatedIOUType || (type !== CONST.IOU.TYPE.REQUEST && type !== CONST.IOU.TYPE.SEND))
.includes(route.params?.iouType);
const isEditing = 'action' in route.params && route.params?.action === CONST.IOU.ACTION.EDIT;
const canUserPerformWriteAction = ReportUtils.canUserPerformWriteAction(report);

const canUserPerformWriteAction = ReportUtils.canUserPerformWriteAction(reportOrDefault);

useEffect(() => {
if (!!report?.reportID || !route.params.reportID || !!reportDraft || !isEditing) {
if (!!reportOrDefault?.reportID || !route.params.reportID || !!reportDraft || !isEditing) {
return;
}
ReportActions.openReport(route.params.reportID);
Expand All @@ -81,25 +85,17 @@ export default function <TProps extends WithWritableReportOrNotFoundProps<MoneyR
return (
<WrappedComponent
// eslint-disable-next-line react/jsx-props-no-spreading
{...props}
{...(props as TProps)}
report={report}
reportDraft={reportDraft}
ref={ref}
/>
);
}

WithWritableReportOrNotFound.displayName = `withWritableReportOrNotFound(${getComponentDisplayName(WrappedComponent)})`;

return withOnyx<TProps & RefAttributes<TRef>, WithWritableReportOrNotFoundOnyxProps>({
report: {
key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT}${route.params.reportID ?? '-1'}`,
},
isLoadingApp: {
key: ONYXKEYS.IS_LOADING_APP,
},
reportDraft: {
key: ({route}) => `${ONYXKEYS.COLLECTION.REPORT_DRAFT}${route.params.reportID ?? '-1'}`,
},
})(forwardRef(WithWritableReportOrNotFound));
return forwardRef(WithWritableReportOrNotFound);
}

export type {WithWritableReportOrNotFoundProps};
Loading