simplify

Author: Gonals

src/libs/CardUtils.ts

@@ -1072,41 +1072,13 @@ function collectUsedCSVFeedSlotNumbersFromCompanyCards(companyCards: CompanyFeed
     return numbers;
 }
 
-function collectUsedCSVFeedSlotNumbersFromWorkspaceCardsCollection(allWorkspaceCardsList: OnyxCollection<WorkspaceCardsList> | undefined, domainID: number, csvPrefix: string): number[] {
-    const numbers: number[] = [];
-    const domainKeyPrefix = `${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${domainID}_`;
-    for (const key of Object.keys(allWorkspaceCardsList ?? {})) {
-        if (!key.startsWith(domainKeyPrefix)) {
-            continue;
-        }
-        const feedPart = key.slice(domainKeyPrefix.length);
-        if (!feedPart.startsWith(csvPrefix)) {
-            continue;
-        }
-        const suffix = feedPart.slice(csvPrefix.length);
-        if (!suffix) {
-            continue;
-        }
-        const n = Number.parseInt(suffix, 10);
-        if (!Number.isNaN(n) && n > 0) {
-            numbers.push(n);
-        }
-    }
-    return numbers;
-}
-
 /**
- * Next available CSV file-import feed (`ccuploadN`). Uses `settings.companyCards` and any
- * `cards_<domainID>_ccuploadN` workspace card keys so numbering matches Onyx, including feeds
- * omitted from {@link getFeedType}'s `CombinedCardFeeds` input.
+ * Next available CSV file-import feed (`ccuploadN`) from `settings.companyCards` keys only,
+ * including feeds omitted from {@link getFeedType}'s `CombinedCardFeeds` input.
  */
-function getCSVFeedType(companyCards: CompanyFeeds | undefined, domainID: number, allWorkspaceCardsList: OnyxCollection<WorkspaceCardsList> | undefined): CompanyCardFeedWithNumber {
+function getCSVFeedType(companyCards: CompanyFeeds | undefined): CompanyCardFeedWithNumber {
     const csvPrefix = CONST.COMPANY_CARD.FEED_BANK_NAME.CSV;
-    const merged = [
-        ...collectUsedCSVFeedSlotNumbersFromCompanyCards(companyCards, csvPrefix),
-        ...collectUsedCSVFeedSlotNumbersFromWorkspaceCardsCollection(allWorkspaceCardsList, domainID, csvPrefix),
-    ];
-    const feedNumbers = [...new Set(merged)].sort((a, b) => a - b);
+    const feedNumbers = [...new Set(collectUsedCSVFeedSlotNumbersFromCompanyCards(companyCards, csvPrefix))].sort((a, b) => a - b);
 
     let firstAvailableNumber = 1;
     for (const num of feedNumbers) {

src/pages/workspace/companyCards/addNew/CompanyCardsImportedPage.tsx

@@ -36,15 +36,14 @@ function CompanyCardsImportedPage({route}: CompanyCardsImportedPageProps) {
     const workspaceAccountID = policy?.workspaceAccountID ?? CONST.DEFAULT_NUMBER_ID;
     const [lastSelectedFeed] = useOnyx(`${ONYXKEYS.COLLECTION.LAST_SELECTED_FEED}${policyID}`);
     const [workspaceCardFeeds] = useOnyx(`${ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER}${workspaceAccountID}`);
-    const [allWorkspaceCardsList] = useOnyx(ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST);
     const [isImportingTransactions, setIsImportingTransactions] = useState(false);
     const {setIsClosing} = useCloseImportPage();
     const shouldUseAdvancedFields = addNewCard?.data?.useAdvancedFields ?? false;
     const layoutName = addNewCard?.data?.companyCardLayoutName ?? '';
     const prefilledLayoutType = addNewCard?.data?.layoutType;
     const generatedLayoutType = useMemo(
-        () => prefilledLayoutType ?? getCSVFeedType(workspaceCardFeeds?.settings?.companyCards, workspaceAccountID, allWorkspaceCardsList),
-        [prefilledLayoutType, workspaceCardFeeds?.settings?.companyCards, workspaceAccountID, allWorkspaceCardsList],
+        () => prefilledLayoutType ?? getCSVFeedType(workspaceCardFeeds?.settings?.companyCards),
+        [prefilledLayoutType, workspaceCardFeeds?.settings?.companyCards],
     );
     const layoutType = prefilledLayoutType ?? generatedLayoutType;
     const [existingCardsList] = useOnyx(`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}${workspaceAccountID}_${layoutType}`);

tests/unit/CardUtilsTest.ts

@@ -67,7 +67,6 @@ import {
 } from '@src/libs/CardUtils';
 import type {CardProgramKey} from '@src/libs/CardUtils';
 import DateUtils from '@src/libs/DateUtils';
-import ONYXKEYS from '@src/ONYXKEYS';
 import type {
     BankAccountList,
     Card,
@@ -1887,34 +1886,19 @@ describe('CardUtils', () => {
     describe('getCSVFeedType', () => {
         it('returns the first gap when higher-numbered CSV feeds exist in companyCards only', () => {
             expect(
-                getCSVFeedType(
-                    {
-                        ccupload3: {pending: false},
-                        ccupload7: {pending: false},
-                    } as CompanyFeeds,
-                    111,
-                    undefined,
-                ),
+                getCSVFeedType({
+                    ccupload3: {pending: false},
+                    ccupload7: {pending: false},
+                } as CompanyFeeds),
             ).toBe('ccupload1');
         });
 
-        it('treats existing workspace card list keys as used slots', () => {
-            const collection = {
-                [`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}111_ccupload3`]: {cardList: {}},
-            } as OnyxCollection<WorkspaceCardsList>;
-            expect(getCSVFeedType(undefined, 111, collection)).toBe('ccupload1');
-        });
-
-        it('merges companyCards and workspace keys when picking the next slot', () => {
-            expect(
-                getCSVFeedType({ccupload1: {pending: false}} as CompanyFeeds, 111, {
-                    [`${ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST}111_ccupload2`]: {cardList: {}},
-                } as OnyxCollection<WorkspaceCardsList>),
-            ).toBe('ccupload3');
+        it('returns ccupload2 when ccupload1 is already in companyCards', () => {
+            expect(getCSVFeedType({ccupload1: {pending: false}} as CompanyFeeds)).toBe('ccupload2');
         });
 
         it('returns ccupload1 when no CSV feeds exist', () => {
-            expect(getCSVFeedType(undefined, 111, {})).toBe('ccupload1');
+            expect(getCSVFeedType(undefined)).toBe('ccupload1');
         });
     });