Repository Public
1// SP Notes Core2// File: Sources/SPNotesFeatures/Canvas/CanvasConflictReview.swift3// Description: Review of a canvas sync conflict (`CanvasConflictState`): the list of elements both devices changed, a4// choice « cet appareil / serveur » for each, and the three ways out — keep mine, take the server's, apply my5// choices to the merged proposal. Nothing is written before the user decides. SPEC §7: a card edited on one6// side and deleted on the other is kept, and reported here.7//8// Author: Simon-Pierre Boucher9// Contact: contact@spboucher.ai10import SPNotesDesign11import SPNotesDocument12import SPNotesSync13import SwiftUI1415/// Words for a conflict (pure: tested).16public enum CanvasConflictText {17 public static func title(_ conflict: CanvasConflict, titles: [String: String] = [:]) -> String {18 switch conflict.kind {19 case .node:20 guard let node = conflict.localNode ?? conflict.remoteNode else { return L("Carte") }21 return CanvasNodeLabel.label(node, titles: titles)22 case .edge:23 let label = (conflict.localEdge ?? conflict.remoteEdge)?.label ?? ""24 return label.isEmpty ? L("Lien") : LF("Lien « %@ »", label)25 case .field:26 return conflict.id == "viewport" ? L("Position de la vue") : LF("Réglage « %@ »", conflict.id)27 }28 }2930 public static func reason(_ conflict: CanvasConflict) -> String {31 switch conflict.reason {32 case .bothEdited:33 return L("Modifié sur cet appareil et ailleurs.")34 case .editedAndDeleted:35 return conflict.remote == nil ? L("Modifié ici, supprimé ailleurs : votre version est conservée.")36 : L("Supprimé ici, modifié ailleurs : la version modifiée est conservée.")37 case .deletedButReferenced:38 return L("Supprimé d'un côté, mais un lien y a été attaché de l'autre : la carte est rétablie.")39 }40 }4142 /// What one side holds, in a line (« Supprimé » when absent).43 public static func side(_ value: JSONValue?, kind: CanvasConflict.Kind, titles: [String: String] = [:]) -> String {44 guard let value else { return L("Supprimé") }45 switch kind {46 case .node:47 guard let node = try? CanvasNode(json: value) else { return L("Carte") }48 return LF("%@ — position %lld, %lld", CanvasNodeLabel.label(node, titles: titles), Int(node.x.rounded()), Int(node.y.rounded()))49 case .edge:50 guard let edge = try? CanvasEdge(json: value) else { return L("Lien") }51 return (edge.label?.isEmpty == false ? edge.label! : L("Sans étiquette")) + (CanvasRouting.hasArrow(edge) ? " · " + L("Flèche") : " · " + L("Trait"))52 case .field:53 return value.canonicalString()54 }55 }56}5758public struct CanvasConflictReview: View {59 @Bindable private var model: CanvasModel60 private let close: () -> Void61 @State private var working = false6263 public init(model: CanvasModel, close: @escaping () -> Void) {64 self.model = model65 self.close = close66 }6768 public var body: some View {69 FeatureLayoutReader { sizeClass in70 VStack(alignment: .leading, spacing: 0) {71 FeatureHeader(title: L("Modifié à deux endroits"), subtitle: L("Rien n'a été écrasé. Choisissez ce qu'il faut garder ; votre version reste affichée tant que vous n'avez pas décidé."),72 compact: sizeClass.isCompact) { FeatureButton(L("Plus tard"), action: close) }73 if let failure = model.actionFailure {74 FeatureStatusBanner(failure: failure, freshness: nil).padding(.horizontal, sizeClass.isCompact ? NVSpace.lg : NVSpace.xl)75 }76 if let conflict = model.conflict {77 ScrollView {78 VStack(alignment: .leading, spacing: NVSpace.md) {79 summary(conflict)80 ForEach(conflict.merge.conflicts, id: \.self) { item in row(item, stacked: sizeClass.isCompact) }81 }82 .padding(.horizontal, sizeClass.isCompact ? NVSpace.lg : NVSpace.xl)83 .padding(.bottom, NVSpace.lg)84 }85 footer(conflict, compact: sizeClass.isCompact)86 } else {87 NVEmptyState(systemImage: "checkmark.circle", title: L("Plus aucun conflit"), message: L("Le canevas est de nouveau le même partout."), actionTitle: L("Fermer"), action: close)88 .frame(maxWidth: .infinity, maxHeight: .infinity)89 }90 }91 .background(NVColor.bg)92 }93 }9495 private func summary(_ conflict: CanvasConflictState) -> some View {96 let added = Set(conflict.remote.nodes.map(\.id)).subtracting(conflict.local.nodes.map(\.id)).count97 return HStack(alignment: .top, spacing: NVSpace.sm) {98 Image(systemName: "arrow.triangle.merge").foregroundStyle(NVColor.accent).accessibilityHidden(true)99 Text(added > 0 ? LF("Tout ce qui ne se contredit pas est déjà fusionné, dont %lld cartes venues de l'autre appareil. Éléments à départager : %lld.", added, conflict.merge.conflicts.count)100 : LF("Tout ce qui ne se contredit pas est déjà fusionné. Éléments à départager : %lld.", conflict.merge.conflicts.count))101 .nvFont(.ui).foregroundStyle(NVColor.fgMuted).fixedSize(horizontal: false, vertical: true)102 }103 }104105 private func row(_ item: CanvasConflict, stacked: Bool) -> some View {106 let remote = model.takesRemote(item)107 return VStack(alignment: .leading, spacing: NVSpace.sm) {108 HStack(spacing: NVSpace.sm) {109 Image(systemName: item.kind == .node ? "rectangle" : (item.kind == .edge ? "arrow.triangle.branch" : "gearshape"))110 .foregroundStyle(NVColor.fgMuted).accessibilityHidden(true)111 Text(CanvasConflictText.title(item, titles: model.titles)).nvFont(.uiStrong).foregroundStyle(NVColor.fg).lineLimit(2)112 }113 Text(CanvasConflictText.reason(item)).nvFont(.ui).foregroundStyle(NVColor.fgMuted).fixedSize(horizontal: false, vertical: true)114 let layout = stacked ? AnyLayout(VStackLayout(alignment: .leading, spacing: NVSpace.sm)) : AnyLayout(HStackLayout(alignment: .top, spacing: NVSpace.sm))115 layout {116 option(L("Cet appareil"), CanvasConflictText.side(item.local, kind: item.kind, titles: model.titles), selected: !remote) { model.choose(item, takingRemote: false) }117 option(L("Serveur"), CanvasConflictText.side(item.remote, kind: item.kind, titles: model.titles), selected: remote) { model.choose(item, takingRemote: true) }118 }119 }120 .padding(NVSpace.md)121 .frame(maxWidth: .infinity, alignment: .leading)122 .nvCard(radius: NVRadius.md)123 }124125 private func option(_ title: String, _ detail: String, selected: Bool, action: @escaping () -> Void) -> some View {126 Button(action: action) {127 HStack(alignment: .top, spacing: NVSpace.sm) {128 Image(systemName: selected ? "largecircle.fill.circle" : "circle").foregroundStyle(selected ? NVColor.accent : NVColor.fgMuted).accessibilityHidden(true)129 VStack(alignment: .leading, spacing: NVSpace.xxs) {130 Text(title).nvFont(.uiStrong).foregroundStyle(NVColor.fg)131 Text(detail).nvFont(.ui).foregroundStyle(NVColor.fgMuted).multilineTextAlignment(.leading).lineLimit(3)132 }133 Spacer(minLength: 0)134 }135 .padding(NVSpace.sm)136 .frame(maxWidth: .infinity, minHeight: 44, alignment: .leading)137 .background(selected ? NVColor.accentSoft : NVColor.bgSunken, in: NVRadius.shape(NVRadius.sm))138 .overlay(NVRadius.shape(NVRadius.sm).strokeBorder(selected ? NVColor.accent : NVColor.line, lineWidth: 1))139 .contentShape(Rectangle())140 }141 .buttonStyle(.plain)142 .accessibilityLabel(title + " : " + detail)143 .accessibilityAddTraits(selected ? .isSelected : [])144 }145146 private func decide(_ decision: CanvasModel.ConflictDecision) {147 guard !working else { return }148 working = true149 Task {150 await model.resolveConflict(decision)151 working = false152 if model.conflict == nil, model.actionFailure == nil { close() }153 }154 }155156 private func footer(_ conflict: CanvasConflictState, compact: Bool) -> some View {157 let layout = compact ? AnyLayout(VStackLayout(alignment: .leading, spacing: NVSpace.sm)) : AnyLayout(HStackLayout(spacing: NVSpace.sm))158 return layout {159 FeatureButton(L("Appliquer mes choix"), systemImage: "checkmark", kind: .primary) { decide(.applyChoices) }160 FeatureButton(L("Garder ma version entière")) { decide(.keepMine) }161 FeatureButton(L("Prendre la version du serveur")) { decide(.keepTheirs) }162 if !compact { Spacer(minLength: 0) }163 if working { NVProgressDots() }164 }165 .padding(.horizontal, compact ? NVSpace.lg : NVSpace.xl)166 .padding(.vertical, NVSpace.md)167 .frame(maxWidth: .infinity, alignment: .leading)168 .background(NVColor.bgElevated)169 .overlay(alignment: .top) { Rectangle().fill(NVColor.line).frame(height: 1) }170 .disabled(working)171 }172}173