Merge branch 'develop' of gitlab.verizon.com:BPHV_MIPS/mvm_core into develop

MVMCore/MVMCore/Constants/MVMCoreJSONConstants.h

@@ -24,6 +24,7 @@ extern NSString * const KeyPageMap;
 extern NSString * const KeySystemParameters;
 extern NSString * const KeyButtonMap;
 extern NSString * const KeyOpenSupport;
+extern NSString * const KeyPostAction;
 
 extern NSString * const KeyLinks;
 extern NSString * const KeyTitle;

MVMCore/MVMCore/Constants/MVMCoreJSONConstants.m

@@ -26,6 +26,7 @@ NSString * const KeyPageMap = @"PageMap";
 NSString * const KeySystemParameters = @"SystemParams";
 NSString * const KeyButtonMap = @"ButtonMap";
 NSString * const KeyOpenSupport = @"openSupport";
+NSString * const KeyPostAction = @"PostAction";
 
 NSString * const KeyLinks = @"Links";
 NSString * const KeyTitle = @"title";

MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.h

@@ -26,6 +26,9 @@
 @property (nonatomic) BOOL backgroundLoad;
 @property (nonatomic, getter=areDependenciesAdded) BOOL dependenciesAdded;
 
+/// Legacy flag for if this operation will have an alert to show when finished.
+@property (nonatomic, readonly) BOOL alertToShow;
+
 // Initializes the operation with the request parameters object, data for page, and mvm view controller to handle the loading with.
 - (nullable instancetype)initWithRequestParameters:(nullable MVMCoreRequestParameters *)requestParameters dataForPage:(nullable NSDictionary *)dataForPage delegateObject:(nullable DelegateObject *)delegateObject backgroundLoad:(BOOL)backgroundLoad;
 

MVMCore/MVMCore/LoadHandling/MVMCoreLoadRequestOperation.m

@@ -34,7 +34,7 @@
 @property (weak, nonatomic) NSURLSessionTask *sessionTask;
 
 // For temporarily storing any alert to show until we determine it's delegate.
-@property (nonatomic) BOOL alertToShow;
+@property (nonatomic, readwrite) BOOL alertToShow;
 @property (strong, nonatomic, nullable) MVMCoreErrorObject *errorForAlertToShow;
 
 @end
@@ -167,13 +167,13 @@
                             
                             // Can continue loading with the page.
                             [MVMCoreLoadRequestOperation handleLoadObject:loadObject error:error];
-                        } else if (loadObject.operation.alertToShow || loadObject.operation.backgroundLoad || loadObject.requestParameters.noViewControllerToLoad) {
+                        } else if (loadObject.operation.backgroundLoad || loadObject.requestParameters.noViewControllerToLoad || ([[MVMCoreObject sharedInstance].globalLoadDelegate respondsToSelector:@selector(hasContentToShow:error:)] && [[MVMCoreObject sharedInstance].globalLoadDelegate hasContentToShow:loadObject error:error])) {
-                            
+                                                    
-                            // Alert to show and finish, or nothing to show and asked to show and finish.
+                            // Something to show, or nothing was expected to show, can finish.
                             [MVMCoreLoadRequestOperation loadFinished:loadObject loadedViewController:nil errorObject:error];
                         } else {
                             
-                            // Error, no message and no page but we wanted to show something.
+                            // Error, foreground request with no page, alert, action, or anything else to show. Abort with error.
                             MVMCoreErrorObject *error = [[MVMCoreErrorObject alloc] initWithTitle:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorTitle] message:[MVMCoreGetterUtility hardcodedStringWithKey:HardcodedErrorCritical] code:ErrorCodeNoPageType domain:ErrorDomainNative location:[[MVMCoreLoadHandler sharedGlobal] errorLocationForRequest:loadObject]];
                             [MVMCoreLoadRequestOperation loadAbortedWithError:error loadObject:loadObject];
                         }

MVMCore/MVMCore/MainProtocols/MVMCoreGlobalLoadProtocol.h

@@ -38,4 +38,7 @@
 // Shows the appropriate alert style for the given response info and/or error.
 - (void)createAndShowAlertForLoadObject:(nullable MVMCoreLoadObject *)loadObject error:(nullable MVMCoreErrorObject *)error delegateObject:(nullable DelegateObject *)delegateObject;
 
+/// Checks to see if the operation has content to show.
+- (BOOL)hasContentToShow:(nonnull MVMCoreLoadObject *)loadObject error:(nullable MVMCoreErrorObject *)error;
+
 @end