From fcbec0c6e834e5beb4cb57b20f1200f62dd7e272 Mon Sep 17 00:00:00 2001 From: allgandalf Date: Mon, 12 May 2025 23:02:32 +0530 Subject: [PATCH 1/4] add `multiLevelTags` beta --- src/CONST.ts | 1 + src/libs/Permissions.ts | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/src/CONST.ts b/src/CONST.ts index 448af0b44569..b96702b927d3 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -814,6 +814,7 @@ const CONST = { GLOBAL_REIMBURSEMENTS_ON_ND: 'globalReimbursementsOnND', PRIVATE_DOMAIN_ONBOARDING: 'privateDomainOnboarding', IS_TRAVEL_VERIFIED: 'isTravelVerified', + MULTI_LEVEL_TAGS: 'multiLevelTags', }, BUTTON_STATES: { DEFAULT: 'default', diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts index d71a92b58868..c972fe8f6d1f 100644 --- a/src/libs/Permissions.ts +++ b/src/libs/Permissions.ts @@ -27,6 +27,10 @@ function canUseNetSuiteUSATax(betas: OnyxEntry): boolean { return !!betas?.includes(CONST.BETAS.NETSUITE_USA_TAX) || canUseAllBetas(betas); } +function canUseMultiLevelTags(betas: OnyxEntry): boolean { + return !!betas?.includes(CONST.BETAS.MULTI_LEVEL_TAGS) || canUseAllBetas(betas); +} + /** * Link previews are temporarily disabled. */ @@ -91,4 +95,5 @@ export default { canUseGlobalReimbursementsOnND, canUsePrivateDomainOnboarding, canUseCallScheduling, + canUseMultiLevelTags, }; From 8d00540550749f2004f6e14f79fc1e35b9723b3f Mon Sep 17 00:00:00 2001 From: allgandalf Date: Tue, 13 May 2025 00:44:48 +0530 Subject: [PATCH 2/4] Feat: Add abilitly to download independent multi level tags --- .../ExportMultiLevelTagsSpreadSheetParams.ts | 6 ++++ src/libs/API/parameters/index.ts | 1 + src/libs/API/types.ts | 4 ++- src/libs/Permissions.ts | 2 +- src/libs/PolicyUtils.ts | 8 +++++ src/libs/actions/Policy/Tag.ts | 15 +++++++++ .../workspace/tags/WorkspaceTagsPage.tsx | 33 +++++++++++++++---- 7 files changed, 61 insertions(+), 8 deletions(-) create mode 100644 src/libs/API/parameters/ExportMultiLevelTagsSpreadSheetParams.ts diff --git a/src/libs/API/parameters/ExportMultiLevelTagsSpreadSheetParams.ts b/src/libs/API/parameters/ExportMultiLevelTagsSpreadSheetParams.ts new file mode 100644 index 000000000000..07f984b48656 --- /dev/null +++ b/src/libs/API/parameters/ExportMultiLevelTagsSpreadSheetParams.ts @@ -0,0 +1,6 @@ +type ExportMultiLevelTagsSpreadSheetParams = { + /** ID of the policy */ + policyID: string; +}; + +export default ExportMultiLevelTagsSpreadSheetParams; diff --git a/src/libs/API/parameters/index.ts b/src/libs/API/parameters/index.ts index 5db0f0d46287..de1edaa58c09 100644 --- a/src/libs/API/parameters/index.ts +++ b/src/libs/API/parameters/index.ts @@ -393,3 +393,4 @@ export type {default as GetEmphemeralTokenParams} from './GetEmphemeralTokenPara export type {default as CreateAppleDigitalWalletParams} from './CreateAppleDigitalWalletParams'; export type {default as CompleteConciergeCallParams} from './CompleteConciergeCallParams'; export type {default as FinishCorpayBankAccountOnboardingParams} from './FinishCorpayBankAccountOnboardingParams'; +export type {default as ExportMultiLevelTagsSpreadSheetParams} from './ExportMultiLevelTagsSpreadSheetParams'; diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts index b4034bde5a13..c377863585ae 100644 --- a/src/libs/API/types.ts +++ b/src/libs/API/types.ts @@ -153,7 +153,8 @@ const WRITE_COMMANDS = { IMPORT_PER_DIEM_RATES: 'ImportPerDiemRates', EXPORT_CATEGORIES_CSV: 'ExportCategoriesCSV', EXPORT_MEMBERS_CSV: 'ExportMembersCSV', - EXPORT_TAGS_CSV: 'ExportTagsCSV', + EXPORT_TAGS_CSV: 'ExportSingleLevelTags', + EXPORT_MULTI_LEVEL_TAGS: 'ExportMultiLevelTags', EXPORT_PER_DIEM_CSV: 'ExportPerDiemCSV', EXPORT_REPORT_TO_CSV: 'ExportReportToCSV', MOVE_IOU_REPORT_TO_EXISTING_POLICY: 'MoveIOUReportToExistingPolicy', @@ -618,6 +619,7 @@ type WriteCommandParameters = { [WRITE_COMMANDS.EXPORT_CATEGORIES_CSV]: Parameters.ExportCategoriesSpreadsheetParams; [WRITE_COMMANDS.EXPORT_MEMBERS_CSV]: Parameters.ExportMembersSpreadsheetParams; [WRITE_COMMANDS.EXPORT_TAGS_CSV]: Parameters.ExportTagsSpreadsheetParams; + [WRITE_COMMANDS.EXPORT_MULTI_LEVEL_TAGS]: Parameters.ExportMultiLevelTagsSpreadSheetParams; [WRITE_COMMANDS.EXPORT_PER_DIEM_CSV]: Parameters.ExportPerDiemCSVParams; [WRITE_COMMANDS.EXPORT_REPORT_TO_PDF]: Parameters.ExportReportPDFParams; [WRITE_COMMANDS.RENAME_WORKSPACE_CATEGORY]: Parameters.RenameWorkspaceCategoriesParams; diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts index c972fe8f6d1f..1a028c3bb454 100644 --- a/src/libs/Permissions.ts +++ b/src/libs/Permissions.ts @@ -3,7 +3,7 @@ import CONST from '@src/CONST'; import type Beta from '@src/types/onyx/Beta'; function canUseAllBetas(betas: OnyxEntry): boolean { - return !!betas?.includes(CONST.BETAS.ALL); + return true; } function canUseDefaultRooms(betas: OnyxEntry): boolean { diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts index a650b5d4ac4f..7e7f8030b344 100644 --- a/src/libs/PolicyUtils.ts +++ b/src/libs/PolicyUtils.ts @@ -763,6 +763,13 @@ function hasDependentTags(policy: OnyxEntry, policyTagList: OnyxEntry Object.values(tagList.tags).some((tag) => !!tag.rules?.parentTagsFilter || !!tag.parentTagsFilter)); } +function hasIndependentTags(policy: OnyxEntry, policyTagList: OnyxEntry) { + if (!policy?.hasMultipleTagLists) { + return false; + } + return Object.values(policyTagList ?? {}).every((tagList) => Object.values(tagList.tags).every((tag) => !tag.rules?.parentTagsFilter && !tag.parentTagsFilter)); +} + /** Get the Xero organizations connected to the policy */ function getXeroTenants(policy: Policy | undefined): Tenant[] { // Due to the way optional chain is being handled in this useMemo we are forced to use this approach to properly handle undefined values @@ -1537,6 +1544,7 @@ export { getActiveEmployeeWorkspaces, isUserInvitedToWorkspace, getPolicyRole, + hasIndependentTags, }; export type {MemberEmailsToAccountIDs}; diff --git a/src/libs/actions/Policy/Tag.ts b/src/libs/actions/Policy/Tag.ts index 95edd25516c1..acb116813b84 100644 --- a/src/libs/actions/Policy/Tag.ts +++ b/src/libs/actions/Policy/Tag.ts @@ -1035,6 +1035,20 @@ function downloadTagsCSV(policyID: string, onDownloadFailed: () => void) { fileDownload(ApiUtils.getCommandURL({command: WRITE_COMMANDS.EXPORT_TAGS_CSV}), fileName, '', false, formData, CONST.NETWORK.METHOD.POST, onDownloadFailed); } +function downloadMultiLevelIndependentTagsCSV(policyID: string, onDownloadFailed: () => void) { + const finalParameters = enhanceParameters(WRITE_COMMANDS.EXPORT_MULTI_LEVEL_TAGS, { + policyID, + }); + const fileName = 'MultiLevelTags.csv'; + + const formData = new FormData(); + Object.entries(finalParameters).forEach(([key, value]) => { + formData.append(key, String(value)); + }); + + fileDownload(ApiUtils.getCommandURL({command: WRITE_COMMANDS.EXPORT_MULTI_LEVEL_TAGS}), fileName, '', false, formData, CONST.NETWORK.METHOD.POST, onDownloadFailed); +} + function getPolicyTagsData(policyID: string | undefined) { return allPolicyTags?.[`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policyID}`] ?? {}; } @@ -1058,4 +1072,5 @@ export { importPolicyTags, downloadTagsCSV, getPolicyTagsData, + downloadMultiLevelIndependentTagsCSV, }; diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx index bdbbbb58f988..224323dbe6fc 100644 --- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx +++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx @@ -28,6 +28,7 @@ import useEnvironment from '@hooks/useEnvironment'; import useLocalize from '@hooks/useLocalize'; import useMobileSelectionMode from '@hooks/useMobileSelectionMode'; import useNetwork from '@hooks/useNetwork'; +import usePermissions from '@hooks/usePermissions'; import usePolicy from '@hooks/usePolicy'; import useResponsiveLayout from '@hooks/useResponsiveLayout'; import useSearchBackPress from '@hooks/useSearchBackPress'; @@ -37,7 +38,15 @@ import useThemeStyles from '@hooks/useThemeStyles'; import useThreeDotsAnchorPosition from '@hooks/useThreeDotsAnchorPosition'; import {isConnectionInProgress, isConnectionUnverified} from '@libs/actions/connections'; import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode'; -import {clearPolicyTagErrors, deletePolicyTags, downloadTagsCSV, openPolicyTagsPage, setPolicyTagsRequired, setWorkspaceTagEnabled} from '@libs/actions/Policy/Tag'; +import { + clearPolicyTagErrors, + deletePolicyTags, + downloadMultiLevelIndependentTagsCSV, + downloadTagsCSV, + openPolicyTagsPage, + setPolicyTagsRequired, + setWorkspaceTagEnabled, +} from '@libs/actions/Policy/Tag'; import {canUseTouchScreen} from '@libs/DeviceCapabilities'; import localeCompare from '@libs/LocaleCompare'; import goBackFromWorkspaceCentralScreen from '@libs/Navigation/helpers/goBackFromWorkspaceCentralScreen'; @@ -50,6 +59,8 @@ import { getCurrentConnectionName, getTagLists, hasAccountingConnections as hasAccountingConnectionsPolicyUtils, + hasDependentTags as hasDependentTagsPolicyUtils, + hasIndependentTags as hasIndependentTagsPolicyUtils, isMultiLevelTags as isMultiLevelTagsPolicyUtils, shouldShowSyncError, } from '@libs/PolicyUtils'; @@ -91,12 +102,16 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { const connectedIntegration = getConnectedIntegration(policy) ?? connectionSyncProgress?.connectionName; const isConnectionVerified = connectedIntegration && !isConnectionUnverified(policy, connectedIntegration); const currentConnectionName = getCurrentConnectionName(policy); - const [policyTagLists, isMultiLevelTags] = useMemo(() => [getTagLists(policyTags), isMultiLevelTagsPolicyUtils(policyTags)], [policyTags]); + const [policyTagLists, isMultiLevelTags, hasDependentTags, hasIndependentTags] = useMemo( + () => [getTagLists(policyTags), isMultiLevelTagsPolicyUtils(policyTags), hasDependentTagsPolicyUtils(policy, policyTags), hasIndependentTagsPolicyUtils(policy, policyTags)], + [policyTags], + ); const canSelectMultiple = !isMultiLevelTags && (shouldUseNarrowLayout ? selectionMode?.isEnabled : true); const fetchTags = useCallback(() => { openPolicyTagsPage(policyID); }, [policyID]); const isQuickSettingsFlow = !!backTo; + const {canUseMultiLevelTags} = usePermissions(); const {isOffline} = useNetwork({onReconnect: fetchTags}); @@ -413,9 +428,15 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { return; } close(() => { - downloadTagsCSV(policyID, () => { - setIsDownloadFailureModalVisible(true); - }); + if (hasIndependentTags && canUseMultiLevelTags) { + downloadMultiLevelIndependentTagsCSV(policyID, () => { + setIsDownloadFailureModalVisible(true); + }); + } else { + downloadTagsCSV(policyID, () => { + setIsDownloadFailureModalVisible(true); + }); + } }); }, }); @@ -459,7 +480,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { goBackFromWorkspaceCentralScreen(policyID); }} - shouldShowThreeDotsButton={!policy?.hasMultipleTagLists} + shouldShowThreeDotsButton={canUseMultiLevelTags ? !hasDependentTags : !policy?.hasMultipleTagLists} threeDotsMenuItems={threeDotsMenuItems} threeDotsAnchorPosition={threeDotsAnchorPosition} > From b895faf74f97a1dee052cf23ebeb70954dccb0b8 Mon Sep 17 00:00:00 2001 From: allgandalf Date: Tue, 13 May 2025 00:49:38 +0530 Subject: [PATCH 3/4] fix esLint --- src/libs/Permissions.ts | 2 +- src/pages/workspace/tags/WorkspaceTagsPage.tsx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/Permissions.ts b/src/libs/Permissions.ts index 1a028c3bb454..c972fe8f6d1f 100644 --- a/src/libs/Permissions.ts +++ b/src/libs/Permissions.ts @@ -3,7 +3,7 @@ import CONST from '@src/CONST'; import type Beta from '@src/types/onyx/Beta'; function canUseAllBetas(betas: OnyxEntry): boolean { - return true; + return !!betas?.includes(CONST.BETAS.ALL); } function canUseDefaultRooms(betas: OnyxEntry): boolean { diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx index 224323dbe6fc..b4454925a612 100644 --- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx +++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx @@ -104,7 +104,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { const currentConnectionName = getCurrentConnectionName(policy); const [policyTagLists, isMultiLevelTags, hasDependentTags, hasIndependentTags] = useMemo( () => [getTagLists(policyTags), isMultiLevelTagsPolicyUtils(policyTags), hasDependentTagsPolicyUtils(policy, policyTags), hasIndependentTagsPolicyUtils(policy, policyTags)], - [policyTags], + [policy, policyTags], ); const canSelectMultiple = !isMultiLevelTags && (shouldUseNarrowLayout ? selectionMode?.isEnabled : true); const fetchTags = useCallback(() => { @@ -443,7 +443,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { } return menuItems; - }, [policy, hasVisibleTags, translate, isOffline, isQuickSettingsFlow, policyID, backTo]); + }, [policy, hasVisibleTags, translate, isOffline, isQuickSettingsFlow, policyID, backTo, canUseMultiLevelTags, hasIndependentTags]); const selectionModeHeader = selectionMode?.isEnabled && shouldUseNarrowLayout; From 24396909de672d3f444f8390caceef3ce16a5d48 Mon Sep 17 00:00:00 2001 From: allgandalf Date: Tue, 13 May 2025 09:52:25 +0530 Subject: [PATCH 4/4] update API name to `EXPORT_MULTI_LEVEL_TAGS_CSV` --- src/libs/API/types.ts | 4 ++-- src/libs/actions/Policy/Tag.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts index e77f7be18212..284626a84e91 100644 --- a/src/libs/API/types.ts +++ b/src/libs/API/types.ts @@ -155,7 +155,7 @@ const WRITE_COMMANDS = { EXPORT_CATEGORIES_CSV: 'ExportCategoriesCSV', EXPORT_MEMBERS_CSV: 'ExportMembersCSV', EXPORT_TAGS_CSV: 'ExportSingleLevelTags', - EXPORT_MULTI_LEVEL_TAGS: 'ExportMultiLevelTags', + EXPORT_MULTI_LEVEL_TAGS_CSV: 'ExportMultiLevelTagsCSV', EXPORT_PER_DIEM_CSV: 'ExportPerDiemCSV', EXPORT_REPORT_TO_CSV: 'ExportReportToCSV', MOVE_IOU_REPORT_TO_EXISTING_POLICY: 'MoveIOUReportToExistingPolicy', @@ -622,7 +622,7 @@ type WriteCommandParameters = { [WRITE_COMMANDS.EXPORT_CATEGORIES_CSV]: Parameters.ExportCategoriesSpreadsheetParams; [WRITE_COMMANDS.EXPORT_MEMBERS_CSV]: Parameters.ExportMembersSpreadsheetParams; [WRITE_COMMANDS.EXPORT_TAGS_CSV]: Parameters.ExportTagsSpreadsheetParams; - [WRITE_COMMANDS.EXPORT_MULTI_LEVEL_TAGS]: Parameters.ExportMultiLevelTagsSpreadSheetParams; + [WRITE_COMMANDS.EXPORT_MULTI_LEVEL_TAGS_CSV]: Parameters.ExportMultiLevelTagsSpreadSheetParams; [WRITE_COMMANDS.EXPORT_PER_DIEM_CSV]: Parameters.ExportPerDiemCSVParams; [WRITE_COMMANDS.EXPORT_REPORT_TO_PDF]: Parameters.ExportReportPDFParams; [WRITE_COMMANDS.RENAME_WORKSPACE_CATEGORY]: Parameters.RenameWorkspaceCategoriesParams; diff --git a/src/libs/actions/Policy/Tag.ts b/src/libs/actions/Policy/Tag.ts index 077f590d057f..85161844ba12 100644 --- a/src/libs/actions/Policy/Tag.ts +++ b/src/libs/actions/Policy/Tag.ts @@ -1036,7 +1036,7 @@ function downloadTagsCSV(policyID: string, onDownloadFailed: () => void) { } function downloadMultiLevelIndependentTagsCSV(policyID: string, onDownloadFailed: () => void) { - const finalParameters = enhanceParameters(WRITE_COMMANDS.EXPORT_MULTI_LEVEL_TAGS, { + const finalParameters = enhanceParameters(WRITE_COMMANDS.EXPORT_MULTI_LEVEL_TAGS_CSV, { policyID, }); const fileName = 'MultiLevelTags.csv'; @@ -1046,7 +1046,7 @@ function downloadMultiLevelIndependentTagsCSV(policyID: string, onDownloadFailed formData.append(key, String(value)); }); - fileDownload(ApiUtils.getCommandURL({command: WRITE_COMMANDS.EXPORT_MULTI_LEVEL_TAGS}), fileName, '', false, formData, CONST.NETWORK.METHOD.POST, onDownloadFailed); + fileDownload(ApiUtils.getCommandURL({command: WRITE_COMMANDS.EXPORT_MULTI_LEVEL_TAGS_CSV}), fileName, '', false, formData, CONST.NETWORK.METHOD.POST, onDownloadFailed); } function getPolicyTagsData(policyID: string | undefined) {