@zeniai/client-epic-state 5.0.51-betaRD1 → 5.0.51-betaRD3

package/lib/entity/tenant/epic/saveConnectorCredentialsEpic.d.ts

@@ -3,16 +3,18 @@ import { RootState } from '../../../reducer';
 import { ZeniAPI } from '../../../zeniAPI';
 import { saveConnectorCredentials, saveConnectorCredentialsFailure, saveConnectorCredentialsSuccess } from '../tenantReducer';
 export type ActionType = ReturnType<typeof saveConnectorCredentials> | ReturnType<typeof saveConnectorCredentialsSuccess> | ReturnType<typeof saveConnectorCredentialsFailure>;
-export declare const saveConnectorCredentialsEpic: (actions$: ActionsObservable<ActionType>, _: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<{
+export declare const saveConnectorCredentialsEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => import("rxjs").Observable<{
     payload: {
         tenantId: string;
         connectionType: "revenue" | "payments";
+        connectionName: "chargebee" | "hubspot" | "stripe" | "mercury" | "paypal";
         connectionPayload: import("../tenantPayload").ConnectionDataPayload;
     };
     type: "tenant/saveConnectorCredentialsSuccess";
 } | {
     payload: {
         tenantId: string;
+        connectionName: "chargebee" | "hubspot" | "stripe" | "mercury" | "paypal";
         status: import("../../../responsePayload").ZeniAPIStatus<Record<string, unknown>>;
     };
     type: "tenant/saveConnectorCredentialsFailure";

package/lib/entity/tenant/epic/saveConnectorCredentialsEpic.js

@@ -12,26 +12,31 @@ const tenantReducer_1 = require("../tenantReducer");
 // connector-specific (api_key, or client_id+client_secret) and is forwarded
 // verbatim to the BE — connector-side validation lives in
 // prepare_credential_update_args on the tenant service.
-const saveConnectorCredentialsEpic = (actions$, _, zeniAPI) => actions$.pipe((0, operators_1.filter)(tenantReducer_1.saveConnectorCredentials.match), (0, operators_1.switchMap)((action) => zeniAPI
-    .postAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/connectors/${action.payload.connectionName}/credentials`, action.payload.credentials, Object.assign({ 'zeni-tenant-id': action.payload.tenantId }))
+const saveConnectorCredentialsEpic = (actions$, 
+// Underscore prefix marks the parameter as intentionally unused today but
+// names what it will become — when we wire an in-progress guard (so a
+// second save click can't `switchMap`-cancel an in-flight save and leave
+// the BE in an indeterminate state), drop the underscore and read state
+// here.
+_state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(tenantReducer_1.saveConnectorCredentials.match), (0, operators_1.switchMap)((action) => zeniAPI
+    .postAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/connectors/${action.payload.connectionName}/credentials`, action.payload.credentials, { 'zeni-tenant-id': action.payload.tenantId })
     .pipe((0, operators_1.mergeMap)((response) => {
-    if ((0, responsePayload_1.isSuccessResponse)(response)) {
+    if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
         return (0, rxjs_1.from)([
-            (0, tenantReducer_1.saveConnectorCredentialsSuccess)(action.payload.tenantId, action.payload.connectionType, response.data // eslint-disable-line @typescript-eslint/no-non-null-assertion
-            ),
+            (0, tenantReducer_1.saveConnectorCredentialsSuccess)(action.payload.tenantId, action.payload.connectionType, action.payload.connectionName, response.data),
         ]);
     }
     const status = response.status ??
         (0, responsePayload_1.createZeniAPIStatus)('Failed to save connection. Please try again.');
     return (0, rxjs_1.from)([
-        (0, tenantReducer_1.saveConnectorCredentialsFailure)(action.payload.tenantId, status),
+        (0, tenantReducer_1.saveConnectorCredentialsFailure)(action.payload.tenantId, action.payload.connectionName, status),
     ]);
 }), (0, operators_1.catchError)((error) => {
     const message = error instanceof Error
         ? error.message
         : 'Unexpected error saving connection.';
     return (0, rxjs_1.from)([
-        (0, tenantReducer_1.saveConnectorCredentialsFailure)(action.payload.tenantId, (0, responsePayload_1.createZeniAPIStatus)(message)),
+        (0, tenantReducer_1.saveConnectorCredentialsFailure)(action.payload.tenantId, action.payload.connectionName, (0, responsePayload_1.createZeniAPIStatus)(message)),
     ]);
 }))));
 exports.saveConnectorCredentialsEpic = saveConnectorCredentialsEpic;

package/lib/entity/tenant/tenantReducer.d.ts

@@ -17,6 +17,23 @@ export declare const toExternalIntegrationType: (v: string) => "revenue" | "paym
 export type ExternalIntegrationType = ReturnType<typeof toExternalIntegrationType>;
 export declare const toExternalSupportedTool: (v: string) => "chargebee" | "hubspot" | "stripe" | "mercury" | "paypal";
 export type ExternalSupportedTool = ReturnType<typeof toExternalSupportedTool>;
+export type ConnectorCredentialsBySlug = {
+    connectionName: 'stripe';
+    credentials: {
+        api_key: string;
+    };
+} | {
+    connectionName: 'mercury';
+    credentials: {
+        api_key: string;
+    };
+} | {
+    connectionName: 'paypal';
+    credentials: {
+        client_id: string;
+        client_secret: string;
+    };
+};
 export declare const initialState: TenantState;
 export declare const updateTenants: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tenants: TenantPayload[], userTenantPayload?: TenantUserPayload | undefined, tenantUpdated?: any], {
     tenants: TenantPayload[];
@@ -126,17 +143,36 @@ export declare const updateTenants: import("@reduxjs/toolkit").ActionCreatorWith
 }, "tenant/saveOAuthConnectionSuccess", never, never>, saveOAuthConnectionFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tenantId: string, status: ZeniAPIStatus<Record<string, unknown>>], {
     tenantId: string;
     status: ZeniAPIStatus<Record<string, unknown>>;
-}, "tenant/saveOAuthConnectionFailure", never, never>, saveConnectorCredentials: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tenantId: string, connectionType: "revenue" | "payments", connectionName: "chargebee" | "hubspot" | "stripe" | "mercury" | "paypal", credentials: Record<string, string>], {
+}, "tenant/saveOAuthConnectionFailure", never, never>, saveConnectorCredentials: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tenantId: string, connectionType: "revenue" | "payments", args: ConnectorCredentialsBySlug], {
+    connectionName: "stripe";
+    credentials: {
+        api_key: string;
+    };
     tenantId: string;
     connectionType: "revenue" | "payments";
-    connectionName: "chargebee" | "hubspot" | "stripe" | "mercury" | "paypal";
-    credentials: Record<string, string>;
-}, "tenant/saveConnectorCredentials", never, never>, saveConnectorCredentialsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tenantId: string, connectionType: "revenue" | "payments", connectionPayload: ConnectionDataPayload], {
+} | {
+    connectionName: "mercury";
+    credentials: {
+        api_key: string;
+    };
+    tenantId: string;
+    connectionType: "revenue" | "payments";
+} | {
+    connectionName: "paypal";
+    credentials: {
+        client_id: string;
+        client_secret: string;
+    };
     tenantId: string;
     connectionType: "revenue" | "payments";
+}, "tenant/saveConnectorCredentials", never, never>, saveConnectorCredentialsSuccess: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tenantId: string, connectionType: "revenue" | "payments", connectionName: "chargebee" | "hubspot" | "stripe" | "mercury" | "paypal", connectionPayload: ConnectionDataPayload], {
+    tenantId: string;
+    connectionType: "revenue" | "payments";
+    connectionName: "chargebee" | "hubspot" | "stripe" | "mercury" | "paypal";
     connectionPayload: ConnectionDataPayload;
-}, "tenant/saveConnectorCredentialsSuccess", never, never>, saveConnectorCredentialsFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tenantId: string, status: ZeniAPIStatus<Record<string, unknown>>], {
+}, "tenant/saveConnectorCredentialsSuccess", never, never>, saveConnectorCredentialsFailure: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tenantId: string, connectionName: "chargebee" | "hubspot" | "stripe" | "mercury" | "paypal", status: ZeniAPIStatus<Record<string, unknown>>], {
     tenantId: string;
+    connectionName: "chargebee" | "hubspot" | "stripe" | "mercury" | "paypal";
     status: ZeniAPIStatus<Record<string, unknown>>;
 }, "tenant/saveConnectorCredentialsFailure", never, never>, deleteConnection: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[tenantId: string, connectionId: string, connectionType: "revenue" | "payments"], {
     tenantId: string;

package/lib/entity/tenant/tenantReducer.js

@@ -357,7 +357,8 @@ const tenant = (0, toolkit_1.createSlice)({
                     revenue: [],
                     saveConnectionState: 'Not-Started',
                     saveAPIKeyConnectionState: 'Not-Started',
-                    saveConnectorCredentialsState: 'Not-Started',
+                    saveConnectorCredentialsStateBySlug: {},
+                    saveConnectorCredentialsErrorBySlug: {},
                     saveOAuthConnectionState: 'Not-Started',
                     deleteConnectionState: 'Not-Started',
                     error: undefined,
@@ -377,7 +378,8 @@ const tenant = (0, toolkit_1.createSlice)({
                     revenue,
                     saveConnectionState: 'Completed',
                     saveAPIKeyConnectionState: 'Not-Started',
-                    saveConnectorCredentialsState: 'Not-Started',
+                    saveConnectorCredentialsStateBySlug: {},
+                    saveConnectorCredentialsErrorBySlug: {},
                     saveOAuthConnectionState: 'Not-Started',
                     deleteConnectionState: 'Not-Started',
                     error: undefined,
@@ -397,7 +399,8 @@ const tenant = (0, toolkit_1.createSlice)({
                     revenue: [],
                     saveConnectionState: 'Error',
                     saveAPIKeyConnectionState: 'Not-Started',
-                    saveConnectorCredentialsState: 'Not-Started',
+                    saveConnectorCredentialsStateBySlug: {},
+                    saveConnectorCredentialsErrorBySlug: {},
                     saveOAuthConnectionState: 'Not-Started',
                     deleteConnectionState: 'Not-Started',
                     error: status,
@@ -555,46 +558,48 @@ const tenant = (0, toolkit_1.createSlice)({
         // ChargeBee + HubSpot continue using the legacy saveAPIKeyConnection /
         // saveOAuthConnection actions that POST to /1.0/connections/<id>.
         saveConnectorCredentials: {
-            prepare(tenantId, connectionType, connectionName, credentials) {
+            prepare(tenantId, connectionType, args) {
                 return {
-                    payload: { tenantId, connectionType, connectionName, credentials },
+                    payload: { tenantId, connectionType, ...args },
                 };
             },
             reducer(draft, action) {
                 const existing = draft.externalConnectionsByTenant[action.payload.tenantId];
                 if (existing != null) {
-                    existing.saveConnectorCredentialsState = 'In-Progress';
-                    existing.saveConnectorCredentialsError = undefined;
+                    existing.saveConnectorCredentialsStateBySlug[action.payload.connectionName] = 'In-Progress';
+                    delete existing.saveConnectorCredentialsErrorBySlug[action.payload.connectionName];
                 }
             },
         },
         saveConnectorCredentialsSuccess: {
-            prepare(tenantId, connectionType, connectionPayload) {
-                return { payload: { tenantId, connectionType, connectionPayload } };
+            prepare(tenantId, connectionType, connectionName, connectionPayload) {
+                return {
+                    payload: { tenantId, connectionType, connectionName, connectionPayload },
+                };
             },
             reducer(draft, action) {
                 const existing = draft.externalConnectionsByTenant[action.payload.tenantId];
                 if (existing != null) {
-                    existing.saveConnectorCredentialsState = 'Completed';
+                    existing.saveConnectorCredentialsStateBySlug[action.payload.connectionName] = 'Completed';
                     // Upsert by connection_name — see saveAPIKeyConnectionSuccess for
                     // the rationale on lazy bucket init + replace-or-append.
                     if (existing[action.payload.connectionType] == null) {
                         existing[action.payload.connectionType] = [];
                     }
                     replaceOrAppendConnectionByName(existing[action.payload.connectionType], (0, exports.toConnection)(action.payload.connectionPayload));
-                    existing.saveConnectorCredentialsError = undefined;
+                    delete existing.saveConnectorCredentialsErrorBySlug[action.payload.connectionName];
                 }
             },
         },
         saveConnectorCredentialsFailure: {
-            prepare(tenantId, status) {
-                return { payload: { tenantId, status } };
+            prepare(tenantId, connectionName, status) {
+                return { payload: { tenantId, connectionName, status } };
             },
             reducer(draft, action) {
                 const existing = draft.externalConnectionsByTenant[action.payload.tenantId];
                 if (existing != null) {
-                    existing.saveConnectorCredentialsState = 'Error';
-                    existing.saveConnectorCredentialsError = action.payload.status;
+                    existing.saveConnectorCredentialsStateBySlug[action.payload.connectionName] = 'Error';
+                    existing.saveConnectorCredentialsErrorBySlug[action.payload.connectionName] = action.payload.status;
                 }
             },
         },

package/lib/entity/tenant/tenantState.d.ts

@@ -9,7 +9,7 @@ import { MasterTOSInfo, UserReimbursementInfo } from '../company/companyStateTyp
 import { SubscriptionSummary } from '../subscription/subscriptionSummary/subscriptionSummaryState';
 import { InvitationStatus } from '../userRole/userRoleState';
 import { UserRoleType } from '../userRole/userRoleType';
-import { AuthProvider } from './tenantReducer';
+import { AuthProvider, ExternalSupportedTool } from './tenantReducer';
 export interface TenantExternalConnections {
     accounting: Connection[];
     deleteConnectionState: FetchState;
@@ -18,12 +18,12 @@ export interface TenantExternalConnections {
     revenue: Connection[];
     saveAPIKeyConnectionState: FetchState;
     saveConnectionState: FetchState;
-    saveConnectorCredentialsState: FetchState;
+    saveConnectorCredentialsErrorBySlug: Partial<Record<ExternalSupportedTool, ZeniAPIStatus>>;
+    saveConnectorCredentialsStateBySlug: Partial<Record<ExternalSupportedTool, FetchState>>;
     saveOAuthConnectionState: FetchState;
     deleteConnectionError?: ZeniAPIStatus;
     error?: ZeniAPIStatus;
     saveAPIKeyConnectionError?: ZeniAPIStatus;
-    saveConnectorCredentialsError?: ZeniAPIStatus;
     saveOAuthConnectionError?: ZeniAPIStatus;
 }
 export interface TenantState extends FetchedState {

package/lib/epic.d.ts

@@ -182,8 +182,6 @@ import { ActionType as FetchExpenseAutomationSaveTransactionCategorizationAction
 import { ActionType as TriggerReviewTabRefetchActionType } from './view/expenseAutomationView/epics/transactionCategorization/triggerReviewTabRefetchEpic';
 import { ActionType as FetchExpenseAutomationUpdateTransactionCategorizationEpicActionType } from './view/expenseAutomationView/epics/transactionCategorization/updateTransactionCategorizationEpic';
 import { ActionType as UploadTransactionReceiptSuccessEpicActionType } from './view/expenseAutomationView/epics/transactionCategorization/uploadTransactionReceiptSuccessEpic';
-import { ActionType as FetchRegisteredInterestsActionType } from './view/featureNotificationView/epics/fetchRegisteredInterestsEpic';
-import { ActionType as NotifyMeForFeatureActionType } from './view/featureNotificationView/epics/notifyMeForFeatureEpic';
 import { ActionType as DeleteFileActionType } from './view/fileView/epic/deleteFileEpic';
 import { ActionType as DeleteFileListActionType } from './view/fileView/epic/deleteFileListEpic';
 import { ActionType as FetchFileActionType } from './view/fileView/epic/fetchFileEpic';
@@ -209,6 +207,8 @@ import { ActionType as FetchNotificationUnreadCountActionType } from './view/not
 import { ActionType as FetchNotificationViewActionType } from './view/notificationView/epics/fetchNotificationViewEpic';
 import { ActionType as UpdateNotificationViewAllNotificationsStatusActionType } from './view/notificationView/epics/updateNotificationViewAllNotificationsStatusEpic';
 import { ActionType as UpdateNotificationViewNotificationStatusActionType } from './view/notificationView/epics/updateNotificationViewNotificationStatusEpic';
+import { ActionType as FetchRegisteredInterestsActionType } from './view/featureNotificationView/epics/fetchRegisteredInterestsEpic';
+import { ActionType as NotifyMeForFeatureActionType } from './view/featureNotificationView/epics/notifyMeForFeatureEpic';
 import { ActionType as FetchCompanyOnboardingViewActionType } from './view/onboardingView/cockpitView/epic/fetchCompanyOnboardingViewEpic';
 import { ActionType as FetchOnboardingCompletedCompaniesActionType } from './view/onboardingView/cockpitView/epic/fetchOnboardingCompletedCompaniesEpic';
 import { ActionType as FetchQBOConnectionPoolActionType } from './view/onboardingView/cockpitView/epic/fetchQBOConnectionPoolEpic';
@@ -495,18 +495,15 @@ import { ActionType as SaveSubscriptionUpdatesActionType } from './view/subscrip
 import { ActionType as CreateTagActionType } from './view/tagView/epics/createTagEpic';
 import { ActionType as DeleteTagActionType } from './view/tagView/epics/deleteTagEpic';
 import { ActionType as FetchAllTagsActionType } from './view/tagView/epics/fetchAllTagsEpic';
-import { ActionType as DeleteCannedResponseActionType } from './view/taskManager/cannedResponsesView/epics/deleteCannedResponseEpic';
-import { ActionType as FetchCannedResponsesActionType } from './view/taskManager/cannedResponsesView/epics/fetchCannedResponsesEpic';
-import { ActionType as SaveCannedResponseActionType } from './view/taskManager/cannedResponsesView/epics/saveCannedResponseEpic';
 import { ActionType as ArchiveTaskActionType } from './view/taskManager/taskDetailView/epics/archiveTaskEpic';
 import { ActionType as DeleteTaskActionType } from './view/taskManager/taskDetailView/epics/deleteTaskEpic';
+import { ActionType as SnoozeTaskActionType } from './view/taskManager/taskDetailView/epics/snoozeTaskEpic';
+import { ActionType as UnsnoozeTaskActionType } from './view/taskManager/taskDetailView/epics/unsnoozeTaskEpic';
 import { ActionType as FetchTaskDetailActionType } from './view/taskManager/taskDetailView/epics/fetchTaskDetailEpic';
 import { ActionType as FetchTaskDetailPageActionType } from './view/taskManager/taskDetailView/epics/fetchTaskDetailPageEpic';
 import { ActionType as FetchTaskHistoryActionType } from './view/taskManager/taskDetailView/epics/fetchTaskHistoryEpic';
 import { ActionType as InitializeTaskToLocalStoreActionType } from './view/taskManager/taskDetailView/epics/initializeTaskToLocalStoreEpic';
 import { ActionType as SaveTaskDetailActionType } from './view/taskManager/taskDetailView/epics/saveTaskDetailEpic';
-import { ActionType as SnoozeTaskActionType } from './view/taskManager/taskDetailView/epics/snoozeTaskEpic';
-import { ActionType as UnsnoozeTaskActionType } from './view/taskManager/taskDetailView/epics/unsnoozeTaskEpic';
 import { ActionType as CreateTaskFromTaskGroupTemplateActionType } from './view/taskManager/taskGroupTemplateView/epics/createTaskFromTaskGroupTemplateEpic';
 import { ActionType as FetchTaskGroupTemplatesActionType } from './view/taskManager/taskGroupTemplateView/epics/fetchTaskGroupTemplatesEpic';
 import { ActionType as CreateNewTaskGroupActionType } from './view/taskManager/taskGroupView/epics/createNewTaskGroupEpic';
@@ -518,6 +515,9 @@ import { ActionType as DragNDropTasksActionType } from './view/taskManager/taskL
 import { ActionType as FetchTaskListActionType } from './view/taskManager/taskListView/epics/fetchTaskListEpic';
 import { ActionType as FetchTaskListPageActionType } from './view/taskManager/taskListView/epics/fetchTaskListPageEpic';
 import { ActionType as UpdateTaskFromListViewActionType } from './view/taskManager/taskListView/epics/updateTaskFromListViewEpic';
+import { ActionType as FetchCannedResponsesActionType } from './view/taskManager/cannedResponsesView/epics/fetchCannedResponsesEpic';
+import { ActionType as SaveCannedResponseActionType } from './view/taskManager/cannedResponsesView/epics/saveCannedResponseEpic';
+import { ActionType as DeleteCannedResponseActionType } from './view/taskManager/cannedResponsesView/epics/deleteCannedResponseEpic';
 import { ActionType as FetchTasksCardActionType } from './view/tasksCard/fetchTasksCardEpic';
 import { ActionType as TopExActionType } from './view/topEx/topExEpic';
 import { ActionType as FetchTransactionActivityLogActionType } from './view/transactionActivityLogView/fetchTransactionActivityLogEpic';
@@ -531,13 +531,13 @@ import { ActionType as UpdateTransactionDetailActionType } from './view/transact
 import { ActionType as UpdateTransactionOnUploadSuccessActionType } from './view/transactionDetail/epics/uploadMissingAttachmentSuccessEpic';
 import { ActionType as FetchTransactionListByAccountActionType } from './view/transactionList/fetchTransactionListByAccountEpic';
 import { ActionType as FetchTransactionListByClassActionType } from './view/transactionList/fetchTransactionListByClassEpic';
-import { ActionType as FetchTransactionListByEntityActionType } from './view/transactionList/fetchTransactionListByEntityEpic';
 import { ActionType as FetchTransactionListByProjectActionType } from './view/transactionList/fetchTransactionListByProjectEpic';
+import { ActionType as FetchTransactionListByEntityActionType } from './view/transactionList/fetchTransactionListByEntityEpic';
 import { ActionType as FetchTransactionsListByCategoryTypeActionType } from './view/transactionList/fetchTransactionsListByCategoryTypeEpic';
 import { ActionType as ParallelFetchAccountTransactionListActionType } from './view/transactionList/parallelFetchAccountTransactionListEpic';
 import { ActionType as ParallelFetchClassTransactionListActionType } from './view/transactionList/parallelFetchClassTransactionListEpic';
-import { ActionType as ParallelFetchEntityTransactionListActionType } from './view/transactionList/parallelFetchEntityTransactionListEpic';
 import { ActionType as ParallelFetchProjectTransactionListActionType } from './view/transactionList/parallelFetchProjectTransactionListEpic';
+import { ActionType as ParallelFetchEntityTransactionListActionType } from './view/transactionList/parallelFetchEntityTransactionListEpic';
 import { ActionType as ParallelFetchTransactionListByCategoryTypeActionType } from './view/transactionList/parallelFetchTransactionListByCategoryTypeEpic';
 import { ActionType as FetchExpenseTrendActionType } from './view/trend/fetchExpenseTrendEpic';
 import { ActionType as FetchIncomeTrendActionType } from './view/trend/fetchIncomeTrendEpic';

package/lib/epic.js

@@ -9,7 +9,6 @@ const sectionAccountsViewEpic_1 = require("./entity/sectionAccountsView/sectionA
 const sectionClassesViewEpic_1 = require("./entity/sectionClassesViewV2/sectionClassesViewEpic");
 const sectionProjectViewEpic_1 = require("./entity/sectionProjectView/sectionProjectViewEpic");
 const clearAllEpic_1 = require("./entity/tenant/clearAllEpic");
-const deleteConnectionEpic_1 = require("./entity/tenant/epic/deleteConnectionEpic");
 const doMagicLinkSignInEpic_1 = require("./entity/tenant/epic/doMagicLinkSignInEpic");
 const fetchActiveTenantEpic_1 = require("./entity/tenant/epic/fetchActiveTenantEpic");
 const fetchAllTenantsEpic_1 = require("./entity/tenant/epic/fetchAllTenantsEpic");
@@ -17,6 +16,7 @@ const fetchExcludedResourcesEpic_1 = require("./entity/tenant/epic/fetchExcluded
 const fetchExternalConnectionsEpic_1 = require("./entity/tenant/epic/fetchExternalConnectionsEpic");
 const fetchSubscriptionSummaryForTenantEpic_1 = require("./entity/tenant/epic/fetchSubscriptionSummaryForTenantEpic");
 const resendVerifyDeviceOTPEpic_1 = require("./entity/tenant/epic/resendVerifyDeviceOTPEpic");
+const deleteConnectionEpic_1 = require("./entity/tenant/epic/deleteConnectionEpic");
 const saveAPIKeyConnectionEpic_1 = require("./entity/tenant/epic/saveAPIKeyConnectionEpic");
 const saveConnectorCredentialsEpic_1 = require("./entity/tenant/epic/saveConnectorCredentialsEpic");
 const saveExternalConnectionEpic_1 = require("./entity/tenant/epic/saveExternalConnectionEpic");
@@ -190,8 +190,6 @@ const saveTransactionCategorizationEpic_1 = require("./view/expenseAutomationVie
 const triggerReviewTabRefetchEpic_1 = require("./view/expenseAutomationView/epics/transactionCategorization/triggerReviewTabRefetchEpic");
 const updateTransactionCategorizationEpic_1 = require("./view/expenseAutomationView/epics/transactionCategorization/updateTransactionCategorizationEpic");
 const uploadTransactionReceiptSuccessEpic_1 = require("./view/expenseAutomationView/epics/transactionCategorization/uploadTransactionReceiptSuccessEpic");
-const fetchRegisteredInterestsEpic_1 = require("./view/featureNotificationView/epics/fetchRegisteredInterestsEpic");
-const notifyMeForFeatureEpic_1 = require("./view/featureNotificationView/epics/notifyMeForFeatureEpic");
 const deleteFileEpic_1 = require("./view/fileView/epic/deleteFileEpic");
 const deleteFileListEpic_1 = require("./view/fileView/epic/deleteFileListEpic");
 const fetchFileEpic_1 = require("./view/fileView/epic/fetchFileEpic");
@@ -217,6 +215,8 @@ const fetchNotificationUnreadCountEpic_1 = require("./view/notificationView/epic
 const fetchNotificationViewEpic_1 = require("./view/notificationView/epics/fetchNotificationViewEpic");
 const updateNotificationViewAllNotificationsStatusEpic_1 = require("./view/notificationView/epics/updateNotificationViewAllNotificationsStatusEpic");
 const updateNotificationViewNotificationStatusEpic_1 = require("./view/notificationView/epics/updateNotificationViewNotificationStatusEpic");
+const fetchRegisteredInterestsEpic_1 = require("./view/featureNotificationView/epics/fetchRegisteredInterestsEpic");
+const notifyMeForFeatureEpic_1 = require("./view/featureNotificationView/epics/notifyMeForFeatureEpic");
 const fetchCompanyOnboardingViewEpic_1 = require("./view/onboardingView/cockpitView/epic/fetchCompanyOnboardingViewEpic");
 const fetchOnboardingCompletedCompaniesEpic_1 = require("./view/onboardingView/cockpitView/epic/fetchOnboardingCompletedCompaniesEpic");
 const fetchQBOConnectionPoolEpic_1 = require("./view/onboardingView/cockpitView/epic/fetchQBOConnectionPoolEpic");
@@ -506,18 +506,15 @@ const saveSubscriptionUpdatesEpic_1 = require("./view/subscriptionView/epic/save
 const createTagEpic_1 = require("./view/tagView/epics/createTagEpic");
 const deleteTagEpic_1 = require("./view/tagView/epics/deleteTagEpic");
 const fetchAllTagsEpic_1 = require("./view/tagView/epics/fetchAllTagsEpic");
-const deleteCannedResponseEpic_1 = require("./view/taskManager/cannedResponsesView/epics/deleteCannedResponseEpic");
-const fetchCannedResponsesEpic_1 = require("./view/taskManager/cannedResponsesView/epics/fetchCannedResponsesEpic");
-const saveCannedResponseEpic_1 = require("./view/taskManager/cannedResponsesView/epics/saveCannedResponseEpic");
 const archiveTaskEpic_1 = require("./view/taskManager/taskDetailView/epics/archiveTaskEpic");
 const deleteTaskEpic_1 = require("./view/taskManager/taskDetailView/epics/deleteTaskEpic");
+const snoozeTaskEpic_1 = require("./view/taskManager/taskDetailView/epics/snoozeTaskEpic");
+const unsnoozeTaskEpic_1 = require("./view/taskManager/taskDetailView/epics/unsnoozeTaskEpic");
 const fetchTaskDetailEpic_1 = require("./view/taskManager/taskDetailView/epics/fetchTaskDetailEpic");
 const fetchTaskDetailPageEpic_1 = require("./view/taskManager/taskDetailView/epics/fetchTaskDetailPageEpic");
 const fetchTaskHistoryEpic_1 = require("./view/taskManager/taskDetailView/epics/fetchTaskHistoryEpic");
 const initializeTaskToLocalStoreEpic_1 = require("./view/taskManager/taskDetailView/epics/initializeTaskToLocalStoreEpic");
 const saveTaskDetailEpic_1 = require("./view/taskManager/taskDetailView/epics/saveTaskDetailEpic");
-const snoozeTaskEpic_1 = require("./view/taskManager/taskDetailView/epics/snoozeTaskEpic");
-const unsnoozeTaskEpic_1 = require("./view/taskManager/taskDetailView/epics/unsnoozeTaskEpic");
 const createTaskFromTaskGroupTemplateEpic_1 = require("./view/taskManager/taskGroupTemplateView/epics/createTaskFromTaskGroupTemplateEpic");
 const fetchTaskGroupTemplatesEpic_1 = require("./view/taskManager/taskGroupTemplateView/epics/fetchTaskGroupTemplatesEpic");
 const createNewTaskGroupEpic_1 = require("./view/taskManager/taskGroupView/epics/createNewTaskGroupEpic");
@@ -529,6 +526,9 @@ const dragNDropTasksEpic_1 = require("./view/taskManager/taskListView/epics/drag
 const fetchTaskListEpic_1 = require("./view/taskManager/taskListView/epics/fetchTaskListEpic");
 const fetchTaskListPageEpic_1 = require("./view/taskManager/taskListView/epics/fetchTaskListPageEpic");
 const updateTaskFromListViewEpic_1 = require("./view/taskManager/taskListView/epics/updateTaskFromListViewEpic");
+const fetchCannedResponsesEpic_1 = require("./view/taskManager/cannedResponsesView/epics/fetchCannedResponsesEpic");
+const saveCannedResponseEpic_1 = require("./view/taskManager/cannedResponsesView/epics/saveCannedResponseEpic");
+const deleteCannedResponseEpic_1 = require("./view/taskManager/cannedResponsesView/epics/deleteCannedResponseEpic");
 const fetchTasksCardEpic_1 = require("./view/tasksCard/fetchTasksCardEpic");
 const topExEpic_1 = require("./view/topEx/topExEpic");
 const fetchTransactionActivityLogEpic_1 = require("./view/transactionActivityLogView/fetchTransactionActivityLogEpic");
@@ -542,13 +542,13 @@ const updateTransactionDetailEpic_1 = require("./view/transactionDetail/epics/up
 const uploadMissingAttachmentSuccessEpic_1 = require("./view/transactionDetail/epics/uploadMissingAttachmentSuccessEpic");
 const fetchTransactionListByAccountEpic_1 = require("./view/transactionList/fetchTransactionListByAccountEpic");
 const fetchTransactionListByClassEpic_1 = require("./view/transactionList/fetchTransactionListByClassEpic");
-const fetchTransactionListByEntityEpic_1 = require("./view/transactionList/fetchTransactionListByEntityEpic");
 const fetchTransactionListByProjectEpic_1 = require("./view/transactionList/fetchTransactionListByProjectEpic");
+const fetchTransactionListByEntityEpic_1 = require("./view/transactionList/fetchTransactionListByEntityEpic");
 const fetchTransactionsListByCategoryTypeEpic_1 = require("./view/transactionList/fetchTransactionsListByCategoryTypeEpic");
 const parallelFetchAccountTransactionListEpic_1 = require("./view/transactionList/parallelFetchAccountTransactionListEpic");
 const parallelFetchClassTransactionListEpic_1 = require("./view/transactionList/parallelFetchClassTransactionListEpic");
-const parallelFetchEntityTransactionListEpic_1 = require("./view/transactionList/parallelFetchEntityTransactionListEpic");
 const parallelFetchProjectTransactionListEpic_1 = require("./view/transactionList/parallelFetchProjectTransactionListEpic");
+const parallelFetchEntityTransactionListEpic_1 = require("./view/transactionList/parallelFetchEntityTransactionListEpic");
 const parallelFetchTransactionListByCategoryTypeEpic_1 = require("./view/transactionList/parallelFetchTransactionListByCategoryTypeEpic");
 const fetchExpenseTrendEpic_1 = require("./view/trend/fetchExpenseTrendEpic");
 const fetchIncomeTrendEpic_1 = require("./view/trend/fetchIncomeTrendEpic");

package/lib/esm/entity/tenant/epic/saveConnectorCredentialsEpic.js

@@ -9,25 +9,30 @@ import { saveConnectorCredentials, saveConnectorCredentialsFailure, saveConnecto
 // connector-specific (api_key, or client_id+client_secret) and is forwarded
 // verbatim to the BE — connector-side validation lives in
 // prepare_credential_update_args on the tenant service.
-export const saveConnectorCredentialsEpic = (actions$, _, zeniAPI) => actions$.pipe(filter(saveConnectorCredentials.match), switchMap((action) => zeniAPI
-    .postAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/connectors/${action.payload.connectionName}/credentials`, action.payload.credentials, Object.assign({ 'zeni-tenant-id': action.payload.tenantId }))
+export const saveConnectorCredentialsEpic = (actions$, 
+// Underscore prefix marks the parameter as intentionally unused today but
+// names what it will become — when we wire an in-progress guard (so a
+// second save click can't `switchMap`-cancel an in-flight save and leave
+// the BE in an indeterminate state), drop the underscore and read state
+// here.
+_state$, zeniAPI) => actions$.pipe(filter(saveConnectorCredentials.match), switchMap((action) => zeniAPI
+    .postAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/connectors/${action.payload.connectionName}/credentials`, action.payload.credentials, { 'zeni-tenant-id': action.payload.tenantId })
     .pipe(mergeMap((response) => {
-    if (isSuccessResponse(response)) {
+    if (isSuccessResponse(response) && response.data != null) {
         return from([
-            saveConnectorCredentialsSuccess(action.payload.tenantId, action.payload.connectionType, response.data // eslint-disable-line @typescript-eslint/no-non-null-assertion
-            ),
+            saveConnectorCredentialsSuccess(action.payload.tenantId, action.payload.connectionType, action.payload.connectionName, response.data),
         ]);
     }
     const status = response.status ??
         createZeniAPIStatus('Failed to save connection. Please try again.');
     return from([
-        saveConnectorCredentialsFailure(action.payload.tenantId, status),
+        saveConnectorCredentialsFailure(action.payload.tenantId, action.payload.connectionName, status),
     ]);
 }), catchError((error) => {
     const message = error instanceof Error
         ? error.message
         : 'Unexpected error saving connection.';
     return from([
-        saveConnectorCredentialsFailure(action.payload.tenantId, createZeniAPIStatus(message)),
+        saveConnectorCredentialsFailure(action.payload.tenantId, action.payload.connectionName, createZeniAPIStatus(message)),
     ]);
 }))));

package/lib/esm/entity/tenant/tenantReducer.js

@@ -346,7 +346,8 @@ const tenant = createSlice({
                     revenue: [],
                     saveConnectionState: 'Not-Started',
                     saveAPIKeyConnectionState: 'Not-Started',
-                    saveConnectorCredentialsState: 'Not-Started',
+                    saveConnectorCredentialsStateBySlug: {},
+                    saveConnectorCredentialsErrorBySlug: {},
                     saveOAuthConnectionState: 'Not-Started',
                     deleteConnectionState: 'Not-Started',
                     error: undefined,
@@ -366,7 +367,8 @@ const tenant = createSlice({
                     revenue,
                     saveConnectionState: 'Completed',
                     saveAPIKeyConnectionState: 'Not-Started',
-                    saveConnectorCredentialsState: 'Not-Started',
+                    saveConnectorCredentialsStateBySlug: {},
+                    saveConnectorCredentialsErrorBySlug: {},
                     saveOAuthConnectionState: 'Not-Started',
                     deleteConnectionState: 'Not-Started',
                     error: undefined,
@@ -386,7 +388,8 @@ const tenant = createSlice({
                     revenue: [],
                     saveConnectionState: 'Error',
                     saveAPIKeyConnectionState: 'Not-Started',
-                    saveConnectorCredentialsState: 'Not-Started',
+                    saveConnectorCredentialsStateBySlug: {},
+                    saveConnectorCredentialsErrorBySlug: {},
                     saveOAuthConnectionState: 'Not-Started',
                     deleteConnectionState: 'Not-Started',
                     error: status,
@@ -544,46 +547,48 @@ const tenant = createSlice({
         // ChargeBee + HubSpot continue using the legacy saveAPIKeyConnection /
         // saveOAuthConnection actions that POST to /1.0/connections/<id>.
         saveConnectorCredentials: {
-            prepare(tenantId, connectionType, connectionName, credentials) {
+            prepare(tenantId, connectionType, args) {
                 return {
-                    payload: { tenantId, connectionType, connectionName, credentials },
+                    payload: { tenantId, connectionType, ...args },
                 };
             },
             reducer(draft, action) {
                 const existing = draft.externalConnectionsByTenant[action.payload.tenantId];
                 if (existing != null) {
-                    existing.saveConnectorCredentialsState = 'In-Progress';
-                    existing.saveConnectorCredentialsError = undefined;
+                    existing.saveConnectorCredentialsStateBySlug[action.payload.connectionName] = 'In-Progress';
+                    delete existing.saveConnectorCredentialsErrorBySlug[action.payload.connectionName];
                 }
             },
         },
         saveConnectorCredentialsSuccess: {
-            prepare(tenantId, connectionType, connectionPayload) {
-                return { payload: { tenantId, connectionType, connectionPayload } };
+            prepare(tenantId, connectionType, connectionName, connectionPayload) {
+                return {
+                    payload: { tenantId, connectionType, connectionName, connectionPayload },
+                };
             },
             reducer(draft, action) {
                 const existing = draft.externalConnectionsByTenant[action.payload.tenantId];
                 if (existing != null) {
-                    existing.saveConnectorCredentialsState = 'Completed';
+                    existing.saveConnectorCredentialsStateBySlug[action.payload.connectionName] = 'Completed';
                     // Upsert by connection_name — see saveAPIKeyConnectionSuccess for
                     // the rationale on lazy bucket init + replace-or-append.
                     if (existing[action.payload.connectionType] == null) {
                         existing[action.payload.connectionType] = [];
                     }
                     replaceOrAppendConnectionByName(existing[action.payload.connectionType], toConnection(action.payload.connectionPayload));
-                    existing.saveConnectorCredentialsError = undefined;
+                    delete existing.saveConnectorCredentialsErrorBySlug[action.payload.connectionName];
                 }
             },
         },
         saveConnectorCredentialsFailure: {
-            prepare(tenantId, status) {
-                return { payload: { tenantId, status } };
+            prepare(tenantId, connectionName, status) {
+                return { payload: { tenantId, connectionName, status } };
             },
             reducer(draft, action) {
                 const existing = draft.externalConnectionsByTenant[action.payload.tenantId];
                 if (existing != null) {
-                    existing.saveConnectorCredentialsState = 'Error';
-                    existing.saveConnectorCredentialsError = action.payload.status;
+                    existing.saveConnectorCredentialsStateBySlug[action.payload.connectionName] = 'Error';
+                    existing.saveConnectorCredentialsErrorBySlug[action.payload.connectionName] = action.payload.status;
                 }
             },
         },