Jon Vanvik
7d8f1c7b2d
The generation-guard refactor moved the fetched.map{…}.sorted{…} chain into an
untyped `let merged`, dropping the type anchor the property assignment used to
provide. A multi-statement .map closure then leaves .sorted's $0 uninferred
(error: cannot infer type of closure parameter). Annotate merged in
OLTListViewModel and ONUListViewModel as [OLTStateDoc]/[ONUStateDoc].
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
43 lines
1.6 KiB
Swift
43 lines
1.6 KiB
Swift
import Foundation
|
|
import Observation
|
|
|
|
@MainActor
|
|
@Observable
|
|
final class OLTListViewModel {
|
|
var phase: LoadPhase = .idle
|
|
var olts: [OLTStateDoc] = []
|
|
var search = ""
|
|
|
|
private let connection: MCMSConnection
|
|
/// Bumped per load so an overlapping/stale fetch can't commit over a newer one.
|
|
private var loadGeneration = 0
|
|
init(connection: MCMSConnection) { self.connection = connection }
|
|
|
|
var filtered: [OLTStateDoc] {
|
|
let query = search.trimmingCharacters(in: .whitespaces)
|
|
guard !query.isEmpty else { return olts }
|
|
return olts.filter {
|
|
$0.id.localizedCaseInsensitiveContains(query)
|
|
|| ($0.resolvedName?.localizedCaseInsensitiveContains(query) ?? false)
|
|
}
|
|
}
|
|
|
|
func load() async {
|
|
loadGeneration += 1
|
|
let gen = loadGeneration
|
|
phase = .loading
|
|
do {
|
|
let fetched = try await connection.olt.allStates()
|
|
let names = (try? await connection.olt.nameMap()) ?? [:]
|
|
let merged: [OLTStateDoc] = fetched
|
|
.map { olt in var olt = olt; olt.resolvedName = names[olt.id]; return olt }
|
|
.sorted { $0.displayName.localizedCaseInsensitiveCompare($1.displayName) == .orderedAscending }
|
|
guard gen == loadGeneration, !Task.isCancelled else { return }
|
|
olts = merged
|
|
phase = .loaded
|
|
} catch {
|
|
guard gen == loadGeneration, !Task.isCancelled else { return }
|
|
phase = .failed((error as? APIError)?.localizedDescription ?? error.localizedDescription)
|
|
}
|
|
}
|
|
}
|