Merge branch 'feature/actions' into 'develop'

actions action and minor cleanup

See merge request BPHV_MIPS/mvm_core_ui!656

MVMCoreUI/Atomic/Atoms/FormFields/TextFields/BaseDropdownEntryField.swift

@@ -92,9 +92,9 @@ import UIKit
      }
     
     func performDropdownAction() {
-        if let baseDropdownEntryFieldModel = baseDropdownEntryFieldModel, let actionModel = baseDropdownEntryFieldModel.action, let actionMap = actionModel.toJSON() {
+        if let baseDropdownEntryFieldModel = baseDropdownEntryFieldModel, let actionModel = baseDropdownEntryFieldModel.action {
             let additionalDataWithSource = additionalData.dictionaryAdding(key: KeySourceModel, value: baseDropdownEntryFieldModel)
-            MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalDataWithSource, delegateObject: delegateObject)
+            MVMCoreActionHandler.shared()?.asyncHandleAction(with: actionModel, additionalData: additionalDataWithSource, delegateObject: delegateObject)
         }
     }
 }

MVMCoreUI/Atomic/Atoms/Selectors/Checkbox.swift

@@ -396,11 +396,9 @@ import MVMCore
     }
     
     private func performCheckboxAction(with actionModel: ActionModelProtocol, delegateObject: MVMCoreUIDelegateObject?, additionalData: [AnyHashable: Any]?) {
-        if let actionMap = actionModel.toJSON() {
+        var additionalDataToUpdate = additionalData ?? [:]
-            var additionalDatatoUpdate = additionalData ?? [:]
+        additionalDataToUpdate[KeySourceModel] = checkboxModel
-            additionalDatatoUpdate[KeySourceModel] = checkboxModel
+        MVMCoreActionHandler.shared()?.asyncHandleAction(with: actionModel, additionalData: additionalDataToUpdate, delegateObject: delegateObject)
-            MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalDatatoUpdate, delegateObject: delegateObject)
-        }
     }
     
     public override func set(with model: MoleculeModelProtocol, _ delegateObject: MVMCoreUIDelegateObject?, _ additionalData: [AnyHashable: Any]?) {

MVMCoreUI/Atomic/Atoms/Views/Label/Label.swift

@@ -381,9 +381,7 @@ public typealias ActionBlock = () -> ()
                     }
                 case let actionAtt as LabelAttributeActionModel:
                     addTappableLinkAttribute(range: NSRange(location: range.location, length: range.length)) {
-                        if let data = try? actionAtt.action.encode(using: JSONEncoder()), let actionMap = try? JSONSerialization.jsonObject(with: data, options: JSONSerialization.ReadingOptions.init()) as? [AnyHashable: Any] {
+                        MVMCoreActionHandler.shared()?.asyncHandleAction(with: actionAtt.action, additionalData: additionalData, delegateObject: delegateObject)
-                            MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalData, delegateObject: delegateObject)
-                        }
                     }
                     addActionAttributes(range: range, string: attributedString)
                     

MVMCoreUI/Atomic/Atoms/Views/Toggle.swift

@@ -392,21 +392,17 @@ public typealias ActionBlockConfirmation = () -> (Bool)
             accessibilityLabel = accessibileString
         }
         
-        let actionMap = model.action?.toJSON()
-        let alternateActionMap = model.alternateAction?.toJSON()
         let additionalDataWithSource = additionalData.dictionaryAdding(key: KeySourceModel, value: model)
-        if actionMap != nil || alternateActionMap != nil {
+        if model.action != nil || model.alternateAction != nil {
             didToggleAction = { [weak self] in
                 guard let self = self else { return }
                 if self.isOn {
-                    if actionMap != nil {
+                    if let action = model.action {
-                        MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalDataWithSource, delegateObject: delegateObject)
+                        MVMCoreActionHandler.shared()?.asyncHandleAction(with: action, additionalData: additionalDataWithSource, delegateObject: delegateObject)
                     }
                 } else {
-                    if alternateActionMap != nil {
+                    if let action = model.alternateAction ?? model.action {
-                        MVMCoreActionHandler.shared()?.handleAction(with: alternateActionMap, additionalData: additionalDataWithSource, delegateObject: delegateObject)
+                        MVMCoreActionHandler.shared()?.asyncHandleAction(with: action, additionalData: additionalDataWithSource, delegateObject: delegateObject)
-                    } else if actionMap != nil {
-                        MVMCoreActionHandler.shared()?.handleAction(with: actionMap, additionalData: additionalDataWithSource, delegateObject: delegateObject)
                     }
                 }
             }

MVMCoreUI/Atomic/Templates/ModalMoleculeListTemplate.swift

@@ -29,14 +29,10 @@ open class ModalMoleculeListTemplate: MoleculeListTemplate {
         super.handleNewData()
         
         closeButton = MVMCoreUICommonViewsUtility.addCloseButton(to: view, action: { [weak self] _ in
-            guard let self = self else {
+            guard let self = self else { return }
-                return
+            let closeAction = (self.templateModel as? ModalListPageTemplateModel)?.closeAction ??
-            }
+                ActionBackModel()
-            guard  let model = self.templateModel as? ModalListPageTemplateModel, let actionMap = model.closeAction else {
+            MVMCoreActionHandler.shared()?.asyncHandleAction(with: closeAction, additionalData: nil, delegateObject: self.delegateObjectIVar)
-                MVMCoreActionHandler.shared()?.handleAction(with: ActionBackModel().toJSON(), additionalData: nil, delegateObject: self.delegateObjectIVar)
-               return
-            }
-            MVMCoreActionHandler.shared()?.handleAction(with: actionMap.toJSON(), additionalData: nil, delegateObject: self.delegateObjectIVar)
         })
     }
     

MVMCoreUI/Atomic/Templates/ModalMoleculeStackTemplate.swift

@@ -18,15 +18,10 @@ open class ModalMoleculeStackTemplate: MoleculeStackTemplate {
     override open func handleNewData() {
         super.handleNewData()
         _ = MVMCoreUICommonViewsUtility.addCloseButton(to: view, action: {[weak self] _ in
-            guard let self = self else {
+            guard let self = self else { return }
-               return
+            let closeAction = (self.templateModel as? ModalStackPageTemplateModel)?.closeAction ??
-            }
+                ActionBackModel()
-            
+            MVMCoreActionHandler.shared()?.asyncHandleAction(with: closeAction, additionalData: nil, delegateObject: self.delegateObjectIVar)
-           guard  let model = self.templateModel as? ModalStackPageTemplateModel, let actionMap = model.closeAction else {
-               MVMCoreActionHandler.shared()?.handleAction(with: ActionBackModel().toJSON(), additionalData: nil, delegateObject: self.delegateObjectIVar)
-              return
-           }
-           MVMCoreActionHandler.shared()?.handleAction(with: actionMap.toJSON(), additionalData: nil, delegateObject: self.delegateObjectIVar)
         })
     }
 }

MVMCoreUI/Atomic/Templates/ModalSectionListTemplate.swift

@@ -19,12 +19,9 @@ open class ModalSectionListTemplate: SectionListTemplate {
         super.handleNewData()
         _ = MVMCoreUICommonViewsUtility.addCloseButton(to: view, action: {[weak self] _ in
             guard let self = self else { return }
-           guard let model = self.templateModel as? ModalSectionListTemplateModel,
+            let closeAction = (self.templateModel as? ModalSectionListTemplateModel)?.closeAction ??
-                 let actionMap = model.closeAction else {
+                ActionBackModel()
-               MVMCoreActionHandler.shared()?.handleAction(with: ActionBackModel().toJSON(), additionalData: nil, delegateObject: self.delegateObjectIVar)
+            MVMCoreActionHandler.shared()?.asyncHandleAction(with: closeAction, additionalData: nil, delegateObject: self.delegateObjectIVar)
-              return
-           }
-           MVMCoreActionHandler.shared()?.handleAction(with: actionMap.toJSON(), additionalData: nil, delegateObject: self.delegateObjectIVar)
         })
     }
 }

MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.h

@@ -27,20 +27,6 @@ NS_ASSUME_NONNULL_BEGIN
 // Shows a topnotification new molecular
 - (void)topNotificationAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegateObject:(nullable DelegateObject *)delegateObject;
 
-#pragma mark - Deprecated
-
-// Shows a popup
-- (void)popupAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegate:(nullable NSObject <MVMCoreLoadDelegateProtocol, MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate __deprecated;
-
-// Shows a top alert
-- (void)topAlertAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegate:(nullable NSObject <MVMCoreLoadDelegateProtocol, MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate __deprecated;
-
-// Shows a molecular top alert
-- (void)topNotificationAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegate:(nullable NSObject <MVMCoreLoadDelegateProtocol, MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate __deprecated;
-
-// Collapses the current top notification
-- (void)collapseNotificationAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegate:(nullable NSObject <MVMCoreLoadDelegateProtocol, MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate __deprecated;
-
 @end
 
 NS_ASSUME_NONNULL_END

MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.m

@@ -122,70 +122,4 @@
     }
 }
 
-#pragma mark - Deprecated
-
-- (BOOL)handleOtherActions:(nullable NSString *)actionType actionInformation:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegate:(nullable NSObject <MVMCoreLoadDelegateProtocol, MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate {
-    if ([actionType isEqualToString:KeyActionTypePopup]) {
-        [self popupAction:actionInformation additionalData:additionalData delegate:delegate];
-        return YES;
-    } else if ([actionType isEqualToString:KeyActionTypeTopAlert]) {
-        [self topAlertAction:actionInformation additionalData:additionalData delegate:delegate];
-        return YES;
-    } else if ([actionType isEqualToString:KeyActionTypeCollapseNotification]) {
-        [self collapseNotificationAction:actionInformation additionalData:additionalData delegate:delegate];
-        return YES;
-    } else if ([actionType isEqualToString:KeyActionTypeTopNotification]) {
-        [self topNotificationAction:actionInformation additionalData:additionalData delegate:delegate];
-        return YES;
-    }
-    return NO;
-}
-
-- (void)popupAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegate:(nullable NSObject <MVMCoreLoadDelegateProtocol, MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate {
-    // Perform a popup.
-    NSString *pageTypeForPopup = [actionInformation stringForKey:KeyPageType];
-    [[MVMCoreCache sharedCache] fetchJSONForPageType:pageTypeForPopup queue:nil waitUntilFinished:YES completionHandler:^(NSDictionary * _Nullable jsonDictionary) {
-        
-        MVMCoreErrorObject *error = nil;
-        MVMCoreAlertObject *alertObject = [MVMCoreAlertObject alertObjectWithPage:jsonDictionary isGreedy:NO additionalData:additionalData delegate:delegate error:&error];
-        if ([delegate respondsToSelector:@selector(willShowPopupWithAlertObject:alertJson:)]) {
-            [((id <MVMCoreUIActionDelegateProtocol>)delegate) willShowPopupWithAlertObject:alertObject alertJson:jsonDictionary];
-        }
-        
-        if (alertObject) {
-            [[MVMCoreAlertHandler sharedAlertHandler] showAlertWithAlertObject:alertObject];
-        } else {
-            [self handleActionError:error actionInformation:actionInformation additionalData:additionalData delegate:delegate];
-        }
-    }];
-}
-
-- (void)topAlertAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegate:(nullable NSObject <MVMCoreLoadDelegateProtocol, MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate {
-    // Perform a top alert.
-    NSString *pageTypeForTopAlert = [actionInformation stringForKey:KeyPageType];
-    [[MVMCoreCache sharedCache] fetchJSONForPageType:pageTypeForTopAlert queue:nil waitUntilFinished:YES completionHandler:^(NSDictionary * _Nullable jsonDictionary) {
-        
-        NSDictionary *responseInfo = [jsonDictionary dict:KeyResponseInfo];
-        if (responseInfo) {
-            MVMCoreAlertObject *alertObject = [MVMCoreAlertObject alertObjectForPageType:pageTypeForTopAlert responseInfo:responseInfo additionalData:additionalData actionDelegate:delegate];
-            if ([delegate respondsToSelector:@selector(willShowTopAlertWithAlertObject:alertJson:)]) {
-                alertObject = [((id <MVMCoreUIActionDelegateProtocol>)delegate) willShowTopAlertWithAlertObject:alertObject alertJson:jsonDictionary];
-            }
-            [alertObject showAlert];
-        }
-    }];
-}
-
-- (void)collapseNotificationAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegate:(nullable NSObject <MVMCoreLoadDelegateProtocol, MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate {
-    // Collapse the current notification.
-    if ([[CoreUIObject sharedInstance].globalTopAlertDelegate respondsToSelector:@selector(getTopAlertView)]) {
-        [[[CoreUIObject sharedInstance].globalTopAlertDelegate getTopAlertView] collapseNotification];
-    }
-}
-
-- (void)topNotificationAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegate:(nullable NSObject <MVMCoreLoadDelegateProtocol, MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate {
-    //Handle molecular topnotification
-    [[MVMCoreUITopAlertView sharedGlobal] showTopAlertWith:[actionInformation dict:@"topNotification"] ?: @{}];
-}
-
 @end