SPB Git

Repository Public

HistoryAndConflicts.swift 9.4 KB 148 lines swift

1// Author: Simon-Pierre Boucher — contact@spboucher.ai2// File: Features/History/HistoryAndConflicts.swift3// Description: Version history of a note (local snapshots, available offline, and server versions) with preview and restore; conflict banner and side-by-side resolution where both copies always survive.4import SwiftUI5import SPNotesDocument6import SPNotesStore7import SPNotesAPI8import SPNotesSync910struct HistorySheet: View {11    @Environment(AppEnvironment.self) private var env12    @Environment(\.dismiss) private var dismiss13    let session: NoteSession14    enum Entry: Identifiable, Hashable { case local(LocalVersionInfo), server(PageVersionSummary)15        var id: String { switch self { case .local(let v): "l-" + v.id; case .server(let v): "s-\(v.version)" } }16        static func == (a: Entry, b: Entry) -> Bool { a.id == b.id }17        func hash(into h: inout Hasher) { h.combine(id) }18        var date: Date { switch self { case .local(let v): v.createdAt; case .server(let v): v.createdAt } }19    }20    @State private var local: [LocalVersionInfo] = []21    @State private var server: [PageVersionSummary] = []22    @State private var serverNote: String?23    @State private var selected: Entry?24    @State private var previewText = ""25    @State private var previewTitle = ""26    @State private var busy = false2728    var body: some View {29        VStack(spacing: 0) {30            HSplitView {31                List(selection: $selected) {32                    Section("Sur ce Mac") {33                        if local.isEmpty { Text("Aucune version locale pour l'instant").foregroundStyle(.tertiary).font(.callout) }34                        ForEach(local) { v in row(Format.long(v.createdAt), v.reason, Format.words(v.wordCount)).tag(Entry.local(v)) }35                    }36                    Section("Sur le serveur") {37                        if let serverNote { Text(serverNote).foregroundStyle(.tertiary).font(.callout) }38                        ForEach(server) { v in row(Format.long(v.createdAt), v.reason ?? "", v.wordCount.map(Format.words) ?? "").tag(Entry.server(v)) }39                    }40                }.frame(minWidth: 250, idealWidth: 280)41                VStack(alignment: .leading, spacing: 8) {42                    if selected == nil { EmptyState(symbol: "clock.arrow.circlepath", title: "Historique", message: "Choisis une version pour la lire. La restauration garde d'abord l'état actuel dans l'historique.") }43                    else { Text(previewTitle.isEmpty ? "Sans titre" : previewTitle).font(.title3.weight(.semibold)); ScrollView { Text(previewText.isEmpty ? "Aucun texte" : previewText).textSelection(.enabled).frame(maxWidth: .infinity, alignment: .leading) } }44                }.padding(14).frame(minWidth: 340)45            }46            Divider()47            HStack {48                Text("Versions locales : au plus \(NotesStore.maxLocalVersionsPerPage) par note.").font(.caption).foregroundStyle(.secondary)49                Spacer()50                Button("Fermer") { dismiss() }.keyboardShortcut(.cancelAction)51                Button("Restaurer cette version") { Task { await restore() } }.keyboardShortcut(.defaultAction).disabled(selected == nil || busy || !session.isEditable)52            }.padding(12)53        }54        .frame(width: 760, height: 480)55        .task { await load() }56        .onChange(of: selected) { _, e in Task { await preview(e) } }57    }58    private func row(_ a: String, _ b: String, _ c: String) -> some View { VStack(alignment: .leading, spacing: 1) { Text(a).font(.callout); Text([b, c].filter { !$0.isEmpty }.joined(separator: " · ")).font(.caption).foregroundStyle(.secondary).lineLimit(1) } }5960    private func load() async {61        local = (try? await env.store.localVersions(pageId: session.id)) ?? []62        guard env.account.isSignedIn else { serverNote = "Connecte-toi pour voir les versions du serveur."; return }63        guard env.connectivity.reachable else { serverNote = "Hors ligne : versions du serveur indisponibles."; return }64        guard session.page.serverVersion > 0 else { serverNote = "Cette note n'a pas encore été envoyée."; return }65        do { server = try await env.api.pageVersions(pageID: session.id); serverNote = server.isEmpty ? "Aucune version sur le serveur." : nil } catch { serverNote = "Versions du serveur indisponibles." }66    }67    private func preview(_ e: Entry?) async {68        switch e {69        case .local(let v): if let full = try? await env.store.localVersion(id: v.id) { previewTitle = full.title; previewText = full.plainText }70        case .server(let v): if let s = try? await env.api.pageVersion(pageID: session.id, version: v.version) { previewTitle = s.title; previewText = ((try? NoteDocument(json: s.content.data)) ?? NoteDocument()).plainText() } else { previewText = "Version indisponible." }71        case nil: previewText = ""; previewTitle = ""72        }73    }74    private func restore() async {75        guard let selected else { return }76        busy = true; defer { busy = false }77        switch selected {78        case .local(let v): await session.restore(localVersion: v.id); env.toasts.show("Version restaurée", symbol: "clock.arrow.circlepath")79        case .server(let v):80            // the server keeps the current state as a version before restoring; the note comes back through the change feed81            await session.saveNow(reason: "Avant restauration"); _ = await env.syncMonitor.run()82            do { _ = try await env.api.restorePageVersion(pageID: session.id, version: v.version); _ = await env.syncMonitor.run(); env.toasts.show("Version du serveur restaurée", symbol: "clock.arrow.circlepath") } catch { env.toasts.show("La restauration a échoué : \((error as? APIError)?.message ?? error.localizedDescription)", isError: true) }83        }84        dismiss()85    }86}8788struct ConflictBanner: View {89    @Environment(AppEnvironment.self) private var env90    let session: NoteSession91    @State private var show = false92    var body: some View {93        Banner(symbol: "exclamationmark.triangle.fill", text: "Cette note a été modifiée ailleurs en même temps qu'ici. Ta version est intacte sur ce Mac ; rien n'est envoyé tant que tu n'as pas choisi.", tint: .orange) {94            Button("Comparer et choisir…") { show = true }.accessibilityIdentifier("resolve-conflict")95        }96        .sheet(isPresented: $show) { ConflictSheet(session: session).environment(env) }97    }98}99100struct ConflictSheet: View {101    @Environment(AppEnvironment.self) private var env102    @Environment(\.dismiss) private var dismiss103    let session: NoteSession104    @State private var busy = false105    @State private var error: String?106    var body: some View {107        VStack(alignment: .leading, spacing: 12) {108            Text("Deux versions de « \(session.title.isEmpty ? "Sans titre" : session.title) »").font(.headline)109            Text("Quel que soit ton choix, les deux versions restent dans l'historique du serveur.").font(.callout).foregroundStyle(.secondary)110            HStack(alignment: .top, spacing: 12) {111                column("Sur ce Mac", session.title, session.editor.document().plainText(), nil)112                column("Sur le serveur", session.conflict?.server.title ?? "", serverText, session.conflict.map { "Modifiée " + Format.long($0.server.updatedAt) })113            }114            if let error { Text(error).font(.callout).foregroundStyle(.red) }115            HStack {116                Button("Annuler", role: .cancel) { dismiss() }.keyboardShortcut(.cancelAction)117                Spacer()118                Button("Garder les deux (copie)") { resolve(.keepBoth) }119                Button("Garder celle du serveur") { resolve(.keepTheirs) }120                Button("Garder la mienne") { resolve(.keepMine) }.keyboardShortcut(.defaultAction)121            }.disabled(busy)122        }.padding(18).frame(width: 760, height: 500)123    }124    private var serverText: String { session.conflict.flatMap { try? NoteDocument(json: $0.server.content) }?.plainText() ?? "" }125    private func column(_ head: String, _ title: String, _ text: String, _ foot: String?) -> some View {126        VStack(alignment: .leading, spacing: 6) {127            Text(head.uppercased()).font(.caption.weight(.semibold)).foregroundStyle(.secondary)128            Text(title.isEmpty ? "Sans titre" : title).font(.callout.weight(.semibold))129            ScrollView { Text(text.isEmpty ? "Aucun texte" : text).font(.callout).textSelection(.enabled).frame(maxWidth: .infinity, alignment: .leading) }130                .padding(8).background(Palette.subtle, in: RoundedRectangle(cornerRadius: 7))131            if let foot { Text(foot).font(.caption).foregroundStyle(.secondary) }132        }.frame(maxWidth: .infinity)133    }134    private func resolve(_ choice: ConflictResolution) {135        guard env.account.isSignedIn, env.connectivity.reachable else { error = "La résolution demande une connexion au serveur. Tes deux versions restent en sécurité en attendant."; return }136        busy = true; error = nil137        Task {138            await session.saveNow(reason: "Avant résolution du conflit")139            do {140                let copy = try await env.syncMonitor.resolve(pageId: session.id, choice: choice)141                await session.storeChanged()142                env.toasts.show(copy != nil ? "Copie créée : les deux versions sont conservées" : "Conflit résolu", symbol: "checkmark.circle")143                dismiss()144            } catch let e { error = "La résolution a échoué : \((e as? APIError)?.message ?? e.localizedDescription)"; busy = false }145        }146    }147}148
Files main
Menu

Theme