@zeniai/client-epic-state 5.1.13 → 5.1.14

package/lib/esm/view/companyTaskManagerView/companyTaskManagerViewSelector.js

@@ -1,11 +1,10 @@
 import { createSelector } from '@reduxjs/toolkit';
-import { reduceAnyFetchState } from '../../commonStateTypes/reduceFetchState';
-import { getCompanyByCompanyId, getCompanyByCompanyIds, } from '../../entity/company/companySelector';
+import { getCompanyByCompanyId } from '../../entity/company/companySelector';
 import { getTagsByIds } from '../../entity/tag/tagSelector';
 import { getTaskById } from '../../entity/task/taskSelector';
 import { getUserByUserId, getUsersByUserIds, } from '../../entity/user/userSelector';
 export const getCompanyTaskManagerView = createSelector((state) => state.companyTaskManagerViewState, (state) => state.companyState, (state) => state.userState, (state) => state.taskState, (state) => state.tagState, (companyTaskManagerViewState, companyState, userState, taskState, tagState) => {
-    const { taskIds, uiState, totalTaskCount, metrics, metricsFetchState } = companyTaskManagerViewState;
+    const { taskIds, uiState, fetchState, error, totalTaskCount, metrics, metricsFetchState, } = companyTaskManagerViewState;
     const tasksList = [];
     taskIds.forEach((taskId) => {
         const task = getTaskById(taskState, taskId);
@@ -27,22 +26,13 @@ export const getCompanyTaskManagerView = createSelector((state) => state.company
             }
         }
     });
-    const allCompanyIds = companyTaskManagerViewState.cockpitContext.companyIds;
-    const companies = getCompanyByCompanyIds(companyState, allCompanyIds).map((c) => c.company);
-    const users = getUsersByUserIds(userState, companyTaskManagerViewState.cockpitContext.userIds);
-    const fetchStateAndError = reduceAnyFetchState([
-        companyTaskManagerViewState,
-        companyTaskManagerViewState.cockpitContext,
-    ]);
     return {
-        companies,
         metrics,
         metricsFetchState,
         tasksList,
         uiState,
-        fetchState: fetchStateAndError.fetchState,
-        error: fetchStateAndError.error,
+        fetchState,
+        error,
         totalTaskCount,
-        users,
     };
 });

package/lib/esm/view/companyTaskManagerView/epics/fetchCompanyTaskManagerViewEpic.js

@@ -1,35 +1,51 @@
 import { from } from 'rxjs';
 import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { getSortOrder } from '../../../commonPayloadTypes/sortOrderPayload';
+import { updateCompanies } from '../../../entity/company/companyReducer';
 import { updateTags } from '../../../entity/tag/tagReducer';
 import { updateTasks } from '../../../entity/task/taskReducer';
+import { updateAllUsers } from '../../../entity/user/userReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { fetchCompanyTaskManagerView, updateCompanyTaskManagerViewOnFailure, updateCompanyTaskManagerViewOnSuccess, } from '../companyTaskManagerViewReducer';
-const DEFAULT_PAGE_SIZE = 100;
+const toSortKeyPayload = (sortKey) => {
+    switch (sortKey) {
+        case 'taskName':
+            return 'name';
+        case 'dueDate':
+            return 'due_date';
+        case 'createdBy':
+            return 'created_by';
+        case 'name':
+            return 'company_name';
+        default:
+            return sortKey;
+    }
+};
 export const fetchCompanyTaskManagerViewEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchCompanyTaskManagerView.match), switchMap((action) => {
-    const { from: fromOffset, searchString, sortKey, sortOrder, filters, } = action.payload;
+    const { pageToken, sortKey, sortOrder, searchString } = action.payload;
     const queryValue = {
-        size: DEFAULT_PAGE_SIZE,
-        from: fromOffset,
-        global_search: searchString ?? '',
+        page_token: pageToken,
         sort_by: toSortKeyPayload(sortKey),
         sort_order: getSortOrder(sortOrder),
-        filter_join: filters?.categoryCombinationOperator === 'AND' ? 'and' : 'or',
-        ...(filters?.categories != null && filters.categories.length > 0
-            ? { filter_by: toFilterByPayload(filters) }
-            : {}),
+        search_text: searchString ?? '',
+        view: 'cockpit_task_manager_view',
     };
     return zeniAPI
-        .getJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/cockpit-panels/tasks-es?query=${encodeURIComponent(JSON.stringify(queryValue))}`)
+        .getJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/cockpit-panels/tasks?query=${encodeURIComponent(JSON.stringify(queryValue))}`)
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
-            const tasksList = response.data.aggregations.group_by_company_name.buckets.flatMap((bucket) => bucket.tasks);
+            const tasksList = response.data.tasks;
             const actions = [
                 updateCompanyTaskManagerViewOnSuccess({
                     data: response.data,
                 }),
                 updateTasks(tasksList),
-                updateTags(tasksList.flatMap((task) => task.tags)),
+                updateCompanies({
+                    payload: response.data.companies,
+                    schema: {},
+                }),
+                updateTags(tasksList.map((task) => task.tags).flat()),
+                updateAllUsers({ users: response.data.users }),
             ];
             return from(actions);
         }
@@ -46,28 +62,3 @@ export const fetchCompanyTaskManagerViewEpic = (actions$, _state$, zeniAPI) => a
         return from(actions);
     }));
 }));
-const toSortKeyPayload = (sortKey) => {
-    switch (sortKey) {
-        case 'taskName':
-            return 'name';
-        case 'dueDate':
-            return 'due_date';
-        case 'createdBy':
-            return 'created_by';
-        case 'name':
-            return 'company_name';
-        default:
-            return sortKey;
-    }
-};
-const toFilterByPayload = (filters) => {
-    if (filters.categories == null) {
-        return [];
-    }
-    return filters.categories.map((category) => ({
-        field: category.field ?? '',
-        operator: category.matchingOperator === 'equal' ? 'is' : 'is_not',
-        values: category.values.map((v) => String(v)),
-        join: category.valuesCombinationOperator === 'ALL' ? 'and' : 'or',
-    }));
-};

package/lib/esm/view/companyView/epic/companyPassport/updateCapitalizationAccountThresholdEpic.js

@@ -2,7 +2,7 @@ import { from } from 'rxjs';
 import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { updateCompanies } from '../../../../entity/company/companyReducer';
 import { openSnackbar } from '../../../../entity/snackbar/snackbarReducer';
-import { updateTenantCapitalizationAccountOverride, updateTenantCapitalizationOnboardingDismissed, } from '../../../../entity/tenant/tenantReducer';
+import { updateTenantCapitalizationOnboardingDismissed, updateTenantCapitalizationAccountOverride, } from '../../../../entity/tenant/tenantReducer';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../responsePayload';
 import { updateCapitalizationAccountThreshold, updateCapitalizationAccountThresholdFailure, updateCapitalizationAccountThresholdSuccess, } from '../../companyViewReducer';
 export const updateCapitalizationAccountThresholdEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(updateCapitalizationAccountThreshold.match), switchMap((action) => {
@@ -50,9 +50,9 @@ export const updateCapitalizationAccountThresholdEpic = (actions$, state$, zeniA
                     accountId,
                     threshold,
                     allOverrides: allOverrides !== undefined
-                        ? Object.keys(finalOverrides).length > 0
+                        ? (Object.keys(finalOverrides).length > 0
                             ? finalOverrides
-                            : null
+                            : null)
                         : undefined,
                 }));
                 if (dismissOnboardingForAccount === true) {

package/lib/esm/view/companyView/epic/fetchAllCockpitViewsEpic.js

@@ -21,7 +21,7 @@ export const fetchAllCockpitViewsEpic = (actions$, state$) => actions$.pipe(filt
             fetchReviewCompanyView(),
             fetchCompanyHealthMetricView(),
             fetchCompanyMetaData(),
-            fetchCompanyTaskManagerView(0, 'dueDate', 'descending', false),
+            fetchCompanyTaskManagerView(null, 'dueDate', 'descending', false),
             fetchCompanyHealthMetricConfig(),
         ]);
     }
@@ -74,7 +74,7 @@ export const fetchAllCockpitViewsEpic = (actions$, state$) => actions$.pipe(filt
         }
         if (state.companyTaskManagerViewState.fetchState !== 'In-Progress' &&
             state.companyTaskManagerViewState.hasValidState() === false) {
-            fetchActions.push(fetchCompanyTaskManagerView(0, 'dueDate', 'descending', false));
+            fetchActions.push(fetchCompanyTaskManagerView(null, 'dueDate', 'descending', false));
         }
         return from(fetchActions);
     }

package/lib/esm/view/expenseAutomationView/selectors/transactionCategorizationSelector.js

@@ -5,12 +5,12 @@ import { toMonthYearPeriodId } from '../../../commonStateTypes/timePeriod';
 import { getCurrentTenant, getIsAccountingClassesEnabled, getIsAccountingProjectsEnabled, } from '../../../entity/tenant/tenantSelector';
 import { getTransactionWithCOT } from '../../../entity/transaction/transactionHelper';
 import { getSupportedTransactionsByIds } from '../../../entity/transaction/transactionSelector';
+import { applyTransactionFilters, } from '../transactionFilterHelpers';
 import { getAccountList, getNestedAccountListHierarchy, getUncategorizedAccounts, } from '../../accountList/accountListSelector';
 import { getClassList, getNestedClassListHierarchy, } from '../../classList/classListSelector';
 import { getResolvedTransferAccounts } from '../../createTransferEntry/createTransferEntrySelector';
 import { getProjectList } from '../../projectList/projectListSelector';
 import { getAllSteps } from '../selectorTypes/expenseAutomationViewSelectorTypes';
-import { applyTransactionFilters, } from '../transactionFilterHelpers';
 // Walks the tab's transactionReviewLocalDataById map and returns
 // `{ [transactionId]: true }` for every transaction that has at least
 // one line whose targeted-fetch is In-Progress. Pulled out as a plain

package/lib/esm/view/fileView/epic/deleteFileEpic.js

@@ -1,9 +1,9 @@
 import { of } from 'rxjs';
-import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { removeFiles } from '../../../entity/file/fileReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { deleteFile, deleteFileFailure, deleteFileSuccess, } from '../fileViewReducer';
-export const deleteFileEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteFile.match), mergeMap((action) => {
+export const deleteFileEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteFile.match), switchMap((action) => {
     /**
      * tenantId is required for deleting onboarding files.
      */

package/lib/esm/view/fileView/epic/deleteFileListEpic.js

@@ -1,9 +1,9 @@
 import { of } from 'rxjs';
-import { catchError, filter, mergeMap } from 'rxjs/operators';
+import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { removeFiles } from '../../../entity/file/fileReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../../responsePayload';
 import { deleteFileList, deleteFileListFailure, deleteFileListSuccess, } from '../fileViewReducer';
-export const deleteFileListEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteFileList.match), mergeMap((action) => {
+export const deleteFileListEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(deleteFileList.match), switchMap((action) => {
     const { fileIds } = action.payload;
     return zeniAPI
         .deleteAndGetJSON(`${zeniAPI.apiEndPoints.fileMicroServiceBaseUrl}/1.0/files?query=${encodeURIComponent(JSON.stringify({ file_ids: fileIds }))}`)

package/lib/esm/view/onboardingView/customerView/epic/customerDetails/updateOnboardingCustomerViewEpic.js

@@ -18,7 +18,7 @@ import { getOnboardingCustomerView } from '../../onboardingCustomerViewSelector'
 export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(updateOnboardingCustomerView.match), mergeMap((action) => {
     const { companyId, officerType, sendForVerification, reCalculateCurrentStep = false, isBillingAddressUpdate, } = action.payload;
     const { onboardingCustomerViewState } = state$.value;
-    const { companyDetails, primaryContactDetails, companyOfficerUpdateStatus, currentStep, currentSubStep, } = onboardingCustomerViewState;
+    const { companyDetails, primaryContactDetails, companyOfficerUpdateStatus, currentStep, } = onboardingCustomerViewState;
     const companyLocalData = companyDetails.localData;
     const primaryContactLocalData = primaryContactDetails.localData;
     let companyOfficerLocalData;
@@ -52,12 +52,8 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
             Boolean(companyOfficerLocalData.email) === true // Don't save Empty Company Officer details
             ? toBusinessVerificationOfficerDataPayload(companyOfficerLocalData, false, companyOfficerAddressToCreate)
             : {};
-        // Verification step has two sub-steps that share currentStep but save
-        // different payloads — currentSubStep is the source of truth here.
-        const isOfficerSave = currentStep === 'verification' &&
-            currentSubStep === 'company_officer';
         if (isBillingAddressUpdate === false) {
-            if (isOfficerSave) {
+            if (currentStep === 'company_officer') {
                 payload = {
                     company: toBusinessVerificationMinimalCompanyDataPayload(companyLocalData),
                     company_officer,
@@ -70,11 +66,6 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
                 };
             }
         }
-        const section = isBillingAddressUpdate === true
-            ? 'setup_billing'
-            : isOfficerSave
-                ? 'company_officer'
-                : 'company_details';
         const messageSectionMapper = {
             company_officer: {
                 sendForVerification: 'onboarding_customer_identity_verification_submit',
@@ -84,20 +75,23 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
                 sendForVerification: 'onboarding_customer_business_verification_submit',
                 save: 'onboarding_customer_business_verification_save',
             },
-            setup_billing: {
+            link_payment_account: {
                 save: 'billing_address_view',
                 sendForVerification: 'billing_address_view',
             },
         };
         let messageSection;
         if (isBillingAddressUpdate === true) {
-            messageSection = messageSectionMapper[section].save;
-        }
-        else if (sendForVerification === true) {
-            messageSection = messageSectionMapper[section].sendForVerification;
+            messageSection = messageSectionMapper[currentStep].save;
         }
         else {
-            messageSection = messageSectionMapper[section].save;
+            if (sendForVerification === true) {
+                messageSection =
+                    messageSectionMapper[currentStep].sendForVerification;
+            }
+            else {
+                messageSection = messageSectionMapper[currentStep].save;
+            }
         }
         return zeniAPI
             .putAndGetJSON(`${zeniAPI.apiEndPoints.tenantMicroServiceBaseUrl}/1.0/companies/${companyId}`, payload)
@@ -120,18 +114,18 @@ export const updateOnboardingCustomerViewEpic = (actions$, state$, zeniAPI) => a
                 const externalConnections = currentTenant.externalConnections;
                 const isQBOConnection = externalConnections?.accounting?.some((connection) => connection.connectionName.match(/quickbooks/i)) ?? false;
                 const { allSteps } = getOnboardingCustomerView(state$.value, companyId);
-                if (currentStep === 'setup_billing') {
+                if (currentStep === 'link_payment_account') {
                     if (isQBOConnection === true &&
-                        allSteps.includes('connect_ledger')) {
-                        actions.push(updateCurrentStep({ step: 'connect_ledger' }));
+                        allSteps.includes('qbo_connection')) {
+                        actions.push(updateCurrentStep({ step: 'qbo_connection' }));
                     }
                     else {
-                        actions.push(updateCurrentStep({ step: 'verification' }));
+                        actions.push(updateCurrentStep({ step: 'company_officer' }));
                     }
                 }
-                // The officer→details transition is now a sub-step change
-                // handled by the page (currentSubStep dispatch). No
-                // currentStep update needed for that traversal anymore.
+                if (currentStep === 'company_officer') {
+                    actions.push(updateCurrentStep({ step: 'company_details' }));
+                }
                 actions.push(updateOnboardingCustomerViewLocalStoreData({
                     companyId: response.data.companies[0].company_id,
                     currentStep,

package/lib/esm/view/onboardingView/customerView/epic/customerDetails/updateOnboardingCustomerViewLocalStoreDataEpic.js

@@ -12,11 +12,11 @@ import { newAddressInLocalStore, resetNewAddressesInLocalStore, } from '../../..
 import { toAddressViewLocalData } from '../../../../addressView/toAddressViewLocalData';
 import { getCompanyView } from '../../../../companyView/selectorHelpers/getCompanyView';
 import { toSetupViewLocalData } from '../../../../spendManagement/commonSetup/epic/setup/updateSetupViewLocalStoreDataEpic';
-import { clearOnboardingCustomerViewDataInLocalStore, saveOnboardingCustomerViewDataInLocalStore, updateCurrentStep, updateCurrentSubStep, updateOnboardingCustomerViewLocalStoreData, } from '../../onboardingCustomerViewReducer';
-import { onboardingStepsData } from '../../onboardingCustomerViewSelector';
+import { clearOnboardingCustomerViewDataInLocalStore, saveOnboardingCustomerViewDataInLocalStore, updateCurrentStep, updateOnboardingCustomerViewLocalStoreData, } from '../../onboardingCustomerViewReducer';
+import { isOfficerDetailsCompleted, onboardingStepsData, } from '../../onboardingCustomerViewSelector';
 export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$) => actions$.pipe(filter(updateOnboardingCustomerViewLocalStoreData.match), mergeMap((action) => {
     const { companyId, currentStep, reCalculateCurrentStep } = action.payload;
-    const { companyState, companyViewState, userState, userRoleState, onboardingCustomerViewState, subscriptionPaymentAccountState, paymentAccountState, addressState, } = state$.value;
+    const { companyState, companyViewState, fileState, userState, userRoleState, onboardingCustomerViewState, subscriptionPaymentAccountState, paymentAccountState, addressState, } = state$.value;
     const { subscriptionPaymentAccountIds } = onboardingCustomerViewState;
     const subscriptionIDs = recordGet(companyViewState.passportView.subscriptionIDsByCompanyID, companyId, undefined);
     const companyView = getCompanyView(state$.value, companyId, subscriptionIDs ?? []);
@@ -36,12 +36,7 @@ export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$)
         const onboardingCustomerViewLocalData = toOnboardingCustomerViewLocalData(company, companyOfficers, companyOfficerRoles, primaryContact);
         const { companyDetails, officers, primaryContactDetails } = onboardingCustomerViewLocalData;
         let updatedCompanyDetails = companyDetails;
-        // After an officer sub-step save inside the verification step, propagate
-        // the latest syncToken into the cached company-details local data so the
-        // user's next details-save doesn't 409.
-        const isOfficerSave = currentStep === 'verification' &&
-            onboardingCustomerViewState.currentSubStep === 'company_officer';
-        if (isOfficerSave &&
+        if (currentStep === 'company_officer' &&
             onboardingCustomerViewState.companyDetails.localData != null) {
             const { companyInfo } = company;
             const { syncToken } = companyInfo;
@@ -50,7 +45,7 @@ export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$)
                 syncToken,
             };
         }
-        let updatedCurrentStep = 'setup_billing';
+        let updatedCurrentStep = 'link_payment_account';
         let subscriptionPaymentAccount;
         const { companyOnboardingInfo } = company;
         const accountingConnectionCreationMode = companyOnboardingInfo?.onboardingInfo
@@ -77,17 +72,18 @@ export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$)
                 cardPaymentViewState.cardPaymentsIds.length > 0) &&
                 companyView?.company.company.companyOnboardingInfo
                     .subscriptionBillingAddressId != null) {
-                updatedCurrentStep = 'connect_ledger';
-                const isOnboardingAiActivationViewed = companyOnboardingInfo?.onboardingInfo
-                    ?.onboardingAiActivationInfo?.isOnboardingAiActivationViewed ??
-                    false;
-                // Past the ledger step we always sit on connect_data_source —
-                // it has many integrations, so we treat it as never auto-complete
-                // and only advance to verification on an explicit user dispatch.
-                // While the AI activation interstitial hasn't been viewed yet,
-                // stay on connect_ledger so the interstitial gets its chance.
-                if (isValidConnection && isOnboardingAiActivationViewed) {
-                    updatedCurrentStep = 'connect_data_source';
+                updatedCurrentStep = 'qbo_connection';
+                if (isValidConnection) {
+                    updatedCurrentStep = 'company_officer';
+                    let officerIndex = companyOfficers.length > 0
+                        ? officers.findIndex((officer) => officer?.isSelectedForVerification === true)
+                        : 0;
+                    if (officerIndex === -1) {
+                        officerIndex = 0;
+                    }
+                    if (isOfficerDetailsCompleted(companyOfficers, companyOfficerRoles, officers[officerIndex], fileState)) {
+                        updatedCurrentStep = 'company_details';
+                    }
                 }
             }
         }
@@ -109,14 +105,6 @@ export const updateOnboardingCustomerViewLocalStoreDataEpic = (actions$, state$)
         }
         if (reCalculateCurrentStep === true) {
             fetchActions.push(updateCurrentStep({ step: updatedCurrentStep }));
-            // Whenever the recalc lands the user on a different step, reset
-            // the sub-step to the step's landing sub-state — otherwise a
-            // stale subStep (e.g. 'default' carried over from another step)
-            // leaves verification rendering an empty form.
-            if (updatedCurrentStep !== onboardingCustomerViewState.currentStep) {
-                const targetSubStep = updatedCurrentStep === 'verification' ? 'unlock-stack' : 'default';
-                fetchActions.push(updateCurrentSubStep({ subStep: targetSubStep }));
-            }
         }
     }
     if (companyView != null) {