mbrucedogs/mvm_core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/11_0_0' into 'develop'

Browse Source 
release/11_0_0 hotfix merge

Co-authored-by: Hedden, Kyle Matthew <kyle.hedden@verizonwireless.com>

See merge request https://gitlab.verizon.com/BPHV_MIPS/mvm_core/-/merge_requests/283
This commit is contained in:
Pfeil, Scott Robert 2023-10-10 13:29:58 +00:00
commit f2df0f52e6
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.swift
View File

@ -97,14 +97,14 @@ public protocol MVMCoreJSONActionHandlerProtocol: MVMCoreActionHandlerProtocol {
do { do {
let handlerType = try ModelRegistry.getHandler(model) as! MVMCoreActionHandlerProtocol.Type let handlerType = try ModelRegistry.getHandler(model) as! MVMCoreActionHandlerProtocol.Type
let handler = handlerType.init() let handler = handlerType.init()
MVMCoreLoggingHandler.shared()?.logCoreEvent(.actionInvoked(name: model.actionType, pageType: pageType(from: delegateObject), uuid: uuid)) MVMCoreLoggingHandler.shared()?.logCoreEvent(.actionInvoked(name: model.actionType, pageType: pageType(from: delegateObject), uuid: uuid, model: model))
if let handler = handler as? MVMCoreJSONActionHandlerProtocol { if let handler = handler as? MVMCoreJSONActionHandlerProtocol {
// Needed until we can remove legacy delegate functions. // Needed until we can remove legacy delegate functions.
try await handler.performAction(with: json, model: model, delegateObject: delegateObject, additionalData: additionalData) try await handler.performAction(with: json, model: model, delegateObject: delegateObject, additionalData: additionalData)
} else { } else {
try await handler.execute(with: model, delegateObject: delegateObject, additionalData: additionalData) try await handler.execute(with: model, delegateObject: delegateObject, additionalData: additionalData)
} }
MVMCoreLoggingHandler.shared()?.logCoreEvent(.actionComplete(name: model.actionType, pageType: pageType(from: delegateObject), uuid: uuid)) MVMCoreLoggingHandler.shared()?.logCoreEvent(.actionComplete(name: model.actionType, pageType: pageType(from: delegateObject), uuid: uuid, model: model))
} catch ModelRegistry.Error.handlerNotMapped { } catch ModelRegistry.Error.handlerNotMapped {
try Task.checkCancellation() try Task.checkCancellation()
// Allows custom handling if there no handler for the action. // Allows custom handling if there no handler for the action.
@ -114,7 +114,7 @@ public protocol MVMCoreJSONActionHandlerProtocol: MVMCoreActionHandlerProtocol {
throw ActionError.unknownAction(type: model.actionType) throw ActionError.unknownAction(type: model.actionType)
} }
} catch { } catch {
MVMCoreLoggingHandler.shared()?.logCoreEvent(.actionFailed(name: model.actionType, pageType: pageType(from: delegateObject), uuid: uuid, error: error)) MVMCoreLoggingHandler.shared()?.logCoreEvent(.actionFailed(name: model.actionType, pageType: pageType(from: delegateObject), uuid: uuid, model: model, error: error))
MVMCoreActionHandler.log(string: "Failed Action \(error)", additionalData: additionalData) MVMCoreActionHandler.log(string: "Failed Action \(error)", additionalData: additionalData)
throw error throw error
} }

17
MVMCore/MVMCore/OtherHandlers/MVMCoreEvent.swift
View File

@ -23,32 +23,35 @@ public enum MVMCoreEvent {
error: Error? error: Error?
) )
/// Could not find the action specified.. /// Could not find the action specified.
case actionNotFound( case actionNotFound(
name: String, name: String,
pageType: String pageType: String
) )
/// The webview bridge action handler was invoked and is in progress. /// The core action handler was invoked and is in progress.
case actionInvoked( case actionInvoked(
name: String, name: String,
pageType: String, pageType: String,
uuid: String uuid: String,
model: ActionModelProtocol
) )
/// The action failed.. /// The core action handler failed to complete the action.
case actionFailed( case actionFailed(
name: String, name: String,
pageType: String, pageType: String,
uuid: String, uuid: String,
model: ActionModelProtocol,
error: Error? error: Error?
) )
/// The action is completed. /// The core action handler completed an action.
case actionComplete( case actionComplete(
name: String, name: String,
pageType: String, pageType: String,
uuid: String uuid: String,
model: ActionModelProtocol
) )
// ---------------------------- // ----------------------------
@ -61,7 +64,7 @@ public enum MVMCoreEvent {
actionId: String actionId: String
) )
/// The client perameter handler was invoked and is in progress. /// The client parameter handler was invoked and is in progress.
case clientParameterStartFetch( case clientParameterStartFetch(
name: String, name: String,
uuid: String, uuid: String,