@zeniai/client-epic-state 5.0.90-betaAS4 → 5.0.90-betaAS5

package/lib/esm/view/spendManagement/billPay/internationalWireVerification/epics/fetchIntlVerificationFormEpic.js

@@ -1,8 +1,9 @@
 import { from, of } from 'rxjs';
 import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { createZeniAPIStatus, isSuccessResponse, } from '../../../../../responsePayload';
-import { fetchInternationalVerificationForm, initializeIntlVerificationForm, updateInternationalVerificationForm, updateVerificationFormFailure, } from '../internationalWireVerificationReducer';
-export const fetchIntlVerificationFormEpic = (actions$, _state$, zeniAPI) => actions$.pipe(filter(fetchInternationalVerificationForm.match), switchMap((action) => {
+import { toVerificationFormLocalDataFromOnboardingDetails } from '../internationalWireOnboardingDetailsToLocalData';
+import { fetchInternationalVerificationForm, updateInternationalVerificationForm, updateVerificationFormFailure, updateVerificationFormLocalData, } from '../internationalWireVerificationReducer';
+export const fetchIntlVerificationFormEpic = (actions$, state$, zeniAPI) => actions$.pipe(filter(fetchInternationalVerificationForm.match), switchMap((action) => {
     const query = {
         region: 'US',
         legal_type: 'BUSINESS',
@@ -11,11 +12,14 @@ export const fetchIntlVerificationFormEpic = (actions$, _state$, zeniAPI) => act
         .getJSON(`${zeniAPI.apiEndPoints.payMicroServiceBaseUrl}/1.0/international-wire/onboarding-fields?query=${encodeURIComponent(JSON.stringify(query))}`)
         .pipe(mergeMap((response) => {
         if (isSuccessResponse(response) && response.data != null) {
+            const onboardingDataFromCompanyInfo = state$.value.companyState.companiesById[action.payload.companyId]
+                ?.companyBillPayInfo?.internationalWireOnboardingDetails;
+            const localData = toVerificationFormLocalDataFromOnboardingDetails(onboardingDataFromCompanyInfo, response.data.labels);
             return from([
                 updateInternationalVerificationForm({
                     internationalWireFormPayload: response.data.labels,
                 }),
-                initializeIntlVerificationForm(action.payload.companyId, response.data.labels),
+                updateVerificationFormLocalData(localData),
             ]);
         }
         else {

package/lib/esm/view/spendManagement/billPay/internationalWireVerification/epics/initializeIntlVerificationFormEpic.js

@@ -1,12 +1,38 @@
-import { from } from 'rxjs';
+import { empty, from } from 'rxjs';
 import { filter, mergeMap } from 'rxjs/operators';
+import { getCurrentTenant } from '../../../../../entity/tenant/tenantSelector';
+import { fetchBillPaySetupViewSuccess } from '../../billPaySetupView/billPaySetupViewReducer';
 import { toVerificationFormLocalDataFromOnboardingDetails } from '../internationalWireOnboardingDetailsToLocalData';
 import { initializeIntlVerificationForm, updateVerificationFormLocalData, } from '../internationalWireVerificationReducer';
-export const initializeIntlVerificationFormEpic = (actions$, state$) => actions$.pipe(filter(initializeIntlVerificationForm.match), mergeMap((action) => {
-    const { companyId, internationalWireFormPayload } = action.payload;
+const hasSavedPersonSubfieldData = (localData) => Object.keys(localData).some((key) => /^stake_holder_\d+_/.test(key) ||
+    (key.startsWith('controlling_person_') && key !== 'controlling_person'));
+export const initializeIntlVerificationFormEpic = (actions$, state$) => actions$.pipe(filter((action) => initializeIntlVerificationForm.match(action) ||
+    fetchBillPaySetupViewSuccess.match(action)), mergeMap((action) => {
     const state = state$.value;
-    const onboardingDataFromCompanyInfo = state.companyState.companiesById[companyId].companyBillPayInfo
-        .internationalWireOnboardingDetails;
-    const localData = toVerificationFormLocalDataFromOnboardingDetails(onboardingDataFromCompanyInfo, internationalWireFormPayload);
-    return from([updateVerificationFormLocalData(localData)]);
+    const formFieldLabels = state.internationalWireVerificationState.verificationFormFieldLabels;
+    if (Object.keys(formFieldLabels).length === 0) {
+        return empty();
+    }
+    const companyId = initializeIntlVerificationForm.match(action) ?
+        action.payload.companyId
+        : getCurrentTenant(state)?.companyId;
+    if (companyId == null) {
+        return empty();
+    }
+    const onboardingDataFromCompanyInfo = state.companyState.companiesById[companyId]?.companyBillPayInfo
+        ?.internationalWireOnboardingDetails;
+    const localDataFromCompany = toVerificationFormLocalDataFromOnboardingDetails(onboardingDataFromCompanyInfo, formFieldLabels);
+    const existingLocalData = state.internationalWireVerificationState.verificationFormLocalData;
+    if (fetchBillPaySetupViewSuccess.match(action)) {
+        if (!hasSavedPersonSubfieldData(localDataFromCompany) ||
+            hasSavedPersonSubfieldData(existingLocalData)) {
+            return empty();
+        }
+    }
+    return from([
+        updateVerificationFormLocalData({
+            ...existingLocalData,
+            ...localDataFromCompany,
+        }),
+    ]);
 }));

package/lib/esm/view/spendManagement/billPay/internationalWireVerification/internationalWireVerificationLocalDataHelpers.js

@@ -4,7 +4,21 @@ export const isIntlWireFileOptionLike = (value) => typeof value === 'object' &&
     value != null &&
     'file_id' in value &&
     typeof value.file_id === 'string';
-export const isIntlWirePersonLike = (value) => typeof value === 'object' && value != null && !Array.isArray(value);
+export const isIntlWirePersonLike = (value) => {
+    if (typeof value !== 'object' || value == null || Array.isArray(value)) {
+        return false;
+    }
+    const person = value;
+    return (person.name != null ||
+        person.email != null ||
+        person.nationality != null ||
+        person.company_role != null ||
+        person.ssn != null ||
+        person.date_of_birth != null ||
+        person.ownership_percentage != null ||
+        person.proof_of_identity != null ||
+        person.proof_of_address != null);
+};
 export const toIntlWireFileOptionArray = (items) => items.filter(isIntlWireFileOptionLike);
 export const appendIntlWireFileOptionsToLocalData = (localData, baseKey, fileOptions) => {
     const [front, back] = fileOptions;

package/lib/esm/view/spendManagement/billPay/internationalWireVerification/internationalWireVerificationReducer.js

@@ -4,6 +4,7 @@ export const initialState = {
     verificationFormFetchState: {
         fetchState: 'Not-Started',
     },
+    verificationFormFieldLabels: {},
     verificationFormFields: [],
     verificationFormLocalData: {},
     verificationFormSubmitState: {
@@ -31,6 +32,7 @@ const internationalWireVerification = createSlice({
         },
         updateInternationalVerificationForm(draft, action) {
             const { internationalWireFormPayload } = action.payload;
+            draft.verificationFormFieldLabels = internationalWireFormPayload;
             draft.verificationFormFields = toVerificationFormFields(internationalWireFormPayload);
             draft.verificationFormFetchState.fetchState = 'Completed';
         },
@@ -41,6 +43,7 @@ const internationalWireVerification = createSlice({
         },
         updateVerificationFormLocalData(draft, action) {
             draft.verificationFormLocalData = {
+                ...draft.verificationFormLocalData,
                 ...action.payload,
             };
         },

package/lib/esm/view/spendManagement/billPay/internationalWireVerification/internationalWireVerificationSelector.js

@@ -20,18 +20,19 @@ const collectFileIdsFromLocalData = (localData) => {
 export const getIntlWireVerificationView = (state) => {
     const deleteFileStatusById = {};
     const updateFileStatusById = {};
-    const fileIds = collectFileIdsFromLocalData(state.internationalWireVerificationState.verificationFormLocalData);
+    const { verificationFormFetchState, verificationFormFields, verificationFormLocalData, verificationFormSubmitState, } = state.internationalWireVerificationState;
+    const fileIds = collectFileIdsFromLocalData(verificationFormLocalData);
     fileIds.forEach((fileId) => {
         deleteFileStatusById[fileId] = getFileDeleteStatusById(state, fileId);
         updateFileStatusById[fileId] = getFileUpdateNameStatusById(state, fileId);
     });
-    const userFiles = fileIds.length > 0
-        ? getFilesByFileIds(state.fileState, fileIds)
-        : [];
-    const fetchState = state.internationalWireVerificationState.verificationFormFetchState
-        .fetchState;
+    const userFiles = fileIds.length > 0 ? getFilesByFileIds(state.fileState, fileIds) : [];
+    const fetchState = verificationFormFetchState.fetchState;
     return {
-        ...state.internationalWireVerificationState,
+        verificationFormFetchState,
+        verificationFormFields,
+        verificationFormLocalData,
+        verificationFormSubmitState,
         deleteFileStatusById,
         updateFileStatusById,
         userFiles,

package/lib/view/spendManagement/billPay/internationalWireVerification/epics/fetchIntlVerificationFormEpic.d.ts

@@ -2,6 +2,6 @@ import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { RootState } from '../../../../../reducer';
 import { ZeniAPI } from '../../../../../zeniAPI';
-import { fetchInternationalVerificationForm, initializeIntlVerificationForm, updateInternationalVerificationForm, updateVerificationFormFailure } from '../internationalWireVerificationReducer';
-export type ActionType = ReturnType<typeof fetchInternationalVerificationForm> | ReturnType<typeof updateInternationalVerificationForm> | ReturnType<typeof updateVerificationFormFailure> | ReturnType<typeof initializeIntlVerificationForm>;
-export declare const fetchIntlVerificationFormEpic: (actions$: ActionsObservable<ActionType>, _state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;
+import { fetchInternationalVerificationForm, updateInternationalVerificationForm, updateVerificationFormFailure, updateVerificationFormLocalData } from '../internationalWireVerificationReducer';
+export type ActionType = ReturnType<typeof fetchInternationalVerificationForm> | ReturnType<typeof updateInternationalVerificationForm> | ReturnType<typeof updateVerificationFormFailure> | ReturnType<typeof updateVerificationFormLocalData>;
+export declare const fetchIntlVerificationFormEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/spendManagement/billPay/internationalWireVerification/epics/fetchIntlVerificationFormEpic.js

@@ -4,8 +4,9 @@ exports.fetchIntlVerificationFormEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
 const responsePayload_1 = require("../../../../../responsePayload");
+const internationalWireOnboardingDetailsToLocalData_1 = require("../internationalWireOnboardingDetailsToLocalData");
 const internationalWireVerificationReducer_1 = require("../internationalWireVerificationReducer");
-const fetchIntlVerificationFormEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(internationalWireVerificationReducer_1.fetchInternationalVerificationForm.match), (0, operators_1.switchMap)((action) => {
+const fetchIntlVerificationFormEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(internationalWireVerificationReducer_1.fetchInternationalVerificationForm.match), (0, operators_1.switchMap)((action) => {
     const query = {
         region: 'US',
         legal_type: 'BUSINESS',
@@ -14,11 +15,14 @@ const fetchIntlVerificationFormEpic = (actions$, _state$, zeniAPI) => actions$.p
         .getJSON(`${zeniAPI.apiEndPoints.payMicroServiceBaseUrl}/1.0/international-wire/onboarding-fields?query=${encodeURIComponent(JSON.stringify(query))}`)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
+            const onboardingDataFromCompanyInfo = state$.value.companyState.companiesById[action.payload.companyId]
+                ?.companyBillPayInfo?.internationalWireOnboardingDetails;
+            const localData = (0, internationalWireOnboardingDetailsToLocalData_1.toVerificationFormLocalDataFromOnboardingDetails)(onboardingDataFromCompanyInfo, response.data.labels);
             return (0, rxjs_1.from)([
                 (0, internationalWireVerificationReducer_1.updateInternationalVerificationForm)({
                     internationalWireFormPayload: response.data.labels,
                 }),
-                (0, internationalWireVerificationReducer_1.initializeIntlVerificationForm)(action.payload.companyId, response.data.labels),
+                (0, internationalWireVerificationReducer_1.updateVerificationFormLocalData)(localData),
             ]);
         }
         else {

package/lib/view/spendManagement/billPay/internationalWireVerification/epics/initializeIntlVerificationFormEpic.d.ts

@@ -1,6 +1,7 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
 import { RootState } from '../../../../../reducer';
+import { fetchBillPaySetupViewSuccess } from '../../billPaySetupView/billPaySetupViewReducer';
 import { initializeIntlVerificationForm, updateVerificationFormLocalData } from '../internationalWireVerificationReducer';
 export type ActionType = ReturnType<typeof updateVerificationFormLocalData> | ReturnType<typeof initializeIntlVerificationForm>;
-export declare const initializeIntlVerificationFormEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>) => Observable<ActionType>;
+export declare const initializeIntlVerificationFormEpic: (actions$: ActionsObservable<ActionType | ReturnType<typeof fetchBillPaySetupViewSuccess>>, state$: StateObservable<RootState>) => Observable<ActionType>;

package/lib/view/spendManagement/billPay/internationalWireVerification/epics/initializeIntlVerificationFormEpic.js

@@ -3,14 +3,40 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initializeIntlVerificationFormEpic = void 0;
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");
+const tenantSelector_1 = require("../../../../../entity/tenant/tenantSelector");
+const billPaySetupViewReducer_1 = require("../../billPaySetupView/billPaySetupViewReducer");
 const internationalWireOnboardingDetailsToLocalData_1 = require("../internationalWireOnboardingDetailsToLocalData");
 const internationalWireVerificationReducer_1 = require("../internationalWireVerificationReducer");
-const initializeIntlVerificationFormEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)(internationalWireVerificationReducer_1.initializeIntlVerificationForm.match), (0, operators_1.mergeMap)((action) => {
-    const { companyId, internationalWireFormPayload } = action.payload;
+const hasSavedPersonSubfieldData = (localData) => Object.keys(localData).some((key) => /^stake_holder_\d+_/.test(key) ||
+    (key.startsWith('controlling_person_') && key !== 'controlling_person'));
+const initializeIntlVerificationFormEpic = (actions$, state$) => actions$.pipe((0, operators_1.filter)((action) => internationalWireVerificationReducer_1.initializeIntlVerificationForm.match(action) ||
+    billPaySetupViewReducer_1.fetchBillPaySetupViewSuccess.match(action)), (0, operators_1.mergeMap)((action) => {
     const state = state$.value;
-    const onboardingDataFromCompanyInfo = state.companyState.companiesById[companyId].companyBillPayInfo
-        .internationalWireOnboardingDetails;
-    const localData = (0, internationalWireOnboardingDetailsToLocalData_1.toVerificationFormLocalDataFromOnboardingDetails)(onboardingDataFromCompanyInfo, internationalWireFormPayload);
-    return (0, rxjs_1.from)([(0, internationalWireVerificationReducer_1.updateVerificationFormLocalData)(localData)]);
+    const formFieldLabels = state.internationalWireVerificationState.verificationFormFieldLabels;
+    if (Object.keys(formFieldLabels).length === 0) {
+        return (0, rxjs_1.empty)();
+    }
+    const companyId = internationalWireVerificationReducer_1.initializeIntlVerificationForm.match(action) ?
+        action.payload.companyId
+        : (0, tenantSelector_1.getCurrentTenant)(state)?.companyId;
+    if (companyId == null) {
+        return (0, rxjs_1.empty)();
+    }
+    const onboardingDataFromCompanyInfo = state.companyState.companiesById[companyId]?.companyBillPayInfo
+        ?.internationalWireOnboardingDetails;
+    const localDataFromCompany = (0, internationalWireOnboardingDetailsToLocalData_1.toVerificationFormLocalDataFromOnboardingDetails)(onboardingDataFromCompanyInfo, formFieldLabels);
+    const existingLocalData = state.internationalWireVerificationState.verificationFormLocalData;
+    if (billPaySetupViewReducer_1.fetchBillPaySetupViewSuccess.match(action)) {
+        if (!hasSavedPersonSubfieldData(localDataFromCompany) ||
+            hasSavedPersonSubfieldData(existingLocalData)) {
+            return (0, rxjs_1.empty)();
+        }
+    }
+    return (0, rxjs_1.from)([
+        (0, internationalWireVerificationReducer_1.updateVerificationFormLocalData)({
+            ...existingLocalData,
+            ...localDataFromCompany,
+        }),
+    ]);
 }));
 exports.initializeIntlVerificationFormEpic = initializeIntlVerificationFormEpic;

package/lib/view/spendManagement/billPay/internationalWireVerification/internationalWireVerificationLocalDataHelpers.js

@@ -8,7 +8,21 @@ const isIntlWireFileOptionLike = (value) => typeof value === 'object' &&
     'file_id' in value &&
     typeof value.file_id === 'string';
 exports.isIntlWireFileOptionLike = isIntlWireFileOptionLike;
-const isIntlWirePersonLike = (value) => typeof value === 'object' && value != null && !Array.isArray(value);
+const isIntlWirePersonLike = (value) => {
+    if (typeof value !== 'object' || value == null || Array.isArray(value)) {
+        return false;
+    }
+    const person = value;
+    return (person.name != null ||
+        person.email != null ||
+        person.nationality != null ||
+        person.company_role != null ||
+        person.ssn != null ||
+        person.date_of_birth != null ||
+        person.ownership_percentage != null ||
+        person.proof_of_identity != null ||
+        person.proof_of_address != null);
+};
 exports.isIntlWirePersonLike = isIntlWirePersonLike;
 const toIntlWireFileOptionArray = (items) => items.filter(exports.isIntlWireFileOptionLike);
 exports.toIntlWireFileOptionArray = toIntlWireFileOptionArray;

package/lib/view/spendManagement/billPay/internationalWireVerification/internationalWireVerificationReducer.js

@@ -8,6 +8,7 @@ exports.initialState = {
     verificationFormFetchState: {
         fetchState: 'Not-Started',
     },
+    verificationFormFieldLabels: {},
     verificationFormFields: [],
     verificationFormLocalData: {},
     verificationFormSubmitState: {
@@ -35,6 +36,7 @@ const internationalWireVerification = (0, toolkit_1.createSlice)({
         },
         updateInternationalVerificationForm(draft, action) {
             const { internationalWireFormPayload } = action.payload;
+            draft.verificationFormFieldLabels = internationalWireFormPayload;
             draft.verificationFormFields = (0, internationalWireVerificationPayload_1.toVerificationFormFields)(internationalWireFormPayload);
             draft.verificationFormFetchState.fetchState = 'Completed';
         },
@@ -45,6 +47,7 @@ const internationalWireVerification = (0, toolkit_1.createSlice)({
         },
         updateVerificationFormLocalData(draft, action) {
             draft.verificationFormLocalData = {
+                ...draft.verificationFormLocalData,
                 ...action.payload,
             };
         },

package/lib/view/spendManagement/billPay/internationalWireVerification/internationalWireVerificationSelector.js

@@ -23,18 +23,19 @@ const collectFileIdsFromLocalData = (localData) => {
 const getIntlWireVerificationView = (state) => {
     const deleteFileStatusById = {};
     const updateFileStatusById = {};
-    const fileIds = collectFileIdsFromLocalData(state.internationalWireVerificationState.verificationFormLocalData);
+    const { verificationFormFetchState, verificationFormFields, verificationFormLocalData, verificationFormSubmitState, } = state.internationalWireVerificationState;
+    const fileIds = collectFileIdsFromLocalData(verificationFormLocalData);
     fileIds.forEach((fileId) => {
         deleteFileStatusById[fileId] = (0, fileViewSelector_1.getFileDeleteStatusById)(state, fileId);
         updateFileStatusById[fileId] = (0, fileViewSelector_1.getFileUpdateNameStatusById)(state, fileId);
     });
-    const userFiles = fileIds.length > 0
-        ? (0, fileSelector_1.getFilesByFileIds)(state.fileState, fileIds)
-        : [];
-    const fetchState = state.internationalWireVerificationState.verificationFormFetchState
-        .fetchState;
+    const userFiles = fileIds.length > 0 ? (0, fileSelector_1.getFilesByFileIds)(state.fileState, fileIds) : [];
+    const fetchState = verificationFormFetchState.fetchState;
     return {
-        ...state.internationalWireVerificationState,
+        verificationFormFetchState,
+        verificationFormFields,
+        verificationFormLocalData,
+        verificationFormSubmitState,
         deleteFileStatusById,
         updateFileStatusById,
         userFiles,

package/lib/view/spendManagement/billPay/internationalWireVerification/internationalWireVerificationState.d.ts

@@ -1,6 +1,8 @@
 import { FetchStateAndError } from '../../../../commonStateTypes/common';
+import { FieldPayload } from './internationalWireVerificationPayload';
 export interface InternationalWireVerificationState {
     verificationFormFetchState: FetchStateAndError;
+    verificationFormFieldLabels: Record<string, FieldPayload>;
     verificationFormFields: VerificationFormField[];
     verificationFormLocalData: VerificationFormLocalData;
     verificationFormSubmitState: FetchStateAndError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "5.0.90-betaAS4",
+  "version": "5.0.90-betaAS5",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "module": "lib/esm/index.js",