diff --git a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler+Extension.swift b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler+Extension.swift index 5acdbca..23bb047 100644 --- a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler+Extension.swift +++ b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler+Extension.swift @@ -8,6 +8,22 @@ import Foundation +public protocol MVMCoreActionHandlerProtocol: ModelHandlerProtocol { + init() + func handleAction(_ model: ActionModelProtocol, additionalData: [AnyHashable : Any]?, delegateObject: DelegateObject?) +} + +extension ModelRegistry { + public static func getActionHandler(_ model: ActionModelProtocol) throws -> MVMCoreActionHandlerProtocol { + do { + let type = try ModelRegistry.getHandler(model) as! MVMCoreActionHandlerProtocol.Type + return type.init() + } catch { + throw ModelRegistry.Error.other(message: error.localizedDescription) + } + } +} + public extension MVMCoreActionHandler { /// Converts the action to json for old action handler to handle. @@ -26,6 +42,36 @@ public extension MVMCoreActionHandler { } } + @objc func hasActionHandler(actionType: String?, actionInformation: [String: Any]?, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) -> Bool { + //ensure there is a Serialized version of the Action + guard let actionType = actionType, + let actionInformation = actionInformation, + let actionModelType = ModelRegistry.getType(for: actionType, with: ActionModelProtocol.self) + else { return false } + + do { + //deserialize the actionModel for the actionType found + guard let actionModel = try actionModelType.decode(jsonDict: actionInformation) as? ActionModelProtocol else { + throw ModelRegistry.Error.decoderOther(message: "Could not decode to ActionModelProtocol") + } + + //get the action Handler for the actionModel created + let actionHandler = try ModelRegistry.getActionHandler(actionModel) + + //call the handleAction of the handler + actionHandler.handleAction(actionModel, additionalData: additionalData, delegateObject: delegateObject) + + } catch { + //log the error + if let errorObject = MVMCoreErrorObject.createErrorObject(for: error, location: "") { + MVMCoreActionHandler.shared()?.defaultHandleActionError(errorObject, additionalData: additionalData) + } + } + + //complete + return true + } + /// Start action on current thread. func syncHandleAction(with model: ActionModelProtocol, additionalData: [AnyHashable: Any]?, delegateObject: DelegateObject?) { guard let json = convertActionToJSON(model, delegateObject: delegateObject) else { return } diff --git a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m index 4f307f5..5877975 100644 --- a/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m +++ b/MVMCore/MVMCore/ActionHandling/MVMCoreActionHandler.m @@ -387,7 +387,7 @@ NSString * const KeyActionTypeOpen = @"openPage"; } - (BOOL)handleOtherActions:(nullable NSString *)actionType actionInformation:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegateObject:(nullable DelegateObject *)delegateObject { - return NO; + return [self hasActionHandlerWithActionType:actionType actionInformation:actionInformation additionalData:additionalData delegateObject:delegateObject]; } - (void)unknownAction:(nullable NSString *)actionType actionInformation:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegateObject:(nullable DelegateObject *)delegateObject {