@zeniai/client-epic-state 4.19.67-betaRD1 → 4.19.67-betaRD2

package/lib/entity/transactionActivityLog/transactionActivityLogPayload.d.ts

@@ -8,16 +8,20 @@ export interface TransactionActivityLogLinePayload {
     account?: AccountBasePayload;
     accounting_class?: ClassBasePayload;
     customer?: CustomerBasePayload;
+    line_description?: string;
+    transaction_memo?: string;
     vendor?: VendorBasePayload;
 }
 export interface ActivityLogTransactionPayload {
     line_id: string;
     original_line: TransactionActivityLogLinePayload;
     updated_line: TransactionActivityLogLinePayload;
+    transaction_id?: string;
 }
 export interface TransactionActivityLogDataPayload {
-    ai_summaries: AISummaryPayload[];
     transaction: ActivityLogTransactionPayload;
+    ai_summaries?: AISummaryPayload[];
+    user_id?: string;
 }
 export interface TransactionActivityLogPayload {
     correlation_id: string;
@@ -27,5 +31,6 @@ export interface TransactionActivityLogPayload {
     processing_time_ms: number;
     status_code: string;
 }
-export declare const toTransactionActivityLogData: (data: TransactionActivityLogDataPayload) => TransactionActivityLogData;
+export declare const toActivityLogId: (correlationId: string, eventType: string, lineId: string | null | undefined) => string;
+export declare const toTransactionActivityLogData: (data: TransactionActivityLogDataPayload, correlationId: string) => TransactionActivityLogData;
 export declare const toTransactionActivityLog: (payload: TransactionActivityLogPayload) => TransactionActivityLog;

package/lib/entity/transactionActivityLog/transactionActivityLogPayload.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toTransactionActivityLog = exports.toTransactionActivityLogData = void 0;
+exports.toTransactionActivityLog = exports.toTransactionActivityLogData = exports.toActivityLogId = void 0;
 const zeniDayJS_1 = require("../../zeniDayJS");
 const accountPayload_1 = require("../account/accountPayload");
 const classPayload_1 = require("../class/classPayload");
@@ -8,6 +8,8 @@ const customerPayload_1 = require("../customer/customerPayload");
 const transactionLinePayload_1 = require("../transaction/payloadTypes/transactionLinePayload");
 const vendorPayload_1 = require("../vendor/vendorPayload");
 const transactionActivityLogState_1 = require("./transactionActivityLogState");
+const toActivityLogId = (correlationId, eventType, lineId) => `${correlationId}-${eventType}-${lineId ?? '1'}`;
+exports.toActivityLogId = toActivityLogId;
 const toTransactionActivityLogLine = (line) => {
     return {
         account: line.account
@@ -20,26 +22,33 @@ const toTransactionActivityLogLine = (line) => {
         vendor: line.vendor
             ? (0, vendorPayload_1.mapVendorBasePayloadToVendorBase)(line.vendor)
             : undefined,
+        memo: line.transaction_memo,
+        description: line.line_description,
     };
 };
-const toTransaction = (transaction) => {
+const toTransaction = (transaction, correlationId, userId) => {
     return {
         lineId: transaction.line_id,
         originalLine: toTransactionActivityLogLine(transaction.original_line),
         updatedLine: toTransactionActivityLogLine(transaction.updated_line),
+        correlationId,
+        userId,
     };
 };
-const toTransactionActivityLogData = (data) => {
+const toTransactionActivityLogData = (data, correlationId) => {
     return {
-        aiSummaries: data.ai_summaries.map(transactionLinePayload_1.toAISummary),
-        transaction: toTransaction(data.transaction),
+        aiSummaries: (data.ai_summaries ?? []).map(transactionLinePayload_1.toAISummary),
+        transaction: toTransaction(data.transaction, correlationId, data.user_id),
+        user: undefined,
     };
 };
 exports.toTransactionActivityLogData = toTransactionActivityLogData;
 const toTransactionActivityLog = (payload) => {
     return {
-        id: `${payload.correlation_id}-${payload.event_type}-${payload.data?.transaction?.line_id ?? '1'}`,
-        data: payload.data != null ? (0, exports.toTransactionActivityLogData)(payload.data) : null,
+        id: (0, exports.toActivityLogId)(payload.correlation_id, payload.event_type, payload.data?.transaction?.line_id),
+        data: payload.data != null
+            ? (0, exports.toTransactionActivityLogData)(payload.data, payload.correlation_id)
+            : null,
         eventType: (0, transactionActivityLogState_1.toActivityLogEventType)(payload.event_type),
         createTime: (0, zeniDayJS_1.date)(payload.create_time),
     };

package/lib/entity/transactionActivityLog/transactionActivityLogState.d.ts

@@ -4,24 +4,30 @@ import { AccountBase } from '../account/accountState';
 import { ClassBase } from '../class/classState';
 import { CustomerBase } from '../customer/customerState';
 import { AISummary } from '../transaction/stateTypes/transactionLine';
+import { User } from '../user/userState';
 import { VendorBase } from '../vendor/vendorState';
-export declare const ALL_ACTIVITY_LOG_EVENT_TYPE: readonly ["transaction.sync_database", "transaction_line.account.updated", "transaction_line.class.updated", "transaction_line.customer.updated", "transaction_line.vendor.updated", "transaction_line.vendor.matched", "transaction_line.user_update.vendor", "transaction_line.user_update.customer", "transaction_line.user_update.memo", "transaction_line.user_update.description", "transaction_line.user_update.account", "transaction_line.user_update.class"];
-export declare const toActivityLogEventType: (v: string) => "transaction.sync_database" | "transaction_line.account.updated" | "transaction_line.class.updated" | "transaction_line.customer.updated" | "transaction_line.vendor.updated" | "transaction_line.vendor.matched" | "transaction_line.user_update.vendor" | "transaction_line.user_update.customer" | "transaction_line.user_update.memo" | "transaction_line.user_update.description" | "transaction_line.user_update.account" | "transaction_line.user_update.class";
+export declare const ALL_ACTIVITY_LOG_EVENT_TYPE: readonly ["transaction.sync_database", "transaction_line.account.updated", "transaction_line.class.updated", "transaction_line.customer.updated", "transaction_line.vendor.updated", "transaction_line.vendor.matched", "transaction_line.vendor.user_update", "transaction_line.customer.user_update", "transaction_line.memo.user_update", "transaction_line.description.user_update", "transaction_line.account.user_update", "transaction_line.class.user_update"];
+export declare const toActivityLogEventType: (v: string) => "transaction.sync_database" | "transaction_line.account.updated" | "transaction_line.class.updated" | "transaction_line.customer.updated" | "transaction_line.vendor.updated" | "transaction_line.vendor.matched" | "transaction_line.vendor.user_update" | "transaction_line.customer.user_update" | "transaction_line.memo.user_update" | "transaction_line.description.user_update" | "transaction_line.account.user_update" | "transaction_line.class.user_update";
 export type ActivityLogEventType = ReturnType<typeof toActivityLogEventType>;
 export interface ActivityLogLine {
     account?: AccountBase;
     class?: ClassBase;
     customer?: CustomerBase;
+    description?: string;
+    memo?: string;
     vendor?: VendorBase;
 }
 export interface ActivityLogTransaction {
     lineId: ID;
     originalLine: ActivityLogLine;
     updatedLine: ActivityLogLine;
+    correlationId?: string;
+    userId?: string;
 }
 export interface TransactionActivityLogData {
     aiSummaries: AISummary[];
     transaction: ActivityLogTransaction;
+    user?: User;
 }
 export interface TransactionActivityLog {
     createTime: ZeniDate;

package/lib/entity/transactionActivityLog/transactionActivityLogState.js

@@ -9,12 +9,12 @@ exports.ALL_ACTIVITY_LOG_EVENT_TYPE = [
     'transaction_line.customer.updated',
     'transaction_line.vendor.updated',
     'transaction_line.vendor.matched',
-    'transaction_line.user_update.vendor',
-    'transaction_line.user_update.customer',
-    'transaction_line.user_update.memo',
-    'transaction_line.user_update.description',
-    'transaction_line.user_update.account',
-    'transaction_line.user_update.class',
+    'transaction_line.vendor.user_update',
+    'transaction_line.customer.user_update',
+    'transaction_line.memo.user_update',
+    'transaction_line.description.user_update',
+    'transaction_line.account.user_update',
+    'transaction_line.class.user_update',
 ];
 const toActivityLogEventType = (v) => (0, stringToUnion_1.stringToUnion)(v, exports.ALL_ACTIVITY_LOG_EVENT_TYPE);
 exports.toActivityLogEventType = toActivityLogEventType;

package/lib/esm/entity/transactionActivityLog/transactionActivityLogPayload.js

@@ -5,6 +5,7 @@ import { toCustomerBase } from '../customer/customerPayload';
 import { toAISummary, } from '../transaction/payloadTypes/transactionLinePayload';
 import { mapVendorBasePayloadToVendorBase, } from '../vendor/vendorPayload';
 import { toActivityLogEventType, } from './transactionActivityLogState';
+export const toActivityLogId = (correlationId, eventType, lineId) => `${correlationId}-${eventType}-${lineId ?? '1'}`;
 const toTransactionActivityLogLine = (line) => {
     return {
         account: line.account
@@ -17,25 +18,32 @@ const toTransactionActivityLogLine = (line) => {
         vendor: line.vendor
             ? mapVendorBasePayloadToVendorBase(line.vendor)
             : undefined,
+        memo: line.transaction_memo,
+        description: line.line_description,
     };
 };
-const toTransaction = (transaction) => {
+const toTransaction = (transaction, correlationId, userId) => {
     return {
         lineId: transaction.line_id,
         originalLine: toTransactionActivityLogLine(transaction.original_line),
         updatedLine: toTransactionActivityLogLine(transaction.updated_line),
+        correlationId,
+        userId,
     };
 };
-export const toTransactionActivityLogData = (data) => {
+export const toTransactionActivityLogData = (data, correlationId) => {
     return {
-        aiSummaries: data.ai_summaries.map(toAISummary),
-        transaction: toTransaction(data.transaction),
+        aiSummaries: (data.ai_summaries ?? []).map(toAISummary),
+        transaction: toTransaction(data.transaction, correlationId, data.user_id),
+        user: undefined,
     };
 };
 export const toTransactionActivityLog = (payload) => {
     return {
-        id: `${payload.correlation_id}-${payload.event_type}-${payload.data?.transaction?.line_id ?? '1'}`,
-        data: payload.data != null ? toTransactionActivityLogData(payload.data) : null,
+        id: toActivityLogId(payload.correlation_id, payload.event_type, payload.data?.transaction?.line_id),
+        data: payload.data != null
+            ? toTransactionActivityLogData(payload.data, payload.correlation_id)
+            : null,
         eventType: toActivityLogEventType(payload.event_type),
         createTime: date(payload.create_time),
     };

package/lib/esm/entity/transactionActivityLog/transactionActivityLogState.js

@@ -6,11 +6,11 @@ export const ALL_ACTIVITY_LOG_EVENT_TYPE = [
     'transaction_line.customer.updated',
     'transaction_line.vendor.updated',
     'transaction_line.vendor.matched',
-    'transaction_line.user_update.vendor',
-    'transaction_line.user_update.customer',
-    'transaction_line.user_update.memo',
-    'transaction_line.user_update.description',
-    'transaction_line.user_update.account',
-    'transaction_line.user_update.class',
+    'transaction_line.vendor.user_update',
+    'transaction_line.customer.user_update',
+    'transaction_line.memo.user_update',
+    'transaction_line.description.user_update',
+    'transaction_line.account.user_update',
+    'transaction_line.class.user_update',
 ];
 export const toActivityLogEventType = (v) => stringToUnion(v, ALL_ACTIVITY_LOG_EVENT_TYPE);

package/lib/esm/view/transactionActivityLogView/fetchTransactionActivityLogEpic.js

@@ -1,6 +1,7 @@
 import { from, of } from 'rxjs';
 import { catchError, filter, mergeMap, switchMap } from 'rxjs/operators';
 import { updateTransactionActivityLogs } from '../../entity/transactionActivityLog/transactionActivityLogReducer';
+import { updateAllUsers } from '../../entity/user/userReducer';
 import { createZeniAPIStatus, isSuccessResponse } from '../../responsePayload';
 import { fetchTransactionActivityLog, updateTransactionActivityLogViewFetchStatus, updateTransactionActivityLogViewOnSuccess, } from './transactionActivityLogViewReducer';
 export const fetchTransactionActivityLogEpic = (actions$, _, zeniAPI) => actions$.pipe(filter(fetchTransactionActivityLog.match), switchMap((action) => {
@@ -12,11 +13,15 @@ export const fetchTransactionActivityLogEpic = (actions$, _, zeniAPI) => actions
             response.data != null &&
             response.data.activity != null) {
             const updateActions = [];
+            if (response.data.users != null &&
+                response.data.users.length > 0) {
+                updateActions.push(updateAllUsers({ users: response.data.users, updateType: 'merge' }));
+            }
+            updateActions.push(updateTransactionActivityLogs(response.data.activity));
             updateActions.push(updateTransactionActivityLogViewOnSuccess({
                 data: response.data.activity,
                 qboId,
             }));
-            updateActions.push(updateTransactionActivityLogs(response.data.activity));
             return from(updateActions);
         }
         else {

package/lib/esm/view/transactionActivityLogView/transactionActivityLogViewReducer.js

@@ -1,4 +1,5 @@
 import { createSlice } from '@reduxjs/toolkit';
+import { toActivityLogId, } from '../../entity/transactionActivityLog/transactionActivityLogPayload';
 export const initialState = {
     transactionActivityLogIdsByQboId: {},
     transactionActivityLogFetchStateByQboId: {},
@@ -28,7 +29,7 @@ const transactionActivityLogView = createSlice({
                 fetchState: 'Completed',
                 error: undefined,
             };
-            draft.transactionActivityLogIdsByQboId[qboId] = data.map((transactionActivityLog) => `${transactionActivityLog.correlation_id}-${transactionActivityLog.event_type}-${transactionActivityLog.data?.transaction?.line_id ?? '1'}`);
+            draft.transactionActivityLogIdsByQboId[qboId] = data.map((transactionActivityLog) => toActivityLogId(transactionActivityLog.correlation_id, transactionActivityLog.event_type, transactionActivityLog.data?.transaction?.line_id));
         },
         updateTransactionActivityLogViewFetchStatus(draft, action) {
             const { fetchState, qboId, error } = action.payload;

package/lib/esm/view/transactionActivityLogView/transactionActivityLogViewSelector.js

@@ -1,14 +1,31 @@
 import { createSelector } from '@reduxjs/toolkit';
 import { reduceFetchState } from '../../commonStateTypes/reduceFetchState';
 import { getTransactionActivityLogsByIds } from '../../entity/transactionActivityLog/transactionActivityLogSelector';
-export const getTransactionActivityLogView = createSelector((state) => state.transactionActivityLogViewState, (state) => state.transactionActivityLogState, (_state, qboId) => qboId, (transactionActivityLogViewState, transactionActivityLogState, qboId) => {
+export const getTransactionActivityLogView = createSelector((state) => state.transactionActivityLogViewState, (state) => state.transactionActivityLogState, (state) => state.userState, (_state, qboId) => qboId, (transactionActivityLogViewState, transactionActivityLogState, userState, qboId) => {
     const fetchStateAndError = transactionActivityLogViewState
         .transactionActivityLogFetchStateByQboId[qboId] ?? {
         fetchState: 'Not-Started',
         error: undefined,
     };
     const transactionActivityLogIds = transactionActivityLogViewState.transactionActivityLogIdsByQboId[qboId] ?? [];
-    const transactionActivityLogs = getTransactionActivityLogsByIds(transactionActivityLogState, transactionActivityLogIds);
+    const rawLogs = getTransactionActivityLogsByIds(transactionActivityLogState, transactionActivityLogIds);
+    const transactionActivityLogs = rawLogs.map((log) => {
+        const userId = log.data?.transaction?.userId;
+        if (userId == null || log.data == null) {
+            return log;
+        }
+        const user = userState.userByUserId[userId];
+        if (user == null) {
+            return log;
+        }
+        return {
+            ...log,
+            data: {
+                ...log.data,
+                user,
+            },
+        };
+    });
     return {
         ...reduceFetchState([fetchStateAndError]),
         transactionActivityLogs,