fix: add workspace errors to cardFeedErrors

Author: chrispader

src/libs/actions/OnyxDerived/configs/cardFeedErrors.ts

@@ -1,4 +1,4 @@
-import {getCombinedCardFeedsFromAllFeeds} from '@libs/CardFeedUtils';
+import {getCombinedCardFeedsFromAllFeeds, getWorkspaceCardFeedsStatus} from '@libs/CardFeedUtils';
 import {filterInactiveCards, getCompanyCardFeedWithDomainID, isCardConnectionBroken} from '@libs/CardUtils';
 import createOnyxDerivedValueConfig from '@userActions/OnyxDerived/createOnyxDerivedValueConfig';
 import CONST from '@src/CONST';
@@ -13,13 +13,17 @@ const DEFAULT_CARD_FEED_ERROR_STATE: CardFeedErrorState = {
     shouldShowRBR: false,
     hasFailedCardAssignments: false,
     hasFeedErrors: false,
+    hasWorkspaceErrors: false,
     isFeedConnectionBroken: false,
 };
 
 function getShouldShowRBR(state: Partial<CardFeedErrorState>): boolean {
     if (state.hasFeedErrors) {
         return true;
     }
+    if (state.hasWorkspaceErrors) {
+        return true;
+    }
     if (state.hasFailedCardAssignments) {
         return true;
     }
@@ -32,6 +36,8 @@ export default createOnyxDerivedValueConfig({
     dependencies: [ONYXKEYS.CARD_LIST, ONYXKEYS.COLLECTION.WORKSPACE_CARDS_LIST, ONYXKEYS.COLLECTION.FAILED_COMPANY_CARDS_ASSIGNMENTS, ONYXKEYS.COLLECTION.SHARED_NVP_PRIVATE_DOMAIN_MEMBER],
     compute: ([globalCardList, allWorkspaceCards, failedCompanyCardAssignmentsPerFeed, cardFeeds]) => {
         const combinedCompanyCardFeeds = getCombinedCardFeedsFromAllFeeds(cardFeeds);
+        const workspaceCardFeedsStatus = getWorkspaceCardFeedsStatus(cardFeeds);
+
         const cardFeedErrors: CardFeedErrorsObject = {};
         const shouldShowRbrForWorkspaceAccountID: Record<number, boolean> = {};
         const shouldShowRbrForFeedNameWithDomainID: Record<string, boolean> = {};
@@ -62,6 +68,9 @@ export default createOnyxDerivedValueConfig({
             } as Errors;
             const hasFeedErrors = feedNameWithDomainID ? !isEmptyObject(feedErrors) : false;
 
+            const workspaceErrors = workspaceCardFeedsStatus?.[workspaceAccountID]?.errors;
+            const hasWorkspaceErrors = !!workspaceErrors;
+
             const hasFailedCardAssignments = !isEmptyObject(
                 failedCompanyCardAssignmentsPerFeed?.[`${ONYXKEYS.COLLECTION.FAILED_COMPANY_CARDS_ASSIGNMENTS}${workspaceAccountID}_${feedNameWithDomainID}`],
             );
@@ -86,6 +95,7 @@ export default createOnyxDerivedValueConfig({
             const newFeedState: Omit<CardFeedErrorState, 'shouldShowRBR'> = {
                 isFeedConnectionBroken: isFeedConnectionBroken || previousFeedErrors.isFeedConnectionBroken,
                 hasFeedErrors: hasFeedErrors || previousFeedErrors.hasFeedErrors,
+                hasWorkspaceErrors: hasWorkspaceErrors || previousFeedErrors.hasWorkspaceErrors,
                 hasFailedCardAssignments: hasFailedCardAssignments || previousFeedErrors.hasFailedCardAssignments,
             };
 
@@ -96,6 +106,7 @@ export default createOnyxDerivedValueConfig({
                 shouldShowRBR,
                 cardErrors,
                 feedErrors,
+                workspaceErrors,
             };
 
             // Track cards with broken feed connection
@@ -108,10 +119,12 @@ export default createOnyxDerivedValueConfig({
 
             allFeedsState.isFeedConnectionBroken ||= newFeedState.isFeedConnectionBroken;
             allFeedsState.hasFeedErrors ||= newFeedState.hasFeedErrors;
+            allFeedsState.hasWorkspaceErrors ||= newFeedState.hasWorkspaceErrors;
             allFeedsState.hasFailedCardAssignments ||= newFeedState.hasFailedCardAssignments;
 
             cardTypeState.isFeedConnectionBroken ||= newFeedState.isFeedConnectionBroken;
             cardTypeState.hasFeedErrors ||= newFeedState.hasFeedErrors;
+            cardTypeState.hasWorkspaceErrors ||= newFeedState.hasWorkspaceErrors;
             cardTypeState.hasFailedCardAssignments ||= newFeedState.hasFailedCardAssignments;
 
             shouldShowRbrForWorkspaceAccountID[workspaceAccountID] ||= shouldShowRBR;

src/types/onyx/DerivedValues.ts

@@ -118,7 +118,7 @@ type CardFeedErrorState = {
     /**
      * Whether some workspace has errors.
      */
-    // hasWorkspaceErrors: boolean;
+    hasWorkspaceErrors: boolean;
 
     /**
      * Whether some feed connection is broken.
@@ -138,6 +138,10 @@ type FeedErrors = CardFeedErrorState & {
      * The errors of all cards for a specific feed within a workspace/domain.
      */
     cardErrors: Record<string, CardErrors>;
+    /**
+     * The errors of the workspace/domain.
+     */
+    workspaceErrors?: Errors;
 };
 
 /**