Fix exchange-only process continuation with explicit append path
This commit is contained in:
@@ -30,6 +30,7 @@ pub enum CanvasEvent {
|
||||
Scrolled(Context, scenario::ScrollArea, iced::Vector),
|
||||
Choose(Context, CanvasTool),
|
||||
Select(Context, Id),
|
||||
AppendExchange(Context),
|
||||
Begin {
|
||||
context: Context,
|
||||
tool: Tool,
|
||||
@@ -67,6 +68,7 @@ impl CanvasEvent {
|
||||
| Self::Expand(c, ..)
|
||||
| Self::Open(c, ..)
|
||||
| Self::Back(c)
|
||||
| Self::AppendExchange(c)
|
||||
| Self::Zoom(c, ..)
|
||||
| Self::Viewport(c, ..) => *c,
|
||||
Self::Begin { context, .. }
|
||||
@@ -204,6 +206,15 @@ impl State {
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
pub(crate) fn append_exchange(&mut self, p: &Project, owner: Id) -> Result<(), String> {
|
||||
let last = legacy_order(p, owner)
|
||||
.last()
|
||||
.copied()
|
||||
.ok_or("Choose an ordered exchange path to append to.")?;
|
||||
self.update(p, Event::Start(owner, Tool::Exchange, Some(last)))?;
|
||||
self.draft.as_mut().expect("started form").fixed = true;
|
||||
Ok(())
|
||||
}
|
||||
pub(crate) fn connect(
|
||||
&mut self,
|
||||
p: &Project,
|
||||
|
||||
@@ -848,3 +848,123 @@ fn direct_process_real_picker_stays_bounded_and_search_keeps_selection() {
|
||||
assert_eq!(state.draft.as_ref().unwrap().target, Some(f.work[0]));
|
||||
assert_eq!(state.draft.as_ref().unwrap().browsers[0].page, 0);
|
||||
}
|
||||
|
||||
pub(crate) fn empty_exchange_fixture(layer: Layer) -> (Fixture, Id) {
|
||||
let mut f = fixture(layer);
|
||||
let mut commands = f.nodes.into_iter().map(Command::Delete).collect::<Vec<_>>();
|
||||
commands.push(Command::Connect(
|
||||
f.p.relations[&f.exchange].kind(),
|
||||
"Response".into(),
|
||||
f.work[1],
|
||||
f.work[2],
|
||||
));
|
||||
f.p = execute_batch(&f.p, &commands).unwrap();
|
||||
let next =
|
||||
f.p.relations
|
||||
.values()
|
||||
.find(|r| r.name == "Response")
|
||||
.unwrap()
|
||||
.id;
|
||||
assert!(f.p.elements[&f.owner].steps().unwrap().is_empty());
|
||||
(f, next)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn direct_process_append_preserves_existing_order_and_rejects_incompatible_exchange() {
|
||||
for layer in [Layer::Oa, Layer::Sa] {
|
||||
let (mut f, next) = empty_exchange_fixture(layer);
|
||||
let kind = f.p.relations[&f.exchange].kind();
|
||||
f.p = execute_batch(
|
||||
&f.p,
|
||||
&[Command::Connect(
|
||||
kind,
|
||||
"Recovery".into(),
|
||||
f.work[2],
|
||||
f.work[0],
|
||||
)],
|
||||
)
|
||||
.unwrap();
|
||||
let final_exchange =
|
||||
f.p.relations
|
||||
.values()
|
||||
.find(|r| r.name == "Recovery")
|
||||
.unwrap()
|
||||
.id;
|
||||
for exchange in [f.exchange, next] {
|
||||
let e = occurrence(
|
||||
&f.p,
|
||||
f.owner,
|
||||
"Ordered contribution",
|
||||
OccurrenceBody::Exchange {
|
||||
exchange: Some(exchange),
|
||||
sender: None,
|
||||
receiver: None,
|
||||
message_kind: MessageKind::default(),
|
||||
reply_to: None,
|
||||
values: vec![],
|
||||
},
|
||||
);
|
||||
f.p = execute_batch(&f.p, &[Command::CreateElement(e)]).unwrap();
|
||||
}
|
||||
let before = f.p.elements[&f.owner].steps().unwrap().clone();
|
||||
assert_eq!(legacy_order(&f.p, f.owner), before);
|
||||
assert!(sequence_links(&f.p, f.owner).is_empty());
|
||||
let mut state = State::default();
|
||||
state.append_exchange(&f.p, f.owner).unwrap();
|
||||
let draft = state.draft.as_ref().unwrap();
|
||||
assert!(draft.fixed);
|
||||
assert_eq!(draft.before, before.last().copied());
|
||||
assert_eq!(draft.after, None);
|
||||
assert!(!compatible_source(&f.p, draft, f.exchange));
|
||||
assert!(compatible_source(&f.p, draft, final_exchange));
|
||||
state
|
||||
.update(
|
||||
&f.p,
|
||||
Event::Target(Choice {
|
||||
id: f.exchange,
|
||||
label: "Incompatible".into(),
|
||||
}),
|
||||
)
|
||||
.unwrap();
|
||||
assert!(state.prepare_pending(&f.p).is_err());
|
||||
assert!(state.draft.is_some());
|
||||
state
|
||||
.update(
|
||||
&f.p,
|
||||
Event::Target(Choice {
|
||||
id: final_exchange,
|
||||
label: "Recovery".into(),
|
||||
}),
|
||||
)
|
||||
.unwrap();
|
||||
let command = state.prepare_pending(&f.p).unwrap();
|
||||
let Command::Batch(commands) = &command else {
|
||||
panic!("one ordinary batch")
|
||||
};
|
||||
assert_eq!(
|
||||
commands.len(),
|
||||
4,
|
||||
"materialize old path + occurrence + append link + order"
|
||||
);
|
||||
let serialized = serde_json::to_value(command).unwrap();
|
||||
let result = execute_batch(&f.p, &[serde_json::from_value(serialized).unwrap()]).unwrap();
|
||||
let after = result.elements[&f.owner].steps().unwrap();
|
||||
assert_eq!(&after[..2], &before);
|
||||
assert_eq!(after.len(), 3);
|
||||
let links = sequence_links(&result, f.owner);
|
||||
assert_eq!(links.len(), 2);
|
||||
for pair in after.windows(2) {
|
||||
assert_eq!(
|
||||
links
|
||||
.iter()
|
||||
.filter(|r| r.source() == pair[0] && r.target() == pair[1])
|
||||
.count(),
|
||||
1
|
||||
);
|
||||
}
|
||||
assert!(uses_explicit_topology(&result, f.owner));
|
||||
for (id, relation) in &f.p.relations {
|
||||
assert_eq!(result.relations[id], *relation);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -155,7 +155,7 @@ pub(super) fn view<'a>(
|
||||
.spacing(6),
|
||||
);
|
||||
}
|
||||
out=out.push(label(if pending{"Pending contribution · apply or cancel below"}else{match state.tool{
|
||||
out=out.push(label(if pending{"Pending contribution · apply or cancel below"}else if !explicit{"Ordered contributions · Append exchange continues the path"}else{match state.tool{
|
||||
CanvasTool::Select=>"Select local contributions and paths · drag path endpoints to reconnect · ↕ reorders within a column",
|
||||
CanvasTool::Connect=>"Sequence link · click or drag from preceding to following contribution · Escape cancels",
|
||||
CanvasTool::Add(..)=>"Choose a highlighted path or contribution position · existing work stays shared · Escape cancels"}}));
|
||||
@@ -226,8 +226,14 @@ pub(super) fn view<'a>(
|
||||
);
|
||||
} else {
|
||||
out = out.push(label(
|
||||
"Ordered exchange path · convert explicitly before drawing topology.",
|
||||
"Ordered exchange path · append the next exchange or convert to explicit links.",
|
||||
));
|
||||
if !pending {
|
||||
out = out.push(
|
||||
button("Append exchange…")
|
||||
.on_press(Message::TopologyCanvas(CanvasEvent::AppendExchange(context))),
|
||||
).push(label("Append creates the next exchange contribution and an explicit sequence link from the final contribution in one undo step."));
|
||||
}
|
||||
let commands = preserved_order(p, owner, None);
|
||||
if !commands.is_empty() {
|
||||
out = out.push(
|
||||
@@ -235,7 +241,7 @@ pub(super) fn view<'a>(
|
||||
.on_press(Message::Command(unique_batch(p, commands))),
|
||||
);
|
||||
} else {
|
||||
out=out.push(label("A single exchange has no path link to convert. Involve work, a control or a reusable process to begin explicit topology."))
|
||||
out=out.push(label("A single exchange has no path link to convert. Append the next exchange, or involve work, a control or a reusable process."))
|
||||
.push(row![button("Add work…").on_press(event(Event::Start(owner,Tool::Work,selected))),
|
||||
button("Add control…").on_press(event(Event::Start(owner,Tool::Control,selected))),
|
||||
button("Reuse…").on_press(event(Event::Start(owner,Tool::Reuse,selected)))].spacing(6));
|
||||
@@ -309,6 +315,14 @@ pub(super) fn view<'a>(
|
||||
p.named(link.target()),
|
||||
guard
|
||||
)));
|
||||
} else if d.fixed
|
||||
&& d.tool == Tool::Exchange
|
||||
&& let Some(before) = d.before
|
||||
{
|
||||
form = form.push(label(format!(
|
||||
"Append after {} → new exchange · Create adds an explicit sequence link",
|
||||
p.named(before)
|
||||
)));
|
||||
} else if d.fixed && d.tool != Tool::Connect {
|
||||
form = form.push(label(
|
||||
d.insertion
|
||||
|
||||
Reference in New Issue
Block a user