de505df5 Andy McCall 1 month ago ↶
1
2
3
4
use super :: history:: { render_files, FileRows} ;
5
use super :: settings:: { csrf, require} ;
6
use super :: { filters, lookup, lookup_role, Error, Page, RepoShell, Shell} ;
7
use crate :: auth:: { Access, Role, Viewer} ;
8
use crate :: db:: { self , accounts, proposals as pdb} ;
9
use crate :: render:: { self , diff} ;
10
use crate :: repos:: proposals:: { self as pl, Projection, Source} ;
11
use crate :: repos:: view:: { self , ChangeView, ConflictView} ;
12
use crate :: repos:: RepoName;
13
use crate :: Shared;
14
use askama:: Template;
15
use axum:: extract:: { Form, Path, Query, State} ;
16
use axum:: response:: { IntoResponse, Redirect, Response} ;
17
use hub_api:: { Approval, ProposalSource, ProposalState} ;
18
use oxy_core:: hash:: ChangeHash;
19
use serde:: Deserialize;
20
use std:: collections:: { BTreeMap, HashMap} ;
21
22
23
24
# [ derive ( Template ) ]
25
# [ template ( path = " proposals.html" ) ]
26
pub struct ProposalsPage {
27
shell : Shell,
28
repo : RepoShell,
29
rows : Vec< pdb:: ProposalRow> ,
30
filter : String,
31
counts : ( usize , usize , usize ) ,
32
bookmarks : Vec< String> ,
1ac84c62 Andy McCall 1 month ago ↶
33
q : String,
34
sort : String,
35
pager : super:: Pager,
36
labels : std:: collections:: HashMap< i64 , Vec< db:: issues:: Label> > ,
de505df5 Andy McCall 1 month ago ↶
37
}
38
1ac84c62 Andy McCall 1 month ago ↶
39
impl ProposalsPage {
40
fn labels_of ( & self , id : & i64 ) -> & [ db:: issues:: Label] {
41
self .labels.get ( id) .map ( Vec :: as_slice) .unwrap_or ( & [ ] )
42
}
43
}
44
de505df5 Andy McCall 1 month ago ↶
45
# [ derive ( Deserialize ) ]
46
pub struct ListQuery {
47
state : Option< String> ,
1ac84c62 Andy McCall 1 month ago ↶
48
q : Option< String> ,
49
sort : Option< String> ,
50
page : Option< usize > ,
de505df5 Andy McCall 1 month ago ↶
51
}
52
1ac84c62 Andy McCall 1 month ago ↶
53
54
pub const SORTS : & [ ( & str , & str ) ] = & [ ( " updated" , " recently updated" ) , ( " newest" , " newest" ) , ( " oldest" , " oldest" ) ] ;
55
de505df5 Andy McCall 1 month ago ↶
56
pub async fn list (
57
State( app ) : State< Shared> ,
58
viewer : Viewer,
59
Path( (owner , name ) ) : Path< ( String, String) > ,
60
Query( q) : Query< ListQuery> ,
61
) -> Result< Page< ProposalsPage> , Error> {
62
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposals" ) , & viewer) ;
63
let ( repo, row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
64
let all = pdb:: list( & app.db, row.id, & [ ] ) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
65
let counts = (
66
all.iter ( ) .filter ( | p | p.is_open ( ) ) .count ( ) ,
67
all.iter ( ) .filter ( | p | p.state = = " landed" ) .count ( ) ,
68
all.iter ( ) .filter ( | p | p.state = = " closed" ) .count ( ) ,
69
) ;
70
let filter = q.state.unwrap_or_else ( | | " open" .into ( ) ) ;
1ac84c62 Andy McCall 1 month ago ↶
71
let mut labels: std:: collections:: HashMap< i64 , Vec< db:: issues:: Label> > = std:: collections:: HashMap:: new( ) ;
72
for ( id, l) in db:: issues:: labels_by_proposal( & app.db, row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? {
73
labels.entry ( id) .or_default ( ) .push ( l) ;
74
}
75
76
let qtext = q.q.clone ( ) .unwrap_or_default ( ) ;
77
let ( mut authors, mut wanted, mut targets, mut words) = ( vec! [ ] , vec! [ ] , vec! [ ] , vec! [ ] ) ;
78
for tok in qtext.split_whitespace ( ) {
79
match tok.split_once ( ' :' ) {
80
Some ( ( " author" , v) ) => authors.push ( v.to_lowercase ( ) ) ,
81
Some ( ( " label" , v) ) => wanted.push ( v.to_lowercase ( ) ) ,
82
Some ( ( " target" , v) ) => targets.push ( v.to_string ( ) ) ,
83
_ => words.push ( tok.to_lowercase ( ) ) ,
84
}
85
}
86
let mut rows: Vec< pdb:: ProposalRow> = all
de505df5 Andy McCall 1 month ago ↶
87
.into_iter ( )
88
.filter ( | p | match filter.as_str ( ) {
89
" open" => p.is_open ( ) ,
90
" landed" => p.state = = " landed" ,
91
" closed" => p.state = = " closed" ,
92
_ => true ,
93
} )
1ac84c62 Andy McCall 1 month ago ↶
94
.filter ( | p | authors.is_empty ( ) | | authors.contains ( & p.author.to_lowercase ( ) ) )
95
.filter ( | p | targets.is_empty ( ) | | targets.contains ( & p.target) )
96
.filter ( | p | wanted.iter ( ) .all ( | w | labels.get ( & p.id) .is_some_and ( | ls | ls.iter ( ) .any ( | l | l.name.to_lowercase ( ) = = * w ) ) ) )
97
.filter ( | p | words.iter ( ) .all ( | w | p.title.to_lowercase ( ) .contains ( w) | | p.body.to_lowercase ( ) .contains ( w) ) )
de505df5 Andy McCall 1 month ago ↶
98
.collect ( ) ;
1ac84c62 Andy McCall 1 month ago ↶
99
let sort = q.sort.filter ( | s | SORTS .iter ( ) .any ( | ( k , _) | k = = s ) ) .unwrap_or_else ( | | " updated" .into ( ) ) ;
100
match sort.as_str ( ) {
101
" newest" => rows.sort_by_key ( | p | std:: cmp:: Reverse( p.number) ) ,
102
" oldest" => rows.sort_by_key ( | p | p.number ) ,
103
_ => rows.sort_by_key ( | p | std:: cmp:: Reverse( p.updated_ms) ) ,
104
}
105
let pager = super :: Pager:: new( rows.len ( ) , q.page, & [ ( " state" , & filter) , ( " q" , & qtext) , ( " sort" , & sort) ] ) ;
106
let rows = pager.slice ( rows) ;
de505df5 Andy McCall 1 month ago ↶
107
let bookmarks = app
108
.repos
109
.read ( & repo, | r , _| Ok ( r.bookmarks ( ) ? .into_iter ( ) .map ( | b | b.name ) .collect:: < Vec< _ > > ( ) ) )
110
.await
111
.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
1ac84c62 Andy McCall 1 month ago ↶
112
Ok ( Page( ProposalsPage {
113
shell,
114
repo: RepoShell:: new( & app, & row, " proposals" ) .with_role ( role) ,
115
rows,
116
filter,
117
counts,
118
bookmarks,
119
q: qtext,
120
sort,
121
pager,
122
labels,
123
} ) )
de505df5 Andy McCall 1 month ago ↶
124
}
125
126
127
128
# [ derive ( Template ) ]
129
# [ template ( path = " proposal_new.html" ) ]
130
pub struct NewProposalPage {
131
shell : Shell,
132
repo : RepoShell,
133
bookmarks : Vec< String> ,
134
source : String,
135
target : String,
136
error : Option< String> ,
137
138
preview : Vec< ChangeView> ,
139
conflicted : bool ,
7d2eb590 Andy McCall 1 month ago ↶
140
141
title : String,
142
body : String,
143
144
assistants : Vec< String> ,
de505df5 Andy McCall 1 month ago ↶
145
}
146
147
# [ derive ( Deserialize ) ]
148
pub struct NewQuery {
149
source : Option< String> ,
150
target : Option< String> ,
151
}
152
153
0b20f1ec Andy McCall 1 month ago ↶
154
155
156
de505df5 Andy McCall 1 month ago ↶
157
fn parse_source ( app : & Shared, repo : & RepoName, source : & str ) -> Option< ( Option< RepoName> , String) > {
0b20f1ec Andy McCall 1 month ago ↶
158
let plain = | b : & str | ! b.is_empty ( ) & & ! b.chars ( ) .any ( | c | c.is_control ( ) | | c = = ' :' ) ;
de505df5 Andy McCall 1 month ago ↶
159
if let Some ( ( slug, bookmark) ) = source.split_once ( ' :' ) {
160
let fork = RepoName:: parse( slug) ? ;
0b20f1ec Andy McCall 1 month ago ↶
161
if ! plain ( bookmark) {
de505df5 Andy McCall 1 month ago ↶
162
return None ;
0b20f1ec Andy McCall 1 month ago ↶
163
}
164
if fork = = * repo {
165
return Some ( ( None , bookmark.to_string ( ) ) ) ;
de505df5 Andy McCall 1 month ago ↶
166
}
0b20f1ec Andy McCall 1 month ago ↶
167
if ! app.repos.exists ( & fork) {
168
return None ;
169
}
de505df5 Andy McCall 1 month ago ↶
170
return Some ( ( Some ( fork) , bookmark.to_string ( ) ) ) ;
171
}
0b20f1ec Andy McCall 1 month ago ↶
172
plain ( source) .then ( | | ( None , source.to_string ( ) ) )
de505df5 Andy McCall 1 month ago ↶
173
}
174
175
async fn preview_for (
176
app : & Shared,
177
repo : & RepoName,
178
target : & str ,
179
source : & str ,
180
) -> Result< ( Vec< ChangeView> , bool ) , crate:: repos:: RepoError> {
181
let Some ( ( fork, bookmark) ) = parse_source ( app, repo, source) else { return Ok ( ( vec! [ ] , false ) ) } ;
182
let target = target.to_string ( ) ;
183
let fork_dir = fork.as_ref ( ) .map ( | f | app.repos.dir ( f) ) ;
184
app.repos
185
.read ( repo, move | r, cache| {
186
let projection = match & fork_dir {
187
Some ( dir) => {
188
let fork_repo = oxy_core:: repo:: Repo:: open( dir) ? ;
189
let heads = fork_repo.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
190
pl:: project( r, cache, & target, Source:: Fork { fork: & fork_repo, heads } ) ?
191
}
192
None => {
193
let heads = r.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
194
pl:: project( r, cache, & target, Source:: Bookmark( heads) ) ?
195
}
196
} ;
197
Ok ( ( projection.changes, projection.conflicted) )
198
} )
199
.await
200
}
201
202
pub async fn new_form (
203
State( app ) : State< Shared> ,
204
viewer : Viewer,
205
Path( (owner , name ) ) : Path< ( String, String) > ,
206
Query( q) : Query< NewQuery> ,
207
) -> Result< Page< NewProposalPage> , Error> {
208
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposals/new" ) , & viewer) ;
209
require ( & viewer, & shell) ? ;
210
let ( repo, row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
211
let bookmarks = app
212
.repos
213
.read ( & repo, | r , _| Ok ( r.bookmarks ( ) ? .into_iter ( ) .map ( | b | b.name ) .collect:: < Vec< _ > > ( ) ) )
214
.await
215
.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
216
let target = q.target.unwrap_or_else ( | | row.default_bookmark.clone ( ) ) ;
217
let source = q.source.unwrap_or_default ( ) ;
218
let ( preview, conflicted) =
219
if source.is_empty ( ) { ( vec! [ ] , false ) } else { preview_for ( & app, & repo, & target, & source) .await.unwrap_or ( ( vec! [ ] , false ) ) } ;
7d2eb590 Andy McCall 1 month ago ↶
220
let assistants = if preview.is_empty ( ) { vec! [ ] } else { assistant_names ( & app, & row) .await } ;
de505df5 Andy McCall 1 month ago ↶
221
Ok ( Page( NewProposalPage {
222
shell,
223
repo: RepoShell:: new( & app, & row, " proposals" ) .with_role ( role) ,
224
bookmarks,
225
source,
226
target,
227
error: None ,
228
preview,
229
conflicted,
7d2eb590 Andy McCall 1 month ago ↶
230
title: String :: new( ) ,
231
body: String :: new( ) ,
232
assistants,
de505df5 Andy McCall 1 month ago ↶
233
} ) )
234
}
235
236
# [ derive ( Deserialize ) ]
237
pub struct NewForm {
238
#[serde(rename = "_csrf")]
239
csrf_token : String,
240
title : String,
241
#[serde(default)]
242
body : String,
243
target : String,
244
source : String,
245
#[serde(default)]
246
draft : Option< String> ,
7d2eb590 Andy McCall 1 month ago ↶
247
248
#[serde(default)]
249
assistant : String,
de505df5 Andy McCall 1 month ago ↶
250
}
251
b64e2537 Andy McCall 1 month ago ↶
252
253
# [ allow ( clippy::too_many_arguments ) ]
254
pub async fn open_proposal (
255
app : & Shared,
256
repo : & RepoName,
257
row : & db:: repos:: RepoRow,
258
me : & accounts:: Account,
259
title : & str ,
260
body : & str ,
261
target : & str ,
262
source : & str ,
263
draft : bool ,
264
) -> Result< pdb:: ProposalRow, String> {
265
if title.trim ( ) .is_empty ( ) {
266
return Err ( " Give the proposal a title." .into ( ) ) ;
de505df5 Andy McCall 1 month ago ↶
267
}
b64e2537 Andy McCall 1 month ago ↶
268
let bookmarks =
269
app.repos.read ( repo, | r , _| Ok ( r.bookmarks ( ) ? .into_iter ( ) .map ( | b | b.name ) .collect:: < Vec< _ > > ( ) ) ) .await.map_err ( | e | e.to_string ( ) ) ? ;
270
if ! bookmarks.iter ( ) .any ( | b | b = = target ) {
271
return Err ( " Pick a target bookmark of this repository." .into ( ) ) ;
de505df5 Andy McCall 1 month ago ↶
272
}
b64e2537 Andy McCall 1 month ago ↶
273
let Some ( ( fork, bookmark) ) = parse_source ( app, repo, source.trim ( ) ) else {
274
return Err ( " The source is a bookmark of this repository, or owner/name:bookmark of a fork." .into ( ) ) ;
de505df5 Andy McCall 1 month ago ↶
275
} ;
0b20f1ec Andy McCall 1 month ago ↶
276
if fork.is_none ( ) & & ! bookmarks.contains ( & bookmark) {
277
return Err ( format! ( " There is no bookmark {bookmark} in this repository." ) ) ;
278
}
b64e2537 Andy McCall 1 month ago ↶
279
if fork.is_none ( ) & & bookmark = = target {
280
return Err ( " The source and the target are the same bookmark." .into ( ) ) ;
de505df5 Andy McCall 1 month ago ↶
281
}
b64e2537 Andy McCall 1 month ago ↶
282
let ( preview, _ ) = preview_for ( app, repo, target, source.trim ( ) ) .await.map_err ( | e | e.to_string ( ) ) ? ;
de505df5 Andy McCall 1 month ago ↶
283
if preview.is_empty ( ) {
b64e2537 Andy McCall 1 month ago ↶
284
return Err ( " The source adds nothing to the target." .into ( ) ) ;
de505df5 Andy McCall 1 month ago ↶
285
}
286
let source_repo_id = match & fork {
b64e2537 Andy McCall 1 month ago ↶
287
Some ( fk) => db:: repos:: get( & app.db, & fk.owner, & fk.name) .await.map_err ( | e | e.to_string ( ) ) ? .map ( | r | r.id ) ,
de505df5 Andy McCall 1 month ago ↶
288
None => None ,
289
} ;
290
let created = pdb:: create(
291
& app.db,
292
pdb:: NewProposal {
293
repo_id: row.id,
b64e2537 Andy McCall 1 month ago ↶
294
title: title.trim ( ) ,
295
body: body.trim ( ) ,
296
author_id: Some ( me.id) ,
297
author: & me.username,
298
draft,
299
target,
de505df5 Andy McCall 1 month ago ↶
300
source_kind: if fork.is_some ( ) { " fork" } else { " bookmark" } ,
301
source_repo_id,
302
source_bookmark: & bookmark,
303
source_changes: " " ,
304
} ,
305
)
306
.await
b64e2537 Andy McCall 1 month ago ↶
307
.map_err ( | e | e.to_string ( ) ) ? ;
308
pdb:: add_event( & app.db, created.id, & me.username, " opened" , " " ) .await.ok ( ) ;
309
accounts:: audit( & app.db, Some ( me) , " proposal.opened" , & format! ( " {} #{} " , row.slug ( ) , created.number) , title) .await.ok ( ) ;
18e381ea Andy McCall 1 month ago ↶
310
db:: notify:: index( & app.db, " proposal" , row.id, created.id, created.number, & created.title, & created.body) .await.ok ( ) ;
b64e2537 Andy McCall 1 month ago ↶
311
let url = format! ( " /{} /proposal/{} " , row.slug ( ) , created.number) ;
18e381ea Andy McCall 1 month ago ↶
312
crate :: notify:: deliver(
b64e2537 Andy McCall 1 month ago ↶
313
app,
18e381ea Andy McCall 1 month ago ↶
314
crate :: notify:: Event {
315
kind: " proposal.opened" ,
b64e2537 Andy McCall 1 month ago ↶
316
title: format! ( " {} #{} : {} " , row.slug ( ) , created.number, created.title) ,
317
url,
318
actor: me,
18e381ea Andy McCall 1 month ago ↶
319
repo_id: row.id,
320
thread: Some ( ( " proposal" , created.id) ) ,
b64e2537 Andy McCall 1 month ago ↶
321
mention_text: body,
18e381ea Andy McCall 1 month ago ↶
322
direct: vec! [ ] ,
323
} ,
324
)
325
.await;
b64e2537 Andy McCall 1 month ago ↶
326
crate :: hooks:: emit(
327
app,
328
row,
329
" proposal.opened" ,
330
& me.username,
331
serde_json:: json! ( { " number" : created.number, " title" : created.title, " target" : target, " source" : source } ) ,
332
)
333
.await;
334
Ok ( created)
335
}
336
337
pub async fn create (
338
State( app ) : State< Shared> ,
339
viewer : Viewer,
340
Path( (owner , name ) ) : Path< ( String, String) > ,
341
Form( f) : Form< NewForm> ,
342
) -> Result< Response, Error> {
343
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposals/new" ) , & viewer) ;
344
let me = require ( & viewer, & shell) ? ;
345
csrf ( & viewer, & f.csrf_token, & shell) ? ;
346
let ( repo, row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
d0fbea2e Andy McCall 1 month ago ↶
347
super :: writable( & row, & shell) ? ;
b64e2537 Andy McCall 1 month ago ↶
348
match open_proposal ( & app, & repo, & row, & me.account, & f.title, & f.body, & f.target, & f.source, f.draft.is_some ( ) ) .await {
349
Ok ( created) => Ok ( Redirect:: to( & format! ( " /{owner} /{name} /proposal/{} " , created.number) ) .into_response ( ) ) ,
350
Err ( msg) => {
351
let bookmarks =
352
app.repos.read ( & repo, | r , _| Ok ( r.bookmarks ( ) ? .into_iter ( ) .map ( | b | b.name ) .collect:: < Vec< _ > > ( ) ) ) .await.unwrap_or_default ( ) ;
353
Ok ( Page( NewProposalPage {
354
shell,
355
repo: RepoShell:: new( & app, & row, " proposals" ) .with_role ( role) ,
356
bookmarks,
357
source: f.source.clone ( ) ,
358
target: f.target.clone ( ) ,
359
error: Some ( msg) ,
360
preview: vec! [ ] ,
361
conflicted: false ,
7d2eb590 Andy McCall 1 month ago ↶
362
title: f.title.clone ( ) ,
363
body: f.body.clone ( ) ,
364
assistants: vec! [ ] ,
b64e2537 Andy McCall 1 month ago ↶
365
} )
366
.into_response ( ) )
367
}
368
}
de505df5 Andy McCall 1 month ago ↶
369
}
370
371
372
373
374
pub struct CommentView {
375
pub row : pdb:: CommentRow,
376
pub body_html : String,
377
pub line : Option< usize > ,
378
}
379
a1b98695 Andy McCall 1 month ago ↶
380
381
382
pub struct Entry {
383
pub kind : & 'static str ,
384
pub index : usize ,
385
}
386
de505df5 Andy McCall 1 month ago ↶
387
pub struct ReviewView {
388
pub row : pdb:: ReviewRow,
389
pub body_html : String,
390
pub sealed : bool ,
391
}
392
393
394
pub struct Loaded {
395
pub row : pdb:: ProposalRow,
396
pub changes : Vec< ChangeView> ,
397
pub hashes : Vec< ChangeHash> ,
398
pub heads : Vec< ChangeHash> ,
3f02e5ea Andy McCall 1 month ago ↶
399
pub target_heads : Vec< ChangeHash> ,
de505df5 Andy McCall 1 month ago ↶
400
pub state : String,
401
pub target_state : String,
402
pub conflicted : bool ,
403
pub conflicts : Vec< ConflictView> ,
404
pub files : Vec< FileRows> ,
9df855f2 Andy McCall 1 month ago ↶
405
406
pub diffs : Vec< oxy_core:: repo:: FileDiff> ,
407
pub bases : std:: collections:: BTreeMap< String, Vec< u8 > > ,
de505df5 Andy McCall 1 month ago ↶
408
409
pub atoms : HashMap< ( String, usize ) , ( String, u32 ) > ,
410
pub sealing_keys : Vec< String> ,
411
pub touched : Vec< String> ,
412
pub owners : Vec< String> ,
413
pub landed_already : bool ,
414
}
415
416
417
pub async fn load ( app : & Shared, repo : & RepoName, row : pdb:: ProposalRow) -> Result< Loaded, crate:: repos:: RepoError> {
418
let fork_dir = match ( row.source_kind.as_str ( ) , row.source_repo_id) {
419
( " fork" , Some ( id) ) => {
420
db:: repos:: get_by_id( & app.db, id) .await.ok ( ) .flatten ( ) .and_then ( | r | RepoName:: new( & r.owner, & r.name) ) .map ( | n | app.repos.dir ( & n) )
421
}
422
_ => None ,
423
} ;
424
let r2 = row.clone ( ) ;
425
let loaded = app
426
.repos
427
.read ( repo, move | r, cache| {
428
let source = match ( r2.source_kind.as_str ( ) , & fork_dir) {
429
( " changes" , _ ) => Source:: Changes( r2.source_changes ( ) .iter ( ) .filter_map ( | h | ChangeHash:: from_hex( h) ) .collect ( ) ) ,
430
( " fork" , Some ( dir) ) => {
431
let fork_repo = oxy_core:: repo:: Repo:: open( dir) ? ;
432
let heads =
433
fork_repo.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = r2.source_bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
434
435
let fork_state = fork_repo.load_state ( & heads) ? ;
436
let missing: Vec< ChangeHash> = fork_state.changes ( ) .map ( | ( h , _) | * h) .filter ( | h | ! r.store ( ) .has ( h) ) .collect ( ) ;
437
if ! missing.is_empty ( ) {
438
r.import_bundle ( & fork_repo.bundle_for ( & missing) ? , r.current_policy ( ) ? .is_some ( ) ) ? ;
439
}
440
Source:: Changes( heads)
441
}
442
_ => {
443
let heads = r.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = r2.source_bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
444
Source:: Bookmark( heads)
445
}
446
} ;
447
let p: Projection = pl:: project( r, cache, & r2.target, source) ? ;
448
let target_loaded = cache.load ( r, & p.target_heads) ? ;
449
let files = render_files ( & p.files, & p.bases) ;
450
let mut atoms = HashMap:: new( ) ;
451
for f in & files {
452
for l in & f.lines {
453
if let Some ( n) = l.new_no {
454
if let Some ( ( h, i) ) = pl:: atom_at( & p.loaded, & f.path, n as usize ) {
455
atoms.insert ( ( f.path.clone ( ) , n as usize ) , ( h.to_hex ( ) , i) ) ;
456
}
457
}
458
}
459
}
460
let touched: Vec< String> = p.files.iter ( ) .map ( | f | f.path.clone ( ) ) .collect ( ) ;
461
let owners = pl:: owners_for( & target_loaded, & touched) ;
462
let sealing = pl:: sealing_keys( r, & p.hashes) ? .into_iter ( ) .map ( | k | k.to_hex ( ) ) .collect ( ) ;
463
let landed_already = ! p.hashes.is_empty ( ) & & p.hashes.iter ( ) .all ( | h | target_loaded.state.contains ( h) ) ;
0b20f1ec Andy McCall 1 month ago ↶
464
465
466
let ( changes, hashes) = if r2.state = = " landed" & & p.hashes.is_empty ( ) {
467
let hashes: Vec< ChangeHash> = r2.projected_changes ( ) .iter ( ) .filter_map ( | h | ChangeHash:: from_hex( h) ) .collect ( ) ;
468
let labels = HashMap:: new( ) ;
469
let changes = hashes
470
.iter ( )
471
.filter_map ( | h | Some ( view:: change_view_pub( r, h, & r.store ( ) .get_change_meta ( h) .ok ( ) ? , false , & labels) ) )
472
.collect ( ) ;
473
( changes, hashes)
474
} else {
475
( p.changes, p.hashes)
476
} ;
de505df5 Andy McCall 1 month ago ↶
477
Ok ( Loaded {
478
row: r2,
0b20f1ec Andy McCall 1 month ago ↶
479
changes,
480
hashes,
de505df5 Andy McCall 1 month ago ↶
481
heads: p.heads,
3f02e5ea Andy McCall 1 month ago ↶
482
target_heads: p.target_heads.clone ( ) ,
de505df5 Andy McCall 1 month ago ↶
483
state: p.state.to_hex ( ) ,
484
target_state: p.target_state.to_hex ( ) ,
485
conflicted: p.conflicted,
486
conflicts: p.conflicts,
487
files,
9df855f2 Andy McCall 1 month ago ↶
488
diffs: p.files.clone ( ) ,
489
bases: p.bases.clone ( ) ,
de505df5 Andy McCall 1 month ago ↶
490
atoms,
491
sealing_keys: sealing,
492
touched,
493
owners,
494
landed_already,
495
} )
496
} )
497
.await? ;
0b20f1ec Andy McCall 1 month ago ↶
498
499
500
501
if ! loaded.row.is_open ( ) {
502
return Ok ( loaded) ;
503
}
de505df5 Andy McCall 1 month ago ↶
504
let heads_csv = loaded.heads.iter ( ) .map ( | h | h.to_hex ( ) ) .collect:: < Vec< _ > > ( ) .join ( " ," ) ;
505
let changes_csv = loaded.hashes.iter ( ) .map ( | h | h.to_hex ( ) ) .collect:: < Vec< _ > > ( ) .join ( " ," ) ;
506
pdb:: set_projection( & app.db, loaded.row.id, & loaded.state, & heads_csv, & loaded.target_state, & changes_csv, loaded.conflicted)
507
.await
508
.ok ( ) ;
509
Ok ( loaded)
510
}
511
512
513
pub struct Verdict {
514
pub reviews : Vec< ReviewView> ,
515
pub approvals : Vec< Approval> ,
516
pub blockers : Vec< String> ,
517
pub depends_on : Vec< i64 > ,
518
pub requirements : pdb:: Requirements,
519
}
520
521
pub async fn verdict ( app : & Shared, loaded : & Loaded, repo_id : i64 ) -> Result< Verdict, sqlx:: Error> {
522
let rows = pdb:: reviews( & app.db, loaded.row.id) .await? ;
523
let links = accounts:: identity_accounts( & app.db) .await? ;
524
let sealed_accounts: Vec< String> = links.iter ( ) .filter ( | ( k , _) | loaded.sealing_keys.contains ( k) ) .map ( | ( _, u ) | u.clone ( ) ) .collect ( ) ;
525
526
let mut latest: BTreeMap< String, & pdb:: ReviewRow> = BTreeMap:: new( ) ;
7d2eb590 Andy McCall 1 month ago ↶
527
for r in rows.iter ( ) .filter ( | r | r.via.is_empty ( ) ) {
528
de505df5 Andy McCall 1 month ago ↶
529
latest.insert ( r.author.clone ( ) , r) ;
530
}
531
let mut approvals = Vec :: new( ) ;
532
for ( who, r) in & latest {
533
if r.verdict = = " approve" {
534
let sealed = sealed_accounts.contains ( who) ;
535
let key = links.iter ( ) .find ( | ( k , u ) | u = = who & & loaded.sealing_keys.contains ( k) ) .map ( | ( k , _) | k.clone ( ) ) ;
536
approvals.push ( Approval { account: who.clone ( ) , sealed, key } ) ;
537
}
538
}
539
let reviews = rows
540
.iter ( )
541
.map ( | r | ReviewView {
542
row: r.clone ( ) ,
543
body_html: render:: markdown:: render( & r.body, " /" , " /" ) ,
544
sealed: r.verdict = = " approve" & & sealed_accounts.contains ( & r.author) ,
545
} )
546
.collect ( ) ;
547
let requirements = pdb:: requirements( & app.db, repo_id) .await? ;
548
let mut blockers = Vec :: new( ) ;
0b20f1ec Andy McCall 1 month ago ↶
549
550
if ! loaded.row.is_open ( ) {
551
return Ok ( Verdict { reviews, approvals, blockers, depends_on: vec! [ ] , requirements } ) ;
552
}
de505df5 Andy McCall 1 month ago ↶
553
if loaded.row.state = = " draft" {
554
blockers.push ( " the proposal is a draft" .into ( ) ) ;
555
}
556
if loaded.hashes.is_empty ( ) {
557
blockers.push ( " the proposal adds no changes" .into ( ) ) ;
558
}
559
let sealed_count = approvals.iter ( ) .filter ( | a | a.sealed ) .count ( ) as i64 ;
560
if sealed_count < requirements.required_approvals {
561
blockers.push ( format! ( " {sealed_count} of {} required sealed approvals" , requirements.required_approvals) ) ;
562
}
563
if requirements.require_owners {
564
let missing: Vec< & String> = loaded.owners.iter ( ) .filter ( | o | ! approvals.iter ( ) .any ( | a | a.sealed & & & a.account = = * o ) ) .collect ( ) ;
565
if ! missing.is_empty ( ) {
566
blockers.push ( format! ( " code owners still to approve: {} " , missing.iter ( ) .map ( | s | s.as_str ( ) ) .collect:: < Vec< _ > > ( ) .join ( " , " ) ) ) ;
567
}
568
}
569
if loaded.conflicted & & ! requirements.allow_conflicts {
1e23d010 Andy McCall 1 month ago ↶
570
blockers.push ( format! (
571
" landing would carry conflicts, which this repository refuses: resolve them on the source (oxy merge {} there, fix the marked files, oxy commit, push)" ,
572
loaded.row.target
573
) ) ;
de505df5 Andy McCall 1 month ago ↶
574
}
b64e2537 Andy McCall 1 month ago ↶
575
let required = db:: hooks:: required_checks( & app.db, repo_id) .await? ;
576
if ! required.is_empty ( ) {
577
let checks = db:: hooks:: checks_for_state( & app.db, repo_id, & loaded.state) .await? ;
578
let missing: Vec< String> =
579
required.iter ( ) .filter ( | n | ! checks.iter ( ) .any ( | c | & c.name = = * n & & c.status = = " passed" ) ) .cloned ( ) .collect ( ) ;
580
if ! missing.is_empty ( ) {
581
blockers.push ( format! ( " required checks not passed on the projected state: {} " , missing.join ( " , " ) ) ) ;
582
}
583
}
de505df5 Andy McCall 1 month ago ↶
584
let requesting: Vec< & String> = latest.iter ( ) .filter ( | ( _, r ) | r.verdict = = " changes" ) .map ( | ( who , _) | who ) .collect ( ) ;
585
if ! requesting.is_empty ( ) {
586
blockers.push ( format! ( " changes requested by {} " , requesting.iter ( ) .map ( | s | s.as_str ( ) ) .collect:: < Vec< _ > > ( ) .join ( " , " ) ) ) ;
587
}
588
589
let mut depends_on = Vec :: new( ) ;
590
for other in pdb:: list( & app.db, repo_id, & [ " open" , " draft" ] ) .await? {
591
if other.id = = loaded.row.id | | other.number > loaded.row.number {
592
continue ;
593
}
594
let theirs = other.projected_changes ( ) ;
595
if ! theirs.is_empty ( ) & & theirs.iter ( ) .all ( | h | loaded.hashes.iter ( ) .any ( | m | m.to_hex ( ) = = * h ) ) {
596
depends_on.push ( other.number) ;
597
}
598
}
599
if ! depends_on.is_empty ( ) {
600
blockers.push ( format! ( " depends on {} " , depends_on.iter ( ) .map ( | n | format! ( " #{n} " ) ) .collect:: < Vec< _ > > ( ) .join ( " , " ) ) ) ;
601
}
602
Ok ( Verdict { reviews, approvals, blockers, depends_on, requirements } )
603
}
604
605
# [ derive ( Template ) ]
606
# [ template ( path = " proposal.html" ) ]
607
pub struct ProposalPage {
608
shell : Shell,
609
repo : RepoShell,
610
p : pdb:: ProposalRow,
38833ed7 Andy McCall 1 month ago ↶
611
612
closes : Vec< super:: chain:: Link> ,
a1b98695 Andy McCall 1 month ago ↶
613
614
project_choices : Option< Vec< db:: projects:: Project> > ,
615
616
timeline : Vec< Entry> ,
617
618
can_triage : bool ,
de505df5 Andy McCall 1 month ago ↶
619
body_html : String,
620
tab : String,
621
changes : Vec< ChangeView> ,
622
files : Vec< FileRows> ,
9df855f2 Andy McCall 1 month ago ↶
623
diffs : Vec< oxy_core:: repo:: FileDiff> ,
624
bases : std:: collections:: BTreeMap< String, Vec< u8 > > ,
625
626
ignore_ws : bool ,
de505df5 Andy McCall 1 month ago ↶
627
conflicts : Vec< ConflictView> ,
628
conflicted : bool ,
629
comments : Vec< CommentView> ,
630
631
placed : HashMap< ( String, usize ) , Vec< usize > > ,
632
outdated : Vec< usize > ,
633
reviews : Vec< ReviewView> ,
634
approvals : Vec< Approval> ,
635
blockers : Vec< String> ,
636
depends_on : Vec< i64 > ,
637
events : Vec< pdb:: EventRow> ,
638
owners : Vec< String> ,
639
requirements : pdb:: Requirements,
640
landed_already : bool ,
641
can_edit : bool ,
4f37afcc Andy McCall 1 month ago ↶
642
643
644
deletable_source : Option< String> ,
de505df5 Andy McCall 1 month ago ↶
645
can_land : bool ,
646
hub_can_land : bool ,
647
notice : Option< String> ,
648
error : Option< String> ,
649
heads : Vec< String> ,
650
state_hash : String,
651
source_label : String,
652
api_url : String,
18e381ea Andy McCall 1 month ago ↶
653
labels : Vec< db:: issues:: Label> ,
654
all_labels : Vec< db:: issues:: Label> ,
b64e2537 Andy McCall 1 month ago ↶
655
checks : Vec< db:: hooks:: Check> ,
656
required_checks : Vec< String> ,
e1ec9fbf Andy McCall 1 month ago ↶
657
658
projects : Vec< ( db:: projects:: Project, String) > ,
cc1cd197 Andy McCall 1 month ago ↶
659
660
requested : Vec< String> ,
8e96499f Andy McCall 1 month ago ↶
661
662
reviewable : Vec< String> ,
cc1cd197 Andy McCall 1 month ago ↶
663
664
can_request : bool ,
7d2eb590 Andy McCall 1 month ago ↶
665
666
assistants : Vec< String> ,
667
668
draft : Option< String> ,
de505df5 Andy McCall 1 month ago ↶
669
}
670
671
# [ derive ( Deserialize ) ]
672
pub struct DetailQuery {
673
tab : Option< String> ,
a1b98695 Andy McCall 1 month ago ↶
674
9df855f2 Andy McCall 1 month ago ↶
675
#[serde(default)]
a1b98695 Andy McCall 1 month ago ↶
676
notice : Option< String> ,
677
#[serde(default)]
678
error : Option< String> ,
679
#[serde(default)]
9df855f2 Andy McCall 1 month ago ↶
680
w : Option< String> ,
de505df5 Andy McCall 1 month ago ↶
681
}
682
683
684
685
# [ allow ( clippy::too_many_arguments ) ]
686
async fn detail (
687
app : & Shared,
688
shell : Shell,
689
viewer : & Viewer,
690
owner : & str ,
691
name : & str ,
692
number : i64 ,
693
tab : String,
694
notice : Option< String> ,
695
error : Option< String> ,
696
) -> Result< Page< ProposalPage> , Error> {
697
let ( repo, row, role) = lookup ( app, & shell, viewer, owner, name) .await? ;
698
let p = pdb:: get( & app.db, row.id, number)
699
.await
700
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
701
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
702
let loaded = load ( app, & repo, p) .await.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
703
704
if loaded.landed_already & & loaded.row.is_open ( ) {
705
pdb:: set_state( & app.db, loaded.row.id, " landed" , & loaded.target_state) .await.ok ( ) ;
706
pdb:: add_event( & app.db, loaded.row.id, " " , " landed" , " every change reached the target" ) .await.ok ( ) ;
707
}
708
let p = pdb:: get( & app.db, row.id, number) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? .unwrap_or ( loaded.row.clone ( ) ) ;
709
let v = verdict ( app, & loaded, row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
710
let comment_rows = pdb:: comments( & app.db, loaded.row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
711
let events = pdb:: events( & app.db, loaded.row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
712
713
let mut by_atom: HashMap< ( String, String, u32 ) , usize > = HashMap:: new( ) ;
714
for ( ( path, line) , ( h, i) ) in & loaded.atoms {
715
by_atom.insert ( ( path.clone ( ) , h.clone ( ) , * i) , * line) ;
716
}
717
let mut comments = Vec :: new( ) ;
718
let mut placed: HashMap< ( String, usize ) , Vec< usize > > = HashMap:: new( ) ;
719
let mut outdated = Vec :: new( ) ;
720
for ( idx, c) in comment_rows.into_iter ( ) .enumerate ( ) {
721
let line = if c.anchor_change.is_empty ( ) {
722
None
723
} else {
724
by_atom.get ( & ( c.path.clone ( ) , c.anchor_change.clone ( ) , c.anchor_index as u32 ) ) .copied ( )
725
} ;
726
if ! c.anchor_change.is_empty ( ) {
727
match line {
728
Some ( l) => placed.entry ( ( c.path.clone ( ) , l) ) .or_default ( ) .push ( idx) ,
729
None => outdated.push ( idx) ,
730
}
731
}
732
comments.push ( CommentView { body_html: render:: markdown:: render( & c.body, " /" , " /" ) , row: c, line } ) ;
733
}
734
let mut changes = loaded.changes.clone ( ) ;
735
super :: attribute( app, & mut changes.iter_mut ( ) .collect:: < Vec< _ > > ( ) ) .await;
736
let me = viewer.account ( ) ;
737
let can_edit = me.is_some_and ( | a | Some ( a.id) = = p.author_id | | role > = Role:: Maintain) ;
4f37afcc Andy McCall 1 month ago ↶
738
let deletable_source =
739
if p.state = = " landed" & & p.source_kind = = " bookmark" & & role > = Role:: Write & & p.source_bookmark ! = row.default_bookmark {
740
let b = p.source_bookmark.clone ( ) ;
741
app.repos
742
.read ( & repo, move | r, _ | Ok ( r.view ( ) ? .bookmarks.contains_key ( & b) ) )
743
.await
744
.unwrap_or ( false )
745
.then ( | | p.source_bookmark.clone ( ) )
746
} else {
747
None
748
} ;
de505df5 Andy McCall 1 month ago ↶
749
let can_land = role > = Role:: Write & & p.is_open ( ) & & v.blockers.is_empty ( ) ;
cc1cd197 Andy McCall 1 month ago ↶
750
let can_request = p.is_open ( ) & & me.is_some_and ( | a | Some ( a.id) = = p.author_id | | role > = Role:: Write) ;
8e96499f Andy McCall 1 month ago ↶
751
let requested = pdb:: review_requests( & app.db, p.id) .await.unwrap_or_default ( ) ;
752
let mut reviewable: Vec< String> = if can_request {
753
accounts:: assignable( & app.db, row.id, & row.owner) .await.unwrap_or_default ( ) .into_iter ( ) .filter ( | u | * u ! = p.author) .collect ( )
754
} else {
755
Vec :: new( )
756
} ;
757
for r in & requested {
758
if ! reviewable.iter ( ) .any ( | x | x.eq_ignore_ascii_case ( r) ) {
759
reviewable.push ( r.clone ( ) ) ;
760
}
761
}
7d2eb590 Andy McCall 1 month ago ↶
762
let assistants: Vec< String> = if ( can_request | | can_edit) & & p.is_open ( ) { assistant_names ( app, & row) .await } else { Vec :: new( ) } ;
14530604 Andy McCall 1 month ago ↶
763
let delegated = match viewer.account ( ) {
764
Some ( a) => super :: edit:: delegated_identity( app, a.id) .await.is_some ( ) ,
765
None => false ,
766
} ;
767
let hub_can_land = delegated | | app.repos.read ( & repo, | r , _| Ok ( r.current_policy ( ) ? .is_none ( ) ) ) .await.unwrap_or ( false ) ;
de505df5 Andy McCall 1 month ago ↶
768
let source_label = match p.source_kind.as_str ( ) {
769
" fork" => format! (
770
" fork {} " ,
771
db:: repos:: get_by_id( & app.db, p.source_repo_id.unwrap_or ( 0 ) )
772
.await
773
.ok ( )
774
.flatten ( )
775
.map ( | r | format! ( " {} :{} " , r.slug ( ) , p.source_bookmark) )
776
.unwrap_or_default ( )
777
) ,
778
" changes" => format! ( " {} changes" , p.source_changes ( ) .len ( ) ) ,
779
_ => p.source_bookmark.clone ( ) ,
780
} ;
e1ec9fbf Andy McCall 1 month ago ↶
781
let projects = super :: projects:: placements_for( app, viewer, & row, p.number) .await;
38833ed7 Andy McCall 1 month ago ↶
782
let texts: Vec< String> = std:: iter:: once( p.body.clone ( ) ) .chain ( changes.iter ( ) .map ( | c | format! ( " {} \n {} " , c.title, c.body) ) ) .collect ( ) ;
783
let closes = super :: chain:: issues_closed_by( app, & row, & texts.iter ( ) .map ( String :: as_str) .collect:: < Vec< _ > > ( ) ) .await;
a1b98695 Andy McCall 1 month ago ↶
784
let project_choices = super :: projects:: project_choices( app, viewer, & row, & projects) .await;
785
let mut dated: Vec< ( i64 , Entry) > = Vec :: new( ) ;
786
for ( index, c) in comments.iter ( ) .enumerate ( ) {
787
if c.row.anchor_change.is_empty ( ) {
788
dated.push ( ( c.row.created_ms, Entry { kind: " comment" , index } ) ) ;
789
}
790
}
791
for ( index, r) in v.reviews.iter ( ) .enumerate ( ) {
792
dated.push ( ( r.row.created_ms, Entry { kind: " review" , index } ) ) ;
793
}
794
for ( index, e) in events.iter ( ) .enumerate ( ) {
795
dated.push ( ( e.at_ms, Entry { kind: " event" , index } ) ) ;
796
}
797
dated.sort_by_key ( | ( at , _) | * at) ;
798
let timeline: Vec< Entry> = dated.into_iter ( ) .map ( | ( _, e ) | e ) .collect ( ) ;
de505df5 Andy McCall 1 month ago ↶
799
Ok ( Page( ProposalPage {
a1b98695 Andy McCall 1 month ago ↶
800
can_triage: role > = Role:: Triage,
801
timeline,
38833ed7 Andy McCall 1 month ago ↶
802
closes,
a1b98695 Andy McCall 1 month ago ↶
803
project_choices,
e1ec9fbf Andy McCall 1 month ago ↶
804
projects,
de505df5 Andy McCall 1 month ago ↶
805
shell,
806
repo: RepoShell:: new( app, & row, " proposals" ) .with_role ( role) ,
c79a1111 Andy McCall 1 month ago ↶
807
body_html: super :: issues:: markdown( app, & row, & row.default_bookmark, & p.body) .await,
de505df5 Andy McCall 1 month ago ↶
808
p,
809
tab,
810
changes,
811
files: loaded.files,
9df855f2 Andy McCall 1 month ago ↶
812
diffs: loaded.diffs,
813
bases: loaded.bases,
814
ignore_ws: false ,
de505df5 Andy McCall 1 month ago ↶
815
conflicts: loaded.conflicts,
816
conflicted: loaded.conflicted,
817
comments,
818
placed,
819
outdated,
820
reviews: v.reviews,
821
approvals: v.approvals,
822
blockers: v.blockers,
823
depends_on: v.depends_on,
824
events,
825
owners: loaded.owners,
826
requirements: v.requirements,
827
landed_already: loaded.landed_already,
828
can_edit,
4f37afcc Andy McCall 1 month ago ↶
829
deletable_source,
de505df5 Andy McCall 1 month ago ↶
830
can_land,
831
hub_can_land,
832
notice,
833
error,
834
heads: loaded.heads.iter ( ) .map ( | h | h.to_hex ( ) ) .collect ( ) ,
b64e2537 Andy McCall 1 month ago ↶
835
state_hash: loaded.state.clone ( ) ,
de505df5 Andy McCall 1 month ago ↶
836
source_label,
837
api_url: format! ( " {} /api/v1/repos/{owner} /{name} /proposals/{number} " , app.config.base_url ( ) ) ,
18e381ea Andy McCall 1 month ago ↶
838
labels: db:: issues:: proposal_labels( & app.db, loaded.row.id) .await.unwrap_or_default ( ) ,
839
all_labels: db:: issues:: labels( & app.db, row.id) .await.unwrap_or_default ( ) ,
b64e2537 Andy McCall 1 month ago ↶
840
checks: db:: hooks:: checks_for_state( & app.db, row.id, & loaded.state) .await.unwrap_or_default ( ) ,
841
required_checks: db:: hooks:: required_checks( & app.db, row.id) .await.unwrap_or_default ( ) ,
8e96499f Andy McCall 1 month ago ↶
842
requested,
843
reviewable,
7d2eb590 Andy McCall 1 month ago ↶
844
assistants,
845
draft: None ,
cc1cd197 Andy McCall 1 month ago ↶
846
can_request,
de505df5 Andy McCall 1 month ago ↶
847
} ) )
848
}
849
a1b98695 Andy McCall 1 month ago ↶
850
851
852
fn back ( owner : & str , name : & str , number : i64 , tab : & str , notice : Option< String> , error : Option< String> ) -> Response {
853
let mut url = format! ( " /{owner} /{name} /proposal/{number} ?tab={tab} " ) ;
854
if let Some ( n) = notice {
855
url.push_str ( & format! ( " ¬ice={} " , super :: settings:: urlencode( & n) ) ) ;
856
}
857
if let Some ( e) = error {
858
url.push_str ( & format! ( " &error={} " , super :: settings:: urlencode( & e) ) ) ;
859
}
860
Redirect:: to( & url) .into_response ( )
861
}
862
de505df5 Andy McCall 1 month ago ↶
863
pub async fn show (
864
State( app ) : State< Shared> ,
865
viewer : Viewer,
866
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
867
Query( q) : Query< DetailQuery> ,
868
) -> Result< Page< ProposalPage> , Error> {
869
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
a1b98695 Andy McCall 1 month ago ↶
870
let mut page =
871
detail ( & app, shell, & viewer, & owner, & name, number, q.tab.unwrap_or_else ( | | " conversation" .into ( ) ) , q.notice, q.error) .await? ;
9df855f2 Andy McCall 1 month ago ↶
872
if q.w.as_deref ( ) = = Some ( " 1" ) {
873
874
page.0. files =
875
super :: history:: render_files_with( & page.0. diffs, & page.0. bases, crate :: render:: diff:: Options { ignore_whitespace: true } ) ;
876
page.0. ignore_ws = true ;
877
}
878
Ok ( page)
de505df5 Andy McCall 1 month ago ↶
879
}
880
881
882
883
# [ derive ( Deserialize ) ]
884
pub struct CommentForm {
885
#[serde(rename = "_csrf")]
886
csrf_token : String,
887
body : String,
888
#[serde(default)]
889
path : String,
890
#[serde(default)]
891
line : Option< usize > ,
892
}
893
894
pub async fn comment (
895
State( app ) : State< Shared> ,
896
viewer : Viewer,
897
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
898
Form( f) : Form< CommentForm> ,
a1b98695 Andy McCall 1 month ago ↶
899
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
900
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
901
let me = require ( & viewer, & shell) ? ;
902
csrf ( & viewer, & f.csrf_token, & shell) ? ;
903
let ( repo, row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
d0fbea2e Andy McCall 1 month ago ↶
904
super :: writable( & row, & shell) ? ;
de505df5 Andy McCall 1 month ago ↶
905
let p = pdb:: get( & app.db, row.id, number)
906
.await
907
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
908
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
909
if f.body.trim ( ) .is_empty ( ) {
a1b98695 Andy McCall 1 month ago ↶
910
return Ok ( back ( & owner, & name, number, " conversation" , None , Some ( " An empty comment says nothing." .into ( ) ) ) ) ;
de505df5 Andy McCall 1 month ago ↶
911
}
912
let anchor = match ( f.path.trim ( ) , f.line) {
913
( " " , _ ) | ( _ , None ) => None ,
914
( path, Some ( line) ) => {
915
let loaded = load ( & app, & repo, p.clone ( ) ) .await.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
916
loaded.atoms.get ( & ( path.to_string ( ) , line) ) .cloned ( )
917
}
918
} ;
919
let tab = if anchor.is_some ( ) { " files" } else { " conversation" } ;
920
pdb:: add_comment(
921
& app.db,
922
p.id,
923
Some ( me.account.id) ,
924
& me.account.username,
925
f.body.trim ( ) ,
926
f.path.trim ( ) ,
927
anchor.as_ref ( ) .map ( | ( h , i ) | ( h.as_str ( ) , * i as i64 ) ) ,
928
)
929
.await
930
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
a1b98695 Andy McCall 1 month ago ↶
931
Ok ( back ( & owner, & name, number, tab, None , None ) )
de505df5 Andy McCall 1 month ago ↶
932
}
933
934
# [ derive ( Deserialize ) ]
935
pub struct ReviewForm {
936
#[serde(rename = "_csrf")]
937
csrf_token : String,
938
verdict : String,
939
#[serde(default)]
940
body : String,
941
}
942
943
pub async fn review (
944
State( app ) : State< Shared> ,
945
viewer : Viewer,
946
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
947
Form( f) : Form< ReviewForm> ,
a1b98695 Andy McCall 1 month ago ↶
948
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
949
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
950
let me = require ( & viewer, & shell) ? ;
951
csrf ( & viewer, & f.csrf_token, & shell) ? ;
952
let ( _ , row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
d0fbea2e Andy McCall 1 month ago ↶
953
super :: writable( & row, & shell) ? ;
de505df5 Andy McCall 1 month ago ↶
954
let p = pdb:: get( & app.db, row.id, number)
955
.await
956
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
957
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
958
if ! matches! ( f.verdict.as_str ( ) , " comment" | " changes" | " approve" ) {
959
return Err ( Error:: bad( shell, " a review is comment, changes or approve" ) ) ;
960
}
961
if f.verdict = = " approve" & & Some ( me.account.id) = = p.author_id {
a1b98695 Andy McCall 1 month ago ↶
962
return Ok ( back ( & owner, & name, number, " conversation" , None , Some ( " You cannot approve your own proposal." .into ( ) ) ) ) ;
de505df5 Andy McCall 1 month ago ↶
963
}
964
pdb:: add_review( & app.db, p.id, me.account.id, & me.account.username, & f.verdict, f.body.trim ( ) )
965
.await
966
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
967
pdb:: add_event( & app.db, p.id, & me.account.username, & format! ( " review.{} " , f.verdict) , " " ) .await.ok ( ) ;
cc1cd197 Andy McCall 1 month ago ↶
968
reviewed ( & app, & row, & p, & me.account, & f.verdict) .await;
b64e2537 Andy McCall 1 month ago ↶
969
crate :: hooks:: emit( & app, & row, " review" , & me.account.username, serde_json:: json! ( { " number" : number, " verdict" : f.verdict } ) ) .await;
de505df5 Andy McCall 1 month ago ↶
970
let notice = if f.verdict = = " approve" {
971
Some ( format! (
972
" Approval recorded. It counts once you seal the changes: oxy seal --proposal {} /{owner} /{name} /proposal/{number} " ,
973
app.config.base_url ( )
974
) )
975
} else {
976
None
977
} ;
a1b98695 Andy McCall 1 month ago ↶
978
Ok ( back ( & owner, & name, number, " conversation" , notice, None ) )
de505df5 Andy McCall 1 month ago ↶
979
}
980
981
# [ derive ( Deserialize ) ]
982
pub struct EditForm {
983
#[serde(rename = "_csrf")]
984
csrf_token : String,
985
title : String,
986
#[serde(default)]
987
body : String,
988
target : String,
989
}
990
991
pub async fn edit (
992
State( app ) : State< Shared> ,
993
viewer : Viewer,
994
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
995
Form( f) : Form< EditForm> ,
a1b98695 Andy McCall 1 month ago ↶
996
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
997
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
998
let me = require ( & viewer, & shell) ? ;
999
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1000
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1001
let p = pdb:: get( & app.db, row.id, number)
1002
.await
1003
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1004
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1005
if Some ( me.account.id) ! = p.author_id & & role < Role:: Maintain {
1006
return Err ( Error:: not_found( shell) ) ;
1007
}
1008
let target = if crate :: repos:: names:: valid_segment( f.target.trim ( ) ) { f.target.trim ( ) } else { & p.target } ;
1009
pdb:: edit( & app.db, p.id, f.title.trim ( ) , f.body.trim ( ) , target) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1010
pdb:: add_event( & app.db, p.id, & me.account.username, " edited" , " " ) .await.ok ( ) ;
a1b98695 Andy McCall 1 month ago ↶
1011
Ok ( back ( & owner, & name, number, " conversation" , Some ( " Saved." .into ( ) ) , None ) )
de505df5 Andy McCall 1 month ago ↶
1012
}
1013
1014
# [ derive ( Deserialize ) ]
1015
pub struct StateForm {
1016
#[serde(rename = "_csrf")]
1017
csrf_token : String,
1018
action : String,
1019
}
1020
1021
pub async fn state (
1022
State( app ) : State< Shared> ,
1023
viewer : Viewer,
1024
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1025
Form( f) : Form< StateForm> ,
a1b98695 Andy McCall 1 month ago ↶
1026
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
1027
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1028
let me = require ( & viewer, & shell) ? ;
1029
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1030
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1031
let p = pdb:: get( & app.db, row.id, number)
1032
.await
1033
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1034
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1035
if Some ( me.account.id) ! = p.author_id & & role < Role:: Triage {
1036
return Err ( Error:: not_found( shell) ) ;
1037
}
1038
let new_state = match ( f.action.as_str ( ) , p.state.as_str ( ) ) {
1039
( " close" , " open" | " draft" ) => " closed" ,
1040
( " reopen" , " closed" ) => " open" ,
1041
( " ready" , " draft" ) => " open" ,
1042
( " draft" , " open" ) => " draft" ,
1043
_ => return Err ( Error:: bad( shell, " that transition is not possible" ) ) ,
1044
} ;
1045
pdb:: set_state( & app.db, p.id, new_state, " " ) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1046
pdb:: add_event( & app.db, p.id, & me.account.username, new_state, " " ) .await.ok ( ) ;
b64e2537 Andy McCall 1 month ago ↶
1047
crate :: hooks:: emit( & app, & row, & format! ( " proposal.{new_state} " ) , & me.account.username, serde_json:: json! ( { " number" : number } ) ) .await;
a1b98695 Andy McCall 1 month ago ↶
1048
Ok ( back ( & owner, & name, number, " conversation" , None , None ) )
de505df5 Andy McCall 1 month ago ↶
1049
}
1050
1051
pub async fn resolve_comment (
1052
State( app ) : State< Shared> ,
1053
viewer : Viewer,
1054
Path( (owner , name , number , id ) ) : Path< ( String, String, i64 , i64 ) > ,
1055
Form( f) : Form< super:: session:: CsrfForm> ,
a1b98695 Andy McCall 1 month ago ↶
1056
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
1057
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1058
require ( & viewer, & shell) ? ;
1059
csrf ( & viewer, & f.csrf, & shell) ? ;
1060
let ( _ , row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1061
let p = pdb:: get( & app.db, row.id, number)
1062
.await
1063
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1064
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1065
let current: Option< bool > = sqlx:: query_scalar( " SELECT resolved FROM proposal_comments WHERE id = ? AND proposal_id = ?" )
1066
.bind ( id)
1067
.bind ( p.id)
1068
.fetch_optional ( & app.db)
1069
.await
1070
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1071
if let Some ( r) = current {
1072
pdb:: set_comment_resolved( & app.db, id, ! r) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1073
}
a1b98695 Andy McCall 1 month ago ↶
1074
Ok ( back ( & owner, & name, number, " files" , None , None ) )
de505df5 Andy McCall 1 month ago ↶
1075
}
1076
1077
1078
1079
pub async fn land (
1080
State( app ) : State< Shared> ,
1081
viewer : Viewer,
1082
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1083
Form( f) : Form< super:: session:: CsrfForm> ,
a1b98695 Andy McCall 1 month ago ↶
1084
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
1085
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1086
let me = require ( & viewer, & shell) ? ;
1087
csrf ( & viewer, & f.csrf, & shell) ? ;
1088
let ( repo, row, _ ) = lookup_role ( & app, & shell, & viewer, & owner, & name, Access:: Write) .await? ;
0b20f1ec Andy McCall 1 month ago ↶
1089
match land_as ( & app, & repo, & row, & me.account, number, " web" ) .await {
a1b98695 Andy McCall 1 month ago ↶
1090
Ok ( _ ) => Ok ( back ( & owner, & name, number, " conversation" , Some ( " Landed." .into ( ) ) , None ) ) ,
1f1eb06a Andy McCall 1 month ago ↶
1091
Err ( Landing:: NotFound) => Err ( Error:: not_found( shell) ) ,
a1b98695 Andy McCall 1 month ago ↶
1092
Err ( Landing:: Refused( m) ) => Ok ( back ( & owner, & name, number, " conversation" , None , Some ( m) ) ) ,
1f1eb06a Andy McCall 1 month ago ↶
1093
}
1094
}
1095
1096
1097
pub enum Landing {
1098
NotFound,
1099
Refused( String ) ,
1100
}
1101
1102
1103
1104
0b20f1ec Andy McCall 1 month ago ↶
1105
1106
1f1eb06a Andy McCall 1 month ago ↶
1107
pub async fn land_as (
1108
app : & Shared,
1109
repo : & RepoName,
1110
row : & db:: repos:: RepoRow,
1111
me : & accounts:: Account,
1112
number : i64 ,
0b20f1ec Andy McCall 1 month ago ↶
1113
via : & str ,
1f1eb06a Andy McCall 1 month ago ↶
1114
) -> Result< String, Landing> {
1115
let ( owner, name) = ( row.owner.clone ( ) , row.name.clone ( ) ) ;
1116
let refused = | e : String| Landing:: Refused( e) ;
1117
let p = pdb:: get( & app.db, row.id, number) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? .ok_or ( Landing:: NotFound) ? ;
1118
let loaded = load ( app, repo, p.clone ( ) ) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
1119
let v = verdict ( app, & loaded, row.id) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
1120
if ! p.is_open ( ) {
1121
return Err ( refused ( format! ( " Cannot land: the proposal is {} " , p.state) ) ) ;
1122
}
1123
if ! v.blockers.is_empty ( ) {
1124
return Err ( refused ( format! ( " Cannot land: {} " , v.blockers.join ( " ; " ) ) ) ) ;
de505df5 Andy McCall 1 month ago ↶
1125
}
1126
let target = p.target.clone ( ) ;
1127
let heads = loaded.heads.clone ( ) ;
14530604 Andy McCall 1 month ago ↶
1128
1129
1130
1131
1f1eb06a Andy McCall 1 month ago ↶
1132
let result = match super :: edit:: signer_for( app, me.id) .await {
1133
Ok ( signer) => crate :: repos:: edits:: move_bookmark( & app.repos, repo, target.clone ( ) , heads.clone ( ) , signer) .await.map ( | _| pl:: state_ref( & heads) .to_hex ( ) ) ,
14530604 Andy McCall 1 month ago ↶
1134
Err ( why) => {
1135
app.repos
1f1eb06a Andy McCall 1 month ago ↶
1136
.write ( repo, move | r, _ | {
14530604 Andy McCall 1 month ago ↶
1137
if r.current_policy ( ) ? .is_some ( ) {
1138
return Err ( crate :: repos:: RepoError:: Oxy( oxy_core:: repo:: RepoError:: Msg( format! (
1139
" this repository has a trust policy, so the landing must be signed by a key it authorises. Land from a client with oxy proposal land, or delegate to the hub. {why} "
1140
) ) ) ) ;
1141
}
1142
r.bookmark_set ( & target, & heads) ? ;
1143
Ok ( pl:: state_ref( & heads) .to_hex ( ) )
1144
} )
1145
.await
1146
}
1147
} ;
1f1eb06a Andy McCall 1 month ago ↶
1148
let state = result.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
0b20f1ec Andy McCall 1 month ago ↶
1149
pdb:: set_landed( & app.db, p.id, & state, & me.username, via) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
1150
let how = if v.approvals.is_empty ( ) { format! ( " {via} , with no approval" ) } else { via.to_string ( ) } ;
1151
pdb:: add_event( & app.db, p.id, & me.username, " landed" , & how) .await.ok ( ) ;
1f1eb06a Andy McCall 1 month ago ↶
1152
crate :: hooks:: emit(
1153
app,
1154
row,
1155
" proposal.landed" ,
1156
& me.username,
1157
serde_json:: json! ( { " number" : number, " target" : p.target, " state" : state } ) ,
1158
)
1159
.await;
1160
crate :: notify:: deliver(
1161
app,
1162
crate :: notify:: Event {
1163
kind: " proposal.landed" ,
1164
title: format! ( " {owner} /{name} #{number} : {} landed" , p.title) ,
1165
url: format! ( " /{owner} /{name} /proposal/{number} " ) ,
1166
actor: me,
1167
repo_id: row.id,
1168
thread: Some ( ( " proposal" , p.id) ) ,
1169
mention_text: " " ,
1170
direct: p.author_id.into_iter ( ) .collect ( ) ,
1171
} ,
1172
)
1173
.await;
1174
if p.target = = row.default_bookmark {
1175
let messages: Vec< ( String, String) > = loaded.changes.iter ( ) .map ( | c | ( c.hash.clone ( ) , format! ( " {} \n {} " , c.title, c.body) ) ) .collect ( ) ;
1176
super :: issues:: close_from_messages( app, row, & messages) .await;
de505df5 Andy McCall 1 month ago ↶
1177
}
0b20f1ec Andy McCall 1 month ago ↶
1178
accounts:: audit( & app.db, Some ( me) , " proposal.landed" , & format! ( " {owner} /{name} #{number} " ) , & how) .await.ok ( ) ;
1f1eb06a Andy McCall 1 month ago ↶
1179
db:: repos:: record_push(
1180
& app.db,
1181
row.id,
1182
Some ( ( me.id, me.username.as_str ( ) ) ) ,
1183
& [ db:: repos:: PushOutcome {
1184
reference: p.target.clone ( ) ,
1185
ok: true ,
0b20f1ec Andy McCall 1 month ago ↶
1186
reason: format! ( " landed #{number} ({how} )" ) ,
1f1eb06a Andy McCall 1 month ago ↶
1187
old_state: loaded.target_state.clone ( ) ,
1188
new_state: state.clone ( ) ,
1189
heads: loaded.heads.len ( ) as i64 ,
1190
changes: loaded.hashes.len ( ) as i64 ,
1191
} ] ,
1192
)
1193
.await
1194
.ok ( ) ;
1195
Ok ( state)
de505df5 Andy McCall 1 month ago ↶
1196
}
1197
18e381ea Andy McCall 1 month ago ↶
1198
# [ derive ( Deserialize ) ]
1199
pub struct LabelsForm {
1200
#[serde(rename = "_csrf")]
1201
csrf_token : String,
1202
#[serde(default)]
1203
label : Vec< i64 > ,
1204
}
1205
1206
pub async fn set_labels (
1207
State( app ) : State< Shared> ,
1208
viewer : Viewer,
1209
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1210
axum_extra:: extract:: Form( f) : axum_extra:: extract:: Form< LabelsForm> ,
a1b98695 Andy McCall 1 month ago ↶
1211
) -> Result< Response, Error> {
18e381ea Andy McCall 1 month ago ↶
1212
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1213
require ( & viewer, & shell) ? ;
1214
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1215
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1216
if role < Role:: Triage {
1217
return Err ( Error:: not_found( shell) ) ;
1218
}
1219
let p = pdb:: get( & app.db, row.id, number)
1220
.await
1221
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1222
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1223
for l in db:: issues:: labels( & app.db, row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? {
1224
db:: issues:: set_proposal_label( & app.db, p.id, l.id, f.label.contains ( & l.id) ) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1225
}
a1b98695 Andy McCall 1 month ago ↶
1226
Ok ( back ( & owner, & name, number, " conversation" , None , None ) )
18e381ea Andy McCall 1 month ago ↶
1227
}
1228
b64e2537 Andy McCall 1 month ago ↶
1229
1230
1231
pub async fn events (
1232
State( app ) : State< Shared> ,
1233
viewer : Viewer,
1234
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1235
) -> Result< axum:: response:: Sse< impl futures:: Stream< Item = Result< axum:: response:: sse:: Event, std:: convert:: Infallible> > > , Error> {
1236
use futures:: StreamExt;
1237
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1238
let ( _ , row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1239
let rx = app.events.proposals.subscribe ( ) ;
1240
let repo_id = row.id;
1241
let stream = tokio_stream:: wrappers:: BroadcastStream:: new( rx) .filter_map ( move | item| async move {
1242
match item {
1243
Ok ( ( id, ev) ) if id = = repo_id => {
1244
Some ( Ok ( axum:: response:: sse:: Event:: default( ) .event ( ev.kind.clone ( ) ) .data ( serde_json:: to_string( & ev) .unwrap_or_default ( ) ) ) )
1245
}
1246
_ => None ,
1247
}
1248
} ) ;
1249
Ok ( axum:: response:: Sse:: new( stream) .keep_alive ( axum:: response:: sse:: KeepAlive:: default( ) ) )
1250
}
1251
de505df5 Andy McCall 1 month ago ↶
1252
1253
1254
pub async fn to_api ( app : & Shared, owner : & str , name : & str , loaded : & Loaded, v : & Verdict, source_url : Option< String> ) -> hub_api:: Proposal {
1255
let p = & loaded.row;
1256
hub_api:: Proposal {
1257
number: p.number,
1258
title: p.title.clone ( ) ,
1259
body: p.body.clone ( ) ,
1260
author: p.author.clone ( ) ,
1261
state: ProposalState:: parse( & p.state) .unwrap_or ( ProposalState:: Open) ,
1262
target: p.target.clone ( ) ,
1263
source: match p.source_kind.as_str ( ) {
1264
" fork" => {
1265
let ( o, n) = source_url
1266
.as_deref ( )
1267
.and_then ( | u | u.rsplit_once ( ' /' ) )
1268
.and_then ( | ( b , n ) | b.rsplit_once ( ' /' ) .map ( | ( _, o ) | ( o.to_string ( ) , n.to_string ( ) ) ) )
1269
.unwrap_or_default ( ) ;
1270
ProposalSource:: Fork { owner: o, name: n, bookmark: p.source_bookmark.clone ( ) }
1271
}
1272
" changes" => ProposalSource:: Changes { hashes: p.source_changes ( ) } ,
1273
_ => ProposalSource:: Bookmark { bookmark: p.source_bookmark.clone ( ) } ,
1274
} ,
1275
changes: loaded
1276
.changes
1277
.iter ( )
1278
.map ( | c | hub_api:: ChangeSummary {
1279
hash: c.hash.clone ( ) ,
1280
message: if c.body.is_empty ( ) { c.title.clone ( ) } else { format! ( " {} \n \n {} " , c.title, c.body) } ,
1281
author: hub_api:: Author {
1282
name: c.author.name.clone ( ) ,
1283
email: c.author.email.clone ( ) ,
1284
key: c.author.key.clone ( ) ,
1285
account: c.author.account.clone ( ) ,
760a7dd3 Andy McCall 1 month ago ↶
1286
note: hub_api:: Author:: note_for( & c.author.key, & c.author.account) ,
de505df5 Andy McCall 1 month ago ↶
1287
} ,
1288
when_ms: c.when_ms,
1289
deps: c.deps.clone ( ) ,
1290
head: c.head,
8933faff Andy McCall 1 month ago ↶
1291
via: c.via.as_ref ( ) .map ( | v | hub_api:: Via {
1292
name: v.name.clone ( ) ,
1293
key: v.key.clone ( ) ,
1294
scope: v.scope.clone ( ) ,
1295
expires_ms: v.expires_ms,
1296
revoked: v.revoked,
1297
} ) ,
de505df5 Andy McCall 1 month ago ↶
1298
signature: match & c.signature {
1299
view:: SigView:: Unsigned => hub_api:: Signature:: Unsigned,
1300
view:: SigView:: Valid { key, sealed, revoked, .. } => {
1301
hub_api:: Signature:: Valid { key: key.clone ( ) , sealed: * sealed, revoked: * revoked }
1302
}
1303
view:: SigView:: Invalid( why) => hub_api:: Signature:: Invalid { reason: why.clone ( ) } ,
1304
} ,
1305
} )
1306
.collect ( ) ,
1307
projected_heads: loaded.heads.iter ( ) .map ( | h | h.to_hex ( ) ) .collect ( ) ,
1308
projected_state: Some ( loaded.state.clone ( ) ) ,
1309
conflicted: loaded.conflicted,
1310
approvals: v.approvals.clone ( ) ,
1311
landable: p.is_open ( ) & & v.blockers.is_empty ( ) ,
1312
blockers: v.blockers.clone ( ) ,
1313
created_ms: p.created_ms,
1314
updated_ms: p.updated_ms,
1315
url: format! ( " {} /{owner} /{name} /proposal/{} " , app.config.base_url ( ) , p.number) ,
1316
repository_url: format! ( " {} /{owner} /{name} " , app.config.base_url ( ) ) ,
1317
source_url,
0b20f1ec Andy McCall 1 month ago ↶
1318
landed: ( p.state = = " landed" & & p.landed_ms > 0 ) .then ( | | hub_api:: Landed {
1319
by: p.landed_by.clone ( ) ,
1320
via: p.landed_via.clone ( ) ,
1321
when_ms: p.landed_ms,
1322
} ) ,
cc1cd197 Andy McCall 1 month ago ↶
1323
requested_reviewers: pdb:: review_requests( & app.db, p.id) .await.unwrap_or_default ( ) ,
2291f8cc Andy McCall 1 month ago ↶
1324
labels: db:: issues:: proposal_labels( & app.db, p.id)
1325
.await
1326
.unwrap_or_default ( )
1327
.into_iter ( )
1328
.map ( | l | hub_api:: Label { name: l.name, colour: l.colour, description: l.description } )
1329
.collect ( ) ,
de505df5 Andy McCall 1 month ago ↶
1330
}
1331
}
1332
1333
1334
pub fn key ( path : & str , line : impl filters:: Num) -> ( String, usize ) {
1335
( path.to_string ( ) , line.as_u64 ( ) as usize )
1336
}
1337
1338
# [ allow ( dead_code ) ]
1339
fn _unused ( _ : & diff:: Line, _ : & ConflictView, _ : & Role) { }
cc1cd197 Andy McCall 1 month ago ↶
1340
1341
1342
1343
1344
1345
1346
1347
pub async fn request_reviewers (
1348
app : & Shared,
1349
row : & db:: repos:: RepoRow,
1350
p : & pdb:: ProposalRow,
1351
by : & accounts:: Account,
1352
names : & [String],
1353
) -> Result< Vec< String> , String> {
1354
let mut found = Vec :: new( ) ;
1355
for name in names.iter ( ) .map ( | n | n.trim ( ) .trim_start_matches ( ' @' ) ) .filter ( | n | ! n.is_empty ( ) ) {
1356
let Some ( a) = accounts:: account_by_name( & app.db, name) .await.ok ( ) .flatten ( ) else {
1357
return Err ( format! ( " There is no account {name} ." ) ) ;
1358
} ;
1359
if Some ( a.id) = = p.author_id {
1360
return Err ( format! ( " {name} wrote this proposal, and cannot review it." ) ) ;
1361
}
1362
let role = crate :: auth:: roles:: role_for( & app.db, Some ( & a) , row) .await.ok ( ) .flatten ( ) ;
1363
if ! crate :: auth:: roles:: allows( role, crate :: auth:: Access:: Read) {
1364
return Err ( format! ( " {name} cannot read this repository." ) ) ;
1365
}
1366
found.push ( a) ;
1367
}
1368
let mut asked = Vec :: new( ) ;
1369
for a in found {
1370
if ! pdb:: request_review( & app.db, p.id, a.id, & by.username) .await.map_err ( | e | e.to_string ( ) ) ? {
1371
continue ;
1372
}
1373
pdb:: add_event( & app.db, p.id, & by.username, " review requested" , & a.username) .await.ok ( ) ;
1374
crate :: notify:: deliver(
1375
app,
1376
crate :: notify:: Event {
1377
kind: " proposal.review_requested" ,
1378
title: format! ( " {} /{} #{} : {} (review requested from {} )" , row.owner, row.name, p.number, p.title, a.username) ,
1379
url: format! ( " /{} /{} /proposal/{} " , row.owner, row.name, p.number) ,
1380
actor: by,
1381
repo_id: row.id,
1382
thread: None ,
1383
mention_text: " " ,
1384
direct: vec! [ a.id] ,
1385
} ,
1386
)
1387
.await;
1388
asked.push ( a.username) ;
1389
}
1390
Ok ( asked)
1391
}
1392
1393
1394
1395
pub async fn reviewed ( app : & Shared, row : & db:: repos:: RepoRow, p : & pdb:: ProposalRow, by : & accounts:: Account, verdict : & str ) {
1396
pdb:: unrequest_review( & app.db, p.id, by.id) .await.ok ( ) ;
1397
let what = match verdict {
1398
" approve" => " approved" ,
1399
" changes" => " changes requested" ,
1400
_ => " reviewed" ,
1401
} ;
1402
crate :: notify:: deliver(
1403
app,
1404
crate :: notify:: Event {
1405
kind: " proposal.review" ,
1406
title: format! ( " {} /{} #{} : {} ({what} by {} )" , row.owner, row.name, p.number, p.title, by.username) ,
1407
url: format! ( " /{} /{} /proposal/{} " , row.owner, row.name, p.number) ,
1408
actor: by,
1409
repo_id: row.id,
1410
thread: Some ( ( " proposal" , p.id) ) ,
1411
mention_text: " " ,
1412
direct: p.author_id.into_iter ( ) .collect ( ) ,
1413
} ,
1414
)
1415
.await;
1416
}
1417
1418
# [ derive ( Deserialize ) ]
1419
pub struct ReviewersForm {
1420
#[serde(rename = "_csrf")]
1421
csrf_token : String,
8e96499f Andy McCall 1 month ago ↶
1422
cc1cd197 Andy McCall 1 month ago ↶
1423
action : String,
8e96499f Andy McCall 1 month ago ↶
1424
#[serde(default)]
1425
username : Vec< String> ,
cc1cd197 Andy McCall 1 month ago ↶
1426
}
1427
1428
1429
1430
pub async fn reviewers (
1431
State( app ) : State< Shared> ,
1432
viewer : Viewer,
1433
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
8e96499f Andy McCall 1 month ago ↶
1434
axum_extra:: extract:: Form( f) : axum_extra:: extract:: Form< ReviewersForm> ,
cc1cd197 Andy McCall 1 month ago ↶
1435
) -> Result< Response, Error> {
1436
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1437
let me = require ( & viewer, & shell) ? ;
1438
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1439
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1440
let p = pdb:: get( & app.db, row.id, number)
1441
.await
1442
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1443
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1444
if Some ( me.account.id) ! = p.author_id & & role < Role:: Write {
1445
return Err ( Error:: not_found( shell) ) ;
1446
}
8e96499f Andy McCall 1 month ago ↶
1447
let names: Vec< String> = f.username.iter ( ) .map ( | n | n.trim ( ) .trim_start_matches ( ' @' ) .to_string ( ) ) .filter ( | n | ! n.is_empty ( ) ) .collect ( ) ;
1448
let current = pdb:: review_requests( & app.db, p.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1449
1450
let withdraw: Vec< String> = match f.action.as_str ( ) {
1451
" remove" => names.clone ( ) ,
1452
" set" => current.iter ( ) .filter ( | c | ! names.iter ( ) .any ( | n | n.eq_ignore_ascii_case ( c) ) ) .cloned ( ) .collect ( ) ,
1453
_ => Vec :: new( ) ,
1454
} ;
1455
for who in & withdraw {
1456
if let Some ( a) = accounts:: account_by_name( & app.db, who) .await.ok ( ) .flatten ( ) {
cc1cd197 Andy McCall 1 month ago ↶
1457
if pdb:: unrequest_review( & app.db, p.id, a.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? {
1458
pdb:: add_event( & app.db, p.id, & me.account.username, " review request withdrawn" , & a.username) .await.ok ( ) ;
1459
}
1460
}
8e96499f Andy McCall 1 month ago ↶
1461
}
1462
let ask: Vec< String> = match f.action.as_str ( ) {
1463
" add" => names,
1464
" set" => names.into_iter ( ) .filter ( | n | ! current.iter ( ) .any ( | c | c.eq_ignore_ascii_case ( n) ) ) .collect ( ) ,
1465
_ => return Ok ( back ( & owner, & name, number, " conversation" , None , None ) ) ,
1466
} ;
1467
if ask.is_empty ( ) {
cc1cd197 Andy McCall 1 month ago ↶
1468
return Ok ( back ( & owner, & name, number, " conversation" , None , None ) ) ;
1469
}
8e96499f Andy McCall 1 month ago ↶
1470
match request_reviewers ( & app, & row, & p, & me.account, & ask) .await {
cc1cd197 Andy McCall 1 month ago ↶
1471
Ok ( asked) if asked.is_empty ( ) => Ok ( back ( & owner, & name, number, " conversation" , Some ( " Already asked." .into ( ) ) , None ) ) ,
1472
Ok ( asked) => Ok ( back ( & owner, & name, number, " conversation" , Some ( format! ( " Asked {} to review." , asked.join ( " , " ) ) ) , None ) ) ,
1473
Err ( e) => Ok ( back ( & owner, & name, number, " conversation" , None , Some ( e) ) ) ,
7d2eb590 Andy McCall 1 month ago ↶
1474
}
1475
}
1476
1477
# [ derive ( Deserialize ) ]
1478
pub struct AssistantForm {
1479
#[serde(rename = "_csrf")]
1480
csrf_token : String,
1481
assistant : String,
1482
}
1483
1484
1485
1486
1487
pub async fn assistant (
1488
State( app ) : State< Shared> ,
1489
viewer : Viewer,
1490
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1491
Form( f) : Form< AssistantForm> ,
1492
) -> Result< Response, Error> {
1493
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1494
let me = require ( & viewer, & shell) ? ;
1495
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1496
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
d0fbea2e Andy McCall 1 month ago ↶
1497
super :: writable( & row, & shell) ? ;
7d2eb590 Andy McCall 1 month ago ↶
1498
let p = pdb:: get( & app.db, row.id, number)
1499
.await
1500
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1501
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1502
if Some ( me.account.id) ! = p.author_id & & role < Role:: Write {
1503
return Err ( Error:: not_found( shell) ) ;
1504
}
1505
if ! p.is_open ( ) {
1506
return Ok ( back ( & owner, & name, number, " conversation" , None , Some ( " The proposal is not open." .into ( ) ) ) ) ;
1507
}
1508
let Some ( a) = crate :: assistants:: enabled_for_repo( & app.db, & row)
1509
.await
1510
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1511
.into_iter ( )
1512
.find ( | a | a.name.eq_ignore_ascii_case ( f.assistant.trim ( ) ) )
1513
else {
1514
return Ok ( back ( & owner, & name, number, " conversation" , None , Some ( format! ( " No assistant called {} here." , f.assistant.trim ( ) ) ) ) ) ;
1515
} ;
1516
let who = a.name.clone ( ) ;
1517
match crate :: assistants:: request_review( & app, & row, & p, & me.account, a) .await {
1518
Ok ( ( ) ) => Ok ( back (
1519
& owner,
1520
& name,
1521
number,
1522
" conversation" ,
1523
Some ( format! ( " Asked {who} to review; its answer appears here when it comes." ) ) ,
1524
None ,
1525
) ) ,
1526
Err ( e) => Ok ( back ( & owner, & name, number, " conversation" , None , Some ( format! ( " Not asked: {e} ." ) ) ) ) ,
1527
}
1528
}
1529
1530
1531
async fn assistant_names ( app : & Shared, row : & db:: repos:: RepoRow) -> Vec< String> {
1532
crate :: assistants:: enabled_for_repo( & app.db, row) .await.unwrap_or_default ( ) .into_iter ( ) .map ( | a | a.name ) .collect ( )
1533
}
1534
1535
1536
1537
async fn preview_diff (
1538
app : & Shared,
1539
repo : & RepoName,
1540
target : & str ,
1541
source : & str ,
1542
) -> Result< ( Vec< ChangeView> , Vec< oxy_core:: repo:: FileDiff> ) , crate:: repos:: RepoError> {
1543
let Some ( ( fork, bookmark) ) = parse_source ( app, repo, source) else { return Ok ( ( vec! [ ] , vec! [ ] ) ) } ;
1544
let target = target.to_string ( ) ;
1545
let fork_dir = fork.as_ref ( ) .map ( | f | app.repos.dir ( f) ) ;
1546
app.repos
1547
.read ( repo, move | r, cache| {
1548
let projection = match & fork_dir {
1549
Some ( dir) => {
1550
let fork_repo = oxy_core:: repo:: Repo:: open( dir) ? ;
1551
let heads = fork_repo.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
1552
pl:: project( r, cache, & target, Source:: Fork { fork: & fork_repo, heads } ) ?
1553
}
1554
None => {
1555
let heads = r.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
1556
pl:: project( r, cache, & target, Source:: Bookmark( heads) ) ?
1557
}
1558
} ;
1559
Ok ( ( projection.changes, projection.files) )
1560
} )
1561
.await
1562
}
1563
1564
1565
1566
1567
pub async fn new_draft (
1568
State( app ) : State< Shared> ,
1569
viewer : Viewer,
1570
Path( (owner , name ) ) : Path< ( String, String) > ,
1571
Form( f) : Form< NewForm> ,
1572
) -> Result< Page< NewProposalPage> , Error> {
1573
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposals/new" ) , & viewer) ;
1574
let me = require ( & viewer, & shell) ? ;
1575
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1576
let ( repo, row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
d0fbea2e Andy McCall 1 month ago ↶
1577
super :: writable( & row, & shell) ? ;
7d2eb590 Andy McCall 1 month ago ↶
1578
let bookmarks =
1579
app.repos.read ( & repo, | r , _| Ok ( r.bookmarks ( ) ? .into_iter ( ) .map ( | b | b.name ) .collect:: < Vec< _ > > ( ) ) ) .await.unwrap_or_default ( ) ;
1580
let ( preview, conflicted) = preview_for ( & app, & repo, & f.target, & f.source) .await.unwrap_or ( ( vec! [ ] , false ) ) ;
1581
let assistants = if preview.is_empty ( ) { vec! [ ] } else { assistant_names ( & app, & row) .await } ;
1582
let mut page = NewProposalPage {
1583
shell,
1584
repo: RepoShell:: new( & app, & row, " proposals" ) .with_role ( role) ,
1585
bookmarks,
1586
source: f.source.clone ( ) ,
1587
target: f.target.clone ( ) ,
1588
error: None ,
1589
preview,
1590
conflicted,
1591
title: f.title.clone ( ) ,
1592
body: f.body.clone ( ) ,
1593
assistants,
1594
} ;
1595
let assistant = crate :: assistants:: enabled_for_repo( & app.db, & row)
1596
.await
1597
.unwrap_or_default ( )
1598
.into_iter ( )
1599
.find ( | a | a.name.eq_ignore_ascii_case ( f.assistant.trim ( ) ) ) ;
1600
let Some ( a) = assistant else {
1601
page.error = Some ( format! ( " No assistant called {} here." , f.assistant.trim ( ) ) ) ;
1602
return Ok ( Page( page) ) ;
1603
} ;
1604
if page.preview.is_empty ( ) {
1605
page.error = Some ( " Nothing to describe: the source adds nothing to the target." .into ( ) ) ;
1606
return Ok ( Page( page) ) ;
1607
}
1608
let ( changes, diffs) = match preview_diff ( & app, & repo, & f.target, & f.source) .await {
1609
Ok ( x) => x,
1610
Err ( e) => {
1611
page.error = Some ( e.to_string ( ) ) ;
1612
return Ok ( Page( page) ) ;
1613
}
1614
} ;
1615
let d = crate :: assistants:: Draft { slot: - row.id, title: & f.title, target: & f.target, changes: & changes, diffs: & diffs } ;
1616
match crate :: assistants:: draft_description( & app, & row, & me.account, & a, d) .await {
1617
Ok ( text) => page.body = text,
1618
Err ( why) => page.error = Some ( format! ( " {} did not answer: {why} ." , a.name) ) ,
1619
}
1620
Ok ( Page( page) )
1621
}
1622
1623
# [ derive ( Deserialize ) ]
1624
pub struct DraftForm {
1625
#[serde(rename = "_csrf")]
1626
csrf_token : String,
1627
assistant : String,
1628
#[serde(default)]
1629
title : String,
1630
}
1631
1632
1633
1634
1635
pub async fn draft (
1636
State( app ) : State< Shared> ,
1637
viewer : Viewer,
1638
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1639
Form( f) : Form< DraftForm> ,
1640
) -> Result< Response, Error> {
1641
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1642
let me = require ( & viewer, & shell) ? ;
1643
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1644
let ( repo, row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
d0fbea2e Andy McCall 1 month ago ↶
1645
super :: writable( & row, & shell) ? ;
7d2eb590 Andy McCall 1 month ago ↶
1646
let p = pdb:: get( & app.db, row.id, number)
1647
.await
1648
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1649
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1650
if Some ( me.account.id) ! = p.author_id & & role < Role:: Maintain {
1651
return Err ( Error:: not_found( shell) ) ;
1652
}
1653
let Some ( a) = crate :: assistants:: enabled_for_repo( & app.db, & row)
1654
.await
1655
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1656
.into_iter ( )
1657
.find ( | a | a.name.eq_ignore_ascii_case ( f.assistant.trim ( ) ) )
1658
else {
1659
return Ok ( back ( & owner, & name, number, " conversation" , None , Some ( format! ( " No assistant called {} here." , f.assistant.trim ( ) ) ) ) ) ;
1660
} ;
1661
let loaded = crate :: web:: proposals:: load( & app, & repo, p.clone ( ) ) .await.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
1662
let title = if f.title.trim ( ) .is_empty ( ) { p.title.clone ( ) } else { f.title.clone ( ) } ;
1663
let d = crate :: assistants:: Draft { slot: p.id, title: & title, target: & p.target, changes: & loaded.changes, diffs: & loaded.diffs } ;
1664
let draft = crate :: assistants:: draft_description( & app, & row, & me.account, & a, d) .await;
1665
match draft {
1666
Ok ( text) => {
1667
let mut page = detail ( & app, shell, & viewer, & owner, & name, number, " conversation" .into ( ) , None , None ) .await? ;
1668
page.0. draft = Some ( text) ;
1669
Ok ( page.into_response ( ) )
1670
}
1671
Err ( why) => Ok ( back ( & owner, & name, number, " conversation" , None , Some ( format! ( " {} did not answer: {why} ." , a.name) ) ) ) ,
cc1cd197 Andy McCall 1 month ago ↶
1672
}
1673
}