Merge pull request #39206 from callstack-internal/pac-guerreiro/fix/m…

…igrate-25309-25310-25311-25312-25313-to-typescript

src/libs/DateUtils.ts

@@ -267,7 +267,7 @@ function formatToLongDateWithWeekday(datetime: string | Date): string {
  * @returns Sunday
  */
 function formatToDayOfWeek(datetime: Date): string {
- return format(new Date(datetime), CONST.DATE.WEEKDAY_TIME_FORMAT);
+ return format(datetime, CONST.DATE.WEEKDAY_TIME_FORMAT);
 }
 
 /**

src/libs/OptionsListUtils.ts

@@ -2138,4 +2138,4 @@ export {
  getTaxRatesSection,
 };
 
-export type {MemberForList, CategorySection, GetOptions, OptionList, SearchOption, PayeePersonalDetails, Category, TaxRatesOption};
+export type {MemberForList, CategorySection, CategoryTreeSection, GetOptions, OptionList, SearchOption, PayeePersonalDetails, Category, TaxRatesOption};

src/libs/ReportUtils.ts

@@ -29,6 +29,7 @@ import type {
  ReportMetadata,
  Session,
  Task,
+ TaxRate,
  Transaction,
  TransactionViolation,
  UserWallet,
@@ -416,6 +417,9 @@ type OptionData = {
  isDisabled?: boolean | null;
  name?: string | null;
  isSelfDM?: boolean | null;
+ reportID?: string;
+ enabled?: boolean;
+ data?: Partial<TaxRate>;
 } & Report;
 
 type OnyxDataTaskAssigneeChat = {
@@ -995,7 +999,7 @@ function filterReportsByPolicyIDAndMemberAccountIDs(reports: Report[], policyMem
 /**
  * Given an array of reports, return them sorted by the last read timestamp.
  */
-function sortReportsByLastRead(reports: Report[], reportMetadata: OnyxCollection<ReportMetadata>): Array<OnyxEntry<Report>> {
+function sortReportsByLastRead(reports: Array<OnyxEntry<Report>>, reportMetadata: OnyxCollection<ReportMetadata>): Array<OnyxEntry<Report>> {
  return reports
  .filter((report) => !!report?.reportID && !!(reportMetadata?.[`${ONYXKEYS.COLLECTION.REPORT_METADATA}${report.reportID}`]?.lastVisitTime ?? report?.lastReadTime))
  .sort((a, b) => {

tests/e2e/compare/output/console.ts

@@ -13,6 +13,8 @@ type Entry = {
 type Data = {
  significance: Entry[];
  meaningless: Entry[];
+ errors?: string[];
+ warnings?: string[];
 };
 
 const printRegularLine = (entry: Entry) => {
@@ -36,4 +38,4 @@ export default (data: Data) => {
  console.debug('');
 };
 
-export type {Entry};
+export type {Data, Entry};

tests/e2e/compare/output/markdown.js → tests/e2e/compare/output/markdown.ts

@@ -1,80 +1,85 @@
 // From: https://raw.githubusercontent.com/callstack/reassure/main/packages/reassure-compare/src/output/markdown.ts
 import fs from 'node:fs/promises';
 import path from 'path';
-import _ from 'underscore';
+import type {Stats} from 'tests/e2e/measure/math';
 import * as Logger from '../../utils/logger';
+import type {Data, Entry} from './console';
 import * as format from './format';
 import markdownTable from './markdownTable';
 
 const tableHeader = ['Name', 'Duration'];
 
-const collapsibleSection = (title, content) => `<details>\n<summary>${title}</summary>\n\n${content}\n</details>\n\n`;
+const collapsibleSection = (title: string, content: string) => `<details>\n<summary>${title}</summary>\n\n${content}\n</details>\n\n`;
 
-const buildDurationDetails = (title, entry) => {
+const buildDurationDetails = (title: string, entry: Stats) => {
  const relativeStdev = entry.stdev / entry.mean;
 
- return _.filter(
- [
- `**${title}**`,
- `Mean: ${format.formatDuration(entry.mean)}`,
- `Stdev: ${format.formatDuration(entry.stdev)} (${format.formatPercent(relativeStdev)})`,
- entry.entries ? `Runs: ${entry.entries.join(' ')}` : '',
- ],
- Boolean,
- ).join('<br/>');
+ return [
+ `**${title}**`,
+ `Mean: ${format.formatDuration(entry.mean)}`,
+ `Stdev: ${format.formatDuration(entry.stdev)} (${format.formatPercent(relativeStdev)})`,
+ entry.entries ? `Runs: ${entry.entries.join(' ')}` : '',
+ ]
+ .filter(Boolean)
+ .join('<br/>');
 };
 
-const buildDurationDetailsEntry = (entry) =>
- _.filter(['baseline' in entry ? buildDurationDetails('Baseline', entry.baseline) : '', 'current' in entry ? buildDurationDetails('Current', entry.current) : ''], Boolean).join(
- '<br/><br/>',
- );
+const buildDurationDetailsEntry = (entry: Entry) =>
+ ['baseline' in entry ? buildDurationDetails('Baseline', entry.baseline) : '', 'current' in entry ? buildDurationDetails('Current', entry.current) : '']
+ .filter(Boolean)
+ .join('<br/><br/>');
+
+const formatEntryDuration = (entry: Entry): string => {
+ let formattedDuration = '';
 
-const formatEntryDuration = (entry) => {
  if ('baseline' in entry && 'current' in entry) {
- return format.formatDurationDiffChange(entry);
+ formattedDuration = format.formatDurationDiffChange(entry);
  }
+
  if ('baseline' in entry) {
- return format.formatDuration(entry.baseline.mean);
+ formattedDuration = format.formatDuration(entry.baseline.mean);
  }
+
  if ('current' in entry) {
- return format.formatDuration(entry.current.mean);
+ formattedDuration = format.formatDuration(entry.current.mean);
  }
- return '';
+
+ return formattedDuration;
 };
 
-const buildDetailsTable = (entries) => {
+const buildDetailsTable = (entries: Entry[]) => {
  if (!entries.length) {
  return '';
  }
 
- const rows = _.map(entries, (entry) => [entry.name, buildDurationDetailsEntry(entry)]);
+ const rows = entries.map((entry) => [entry.name, buildDurationDetailsEntry(entry)]);
  const content = markdownTable([tableHeader, ...rows]);
 
  return collapsibleSection('Show details', content);
 };
 
-const buildSummaryTable = (entries, collapse = false) => {
+const buildSummaryTable = (entries: Entry[], collapse = false) => {
  if (!entries.length) {
  return '_There are no entries_';
  }
 
- const rows = _.map(entries, (entry) => [entry.name, formatEntryDuration(entry)]);
+ const rows = entries.map((entry) => [entry.name, formatEntryDuration(entry)]);
  const content = markdownTable([tableHeader, ...rows]);
 
  return collapse ? collapsibleSection('Show entries', content) : content;
 };
 
-const buildMarkdown = (data) => {
+const buildMarkdown = (data: Data) => {
  let result = '## Performance Comparison Report 📊';
 
- if (data.errors && data.errors.length) {
+ if (data.errors?.length) {
  result += '\n\n### Errors\n';
  data.errors.forEach((message) => {
  result += ` 1. 🛑 ${message}\n`;
  });
  }
 
- if (data.warnings && data.warnings.length) {
+ if (data.warnings?.length) {
  result += '\n\n### Warnings\n';
  data.warnings.forEach((message) => {
  result += ` 1. 🟡 ${message}\n`;
@@ -92,7 +97,7 @@ const buildMarkdown = (data) => {
  return result;
 };
 
-const writeToFile = (filePath, content) =>
+const writeToFile = (filePath: string, content: string) =>
  fs
  .writeFile(filePath, content)
  .then(() => {
@@ -106,7 +111,7 @@ const writeToFile = (filePath, content) =>
  throw error;
  });
 
-const writeToMarkdown = (filePath, data) => {
+const writeToMarkdown = (filePath: string, data: Data) => {
  const markdown = buildMarkdown(data);
  return writeToFile(filePath, markdown).catch((error) => {
  console.error(error);

tests/perf-test/SidebarLinks.perf-test.js → tests/perf-test/SidebarLinks.perf-test.tsx

@@ -1,32 +1,33 @@
 import {fireEvent, screen} from '@testing-library/react-native';
 import Onyx from 'react-native-onyx';
 import {measurePerformance} from 'reassure';
-import _ from 'underscore';
-import CONST from '../../src/CONST';
-import ONYXKEYS from '../../src/ONYXKEYS';
-import variables from '../../src/styles/variables';
+import variables from '@styles/variables';
+import CONST from '@src/CONST';
+import ONYXKEYS from '@src/ONYXKEYS';
 import * as LHNTestUtils from '../utils/LHNTestUtils';
 import waitForBatchedUpdates from '../utils/waitForBatchedUpdates';
 import wrapOnyxWithWaitForBatchedUpdates from '../utils/wrapOnyxWithWaitForBatchedUpdates';
 
-jest.mock('../../src/libs/Permissions');
-jest.mock('../../src/hooks/usePermissions.ts');
-jest.mock('../../src/libs/Navigation/Navigation');
-jest.mock('../../src/components/Icon/Expensicons');
+jest.mock('@libs/Permissions');
+jest.mock('@hooks/usePermissions.ts');
+jest.mock('@libs/Navigation/Navigation');
+jest.mock('@components/Icon/Expensicons');
 
 jest.mock('@react-navigation/native');
 
 const getMockedReportsMap = (length = 100) => {
- const mockReports = Array.from({length}, (__, i) => {
- const reportID = i + 1;
- const participants = [1, 2];
- const reportKey = `${ONYXKEYS.COLLECTION.REPORT}${reportID}`;
- const report = LHNTestUtils.getFakeReport(participants, 1, true);
-
- return {[reportKey]: report};
- });
-
- return _.assign({}, ...mockReports);
+ const mockReports = Object.fromEntries(
+ Array.from({length}, (value, index) => {
+ const reportID = index + 1;
+ const participants = [1, 2];
+ const reportKey = `${ONYXKEYS.COLLECTION.REPORT}${reportID}`;
+ const report = LHNTestUtils.getFakeReport(participants, 1, true);
+
+ return [reportKey, report];
+ }),
+ );
+
+ return mockReports;
 };
 
 const mockedResponseMap = getMockedReportsMap(500);
@@ -36,11 +37,9 @@ describe('SidebarLinks', () => {
  Onyx.init({
  keys: ONYXKEYS,
  safeEvictionKeys: [ONYXKEYS.COLLECTION.REPORT_ACTIONS],
- registerStorageEventListener: () => {},
  });
 
  Onyx.multiSet({
- [ONYXKEYS.NVP_PRIORITY_MODE]: CONST.PRIORITY_MODE.DEFAULT,
  [ONYXKEYS.PERSONAL_DETAILS_LIST]: LHNTestUtils.fakePersonalDetails,
  [ONYXKEYS.BETAS]: [CONST.BETAS.DEFAULT_ROOMS],
  [ONYXKEYS.NVP_PRIORITY_MODE]: CONST.PRIORITY_MODE.GSD,