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

Minor cleanup

Browse Source
This commit is contained in:
Scott Pfeil 2022-07-22 10:20:46 -04:00
parent f123be046c
commit 71b2146862
1 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
MVMCore/MVMCore/ActionHandling/ActionOpenPageHandler.swift
View File

@ -49,15 +49,18 @@ open class ActionOpenPageHandler: MVMCoreActionHandlerProtocol {
} }
public extension ClientParameterHandler { public extension ClientParameterHandler {
/// Iterates through the clientParameters list. Gets values from the individual handlers and attaches the parameters to extraParameters. /// Iterates through the clientParameters list. Gets values from the individual handlers and attaches the parameters to extraParameters.
func getClientParameters(with model: ClientParameterModel, requestParameters: [String: Any], showLoadingOverlay: Bool) async throws -> [String: Any]? { func getClientParameters(with model: ClientParameterModel, requestParameters: [String: Any], showLoadingOverlay: Bool) async throws -> [String: Any]? {
if showLoadingOverlay { if showLoadingOverlay {
MVMCoreLoadingOverlayHandler.sharedLoadingOverlay()?.startLoading() MVMCoreLoadingOverlayHandler.sharedLoadingOverlay()?.startLoading()
} }
defer {
do { if showLoadingOverlay {
let parameters: [String: Any]? = try await withCheckedThrowingContinuation({ continuation in MVMCoreLoadingOverlayHandler.sharedLoadingOverlay()?.stopLoading(true)
}
}
return try await withCheckedThrowingContinuation({ continuation in
do { do {
try getParameters(with: model, requestParameters: requestParameters) { parameters in try getParameters(with: model, requestParameters: requestParameters) { parameters in
MVMCoreLoadingOverlayHandler.sharedLoadingOverlay()?.stopLoading(true) MVMCoreLoadingOverlayHandler.sharedLoadingOverlay()?.stopLoading(true)
@ -67,15 +70,5 @@ public extension ClientParameterHandler {
continuation.resume(throwing: error) continuation.resume(throwing: error)
} }
}) })
if showLoadingOverlay {
MVMCoreLoadingOverlayHandler.sharedLoadingOverlay()?.stopLoading(true)
}
return parameters
} catch {
if showLoadingOverlay {
MVMCoreLoadingOverlayHandler.sharedLoadingOverlay()?.stopLoading(true)
}
throw error
}
} }
} }