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

[TS migration] Migrate 'ReportActionItemTaskAction.js' component to TypeScript #32560

Merged
merged 6 commits into from
Dec 14, 2023
+25 −40
Merged

[TS migration] Migrate 'ReportActionItemTaskAction.js' component to TypeScript #32560

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f89cc5b
[TS migration] Migrate 'ReportActionItemTaskAction.js' component
VickyStash Dec 6, 2023
d18fe1f
Merge branch 'main' into ts-migration/reportActionItemTaskAction-comp…
VickyStash Dec 11, 2023
3c7e77a
Updates to follow main branch
VickyStash Dec 11, 2023
e486816
Remove unnecessary taskReportID prop
VickyStash Dec 13, 2023
16aeb28
Merge branch 'main' into ts-migration/reportActionItemTaskAction-comp…
VickyStash Dec 14, 2023
3d2e50f
Update useThemeStyles hook import to follow main branch updates
VickyStash Dec 14, 2023
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
34 changes: 0 additions & 34 deletions src/components/ReportActionItem/TaskAction.js
View file
Open in desktop

This file was deleted.

24 changes: 24 additions & 0 deletions src/components/ReportActionItem/TaskAction.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import React from 'react';
import {View} from 'react-native';
import Text from '@components/Text';
import useThemeStyles from '@hooks/useThemeStyles';
import * as TaskUtils from '@libs/TaskUtils';

type TaskActionProps = {
/** Name of the reportAction action */
actionName: string;
Copy link
Contributor

Choose a reason for hiding this comment

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

i notice we are passing a value to taskReportID for this component, should we add it in this prop type?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@getusha I think taskReportID is not used anymore in this component

Copy link
Contributor

Choose a reason for hiding this comment

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

@VickyStash i noticed this comment above taskReportID in proptypes
// eslint-disable-next-line react/no-unused-prop-types -- This is used in the withOnyx HOC, so you're saying it is not used anymore in withOnyx HOC?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@getusha This component doesn't have withOnyx HOC where taskReportID was used, it was removed some time ago.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

After some time taskReportID was also used in another place, but it also was updated

Copy link
Contributor

Choose a reason for hiding this comment

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

Could we remove this if that's the case, it is kind of confusing.

App/src/pages/home/report/ReportActionItem.js

Line 363 in 7f7cfb3

taskReportID={props.action.originalMessage.taskReportID.toString()}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@getusha Done!

};

function TaskAction({actionName}: TaskActionProps) {
const styles = useThemeStyles();

return (
<View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
<Text style={[styles.chatItemMessage, styles.colorMuted]}>{TaskUtils.getTaskReportActionMessage(actionName)}</Text>
</View>
);
}

TaskAction.displayName = 'TaskAction';

export default TaskAction;
7 changes: 1 addition & 6 deletions src/pages/home/report/ReportActionItem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,12 +358,7 @@ function ReportActionItem(props) {
props.action.actionName === CONST.REPORT.ACTIONS.TYPE.TASKCANCELLED ||
props.action.actionName === CONST.REPORT.ACTIONS.TYPE.TASKREOPENED
) {
children = (
<TaskAction
taskReportID={props.action.originalMessage.taskReportID.toString()}
actionName={props.action.actionName}
/>
);
children = <TaskAction actionName={props.action.actionName} />;
} else if (ReportActionsUtils.isCreatedTaskReportAction(props.action)) {
children = (
<ShowContextMenuContext.Provider value={contextValue}>
Expand Down