Fix/74127 Invoicify related bugs

cspell.json

@@ -815,7 +815,8 @@
         "RNCORE",
         "Wooo",
         "Splittable",
-        "pgrep"
+        "pgrep",
+        "Invoicify"
     ],
     "ignorePaths": [
         "src/languages/de.ts",

src/libs/PolicyUtils.ts

@@ -60,7 +60,7 @@
 
 let allPolicies: OnyxCollection<Policy>;
 
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.POLICY,
     waitForCollectionCallback: true,
     callback: (value) => (allPolicies = value),
@@ -1580,6 +1580,54 @@
     return (otherControlWorkspaces?.length ?? 0) > 0;
 }
 
+/**
+ * Determines whether workspace deletion should be blocked for an Invoicify user.
+ *
+ * The function normalizes owner policies to a flat `Policy[]` regardless of whether
+ * they are provided as an `OnyxCollection` or a precomputed array. For Invoicify users,
+ * it ensures that at least one other controllable workspace exists after excluding
+ * policies with pending ADD or DELETE actions.
+ *
+ * The filtering is done lazily to avoid unnecessary work for non-Invoicify users.
+ *
+ * @param isSubscriptionTypeOfInvoicing - Whether the user is on an Invoicify subscription
+ * @param ownerPolicies - Owner policies as an Onyx collection or a normalized array
+ * @param currentPolicyID - Policy ID of the workspace being evaluated
+ * @param accountID - Account ID used to resolve owned paid policies when needed
+ *
+ */
+function shouldBlockWorkspaceDeletionForInvoicifyUser(
+    isSubscriptionTypeOfInvoicing: boolean,
+    ownerPolicies: OnyxCollection<Policy> | Policy[] | undefined,
+    currentPolicyID: string | undefined,
+    accountID?: number,
+) {
+    if (!isSubscriptionTypeOfInvoicing || !currentPolicyID) {
+        return false;
+    }
+    const normalizedOwnerPolicies: Policy[] = (() => {
+        if (!ownerPolicies) {
+            return [];
+        }
+
+        if (Array.isArray(ownerPolicies)) {
+            return ownerPolicies;
+        }
+
+        if (accountID) {
+            return getOwnedPaidPolicies(ownerPolicies, accountID);
+        }
+
+        return Object.values(ownerPolicies).filter((policy): policy is Policy => !!policy);
+    })();
+
+    const ownerPoliciesWithoutPendingActions = (normalizedOwnerPolicies ?? []).filter(
+        (policy) => policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.ADD && policy.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE,
+    );
+
+    return !hasOtherControlWorkspaces(ownerPoliciesWithoutPendingActions, currentPolicyID);
+}
+
 // If no policyID is provided, it indicates the workspace upgrade/downgrade URL
 // is being accessed from the Subscriptions page without a specific policyID.
 // In this case, check if the user is an admin on more than one policy.
@@ -1876,6 +1924,7 @@
     getUserFriendlyWorkspaceType,
     isPolicyAccessible,
     hasOtherControlWorkspaces,
+    shouldBlockWorkspaceDeletionForInvoicifyUser,
     getManagerAccountEmail,
     getRuleApprovers,
     canModifyPlan,

src/libs/actions/App.ts

@@ -453,6 +453,7 @@ type CreateWorkspaceWithPolicyDraftParams = {
     activePolicyID: string | undefined;
     currentUserAccountIDParam: number;
     currentUserEmailParam: string;
+    shouldCreateControlPolicy?: boolean;
 };
 
 /**
@@ -474,6 +475,7 @@ function createWorkspaceWithPolicyDraftAndNavigateToIt(params: CreateWorkspaceWi
         activePolicyID,
         currentUserAccountIDParam,
         currentUserEmailParam,
+        shouldCreateControlPolicy,
     } = params;
 
     const policyIDWithDefault = policyID || generatePolicyID();
@@ -497,6 +499,7 @@ function createWorkspaceWithPolicyDraftAndNavigateToIt(params: CreateWorkspaceWi
             currentUserAccountIDParam,
             currentUserEmailParam,
             allReportsParam: allReports,
+            shouldCreateControlPolicy,
         });
         Navigation.navigate(routeToNavigate, {forceReplace: !transitionFromOldDot});
     });
@@ -515,6 +518,7 @@ type SavePolicyDraftByNewWorkspaceParams = {
     currentUserAccountIDParam: number;
     currentUserEmailParam: string;
     allReportsParam: OnyxCollection<OnyxTypes.Report>;
+    shouldCreateControlPolicy?: boolean;
 };
 
 /**
@@ -533,6 +537,7 @@ function savePolicyDraftByNewWorkspace({
     currentUserAccountIDParam,
     currentUserEmailParam,
     allReportsParam,
+    shouldCreateControlPolicy,
 }: SavePolicyDraftByNewWorkspaceParams) {
     createWorkspace({
         policyOwnerEmail,
@@ -548,6 +553,7 @@ function savePolicyDraftByNewWorkspace({
         currentUserAccountIDParam,
         currentUserEmailParam,
         allReportsParam,
+        shouldCreateControlPolicy,
     });
 }
 

src/libs/actions/Policy/Policy.ts

@@ -186,6 +186,7 @@
     allReportsParam?: OnyxCollection<Report>;
     onboardingPurposeSelected?: OnboardingPurpose;
     shouldAddGuideWelcomeMessage?: boolean;
+    shouldCreateControlPolicy?: boolean;
 };
 
 type DuplicatePolicyDataOptions = {
@@ -209,7 +210,7 @@
 };
 
 const deprecatedAllPolicies: OnyxCollection<Policy> = {};
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.POLICY,
     callback: (val, key) => {
         if (!key) {
@@ -225,7 +226,7 @@
 });
 
 let deprecatedAllReportActions: OnyxCollection<ReportActions>;
 Onyx.connect({
     key: ONYXKEYS.COLLECTION.REPORT_ACTIONS,
     waitForCollectionCallback: true,
     callback: (actions) => {
@@ -235,7 +236,7 @@
 
 let deprecatedSessionEmail = '';
 let deprecatedSessionAccountID = 0;
 Onyx.connect({
     key: ONYXKEYS.SESSION,
     callback: (val) => {
         deprecatedSessionEmail = val?.email ?? '';
@@ -244,7 +245,7 @@
 });
 
 let deprecatedAllPersonalDetails: OnyxEntry<PersonalDetailsList>;
 Onyx.connect({
     key: ONYXKEYS.PERSONAL_DETAILS_LIST,
     callback: (val) => (deprecatedAllPersonalDetails = val),
 });
@@ -2116,6 +2117,7 @@
         allReportsParam,
         shouldAddGuideWelcomeMessage = true,
         onboardingPurposeSelected,
+        shouldCreateControlPolicy = false,
     } = options;
     const workspaceName = policyName || generateDefaultWorkspaceName(policyOwnerEmail);
 
@@ -2147,7 +2149,7 @@
     // Determine workspace type based on selected features or user reported integration
     const isCorporateFeature = featuresMap?.some((feature) => !feature.enabledByDefault && feature.enabled && feature.requiresUpdate) ?? false;
     const isCorporateIntegration = userReportedIntegration && (CONST.POLICY.CONNECTIONS.CORPORATE as readonly string[]).includes(userReportedIntegration);
-    const workspaceType = isCorporateFeature || isCorporateIntegration ? CONST.POLICY.TYPE.CORPORATE : CONST.POLICY.TYPE.TEAM;
+    const workspaceType = isCorporateFeature || isCorporateIntegration || shouldCreateControlPolicy ? CONST.POLICY.TYPE.CORPORATE : CONST.POLICY.TYPE.TEAM;
 
     const areDistanceRatesEnabled = !!featuresMap?.find((feature) => feature.id === CONST.POLICY.MORE_FEATURES.ARE_DISTANCE_RATES_ENABLED && feature.enabled);
 

src/pages/workspace/WorkspaceConfirmationPage.tsx

@@ -4,10 +4,12 @@ import WorkspaceConfirmationForm from '@components/WorkspaceConfirmationForm';
 import type {WorkspaceConfirmationSubmitFunctionParams} from '@components/WorkspaceConfirmationForm';
 import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
 import useOnyx from '@hooks/useOnyx';
+import usePrivateSubscription from '@hooks/usePrivateSubscription';
 import useResponsiveLayout from '@hooks/useResponsiveLayout';
 import {createWorkspaceWithPolicyDraftAndNavigateToIt} from '@libs/actions/App';
 import {generatePolicyID} from '@libs/actions/Policy/Policy';
 import getCurrentUrl from '@libs/Navigation/currentUrl';
+import {isSubscriptionTypeOfInvoicing} from '@libs/SubscriptionUtils';
 import ONYXKEYS from '@src/ONYXKEYS';
 import ROUTES from '@src/ROUTES';
 import type {LastPaymentMethodType} from '@src/types/onyx';
@@ -21,6 +23,7 @@ function WorkspaceConfirmationPage() {
     const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID, {canBeMissing: true});
     const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED, {canBeMissing: true});
     const currentUserPersonalDetails = useCurrentUserPersonalDetails();
+    const privateSubscription = usePrivateSubscription();
     const onSubmit = (params: WorkspaceConfirmationSubmitFunctionParams) => {
         const policyID = params.policyID || generatePolicyID();
         const routeToNavigate = isSmallScreenWidth ? ROUTES.WORKSPACE_INITIAL.getRoute(policyID) : ROUTES.WORKSPACE_OVERVIEW.getRoute(policyID);
@@ -39,6 +42,7 @@ function WorkspaceConfirmationPage() {
             activePolicyID,
             currentUserAccountIDParam: currentUserPersonalDetails.accountID,
             currentUserEmailParam: currentUserPersonalDetails.email ?? '',
+            shouldCreateControlPolicy: isSubscriptionTypeOfInvoicing(privateSubscription?.type),
         });
     };
     const currentUrl = getCurrentUrl();