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

refactor

Browse Source
This commit is contained in:
Suresh, Kamlesh 2021-01-19 18:25:35 -05:00
parent 8a9b94bdb0
commit 34c4bd18ee
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MVMCore/MVMCore/ActionHandling/ActionHandler+ClientParameters.swift
View File

@ -13,12 +13,12 @@ public extension MVMCoreActionHandler {
/// Iterates threw the clientParameters list. Gets values from the individual handlers and attaches the parameters to extraParameters.
@objc func setClientParameter(with actionMap: [String: Any]?, completionHandler: @escaping ([String : Any]?) -> ()) {
guard let actionMap = actionMap, let clientParameters = actionMap.optionalDictionaryForKey("clientParameters") else {
completionHandler(nil)
guard let actionMapWithClientParameters = actionMap, let clientParameters = actionMapWithClientParameters.optionalDictionaryForKey("clientParameters") else {
completionHandler(actionMap)
return
}
let isBackgroudRequest = actionMap.boolForKey("background")
let isBackgroudRequest = actionMapWithClientParameters.boolForKey("background")
if !isBackgroudRequest {
MVMCoreLoadingOverlayHandler.sharedLoadingOverlay()?.startLoading()
@ -34,13 +34,13 @@ public extension MVMCoreActionHandler {
try ClientParameterRegistry.injectParameters(with: clientParameters) { (clientParams) in
guard let clientParams = clientParams else {
stopLoadingOverlay()
completionHandler(actionMap)
completionHandler(actionMapWithClientParameters)
return
}
var extraParams: [String : Any] = actionMap.dictionaryForKey(KeyExtraParameters)
var extraParams: [String : Any] = actionMapWithClientParameters.dictionaryForKey(KeyExtraParameters)
extraParams.merge(clientParams) { (_, new) in new }
var actionMapM = actionMap
var actionMapM = actionMapWithClientParameters
actionMapM[KeyExtraParameters] = extraParams
stopLoadingOverlay()
@ -48,7 +48,7 @@ public extension MVMCoreActionHandler {
}
} catch {
stopLoadingOverlay()
completionHandler(actionMap)
completionHandler(actionMapWithClientParameters)
MVMCoreLoggingHandler.logDebugMessage(withDelegate: "Error clientParamters: \(error)")
}