From edc6296ff7666b00ec84a9c4d446efa1a9805203 Mon Sep 17 00:00:00 2001
From: "Pfeil, Scott Robert" <scott.pfeil3@verizonwireless.com>
Date: Mon, 4 Jan 2021 13:55:44 -0500
Subject: [PATCH] proper revert

---
 .../Atomic/Actions/ActionTopAlertModel.swift  |  2 +-
 .../OtherHandlers/MVMCoreUIActionHandler.m    | 60 +++++++------------
 2 files changed, 24 insertions(+), 38 deletions(-)

diff --git a/MVMCoreUI/Atomic/Actions/ActionTopAlertModel.swift b/MVMCoreUI/Atomic/Actions/ActionTopAlertModel.swift
index 0fb9d00d..62e496c2 100644
--- a/MVMCoreUI/Atomic/Actions/ActionTopAlertModel.swift
+++ b/MVMCoreUI/Atomic/Actions/ActionTopAlertModel.swift
@@ -12,7 +12,7 @@ import Foundation
     
     public static var identifier: String = "topAlert"
     public var actionType: String = ActionTopAlertModel.identifier
-    public var pageType: String?
+    public var pageType: String
     public var extraParameters: JSONValueDictionary?
     public var analyticsData: JSONValueDictionary?
     
diff --git a/MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.m b/MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.m
index dee4c547..79f92990 100644
--- a/MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.m
+++ b/MVMCoreUI/OtherHandlers/MVMCoreUIActionHandler.m
@@ -84,23 +84,18 @@
 
 - (void)topAlertAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegateObject:(nullable DelegateObject *)delegateObject {
     // Perform a top alert.
-    NSString *pageTypeForTopAlert = [actionInformation string:KeyPageType];
-    if (pageTypeForTopAlert) {
-        [[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 delegateObject:delegateObject];
-                if ([delegateObject.actionDelegate respondsToSelector:@selector(willShowTopAlertWithAlertObject:alertJson:)]) {
-                    [((id <MVMCoreUIActionDelegateProtocol>)delegateObject.actionDelegate) willShowTopAlertWithAlertObject:alertObject alertJson:actionInformation];
-                }
-                [alertObject showAlert];
+    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 delegateObject:delegateObject];
+            if ([delegateObject.actionDelegate respondsToSelector:@selector(willShowTopAlertWithAlertObject:alertJson:)]) {
+                [((id <MVMCoreUIActionDelegateProtocol>)delegateObject.actionDelegate) willShowTopAlertWithAlertObject:alertObject alertJson:actionInformation];
             }
-        }];
-    } else {
-        MVMCoreErrorObject *error = [[MVMCoreErrorObject alloc] initWithTitle:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorTitle] message:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorUnableToProcess] code:ErrorCodeParsingJSON domain:ErrorDomainNative location:[NSString stringWithFormat:@"%@_%@",NSStringFromClass([delegateObject.actionDelegate class]),KeyActionTypeTopAlert]];
-        [self handleActionError:error actionInformation:actionInformation additionalData:additionalData delegateObject:delegateObject];
-    }
+            [alertObject showAlert];
+        }
+    }];
 }
 
 - (void)collapseNotificationAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegateObject:(nullable DelegateObject *)delegateObject {
@@ -112,9 +107,7 @@
 
 - (void)topNotificationAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegateObject:(nullable DelegateObject *)delegateObject {
     //Handle molecular topnotification
-    if (actionInformation) {
-        [[MVMCoreUITopAlertView sharedGlobal] showTopAlertWith:[actionInformation dictionaryForKey:@"topNotification"]];
-    }
+    [[MVMCoreUITopAlertView sharedGlobal] showTopAlertWith:[actionInformation dict:@"topNotification"] ?: @{}];
 }
 
 - (void)defaultHandleActionError:(nonnull MVMCoreErrorObject *)error additionalData:(nullable NSDictionary *)additionalData {
@@ -170,22 +163,17 @@
 - (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];
-    if (pageTypeForTopAlert) {
-        [[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];
+    [[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];
             }
-        }];
-    } else {
-        MVMCoreErrorObject *error = [[MVMCoreErrorObject alloc] initWithTitle:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorTitle] message:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorUnableToProcess] code:ErrorCodeParsingJSON domain:ErrorDomainNative location:[NSString stringWithFormat:@"%@_%@",NSStringFromClass([delegate class]),KeyActionTypeTopAlert]];
-        [self handleActionError:error actionInformation:actionInformation additionalData:additionalData delegate:delegate];
-    }
+            [alertObject showAlert];
+        }
+    }];
 }
 
 - (void)collapseNotificationAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegate:(nullable NSObject <MVMCoreLoadDelegateProtocol, MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate {
@@ -197,9 +185,7 @@
 
 - (void)topNotificationAction:(nullable NSDictionary *)actionInformation additionalData:(nullable NSDictionary *)additionalData delegate:(nullable NSObject <MVMCoreLoadDelegateProtocol, MVMCorePresentationDelegateProtocol,MVMCoreActionDelegateProtocol>*)delegate {
     //Handle molecular topnotification
-    if (actionInformation) {
-        [[MVMCoreUITopAlertView sharedGlobal] showTopAlertWith:[actionInformation dictionaryForKey:@"topNotification"]];
-    }
+    [[MVMCoreUITopAlertView sharedGlobal] showTopAlertWith:[actionInformation dict:@"topNotification"] ?: @{}];
 }
 
 @end