diff --git a/src/CONST.ts b/src/CONST.ts index 3b0c98b37d37..bb6099952452 100755 --- a/src/CONST.ts +++ b/src/CONST.ts @@ -816,6 +816,7 @@ const CONST = { RETRACT_NEWDOT: 'retractNewDot', PRIVATE_DOMAIN_ONBOARDING: 'privateDomainOnboarding', IS_TRAVEL_VERIFIED: 'isTravelVerified', + MULTI_LEVEL_TAGS: 'multiLevelTags', NEWDOT_MULTI_FILES_DRAG_AND_DROP: 'newDotMultiFilesDragAndDrop', PLAID_COMPANY_CARDS: 'plaidCompanyCards', }, 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 88663a07e23c..7212fb5dc9fb 100644 --- a/src/libs/API/parameters/index.ts +++ b/src/libs/API/parameters/index.ts @@ -394,4 +394,5 @@ export type {default as GetGuideCallAvailabilityScheduleParams} from './GetGuide export type {default as GetEmphemeralTokenParams} from './GetEmphemeralTokenParams'; export type {default as CompleteConciergeCallParams} from './CompleteConciergeCallParams'; export type {default as FinishCorpayBankAccountOnboardingParams} from './FinishCorpayBankAccountOnboardingParams'; +export type {default as ExportMultiLevelTagsSpreadSheetParams} from './ExportMultiLevelTagsSpreadSheetParams'; export type {default as ReopenReportParams} from './ReopenReportParams'; diff --git a/src/libs/API/types.ts b/src/libs/API/types.ts index e47fe2499bd5..a3b046c5d5ce 100644 --- a/src/libs/API/types.ts +++ b/src/libs/API/types.ts @@ -154,7 +154,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_CSV: 'ExportMultiLevelTagsCSV', EXPORT_PER_DIEM_CSV: 'ExportPerDiemCSV', EXPORT_REPORT_TO_CSV: 'ExportReportToCSV', MOVE_IOU_REPORT_TO_EXISTING_POLICY: 'MoveIOUReportToExistingPolicy', @@ -621,6 +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_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/Permissions.ts b/src/libs/Permissions.ts index 40051c7b3013..625b8a5cf946 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. */ @@ -104,6 +108,7 @@ export default { canUsePrivateDomainOnboarding, canUseRetractNewDot, canUseCallScheduling, + canUseMultiLevelTags, canUseMultiFilesDragAndDrop, canUsePlaidCompanyCards, }; 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 0ce5c1809ab3..85161844ba12 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_CSV, { + 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_CSV}), 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 51d29fa18f26..b062585c950f 100644 --- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx +++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx @@ -29,6 +29,7 @@ import useFilteredSelection from '@hooks/useFilteredSelection'; 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'; @@ -38,7 +39,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 Navigation from '@libs/Navigation/Navigation'; @@ -50,6 +59,8 @@ import { getCurrentConnectionName, getTagLists, hasAccountingConnections as hasAccountingConnectionsPolicyUtils, + hasDependentTags as hasDependentTagsPolicyUtils, + hasIndependentTags as hasIndependentTagsPolicyUtils, isMultiLevelTags as isMultiLevelTagsPolicyUtils, shouldShowSyncError, } from '@libs/PolicyUtils'; @@ -89,12 +100,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)], + [policy, policyTags], + ); const canSelectMultiple = !isMultiLevelTags && (shouldUseNarrowLayout ? selectionMode?.isEnabled : true); const fetchTags = useCallback(() => { openPolicyTagsPage(policyID); }, [policyID]); const isQuickSettingsFlow = !!backTo; + const {canUseMultiLevelTags} = usePermissions(); const tagsList = useMemo(() => { if (isMultiLevelTags) { @@ -403,16 +418,22 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { return; } close(() => { - downloadTagsCSV(policyID, () => { - setIsDownloadFailureModalVisible(true); - }); + if (hasIndependentTags && canUseMultiLevelTags) { + downloadMultiLevelIndependentTagsCSV(policyID, () => { + setIsDownloadFailureModalVisible(true); + }); + } else { + downloadTagsCSV(policyID, () => { + setIsDownloadFailureModalVisible(true); + }); + } }); }, }); } return menuItems; - }, [policy, hasVisibleTags, translate, isOffline, isQuickSettingsFlow, policyID, backTo]); + }, [policy, hasVisibleTags, translate, isOffline, isQuickSettingsFlow, policyID, backTo, canUseMultiLevelTags, hasIndependentTags]); const selectionModeHeader = selectionMode?.isEnabled && shouldUseNarrowLayout; @@ -449,7 +470,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { Navigation.popToSidebar(); }} - shouldShowThreeDotsButton={!policy?.hasMultipleTagLists} + shouldShowThreeDotsButton={canUseMultiLevelTags ? !hasDependentTags : !policy?.hasMultipleTagLists} threeDotsMenuItems={threeDotsMenuItems} threeDotsAnchorPosition={threeDotsAnchorPosition} >