diff --git a/src/components/CategoryPicker.tsx b/src/components/CategoryPicker.tsx index 14d9bc9a1ebe..07330ee01e4a 100644 --- a/src/components/CategoryPicker.tsx +++ b/src/components/CategoryPicker.tsx @@ -4,9 +4,10 @@ import {useOnyx} from 'react-native-onyx'; import useDebouncedState from '@hooks/useDebouncedState'; import useLocalize from '@hooks/useLocalize'; import useNetwork from '@hooks/useNetwork'; -import * as CategoryOptionsListUtils from '@libs/CategoryOptionListUtils'; +import {getCategoryListSections} from '@libs/CategoryOptionListUtils'; import type {Category} from '@libs/CategoryOptionListUtils'; -import * as OptionsListUtils from '@libs/OptionsListUtils'; +import {getEnabledCategoriesCount} from '@libs/CategoryUtils'; +import {getHeaderMessageForNonUserList} from '@libs/OptionsListUtils'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; @@ -27,9 +28,9 @@ type CategoryPickerProps = { }; function CategoryPicker({selectedCategory, policyID, onSubmit, addBottomSafeAreaPadding = false, contentContainerStyle}: CategoryPickerProps) { - const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`); - const [policyCategoriesDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${policyID}`); - const [policyRecentlyUsedCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${policyID}`); + const [policyCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`, {canBeMissing: true}); + const [policyCategoriesDraft] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES_DRAFT}${policyID}`, {canBeMissing: true}); + const [policyRecentlyUsedCategories] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_RECENTLY_USED_CATEGORIES}${policyID}`, {canBeMissing: true}); const {isOffline} = useNetwork(); const {translate} = useLocalize(); @@ -53,7 +54,7 @@ function CategoryPicker({selectedCategory, policyID, onSubmit, addBottomSafeArea const [sections, headerMessage, shouldShowTextInput] = useMemo(() => { const categories = policyCategories ?? policyCategoriesDraft ?? {}; const validPolicyRecentlyUsedCategories = policyRecentlyUsedCategories?.filter?.((p) => !isEmptyObject(p)); - const categoryOptions = CategoryOptionsListUtils.getCategoryListSections({ + const categoryOptions = getCategoryListSections({ searchValue: debouncedSearchValue, selectedOptions, categories, @@ -61,8 +62,8 @@ function CategoryPicker({selectedCategory, policyID, onSubmit, addBottomSafeArea }); const categoryData = categoryOptions?.at(0)?.data ?? []; - const header = OptionsListUtils.getHeaderMessageForNonUserList(categoryData.length > 0, debouncedSearchValue); - const categoriesCount = OptionsListUtils.getEnabledCategoriesCount(categories); + const header = getHeaderMessageForNonUserList(categoryData.length > 0, debouncedSearchValue); + const categoriesCount = getEnabledCategoriesCount(categories); const isCategoriesCountBelowThreshold = categoriesCount < CONST.STANDARD_LIST_ITEM_LIMIT; const showInput = !isCategoriesCountBelowThreshold; diff --git a/src/languages/en.ts b/src/languages/en.ts index 1a53eae84b31..015992d556ae 100755 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -3971,6 +3971,10 @@ const translations = { glCode: 'GL code', updateGLCodeFailureMessage: 'An error occurred while updating the GL code, please try again', importCategories: 'Import categories', + cannotDeleteOrDisableAllCategories: { + title: 'Cannot delete or disable all categories', + description: `At least one category must remain enabled because your workspace requires categories.`, + }, }, moreFeatures: { subtitle: 'Use the toggles below to enable more features as you grow. Each feature will appear in the navigation menu for further customization.', @@ -4216,6 +4220,14 @@ const translations = { importTags: 'Import tags', importedTagsMessage: ({columnCounts}: ImportedTagsMessageParams) => `We found *${columnCounts} columns* in your spreadsheet. Select *Name* next to the column that contains tags names. You can also select *Enabled* next to the column that sets tags status.`, + cannotDeleteOrDisableAllTags: { + title: 'Cannot delete or disable all tags', + description: `At least one tag must remain enabled because your workspace requires tags.`, + }, + cannotMakeAllTagsOptional: { + title: 'Cannot make all tags optional', + description: `At least one tag must remain required because your workspace settings require tags.`, + }, }, taxes: { subtitle: 'Add tax names, rates, and set defaults.', diff --git a/src/languages/es.ts b/src/languages/es.ts index 452a9d70620f..f4e6e1c607a1 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -4013,6 +4013,10 @@ const translations = { glCode: 'Código de Libro Mayor', updateGLCodeFailureMessage: 'Se produjo un error al actualizar el código de Libro Mayor. Inténtelo nuevamente.', importCategories: 'Importar categorías', + cannotDeleteOrDisableAllCategories: { + title: 'No se pueden eliminar ni deshabilitar todas las categorías', + description: `Debe quedar al menos una categoría habilitada porque tu espacio de trabajo requiere categorías.`, + }, }, moreFeatures: { subtitle: 'Utiliza los botones de abajo para activar más funciones a medida que creces. Cada función aparecerá en el menú de navegación para una mayor personalización.', @@ -4261,6 +4265,14 @@ const translations = { importTags: 'Importar categorías', importedTagsMessage: ({columnCounts}: ImportedTagsMessageParams) => `Hemos encontrado *${columnCounts} columnas* en su hoja de cálculo. Seleccione *Nombre* junto a la columna que contiene los nombres de las etiquetas. También puede seleccionar *Habilitado* junto a la columna que establece el estado de la etiqueta.`, + cannotDeleteOrDisableAllTags: { + title: 'No se pueden eliminar ni deshabilitar todas las etiquetas', + description: `Debe quedar al menos una etiqueta habilitada porque tu espacio de trabajo requiere etiquetas.`, + }, + cannotMakeAllTagsOptional: { + title: 'No se pueden hacer opcionales todas las etiquetas', + description: `Debe haber al menos una etiqueta obligatoria porque la configuración de tu espacio de trabajo requiere etiquetas.`, + }, }, taxes: { subtitle: 'Añade nombres, tasas y establezca valores por defecto para los impuestos.', diff --git a/src/libs/CategoryUtils.ts b/src/libs/CategoryUtils.ts index 79ed264ade68..c0d8a9585a1c 100644 --- a/src/libs/CategoryUtils.ts +++ b/src/libs/CategoryUtils.ts @@ -1,8 +1,8 @@ import type {LocaleContextProps} from '@components/LocaleContextProvider'; import CONST from '@src/CONST'; -import type {Policy, TaxRate, TaxRatesWithDefault} from '@src/types/onyx'; +import type {Policy, PolicyCategories, TaxRate, TaxRatesWithDefault} from '@src/types/onyx'; import type {ApprovalRule, ExpenseRule, MccGroup} from '@src/types/onyx/Policy'; -import * as CurrencyUtils from './CurrencyUtils'; +import {convertToShortDisplayString} from './CurrencyUtils'; function formatDefaultTaxRateText(translate: LocaleContextProps['translate'], taxID: string, taxRate: TaxRate, policyTaxRates?: TaxRatesWithDefault) { const taxRateText = `${taxRate.name} ${CONST.DOT_SEPARATOR} ${taxRate.value}`; @@ -39,7 +39,7 @@ function formatRequireReceiptsOverText(translate: LocaleContextProps['translate' const maxExpenseAmountToDisplay = policy?.maxExpenseAmountNoReceipt === CONST.DISABLED_MAX_EXPENSE_VALUE ? 0 : policy?.maxExpenseAmountNoReceipt; return translate(`workspace.rules.categoryRules.requireReceiptsOverList.default`, { - defaultAmount: CurrencyUtils.convertToShortDisplayString(maxExpenseAmountToDisplay, policy?.outputCurrency ?? CONST.CURRENCY.USD), + defaultAmount: convertToShortDisplayString(maxExpenseAmountToDisplay, policy?.outputCurrency ?? CONST.CURRENCY.USD), }); } @@ -83,4 +83,22 @@ function updateCategoryInMccGroup(mccGroups: Record, oldCatego return updatedGroups; } -export {formatDefaultTaxRateText, formatRequireReceiptsOverText, getCategoryApproverRule, getCategoryExpenseRule, getCategoryDefaultTaxRate, updateCategoryInMccGroup}; +/** + * Calculates count of all enabled options + */ +function getEnabledCategoriesCount(policyCategories: PolicyCategories | undefined): number { + if (policyCategories === undefined) { + return 0; + } + return Object.values(policyCategories).filter((policyCategory) => policyCategory.enabled).length; +} + +export { + formatDefaultTaxRateText, + formatRequireReceiptsOverText, + getCategoryApproverRule, + getCategoryExpenseRule, + getCategoryDefaultTaxRate, + updateCategoryInMccGroup, + getEnabledCategoriesCount, +}; diff --git a/src/libs/OptionsListUtils.ts b/src/libs/OptionsListUtils.ts index 6ffcb77a525c..3b08b8c4f43e 100644 --- a/src/libs/OptionsListUtils.ts +++ b/src/libs/OptionsListUtils.ts @@ -8,6 +8,7 @@ import Onyx from 'react-native-onyx'; import type {OnyxCollection, OnyxEntry} from 'react-native-onyx'; import type {SetNonNullable} from 'type-fest'; import {FallbackAvatar} from '@components/Icon/Expensicons'; +import type {PolicyTagList} from '@pages/workspace/tags/types'; import type {IOUAction} from '@src/CONST'; import CONST from '@src/CONST'; import ONYXKEYS from '@src/ONYXKEYS'; @@ -22,6 +23,7 @@ import type { PolicyCategories, PolicyCategory, PolicyTag, + PolicyTagLists, Report, ReportAction, ReportActions, @@ -33,6 +35,7 @@ import type {Icon, PendingAction} from '@src/types/onyx/OnyxCommon'; import type DeepValueOf from '@src/types/utils/DeepValueOf'; import {isEmptyObject} from '@src/types/utils/EmptyObject'; import Timing from './actions/Timing'; +import {getEnabledCategoriesCount} from './CategoryUtils'; import filterArrayByMatch from './filterArrayByMatch'; import {isReportMessageAttachment} from './isReportMessageAttachment'; import {formatPhoneNumber} from './LocalePhoneNumber'; @@ -45,7 +48,7 @@ import Performance from './Performance'; import Permissions from './Permissions'; import {getDisplayNameOrDefault, getPersonalDetailByEmail, getPersonalDetailsByIDs} from './PersonalDetailsUtils'; import {addSMSDomainIfPhoneNumber, parsePhoneNumber} from './PhoneNumber'; -import {canSendInvoiceFromWorkspace, getSubmitToAccountID, isUserInvitedToWorkspace} from './PolicyUtils'; +import {canSendInvoiceFromWorkspace, getCountOfEnabledTagsOfList, getCountOfRequiredTagLists, getSubmitToAccountID, isUserInvitedToWorkspace} from './PolicyUtils'; import { getCombinedReportActions, getExportIntegrationLastMessageText, @@ -1122,11 +1125,48 @@ function isCurrentUser(userDetails: PersonalDetails): boolean { return Object.keys(loginList ?? {}).some((login) => login.toLowerCase() === userDetailsLogin.toLowerCase()); } -/** - * Calculates count of all enabled options - */ -function getEnabledCategoriesCount(options: PolicyCategories): number { - return Object.values(options).filter((option) => option.enabled).length; +function isDisablingOrDeletingLastEnabledCategory( + policy: Policy | undefined, + policyCategories: PolicyCategories | undefined, + selectedCategories: Array, +): boolean { + const enabledCategoriesCount = getEnabledCategoriesCount(policyCategories); + + if (!enabledCategoriesCount) { + return false; + } + + if (policy?.requiresCategory && selectedCategories.filter((selectedCategory) => selectedCategory?.enabled).length === enabledCategoriesCount) { + return true; + } + + return false; +} + +function isDisablingOrDeletingLastEnabledTag(policyTagList: PolicyTagList | undefined, selectedTags: Array): boolean { + const enabledTagsCount = getCountOfEnabledTagsOfList(policyTagList?.tags); + + if (!enabledTagsCount) { + return false; + } + + if (policyTagList?.required && selectedTags.filter((selectedTag) => selectedTag?.enabled).length === enabledTagsCount) { + return true; + } + return false; +} + +function isMakingLastRequiredTagListOptional(policy: Policy | undefined, policyTags: PolicyTagLists | undefined, selectedTagLists: Array): boolean { + const requiredTagsCount = getCountOfRequiredTagLists(policyTags); + + if (!requiredTagsCount) { + return false; + } + + if (policy?.requiresTag && selectedTagLists.filter((selectedTagList) => selectedTagList?.required).length === requiredTagsCount) { + return true; + } + return false; } function getSearchValueForPhoneOrEmail(searchTerm: string) { @@ -2411,7 +2451,6 @@ export { shouldOptionShowTooltip, getLastActorDisplayName, getLastMessageTextForReport, - getEnabledCategoriesCount, hasEnabledOptions, sortAlphabetically, formatMemberForList, @@ -2447,6 +2486,9 @@ export { getIsUserSubmittedExpenseOrScannedReceipt, getManagerMcTestParticipant, shouldShowLastActorDisplayName, + isDisablingOrDeletingLastEnabledCategory, + isDisablingOrDeletingLastEnabledTag, + isMakingLastRequiredTagListOptional, processReport, }; diff --git a/src/libs/PolicyUtils.ts b/src/libs/PolicyUtils.ts index 4acb68d879e6..350e64d16ec1 100644 --- a/src/libs/PolicyUtils.ts +++ b/src/libs/PolicyUtils.ts @@ -425,9 +425,21 @@ function escapeTagName(tag: string) { /** * Gets a count of enabled tags of a policy */ -function getCountOfEnabledTagsOfList(policyTags: PolicyTags) { +function getCountOfEnabledTagsOfList(policyTags: PolicyTags | undefined): number { + if (!policyTags) { + return 0; + } return Object.values(policyTags).filter((policyTag) => policyTag.enabled).length; } +/** + * Gets count of required tag lists of a policy + */ +function getCountOfRequiredTagLists(policyTagLists: OnyxEntry): number { + if (!policyTagLists) { + return 0; + } + return Object.values(policyTagLists).filter((tagList) => tagList.required).length; +} /** * Whether the policy has multi-level tags @@ -1548,6 +1560,7 @@ export { getManagerAccountID, isPreferredExporter, areAllGroupPoliciesExpenseChatDisabled, + getCountOfRequiredTagLists, getActiveEmployeeWorkspaces, isUserInvitedToWorkspace, getPolicyRole, diff --git a/src/libs/actions/Policy/Category.ts b/src/libs/actions/Policy/Category.ts index abc08009ccac..9e90b3257c94 100644 --- a/src/libs/actions/Policy/Category.ts +++ b/src/libs/actions/Policy/Category.ts @@ -27,7 +27,6 @@ import getIsNarrowLayout from '@libs/getIsNarrowLayout'; import {translateLocal} from '@libs/Localize'; import Log from '@libs/Log'; import enhanceParameters from '@libs/Network/enhanceParameters'; -import {hasEnabledOptions} from '@libs/OptionsListUtils'; import {getPolicy, goBackWhenEnableFeature} from '@libs/PolicyUtils'; import {getAllPolicyReports} from '@libs/ReportUtils'; import {resolveEnableFeatureConflicts} from '@userActions/RequestConflictUtils'; @@ -304,7 +303,6 @@ function buildOptimisticPolicyRecentlyUsedCategories(policyID?: string, category function setWorkspaceCategoryEnabled(policyID: string, categoriesToUpdate: Record) { const policyCategories = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`] ?? {}; - const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]; const optimisticPolicyCategoriesData = { ...Object.keys(categoriesToUpdate).reduce((acc, key) => { acc[key] = { @@ -319,7 +317,7 @@ function setWorkspaceCategoryEnabled(policyID: string, categoriesToUpdate: Recor return acc; }, {}), }; - const shouldDisableRequiresCategory = !hasEnabledOptions({...policyCategories, ...optimisticPolicyCategoriesData}); + const onyxData: OnyxData = { optimisticData: [ { @@ -368,38 +366,8 @@ function setWorkspaceCategoryEnabled(policyID: string, categoriesToUpdate: Recor }, ], }; + appendSetupCategoriesOnboardingData(onyxData); - if (shouldDisableRequiresCategory) { - onyxData.optimisticData?.push({ - onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - value: { - requiresCategory: false, - pendingFields: { - requiresCategory: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, - }, - }, - }); - onyxData.successData?.push({ - onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - value: { - pendingFields: { - requiresCategory: null, - }, - }, - }); - onyxData.failureData?.push({ - onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - value: { - requiresCategory: policy?.requiresCategory, - pendingFields: { - requiresCategory: null, - }, - }, - }); - } const parameters = { policyID, @@ -967,15 +935,12 @@ function clearCategoryErrors(policyID: string, categoryName: string) { } function deleteWorkspaceCategories(policyID: string, categoryNamesToDelete: string[]) { - const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${policyID}`]; const policyCategories = allPolicyCategories?.[`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policyID}`] ?? {}; const optimisticPolicyCategoriesData = categoryNamesToDelete.reduce>>((acc, categoryName) => { acc[categoryName] = {pendingAction: CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, enabled: false}; return acc; }, {}); - const shouldDisableRequiresCategory = !hasEnabledOptions( - Object.values(policyCategories).filter((category) => !categoryNamesToDelete.includes(category.name) && category.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE), - ); + const onyxData: OnyxData = { optimisticData: [ { @@ -1009,38 +974,8 @@ function deleteWorkspaceCategories(policyID: string, categoryNamesToDelete: stri }, ], }; + appendSetupCategoriesOnboardingData(onyxData); - if (shouldDisableRequiresCategory) { - onyxData.optimisticData?.push({ - onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - value: { - requiresCategory: false, - pendingFields: { - requiresCategory: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, - }, - }, - }); - onyxData.successData?.push({ - onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - value: { - pendingFields: { - requiresCategory: null, - }, - }, - }); - onyxData.failureData?.push({ - onyxMethod: Onyx.METHOD.MERGE, - key: `${ONYXKEYS.COLLECTION.POLICY}${policyID}`, - value: { - requiresCategory: policy?.requiresCategory, - pendingFields: { - requiresCategory: null, - }, - }, - }); - } const parameters = { policyID, diff --git a/src/libs/actions/Policy/Tag.ts b/src/libs/actions/Policy/Tag.ts index 00536de44ac3..e332f3b472c7 100644 --- a/src/libs/actions/Policy/Tag.ts +++ b/src/libs/actions/Policy/Tag.ts @@ -20,7 +20,6 @@ import getIsNarrowLayout from '@libs/getIsNarrowLayout'; import {translateLocal} from '@libs/Localize'; import Log from '@libs/Log'; import enhanceParameters from '@libs/Network/enhanceParameters'; -import * as OptionsListUtils from '@libs/OptionsListUtils'; import * as PolicyUtils from '@libs/PolicyUtils'; import {goBackWhenEnableFeature} from '@libs/PolicyUtils'; import * as ReportUtils from '@libs/ReportUtils'; @@ -253,8 +252,6 @@ function setWorkspaceTagEnabled(policyID: string, tagsToUpdate: Record((acc, key) => { acc[key] = { @@ -301,7 +296,6 @@ function setWorkspaceTagEnabled(policyID: string, tagsToUpdate: Record((acc, key) => { acc[key] = { diff --git a/src/pages/workspace/categories/CategorySettingsPage.tsx b/src/pages/workspace/categories/CategorySettingsPage.tsx index 95cfe575fbba..b43447db80c6 100644 --- a/src/pages/workspace/categories/CategorySettingsPage.tsx +++ b/src/pages/workspace/categories/CategorySettingsPage.tsx @@ -21,6 +21,7 @@ import {convertToDisplayString} from '@libs/CurrencyUtils'; import {getLatestErrorMessageField} from '@libs/ErrorUtils'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; +import {isDisablingOrDeletingLastEnabledCategory} from '@libs/OptionsListUtils'; import {getPersonalDetailByEmail} from '@libs/PersonalDetailsUtils'; import {getWorkflowApprovalsUnavailable, isControlPolicy} from '@libs/PolicyUtils'; import type {SettingsNavigatorParamList} from '@navigation/types'; @@ -56,6 +57,8 @@ function CategorySettingsPage({ const policyCurrency = policy?.outputCurrency ?? CONST.CURRENCY.USD; const policyCategoryExpenseLimitType = policyCategory?.expenseLimitType ?? CONST.POLICY.EXPENSE_LIMIT_TYPES.EXPENSE; + const [isCannotDeleteOrDisableLastCategoryModalVisible, setIsCannotDeleteOrDisableLastCategoryModalVisible] = useState(false); + const shouldPreventDisableOrDelete = isDisablingOrDeletingLastEnabledCategory(policy, policyCategories, [policyCategory]); const areCommentsRequired = policyCategory?.areCommentsRequired ?? false; const isQuickSettingsFlow = !!backTo; @@ -115,7 +118,11 @@ function CategorySettingsPage({ return ; } - const updateWorkspaceRequiresCategory = (value: boolean) => { + const updateWorkspaceCategoryEnabled = (value: boolean) => { + if (shouldPreventDisableOrDelete) { + setIsCannotDeleteOrDisableLastCategoryModalVisible(true); + return; + } setWorkspaceCategoryEnabled(policyID, {[policyCategory.name]: {name: policyCategory.name, enabled: value}}); }; @@ -160,6 +167,15 @@ function CategorySettingsPage({ cancelText={translate('common.cancel')} danger /> + setIsCannotDeleteOrDisableLastCategoryModalVisible(false)} + onCancel={() => setIsCannotDeleteOrDisableLastCategoryModalVisible(false)} + title={translate('workspace.categories.cannotDeleteOrDisableAllCategories.title')} + prompt={translate('workspace.categories.cannotDeleteOrDisableAllCategories.description')} + confirmText={translate('common.buttonConfirm')} + shouldShowCancelButton={false} + /> @@ -328,12 +345,17 @@ function CategorySettingsPage({ )} - {!isThereAnyAccountingConnection && ( setDeleteCategoryConfirmModalVisible(true)} + onPress={() => { + if (shouldPreventDisableOrDelete) { + setIsCannotDeleteOrDisableLastCategoryModalVisible(true); + return; + } + setDeleteCategoryConfirmModalVisible(true); + }} /> )} diff --git a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx index ba246068bbab..e10ea479cec8 100644 --- a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx +++ b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx @@ -44,6 +44,7 @@ import localeCompare from '@libs/LocaleCompare'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {WorkspaceSplitNavigatorParamList} from '@libs/Navigation/types'; +import {isDisablingOrDeletingLastEnabledCategory} from '@libs/OptionsListUtils'; import {getConnectedIntegration, getCurrentConnectionName, hasAccountingConnections, shouldShowSyncError} from '@libs/PolicyUtils'; import StringUtils from '@libs/StringUtils'; import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper'; @@ -74,6 +75,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) { const [isOfflineModalVisible, setIsOfflineModalVisible] = useState(false); const [isDownloadFailureModalVisible, setIsDownloadFailureModalVisible] = useState(false); const [deleteCategoriesConfirmModalVisible, setDeleteCategoriesConfirmModalVisible] = useState(false); + const [isCannotDeleteOrDisableLastCategoryModalVisible, setIsCannotDeleteOrDisableLastCategoryModalVisible] = useState(false); const {environmentURL} = useEnvironment(); const policyId = route.params.policyID; const backTo = route.params?.backTo; @@ -90,7 +92,6 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) { const filterCategories = useCallback((category: PolicyCategory | undefined) => !!category && category.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, []); const [selectedCategories, setSelectedCategories] = useFilteredSelection(policyCategories, filterCategories); - const canSelectMultiple = isSmallScreenWidth ? selectionMode?.isEnabled : true; const fetchCategories = useCallback(() => { @@ -113,7 +114,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) { onNavigationCallBack: () => Navigation.goBack(backTo), }); - const updateWorkspaceRequiresCategory = useCallback( + const updateWorkspaceCategoryEnabled = useCallback( (value: boolean, categoryName: string) => { setWorkspaceCategoryEnabled(policyId, {[categoryName]: {name: categoryName, enabled: value}}); }, @@ -141,14 +142,21 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) { isOn={value.enabled} disabled={isDisabled} accessibilityLabel={translate('workspace.categories.enableCategory')} - onToggle={(newValue: boolean) => updateWorkspaceRequiresCategory(newValue, value.name)} + onToggle={(newValue: boolean) => { + if (isDisablingOrDeletingLastEnabledCategory(policy, policyCategories, [value])) { + setIsCannotDeleteOrDisableLastCategoryModalVisible(true); + return; + } + updateWorkspaceCategoryEnabled(newValue, value.name); + }} + showLockIcon={isDisablingOrDeletingLastEnabledCategory(policy, policyCategories, [value])} /> ), }); return acc; }, []); - }, [policyCategories, isOffline, selectedCategories, canSelectMultiple, translate, updateWorkspaceRequiresCategory]); + }, [policyCategories, isOffline, selectedCategories, canSelectMultiple, translate, updateWorkspaceCategoryEnabled, policy]); const filterCategory = useCallback((categoryOption: PolicyOption, searchInput: string) => { const categoryText = StringUtils.normalize(categoryOption.text?.toLowerCase() ?? ''); @@ -227,6 +235,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) { const getHeaderButtons = () => { const options: Array>> = []; const isThereAnyAccountingConnection = Object.keys(policy?.connections ?? {}).length !== 0; + const selectedCategoriesObject = selectedCategories.map((key) => policyCategories?.[key]); if (isSmallScreenWidth ? canSelectMultiple : selectedCategories.length > 0) { if (!isThereAnyAccountingConnection) { @@ -234,7 +243,14 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) { icon: Expensicons.Trashcan, text: translate(selectedCategories.length === 1 ? 'workspace.categories.deleteCategory' : 'workspace.categories.deleteCategories'), value: CONST.POLICY.BULK_ACTION_TYPES.DELETE, - onSelected: () => setDeleteCategoriesConfirmModalVisible(true), + onSelected: () => { + if (isDisablingOrDeletingLastEnabledCategory(policy, policyCategories, selectedCategoriesObject)) { + setIsCannotDeleteOrDisableLastCategoryModalVisible(true); + return; + } + + setDeleteCategoriesConfirmModalVisible(true); + }, }); } @@ -249,12 +265,15 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) { }; return acc; }, {}); - options.push({ icon: Expensicons.Close, text: translate(enabledCategories.length === 1 ? 'workspace.categories.disableCategory' : 'workspace.categories.disableCategories'), value: CONST.POLICY.BULK_ACTION_TYPES.DISABLE, onSelected: () => { + if (isDisablingOrDeletingLastEnabledCategory(policy, policyCategories, selectedCategoriesObject)) { + setIsCannotDeleteOrDisableLastCategoryModalVisible(true); + return; + } setSelectedCategories([]); setWorkspaceCategoryEnabled(policyId, categoriesToDisable); }, @@ -493,6 +512,15 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) { )} + setIsCannotDeleteOrDisableLastCategoryModalVisible(false)} + onCancel={() => setIsCannotDeleteOrDisableLastCategoryModalVisible(false)} + title={translate('workspace.categories.cannotDeleteOrDisableAllCategories.title')} + prompt={translate('workspace.categories.cannotDeleteOrDisableAllCategories.description')} + confirmText={translate('common.buttonConfirm')} + shouldShowCancelButton={false} + /> setIsOfflineModalVisible(false)} diff --git a/src/pages/workspace/tags/TagSettingsPage.tsx b/src/pages/workspace/tags/TagSettingsPage.tsx index 62d24915fa23..04969c398060 100644 --- a/src/pages/workspace/tags/TagSettingsPage.tsx +++ b/src/pages/workspace/tags/TagSettingsPage.tsx @@ -1,4 +1,4 @@ -import React, {useEffect, useMemo} from 'react'; +import React, {useEffect, useMemo, useState} from 'react'; import {View} from 'react-native'; import {useOnyx} from 'react-native-onyx'; import ConfirmModal from '@components/ConfirmModal'; @@ -17,6 +17,7 @@ import useThemeStyles from '@hooks/useThemeStyles'; import {getLatestErrorMessageField} from '@libs/ErrorUtils'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; +import {isDisablingOrDeletingLastEnabledTag} from '@libs/OptionsListUtils'; import {getPersonalDetailByEmail} from '@libs/PersonalDetailsUtils'; import { getCleanedTagName, @@ -39,7 +40,7 @@ import type SCREENS from '@src/SCREENS'; type TagSettingsPageProps = PlatformStackScreenProps; function TagSettingsPage({route, navigation}: TagSettingsPageProps) { - const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${route.params.policyID}`); + const [policyTags] = useOnyx(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${route.params.policyID}`, {canBeMissing: true}); const {orderWeight, policyID, tagName, backTo} = route.params; const styles = useThemeStyles(); const {translate} = useLocalize(); @@ -47,11 +48,13 @@ function TagSettingsPage({route, navigation}: TagSettingsPageProps) { const policy = usePolicy(policyID); const hasAccountingConnections = hasAccountingConnectionsPolicyUtils(policy); const [isDeleteTagModalOpen, setIsDeleteTagModalOpen] = React.useState(false); + const [isCannotDeleteOrDisableLastTagModalVisible, setIsCannotDeleteOrDisableLastTagModalVisible] = useState(false); const isQuickSettingsFlow = !!backTo; const tagApprover = getTagApproverRule(policyID, route.params?.tagName)?.approver ?? ''; const approver = getPersonalDetailByEmail(tagApprover); const approverText = approver?.displayName ?? tagApprover; const currentPolicyTag = policyTag.tags[tagName] ?? Object.values(policyTag.tags ?? {}).find((tag) => tag.previousTagName === tagName); + const shouldPreventDisableOrDelete = isDisablingOrDeletingLastEnabledTag(policyTag, [currentPolicyTag]); useEffect(() => { if (currentPolicyTag?.name === tagName || !currentPolicyTag) { @@ -71,6 +74,10 @@ function TagSettingsPage({route, navigation}: TagSettingsPageProps) { }; const updateWorkspaceTagEnabled = (value: boolean) => { + if (shouldPreventDisableOrDelete) { + setIsCannotDeleteOrDisableLastTagModalVisible(true); + return; + } setWorkspaceTagEnabled(policyID, {[currentPolicyTag.name]: {name: currentPolicyTag.name, enabled: value}}, policyTag.orderWeight); }; @@ -144,6 +151,16 @@ function TagSettingsPage({route, navigation}: TagSettingsPageProps) { cancelText={translate('common.cancel')} danger /> + setIsCannotDeleteOrDisableLastTagModalVisible(false)} + onCancel={() => setIsCannotDeleteOrDisableLastTagModalVisible(false)} + title={translate('workspace.tags.cannotDeleteOrDisableAllTags.title')} + prompt={translate('workspace.tags.cannotDeleteOrDisableAllTags.description')} + confirmText={translate('common.buttonConfirm')} + shouldShowCancelButton={false} + /> + @@ -212,7 +230,13 @@ function TagSettingsPage({route, navigation}: TagSettingsPageProps) { setIsDeleteTagModalOpen(true)} + onPress={() => { + if (shouldPreventDisableOrDelete) { + setIsCannotDeleteOrDisableLastTagModalVisible(true); + return; + } + setIsDeleteTagModalOpen(true); + }} /> )} diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx index b062585c950f..ada0988e0502 100644 --- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx +++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx @@ -53,6 +53,7 @@ import localeCompare from '@libs/LocaleCompare'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {WorkspaceSplitNavigatorParamList} from '@libs/Navigation/types'; +import {isDisablingOrDeletingLastEnabledTag, isMakingLastRequiredTagListOptional} from '@libs/OptionsListUtils'; import { getCleanedTagName, getConnectedIntegration, @@ -88,6 +89,8 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { const [isDownloadFailureModalVisible, setIsDownloadFailureModalVisible] = useState(false); const [isDeleteTagsConfirmModalVisible, setIsDeleteTagsConfirmModalVisible] = useState(false); const [isOfflineModalVisible, setIsOfflineModalVisible] = useState(false); + const [isCannotDeleteOrDisableLastTagModalVisible, setIsCannotDeleteOrDisableLastTagModalVisible] = useState(false); + const [isCannotMakeLastTagOptionalModalVisible, setIsCannotMakeLastTagOptionalModalVisible] = useState(false); const policyID = route.params.policyID; const backTo = route.params.backTo; const policy = usePolicy(policyID); @@ -165,6 +168,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { }, [policyID], ); + const tagList = useMemo(() => { if (isMultiLevelTags) { return policyTagLists.map((policyTagList) => { @@ -175,7 +179,6 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { if (policyTagList.required && !areTagsEnabled) { updateWorkspaceRequiresTag(false, policyTagList.orderWeight); } - return { value: policyTagList.name, orderWeight: policyTagList.orderWeight, @@ -189,13 +192,22 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { updateWorkspaceRequiresTag(newValue, policyTagList.orderWeight)} + onToggle={(newValue: boolean) => { + if (isMakingLastRequiredTagListOptional(policy, policyTags, [policyTagList])) { + setIsCannotMakeLastTagOptionalModalVisible(true); + return; + } + + updateWorkspaceRequiresTag(newValue, policyTagList.orderWeight); + }} disabled={isSwitchDisabled} + showLockIcon={isMakingLastRequiredTagListOptional(policy, policyTags, [policyTagList])} /> ), }; }); } + return Object.values(policyTagLists?.at(0)?.tags ?? {}).map((tag) => ({ value: tag.name, text: getCleanedTagName(tag.name), @@ -210,11 +222,18 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { isOn={tag.enabled} disabled={tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE} accessibilityLabel={translate('workspace.tags.enableTag')} - onToggle={(newValue: boolean) => updateWorkspaceTagEnabled(newValue, tag.name)} + onToggle={(newValue: boolean) => { + if (isDisablingOrDeletingLastEnabledTag(policyTagLists.at(0), [tag])) { + setIsCannotDeleteOrDisableLastTagModalVisible(true); + return; + } + updateWorkspaceTagEnabled(newValue, tag.name); + }} + showLockIcon={isDisablingOrDeletingLastEnabledTag(policyTagLists.at(0), [tag])} /> ), })); - }, [isMultiLevelTags, policyTagLists, selectedTags, canSelectMultiple, translate, updateWorkspaceRequiresTag, updateWorkspaceTagEnabled]); + }, [isMultiLevelTags, policyTagLists, selectedTags, canSelectMultiple, translate, updateWorkspaceRequiresTag, updateWorkspaceTagEnabled, policy, policyTags]); const filterTag = useCallback((tag: TagListItem, searchInput: string) => { const tagText = StringUtils.normalize(tag.text?.toLowerCase() ?? ''); @@ -293,6 +312,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { const getHeaderButtons = () => { const hasAccountingConnections = hasAccountingConnectionsPolicyUtils(policy); + const selectedTagsObject = selectedTags.map((key) => policyTagLists.at(0)?.tags?.[key]); if (shouldUseNarrowLayout ? !selectionMode?.isEnabled : selectedTags.length === 0) { return ( @@ -323,7 +343,14 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { icon: Expensicons.Trashcan, text: translate(selectedTags.length === 1 ? 'workspace.tags.deleteTag' : 'workspace.tags.deleteTags'), value: CONST.POLICY.BULK_ACTION_TYPES.DELETE, - onSelected: () => setIsDeleteTagsConfirmModalVisible(true), + onSelected: () => { + if (isDisablingOrDeletingLastEnabledTag(policyTagLists.at(0), selectedTagsObject)) { + setIsCannotDeleteOrDisableLastTagModalVisible(true); + return; + } + + setIsDeleteTagsConfirmModalVisible(true); + }, }); } @@ -353,6 +380,10 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { text: translate(enabledTagCount === 1 ? 'workspace.tags.disableTag' : 'workspace.tags.disableTags'), value: CONST.POLICY.BULK_ACTION_TYPES.DISABLE, onSelected: () => { + if (isDisablingOrDeletingLastEnabledTag(policyTagLists.at(0), selectedTagsObject)) { + setIsCannotDeleteOrDisableLastTagModalVisible(true); + return; + } setSelectedTags([]); setWorkspaceTagEnabled(policyID, tagsToDisable, 0); }, @@ -382,6 +413,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { options={options} style={[shouldUseNarrowLayout && styles.flexGrow1, shouldUseNarrowLayout && styles.mb3]} isDisabled={!selectedTags.length} + testID={`${WorkspaceTagsPage.displayName}-header-dropdown-menu-button`} /> ); }; @@ -579,6 +611,24 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { cancelText={translate('common.cancel')} danger /> + setIsCannotDeleteOrDisableLastTagModalVisible(false)} + onCancel={() => setIsCannotDeleteOrDisableLastTagModalVisible(false)} + title={translate('workspace.tags.cannotDeleteOrDisableAllTags.title')} + prompt={translate('workspace.tags.cannotDeleteOrDisableAllTags.description')} + confirmText={translate('common.buttonConfirm')} + shouldShowCancelButton={false} + /> + setIsCannotMakeLastTagOptionalModalVisible(false)} + onCancel={() => setIsCannotMakeLastTagOptionalModalVisible(false)} + title={translate('workspace.tags.cannotMakeAllTagsOptional.title')} + prompt={translate('workspace.tags.cannotMakeAllTagsOptional.description')} + confirmText={translate('common.buttonConfirm')} + shouldShowCancelButton={false} + /> ); } diff --git a/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx b/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx index 12dddf4e1e6e..40f5ff304a74 100644 --- a/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx +++ b/src/pages/workspace/tags/WorkspaceViewTagsPage.tsx @@ -39,6 +39,7 @@ import {canUseTouchScreen} from '@libs/DeviceCapabilities'; import localeCompare from '@libs/LocaleCompare'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; +import {isDisablingOrDeletingLastEnabledTag, isMakingLastRequiredTagListOptional} from '@libs/OptionsListUtils'; import {getCleanedTagName, getTagListName, hasDependentTags as hasDependentTagsPolicyUtils, isMultiLevelTags as isMultiLevelTagsPolicyUtils} from '@libs/PolicyUtils'; import StringUtils from '@libs/StringUtils'; import type {SettingsNavigatorParamList} from '@navigation/types'; @@ -73,7 +74,8 @@ function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) { const currentTagListName = useMemo(() => getTagListName(policyTags, route.params.orderWeight), [policyTags, route.params.orderWeight]); const currentPolicyTag = policyTags?.[currentTagListName]; const isQuickSettingsFlow = !!backTo; - + const [isCannotMakeAllTagsOptionalModalVisible, setIsCannotMakeAllTagsOptionalModalVisible] = useState(false); + const [isCannotDeleteOrDisableLastTagModalVisible, setIsCannotDeleteOrDisableLastTagModalVisible] = useState(false); const fetchTags = useCallback(() => { openPolicyTagsPage(policyID); }, [policyID]); @@ -125,11 +127,18 @@ function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) { isOn={tag.enabled} disabled={tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE} accessibilityLabel={translate('workspace.tags.enableTag')} - onToggle={(newValue: boolean) => updateWorkspaceTagEnabled(newValue, tag.name)} + onToggle={(newValue: boolean) => { + if (isDisablingOrDeletingLastEnabledTag(currentPolicyTag, [tag])) { + setIsCannotDeleteOrDisableLastTagModalVisible(true); + return; + } + updateWorkspaceTagEnabled(newValue, tag.name); + }} + showLockIcon={isDisablingOrDeletingLastEnabledTag(currentPolicyTag, [tag])} /> ), })), - [currentPolicyTag?.tags, selectedTags, canSelectMultiple, translate, updateWorkspaceTagEnabled], + [selectedTags, canSelectMultiple, translate, updateWorkspaceTagEnabled, currentPolicyTag], ); const filterTag = useCallback((tag: TagListItem, searchInput: string) => { @@ -253,11 +262,16 @@ function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) { } if (enabledTagCount > 0) { + const selectedTagsObject = selectedTags.map((key) => currentPolicyTag?.tags[key]); options.push({ icon: Expensicons.Close, text: translate(enabledTagCount === 1 ? 'workspace.tags.disableTag' : 'workspace.tags.disableTags'), value: CONST.POLICY.BULK_ACTION_TYPES.DISABLE, onSelected: () => { + if (isDisablingOrDeletingLastEnabledTag(currentPolicyTag, selectedTagsObject)) { + setIsCannotDeleteOrDisableLastTagModalVisible(true); + return; + } setSelectedTags([]); setWorkspaceTagEnabled(policyID, tagsToDisable, route.params.orderWeight); }, @@ -347,11 +361,19 @@ function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) { title={translate('common.required')} switchAccessibilityLabel={translate('common.required')} isActive={!!currentPolicyTag?.required} - onToggle={(on) => setPolicyTagsRequired(policyID, on, route.params.orderWeight)} + onToggle={(on) => { + if (isMakingLastRequiredTagListOptional(policy, policyTags, [currentPolicyTag])) { + setIsCannotMakeAllTagsOptionalModalVisible(true); + return; + } + + setPolicyTagsRequired(policyID, on, route.params.orderWeight); + }} pendingAction={currentPolicyTag.pendingFields?.required} errors={currentPolicyTag?.errorFields?.required ?? undefined} onCloseError={() => clearPolicyTagListErrorField(policyID, route.params.orderWeight, 'required')} disabled={!currentPolicyTag?.required && !Object.values(currentPolicyTag?.tags ?? {}).some((tag) => tag.enabled)} + showLockIcon={isMakingLastRequiredTagListOptional(policy, policyTags, [currentPolicyTag])} /> )} @@ -404,6 +426,24 @@ function WorkspaceViewTagsPage({route}: WorkspaceViewTagsProps) { }} /> )} + setIsCannotDeleteOrDisableLastTagModalVisible(false)} + onCancel={() => setIsCannotDeleteOrDisableLastTagModalVisible(false)} + title={translate('workspace.tags.cannotDeleteOrDisableAllTags.title')} + prompt={translate('workspace.tags.cannotDeleteOrDisableAllTags.description')} + confirmText={translate('common.buttonConfirm')} + shouldShowCancelButton={false} + /> + setIsCannotMakeAllTagsOptionalModalVisible(false)} + onCancel={() => setIsCannotMakeAllTagsOptionalModalVisible(false)} + title={translate('workspace.tags.cannotMakeAllTagsOptional.title')} + prompt={translate('workspace.tags.cannotMakeAllTagsOptional.description')} + confirmText={translate('common.buttonConfirm')} + shouldShowCancelButton={false} + /> ); diff --git a/tests/ui/WorkspaceCategoriesTest.tsx b/tests/ui/WorkspaceCategoriesTest.tsx index 1f470371f643..b8fbf36f5ef9 100644 --- a/tests/ui/WorkspaceCategoriesTest.tsx +++ b/tests/ui/WorkspaceCategoriesTest.tsx @@ -9,7 +9,7 @@ import OnyxProvider from '@components/OnyxProvider'; import {CurrentReportIDContextProvider} from '@hooks/useCurrentReportID'; import * as useResponsiveLayoutModule from '@hooks/useResponsiveLayout'; import type ResponsiveLayoutResult from '@hooks/useResponsiveLayout/types'; -import * as Localize from '@libs/Localize'; +import {translateLocal} from '@libs/Localize'; import createPlatformStackNavigator from '@libs/Navigation/PlatformStackNavigation/createPlatformStackNavigator'; import type {WorkspaceSplitNavigatorParamList} from '@navigation/types'; import WorkspaceCategoriesPage from '@pages/workspace/categories/WorkspaceCategoriesPage'; @@ -125,7 +125,7 @@ describe('WorkspaceCategories', () => { // Wait for menu items to be visible await waitFor(() => { - const deleteText = Localize.translateLocal('workspace.categories.deleteCategories'); + const deleteText = translateLocal('workspace.categories.deleteCategories'); expect(screen.getByText(deleteText)).toBeOnTheScreen(); }); @@ -146,18 +146,18 @@ describe('WorkspaceCategories', () => { // After clicking delete categories dropdown menu item, verify the confirmation modal appears await waitFor(() => { - const confirmModalPrompt = Localize.translateLocal('workspace.categories.deleteCategoriesPrompt'); + const confirmModalPrompt = translateLocal('workspace.categories.deleteCategoriesPrompt'); expect(screen.getByText(confirmModalPrompt)).toBeOnTheScreen(); }); // Verify the delete button in the modal is visible await waitFor(() => { - const deleteConfirmButton = screen.getByLabelText(Localize.translateLocal('common.delete')); + const deleteConfirmButton = screen.getByLabelText(translateLocal('common.delete')); expect(deleteConfirmButton).toBeOnTheScreen(); }); // Click the delete button in the confirmation modal - const deleteConfirmButton = screen.getByLabelText(Localize.translateLocal('common.delete')); + const deleteConfirmButton = screen.getByLabelText(translateLocal('common.delete')); fireEvent.press(deleteConfirmButton); await waitForBatchedUpdatesWithAct(); @@ -170,6 +170,92 @@ describe('WorkspaceCategories', () => { expect(screen.queryByText(SECOND_CATEGORY)).not.toBeOnTheScreen(); }); + unmount(); + await waitForBatchedUpdatesWithAct(); + }); + it('should show a blocking modal when trying to disable the only enabled category when policy has requiresCategory set to true', async () => { + await TestHelper.signInWithTestUser(); + + const policy = { + ...LHNTestUtils.getFakePolicy(), + role: CONST.POLICY.ROLE.ADMIN, + areCategoriesEnabled: true, + requiresCategory: true, + }; + + const categories = { + [FIRST_CATEGORY]: { + name: FIRST_CATEGORY, + enabled: true, + }, + [SECOND_CATEGORY]: { + name: SECOND_CATEGORY, + enabled: true, + }, + }; + + // Initialize categories + await act(async () => { + await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, policy); + await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY_CATEGORIES}${policy.id}`, categories); + }); + + const {unmount} = renderPage(SCREENS.WORKSPACE.CATEGORIES, {policyID: policy.id}); + + await waitForBatchedUpdatesWithAct(); + + // Wait for initial render and verify categories are visible + await waitFor(() => { + expect(screen.getByText(FIRST_CATEGORY)).toBeOnTheScreen(); + }); + await waitFor(() => { + expect(screen.getByText(SECOND_CATEGORY)).toBeOnTheScreen(); + }); + + // Select categories to delete by clicking their checkboxes + fireEvent.press(screen.getByTestId(`TableListItemCheckbox-${FIRST_CATEGORY}`)); + fireEvent.press(screen.getByTestId(`TableListItemCheckbox-${SECOND_CATEGORY}`)); + + const dropdownMenuButtonTestID = `${WorkspaceCategoriesPage.displayName}-header-dropdown-menu-button`; + + // Wait for selection mode to be active and click the dropdown menu button + await waitFor(() => { + expect(screen.getByTestId(dropdownMenuButtonTestID)).toBeOnTheScreen(); + }); + + // Click the "2 selected" button to open the menu + const dropdownButton = screen.getByTestId(dropdownMenuButtonTestID); + fireEvent.press(dropdownButton); + + await waitForBatchedUpdatesWithAct(); + + // Wait for menu items to be visible + await waitFor(() => { + const disableText = translateLocal('workspace.categories.disableCategories'); + expect(screen.getByText(disableText)).toBeOnTheScreen(); + }); + + // Find and verify "Disable categories" dropdown menu item + const disableMenuItem = screen.getByTestId('PopoverMenuItem-Disable categories'); + expect(disableMenuItem).toBeOnTheScreen(); + + // Create a mock event object that matches GestureResponderEvent. Needed for onPress in MenuItem to be called + const mockEvent = { + nativeEvent: {}, + type: 'press', + target: disableMenuItem, + currentTarget: disableMenuItem, + }; + fireEvent.press(disableMenuItem, mockEvent); + + await waitForBatchedUpdatesWithAct(); + + // After clicking disable categories dropdown menu item, verify the blocking modal appears + await waitFor(() => { + const blockingPrompt = translateLocal('workspace.categories.cannotDeleteOrDisableAllCategories.title'); + expect(screen.getByText(blockingPrompt)).toBeOnTheScreen(); + }); + unmount(); await waitForBatchedUpdatesWithAct(); }); diff --git a/tests/ui/WorkspaceTagsTest.tsx b/tests/ui/WorkspaceTagsTest.tsx index 7b81b5d1113a..eeebae428393 100644 --- a/tests/ui/WorkspaceTagsTest.tsx +++ b/tests/ui/WorkspaceTagsTest.tsx @@ -45,10 +45,28 @@ const renderPage = (initialRouteName: typeof SCREENS.WORKSPACE.TAGS, initialPara ); }; -describe('WorkspaceTags', () => { - const FIRST_TAG = 'Tag One'; - const SECOND_TAG = 'Tag Two'; +const FIRST_TAG = 'Tag One'; +const SECOND_TAG = 'Tag Two'; + +const tags = { + TagListOne: { + name: 'TagListOne', + required: true, + orderWeight: 1, + tags: { + [FIRST_TAG]: { + name: FIRST_TAG, + enabled: true, + }, + [SECOND_TAG]: { + name: SECOND_TAG, + enabled: true, + }, + }, + }, +}; +describe('WorkspaceTags', () => { beforeAll(() => { Onyx.init({ keys: ONYXKEYS, @@ -79,24 +97,6 @@ describe('WorkspaceTags', () => { requiresTag: true, }; - const tags = { - TagListOne: { - name: 'TagListOne', - required: true, - orderWeight: 1, - tags: { - [FIRST_TAG]: { - name: FIRST_TAG, - enabled: true, - }, - [SECOND_TAG]: { - name: SECOND_TAG, - enabled: true, - }, - }, - }, - }; - await act(async () => { await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, policy); await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy.id}`, tags); @@ -127,4 +127,57 @@ describe('WorkspaceTags', () => { unmount(); await waitForBatchedUpdatesWithAct(); }); + + it('should show a blocking modal when trying to disable the only enabled tag when policy has requiresTag set to true', async () => { + jest.spyOn(useResponsiveLayoutModule, 'default').mockReturnValue({ + isSmallScreenWidth: false, + shouldUseNarrowLayout: false, + } as ResponsiveLayoutResult); + + await TestHelper.signInWithTestUser(); + + const policy = { + ...LHNTestUtils.getFakePolicy(), + role: CONST.POLICY.ROLE.ADMIN, + areTagsEnabled: true, + requiresTag: true, + }; + + await act(async () => { + await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policy.id}`, policy); + await Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY_TAGS}${policy.id}`, tags); + }); + + const {unmount} = renderPage(SCREENS.WORKSPACE.TAGS, {policyID: policy.id}); + await waitForBatchedUpdatesWithAct(); + + await waitFor(() => { + expect(screen.getByText(FIRST_TAG)).toBeOnTheScreen(); + }); + + await waitFor(() => { + expect(screen.getByText(SECOND_TAG)).toBeOnTheScreen(); + }); + + fireEvent.press(screen.getByTestId(`TableListItemCheckbox-${FIRST_TAG}`)); + fireEvent.press(screen.getByTestId(`TableListItemCheckbox-${SECOND_TAG}`)); + + const dropdownMenuButtonTestID = `${WorkspaceTagsPage.displayName}-header-dropdown-menu-button`; + + fireEvent.press(screen.getByTestId(dropdownMenuButtonTestID)); + await waitFor(() => { + expect(screen.getByText(translateLocal('workspace.tags.disableTags'))).toBeOnTheScreen(); + }); + + const disableMenuItem = screen.getByTestId('PopoverMenuItem-Disable tags'); + const mockEvent = {nativeEvent: {}, type: 'press', target: disableMenuItem, currentTarget: disableMenuItem}; + fireEvent.press(disableMenuItem, mockEvent); + + await waitFor(() => { + expect(screen.getByText(translateLocal('workspace.tags.cannotDeleteOrDisableAllTags.title'))).toBeOnTheScreen(); + }); + + unmount(); + await waitForBatchedUpdatesWithAct(); + }); });