@zeniai/client-epic-state 4.19.8 → 4.19.9

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

@@ -58,10 +58,19 @@ exports.defaultMonthYearPeriod = {
 };
 const getDefaultSelectedPeriodsForTenants = (tenantsData) => {
     const defaultSelectedPeriodsForTenants = tenantsData.tenants.reduce((prev, currentTenant) => {
-        const currentMonthYearPeriod = currentTenant.book_close_date != null
+        // if book close date is of current month then show current month, else show book close date month + 1
+        const currentMonthYearPeriod = currentTenant.book_close_date != null &&
+            ((0, zeniDayJS_1.dateNow)().month() !== (0, zeniDayJS_1.date)(currentTenant.book_close_date).month() ||
+                (0, zeniDayJS_1.dateNow)().year() !== (0, zeniDayJS_1.date)(currentTenant.book_close_date).year())
             ? {
-                month: (0, timePeriod_1.toMonth)((0, zeniDayJS_1.date)(currentTenant.book_close_date).month()),
-                year: (0, zeniDayJS_1.date)(currentTenant.book_close_date).year(),
+                month: (0, timePeriod_1.toMonth)((0, zeniDayJS_1.date)(currentTenant.book_close_date)
+                    .startOf('month')
+                    .add(1, 'month')
+                    .month()),
+                year: (0, zeniDayJS_1.date)(currentTenant.book_close_date)
+                    .startOf('month')
+                    .add(1, 'month')
+                    .year(),
             }
             : undefined;
         if (currentMonthYearPeriod != null) {

package/lib/view/accountList/accountListReducer.d.ts

@@ -3,8 +3,7 @@ import { AccountListResponse } from './accountListPayload';
 import { AccountList, AccountListKeyType, AccountListState } from './accountListState';
 export declare const initialAccountList: AccountList;
 export declare const initialState: AccountListState;
-export declare const fetchAccountList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[accountListKey: AccountListKeyType, fetchFullResponse?: any, excludeAccountPayableAccounts?: any, excludeAccountReceivableAccounts?: any, isLimitedCategoryEnabled?: any, filterAccountTypes?: ("cash_position" | "fixed_assets" | "bank" | "credit_card" | "expenses" | "cogs" | "income" | "cash_in" | "cash_out" | "other_income" | "other_expense" | "accounts_receivable" | "other_current_assets" | "other_assets" | "accounts_payable" | "other_current_liabilities" | "long_term_liabilities" | "equity" | "current_liabilities" | "current_assets")[] | undefined, isIncludeDeleted?: boolean | undefined], {
-    isIncludeDeleted?: true | undefined;
+export declare const fetchAccountList: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[accountListKey: AccountListKeyType, fetchFullResponse?: any, excludeAccountPayableAccounts?: any, excludeAccountReceivableAccounts?: any, isLimitedCategoryEnabled?: any, filterAccountTypes?: ("cash_position" | "fixed_assets" | "bank" | "credit_card" | "expenses" | "cogs" | "income" | "cash_in" | "cash_out" | "other_income" | "other_expense" | "accounts_receivable" | "other_current_assets" | "other_assets" | "accounts_payable" | "other_current_liabilities" | "long_term_liabilities" | "equity" | "current_liabilities" | "current_assets")[] | undefined], {
     accountListKey: AccountListKeyType;
     fetchFullResponse: any;
     excludeAccountPayableAccounts: any;

package/lib/view/accountList/accountListReducer.js

@@ -45,13 +45,16 @@ const accountList = (0, toolkit_1.createSlice)({
                 const existingData = draft.byReportId[action.payload.accountListKey];
                 draft.byReportId[action.payload.accountListKey] = Object.assign(Object.assign({}, existingData), { fetchState: 'In-Progress', error: undefined });
             },
-            prepare(accountListKey, fetchFullResponse = false, excludeAccountPayableAccounts = false, excludeAccountReceivableAccounts = false, isLimitedCategoryEnabled = false, filterAccountTypes, isIncludeDeleted) {
+            prepare(accountListKey, fetchFullResponse = false, excludeAccountPayableAccounts = false, excludeAccountReceivableAccounts = false, isLimitedCategoryEnabled = false, filterAccountTypes) {
                 return {
-                    payload: Object.assign({ accountListKey,
+                    payload: {
+                        accountListKey,
                         fetchFullResponse,
                         excludeAccountPayableAccounts,
                         excludeAccountReceivableAccounts,
-                        isLimitedCategoryEnabled, filterAccountTypes: filterAccountTypes !== null && filterAccountTypes !== void 0 ? filterAccountTypes : [] }, (isIncludeDeleted === true && { isIncludeDeleted })),
+                        isLimitedCategoryEnabled,
+                        filterAccountTypes: filterAccountTypes !== null && filterAccountTypes !== void 0 ? filterAccountTypes : [],
+                    },
                 };
             },
         },

package/lib/view/accountList/fetchAccountListEpic.js

@@ -16,9 +16,14 @@ const getAccountTypes = (isLimitedCategoryEnabled, filterAccountTypes) => {
     return [];
 };
 const fetchAccountListEpic = (actions$, _state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(accountListReducer_1.fetchAccountList.match), (0, operators_1.mergeMap)((action) => {
-    const { accountListKey, fetchFullResponse, excludeAccountPayableAccounts, excludeAccountReceivableAccounts, isLimitedCategoryEnabled, filterAccountTypes, isIncludeDeleted, } = action.payload;
+    const { accountListKey, fetchFullResponse, excludeAccountPayableAccounts, excludeAccountReceivableAccounts, isLimitedCategoryEnabled, filterAccountTypes, } = action.payload;
     const accountTypes = getAccountTypes(isLimitedCategoryEnabled, filterAccountTypes);
-    const queryValue = Object.assign({ is_bookkeeping_admin: fetchFullResponse, is_exclude_account_payable_accounts: excludeAccountPayableAccounts, is_exclude_account_receivable_accounts: excludeAccountReceivableAccounts, account_types: accountTypes }, (isIncludeDeleted === true && { is_include_deleted: true }));
+    const queryValue = {
+        is_bookkeeping_admin: fetchFullResponse,
+        is_exclude_account_payable_accounts: excludeAccountPayableAccounts,
+        is_exclude_account_receivable_accounts: excludeAccountReceivableAccounts,
+        account_types: accountTypes,
+    };
     return zeniAPI
         .getJSON(`${zeniAPI.apiEndPoints.accountMicroServiceBaseUrl}/1.0/accounts?query=${encodeURIComponent(JSON.stringify(queryValue))}`)
         .pipe((0, operators_1.mergeMap)((response) => {

package/lib/view/spendManagement/reimbursement/editRemiView/epics/fetchEditRemiDetailPageEpic.js

@@ -18,8 +18,8 @@ const fetchEditRemiDetailPageEpic = (actions$, state$) => actions$.pipe((0, oper
     const state = state$.value;
     const userId = (_b = (_a = state.tenantState.loggedInUser) === null || _a === void 0 ? void 0 : _a.userId) !== null && _b !== void 0 ? _b : '';
     if (cacheOverride) {
-        remiDetailActions.push((0, accountListReducer_1.fetchAccountList)('reimbursementAccountList', true, true, true, isLimitedCategoryEnabled, [], true));
-        remiDetailActions.push((0, classListReducer_1.fetchClassList)(true));
+        remiDetailActions.push((0, accountListReducer_1.fetchAccountList)('reimbursementAccountList', true, true, true, isLimitedCategoryEnabled));
+        remiDetailActions.push((0, classListReducer_1.fetchClassList)());
         remiDetailActions.push((0, merchantListReducer_1.fetchMerchantList)());
         remiDetailActions.push((0, reimbursementConfigReducer_1.fetchReimbursementConfig)());
         remiDetailActions.push((0, userFinancialAccountReducer_1.fetchUserFinancialAccount)(userId, reimbursementId));
@@ -29,12 +29,14 @@ const fetchEditRemiDetailPageEpic = (actions$, state$) => actions$.pipe((0, oper
     }
     else {
         const accountList = state.accountListState.byReportId.reimbursementAccountList;
-        if (accountList.fetchState !== 'In-Progress') {
-            remiDetailActions.push((0, accountListReducer_1.fetchAccountList)('reimbursementAccountList', true, true, true, isLimitedCategoryEnabled, [], true));
+        if (accountList.hasValidState() === false &&
+            accountList.fetchState !== 'In-Progress') {
+            remiDetailActions.push((0, accountListReducer_1.fetchAccountList)('reimbursementAccountList', true, true, true, isLimitedCategoryEnabled));
         }
         const classList = state.classListState;
-        if (classList.fetchState !== 'In-Progress') {
-            remiDetailActions.push((0, classListReducer_1.fetchClassList)(true));
+        if (classList.hasValidState() === false &&
+            classList.fetchState !== 'In-Progress') {
+            remiDetailActions.push((0, classListReducer_1.fetchClassList)());
         }
         const merchantList = state.merchantListState;
         if (merchantList.hasValidState() === false &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.19.8",
+  "version": "4.19.9",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -30,7 +30,7 @@
     "@liveblocks/client": "^2.23.0",
     "@trivago/prettier-plugin-sort-imports": "^5.2.2",
     "@types/big.js": "^6.2.2",
-    "@types/lodash": "^4.17.23",
+    "@types/lodash": "^4.17.16",
     "@types/node": "^20.19.0",
     "@types/url-parse": "^1.4.11",
     "@typescript-eslint/eslint-plugin": "^8.26.0",
@@ -62,7 +62,7 @@
     "dayjs": "^1.10.7",
     "dayjs-business-time": "^1.0.4",
     "js-base64": "^3.6.0",
-    "lodash": "^4.17.23",
+    "lodash": "^4.17.21",
     "pusher-js": "^8.4.0",
     "redux": "^4.0.5",
     "redux-observable": "^1.2.0",