Merge pull request #54306 from callstack-internal/pac-guerreiro/fix/5…

…0360-undo-default-values-on-report-actions Align default IDs in Report.ts file
Expensify · Jan 21, 2025 · 9b31270 · 9b31270
2 parents 059368f + 20c7866
commit 9b31270
Show file tree

Hide file tree

Showing 7 changed files with 125 additions and 93 deletions.
diff --git a/.eslintrc.changed.js b/.eslintrc.changed.js
@@ -21,13 +21,7 @@ module.exports = {
     },
     overrides: [
         {
-            files: [
-                'src/libs/actions/IOU.ts',
-                'src/libs/actions/Report.ts',
-                'src/pages/workspace/WorkspaceInitialPage.tsx',
-                'src/pages/home/report/PureReportActionItem.tsx',
-                'src/libs/SidebarUtils.ts',
-            ],
+            files: ['src/libs/actions/IOU.ts', 'src/pages/workspace/WorkspaceInitialPage.tsx', 'src/pages/home/report/PureReportActionItem.tsx', 'src/libs/SidebarUtils.ts'],
             rules: {
                 'rulesdir/no-default-id-values': 'off',
             },

diff --git a/src/ROUTES.ts b/src/ROUTES.ts
@@ -749,7 +749,12 @@ const ROUTES = {
     WORKSPACE_NEW_ROOM: 'workspace/new-room',
     WORKSPACE_INITIAL: {
         route: 'settings/workspaces/:policyID',
-        getRoute: (policyID: string, backTo?: string) => `${getUrlWithBackToParam(`settings/workspaces/${policyID}`, backTo)}` as const,
+        getRoute: (policyID: string | undefined, backTo?: string) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID while building route WORKSPACE_INITIAL');
+            }
+            return `${getUrlWithBackToParam(`settings/workspaces/${policyID}`, backTo)}` as const;
+        },
     },
     WORKSPACE_INVITE: {
         route: 'settings/workspaces/:policyID/invite',
@@ -983,7 +988,12 @@ const ROUTES = {
     },
     WORKSPACE_MEMBERS: {
         route: 'settings/workspaces/:policyID/members',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/members` as const,
+        getRoute: (policyID: string | undefined) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID while building route WORKSPACE_MEMBERS');
+            }
+            return `settings/workspaces/${policyID}/members` as const;
+        },
     },
     WORKSPACE_MEMBERS_IMPORT: {
         route: 'settings/workspaces/:policyID/members/import',
@@ -995,7 +1005,10 @@ const ROUTES = {
     },
     POLICY_ACCOUNTING: {
         route: 'settings/workspaces/:policyID/accounting',
-        getRoute: (policyID: string, newConnectionName?: ConnectionName, integrationToDisconnect?: ConnectionName, shouldDisconnectIntegrationBeforeConnecting?: boolean) => {
+        getRoute: (policyID: string | undefined, newConnectionName?: ConnectionName, integrationToDisconnect?: ConnectionName, shouldDisconnectIntegrationBeforeConnecting?: boolean) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID while building route POLICY_ACCOUNTING');
+            }
             let queryParams = '';
             if (newConnectionName) {
                 queryParams += `?newConnectionName=${newConnectionName}`;
@@ -1033,7 +1046,12 @@ const ROUTES = {
     },
     WORKSPACE_CATEGORIES: {
         route: 'settings/workspaces/:policyID/categories',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/categories` as const,
+        getRoute: (policyID: string | undefined) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID while building route WORKSPACE_CATEGORIES');
+            }
+            return `settings/workspaces/${policyID}/categories` as const;
+        },
     },
     WORKSPACE_CATEGORY_SETTINGS: {
         route: 'settings/workspaces/:policyID/category/:categoryName',
@@ -1098,7 +1116,12 @@ const ROUTES = {
     },
     WORKSPACE_MORE_FEATURES: {
         route: 'settings/workspaces/:policyID/more-features',
-        getRoute: (policyID: string) => `settings/workspaces/${policyID}/more-features` as const,
+        getRoute: (policyID: string | undefined) => {
+            if (!policyID) {
+                Log.warn('Invalid policyID while building route WORKSPACE_MORE_FEATURES');
+            }
+            return `settings/workspaces/${policyID}/more-features` as const;
+        },
     },
     WORKSPACE_TAGS: {
         route: 'settings/workspaces/:policyID/tags',

diff --git a/src/libs/API/parameters/SearchForRoomsToMentionParams.ts b/src/libs/API/parameters/SearchForRoomsToMentionParams.ts
@@ -1,6 +1,6 @@
 type SearchForRoomsToMentionParams = {
     query: string;
-    policyID: string;
+    policyID?: string;
 };
 
 export default SearchForRoomsToMentionParams;
diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts
@@ -10,7 +10,7 @@ import type {OnyxCollection, OnyxEntry, OnyxUpdate} from 'react-native-onyx';
 import Onyx from 'react-native-onyx';
 import type {SvgProps} from 'react-native-svg';
 import type {OriginalMessageIOU, OriginalMessageModifiedExpense} from 'src/types/onyx/OriginalMessage';
-import type {TupleToUnion, ValueOf} from 'type-fest';
+import type {SetRequired, TupleToUnion, ValueOf} from 'type-fest';
 import type {FileObject} from '@components/AttachmentModal';
 import {FallbackAvatar, IntacctSquare, NetSuiteSquare, QBOSquare, XeroSquare} from '@components/Icon/Expensicons';
 import * as defaultGroupAvatars from '@components/Icon/GroupDefaultAvatars';
@@ -513,22 +513,25 @@ type OptimisticModifiedExpenseReportAction = Pick<
     | 'delegateAccountID'
 > & {reportID?: string};
 
-type OptimisticTaskReport = Pick<
-    Report,
-    | 'reportID'
-    | 'reportName'
-    | 'description'
-    | 'ownerAccountID'
-    | 'participants'
-    | 'managerID'
-    | 'type'
-    | 'parentReportID'
-    | 'policyID'
-    | 'stateNum'
-    | 'statusNum'
-    | 'parentReportActionID'
-    | 'lastVisibleActionCreated'
-    | 'hasParentAccess'
+type OptimisticTaskReport = SetRequired<
+    Pick<
+        Report,
+        | 'reportID'
+        | 'reportName'
+        | 'description'
+        | 'ownerAccountID'
+        | 'participants'
+        | 'managerID'
+        | 'type'
+        | 'parentReportID'
+        | 'policyID'
+        | 'stateNum'
+        | 'statusNum'
+        | 'parentReportActionID'
+        | 'lastVisibleActionCreated'
+        | 'hasParentAccess'
+    >,
+    'parentReportID'
 >;
 
 type TransactionDetails = {
@@ -6350,8 +6353,8 @@ function buildOptimisticWorkspaceChats(policyID: string, policyName: string, exp
 
 function buildOptimisticTaskReport(
     ownerAccountID: number,
+    parentReportID: string,
     assigneeAccountID = 0,
-    parentReportID?: string,
     title?: string,
     description?: string,
     policyID: string = CONST.POLICY.OWNER_EMAIL_FAKE,