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

Digital PCT265 defect CXTDT-579050: Code simplification and fixes of combine pipeline for page updates.

Browse Source
This commit is contained in:
Hedden, Kyle Matthew 2024-07-03 18:39:28 -04:00
parent 4cbf15a3a7
commit 90f9a0bcf5
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
MVMCoreUI/Atomic/Organisms/Carousel/Carousel.swift
View File

@ -285,6 +285,17 @@ open class Carousel: View {
/// Registers the cells with the collection view
func registerCells(with carouselModel: CarouselModel, delegateObject: MVMCoreUIDelegateObject?) {
for molecule in carouselModel.molecules {
if let info = getMoleculeInfo(with: molecule, delegateObject: delegateObject) {
collectionView.register(info.class, forCellWithReuseIdentifier: info.identifier)
}
}
let moleculeInfo = carouselModel.molecules.map {
getMoleculeInfo(with: $0, delegateObject: delegateObject)
}
// For each molecule with info, register it.
moleculeInfo.compactMap({ $0 }).forEach { collectionView.register($0.class, forCellWithReuseIdentifier: $0.identifier) }
for molecule in carouselModel.molecules {
if let info = getMoleculeInfo(with: molecule, delegateObject: delegateObject) {
collectionView.register(info.class, forCellWithReuseIdentifier: info.identifier)

26
MVMCoreUI/BaseControllers/ViewController.swift
View File

@ -69,27 +69,16 @@ import Combine
observingForResponses = NotificationCenter.default.publisher(for: NSNotification.Name(rawValue: NotificationResponseLoaded))
.receive(on: self.pageUpdateQueue) // Background serial queue.
.map { [weak self] notification in
self?.pullUpdates(from: notification) ?? (nil, nil, nil)
}
.filter { (pageUpdates: [String : Any]?, pageModel: PageModelProtocol?, moduleUpdates: [String : Any]?) in
// Skip any non-updates.
(pageUpdates != nil && pageModel != nil) || (moduleUpdates != nil && moduleUpdates!.count > 0)
.compactMap { [weak self] notification in
self?.pullUpdates(from: notification) ?? nil
}
// Merge all page and module updates into one update event.
//.print("[Update pipe] merging")
.scan((nil, nil, nil)) { accumulator, next in
// Always take the latest page and the latest modules with same key.
return (next.0, next.1, next.2?.mergingRight(accumulator.2 ?? [:]))
return (next.0 ?? accumulator.0, next.1 ?? accumulator.1, next.2?.mergingRight(accumulator.2 ?? [:]))
}
//.print("[Update pipe] into buffer")
// Hold onto the latest merged state until UI is ready for an update. Keep only the latest from scan.
.buffer(size: 1, prefetch: .byRequest, whenFull: .dropOldest)
//.print("[Update pipe] out of buffer")
// Delay allowing the previous model update to settle before triggering a re-render.
.flatMap(maxPublishers: .max(1)) { buffer in
Just(buffer).delay(for: .seconds(0.1), scheduler: RunLoop.main)
}
.throttle(for: .seconds(0.05), scheduler: RunLoop.main, latest: true)
.sink { [weak self] (pageUpdates: [String : Any]?, pageModel: PageModelProtocol?, moduleUpdates: [String : Any]?) in
guard let self = self else { return }
if let pageUpdates, pageModel != nil {
@ -108,7 +97,7 @@ import Combine
self.observingForResponses = nil
}
func pullUpdates(from notification: Notification) -> (pageUpdates: [String : Any]?, pageModel: PageModelProtocol?, moduleUpdates: [String : Any]?) {
func pullUpdates(from notification: Notification) -> (pageUpdates: [String : Any]?, pageModel: PageModelProtocol?, moduleUpdates: [String : Any]?)? {
// Get the page data.
let pageUpdates = extractInterestedPageType(from: notification.userInfo?.optionalDictionaryForKey(KeyPageMap) ?? [:])
// Convert the page data into a new model.
@ -125,7 +114,10 @@ import Combine
}
// Get the module data.
let moduleUpdates = extractInterestedModules(from: notification.userInfo?.optionalDictionaryForKey(KeyModuleMap) ?? [:])
debugLog("Receiving page \(pageModel?.pageType ?? "none") & \(moduleUpdates?.keys.description ?? "none") modules from \((notification.userInfo?["MVMCoreLoadObject"] as? MVMCoreLoadObject)?.requestParameters?.url?.absoluteString ?? "")")
debugLog("Receiving page \(pageModel?.pageType ?? "none") & \(moduleUpdates?.keys.description ?? "none") modules from \((notification.userInfo?["MVMCoreLoadObject"] as? MVMCoreLoadObject)?.requestParameters?.url?.absoluteString ?? "")")
guard (pageUpdates != nil && pageModel != nil) || (moduleUpdates != nil && moduleUpdates!.count > 0) else { return nil }
// Bundle the transformations.
return (pageUpdates, pageModel, moduleUpdates)
}