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

[TS migration] Migrate RoomInvitePage to typescript #34956

Merged
merged 18 commits into from
Feb 13, 2024
Merged

[TS migration] Migrate RoomInvitePage to typescript #34956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
76485b5
migrate RoomInvitePage to TS
SzymczakJ Jan 23, 2024
c8ec7be
delete room invite page
SzymczakJ Jan 23, 2024
034d2f6
Merge branch 'main' into @szymczak/RoomInvitePage
SzymczakJ Jan 29, 2024
a178b52
fix RoomInvitePage after SectionList merge
SzymczakJ Jan 30, 2024
e6b768b
merge changes that were commited before starting to work on RoomInvite
SzymczakJ Jan 30, 2024
f6e7461
fix bugs introduced in migration
SzymczakJ Jan 30, 2024
c6b0586
Merge branch 'main' into @szymczak/RoomInvitePage
SzymczakJ Feb 1, 2024
08f3a1d
fix pr comments
SzymczakJ Feb 1, 2024
a4d0cfe
fix pr comments
SzymczakJ Feb 1, 2024
647f7b5
fix linter
SzymczakJ Feb 1, 2024
ec95735
Merge branch 'main' into @szymczak/RoomInvitePage
SzymczakJ Feb 7, 2024
6f283d8
fix pr comments
SzymczakJ Feb 7, 2024
3def67f
fix tests
SzymczakJ Feb 9, 2024
698d51d
fix tests
SzymczakJ Feb 9, 2024
7289436
fix tests
SzymczakJ Feb 9, 2024
bde558c
Merge branch 'main' into @szymczak/RoomInvitePage
SzymczakJ Feb 12, 2024
7392964
fix linter
SzymczakJ Feb 12, 2024
2870cdf
fix pr comments
SzymczakJ Feb 13, 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
4 changes: 3 additions & 1 deletion src/libs/Navigation/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,9 @@ type RoomMembersNavigatorParamList = {
};

type RoomInviteNavigatorParamList = {
[SCREENS.ROOM_INVITE_ROOT]: undefined;
[SCREENS.ROOM_INVITE_ROOT]: {
reportID: string;
};
};

type MoneyRequestNavigatorParamList = {
Expand Down
22 changes: 7 additions & 15 deletions src/libs/OptionsListUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import lodashGet from 'lodash/get';
import lodashOrderBy from 'lodash/orderBy';
import lodashSet from 'lodash/set';
import lodashSortBy from 'lodash/sortBy';
import type {ReactElement} from 'react';
import Onyx from 'react-native-onyx';
import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
import CONST from '@src/CONST';
Expand Down Expand Up @@ -122,11 +121,11 @@ type MemberForList = {
keyForList: string;
isSelected: boolean;
isDisabled: boolean;
accountID?: number;
accountID?: number | null;
login: string;
rightElement: ReactElement | null;
icons?: OnyxCommon.Icon[];
pendingAction?: OnyxCommon.PendingAction;
reportID: string;
};

type SectionForSearchTerm = {
Expand Down Expand Up @@ -1837,14 +1836,8 @@ function getShareDestinationOptions(
* @param member - personalDetails or userToInvite
* @param config - keys to overwrite the default values
*/
function formatMemberForList(member: ReportUtils.OptionData, config?: Partial<MemberForList>): MemberForList;
function formatMemberForList(member: null | undefined, config?: Partial<MemberForList>): undefined;
function formatMemberForList(member: ReportUtils.OptionData | null | undefined, config: Partial<MemberForList> = {}): MemberForList | undefined {
if (!member) {
Copy link
Collaborator

Choose a reason for hiding this comment

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

do we have any case where this could error?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Same as above, every usage of this function has member of ReportUtils.OptionData type, not undefined or null, so we don't need this check. Future usages are going to be checked by typecheck.

return undefined;
}

const accountID = member.accountID ?? undefined;
function formatMemberForList(member: ReportUtils.OptionData): MemberForList {
const accountID = member.accountID;

return {
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
Expand All @@ -1853,14 +1846,13 @@ function formatMemberForList(member: ReportUtils.OptionData | null | undefined,
alternateText: member.alternateText || member.login || '',
// eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
keyForList: member.keyForList || String(accountID ?? 0) || '',
isSelected: false,
isDisabled: false,
isSelected: member.isSelected ?? false,
isDisabled: member.isDisabled ?? false,
accountID,
login: member.login ?? '',
rightElement: null,
icons: member.icons,
pendingAction: member.pendingAction,
...config,
reportID: member.reportID,
};
}

Expand Down
2 changes: 2 additions & 0 deletions src/libs/PolicyUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,3 +263,5 @@ export {
getPathWithoutPolicyID,
getPolicyMembersByIdWithoutCurrentUser,
};

export type {MemberEmailsToAccountIDs};
Loading
Loading