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 ,
140
}
141
142
# [ derive ( Deserialize ) ]
143
pub struct NewQuery {
144
source : Option< String> ,
145
target : Option< String> ,
146
}
147
148
0b20f1ec Andy McCall 1 month ago ↶
149
150
151
de505df5 Andy McCall 1 month ago ↶
152
fn parse_source ( app : & Shared, repo : & RepoName, source : & str ) -> Option< ( Option< RepoName> , String) > {
0b20f1ec Andy McCall 1 month ago ↶
153
let plain = | b : & str | ! b.is_empty ( ) & & ! b.chars ( ) .any ( | c | c.is_control ( ) | | c = = ' :' ) ;
de505df5 Andy McCall 1 month ago ↶
154
if let Some ( ( slug, bookmark) ) = source.split_once ( ' :' ) {
155
let fork = RepoName:: parse( slug) ? ;
0b20f1ec Andy McCall 1 month ago ↶
156
if ! plain ( bookmark) {
de505df5 Andy McCall 1 month ago ↶
157
return None ;
0b20f1ec Andy McCall 1 month ago ↶
158
}
159
if fork = = * repo {
160
return Some ( ( None , bookmark.to_string ( ) ) ) ;
de505df5 Andy McCall 1 month ago ↶
161
}
0b20f1ec Andy McCall 1 month ago ↶
162
if ! app.repos.exists ( & fork) {
163
return None ;
164
}
de505df5 Andy McCall 1 month ago ↶
165
return Some ( ( Some ( fork) , bookmark.to_string ( ) ) ) ;
166
}
0b20f1ec Andy McCall 1 month ago ↶
167
plain ( source) .then ( | | ( None , source.to_string ( ) ) )
de505df5 Andy McCall 1 month ago ↶
168
}
169
170
async fn preview_for (
171
app : & Shared,
172
repo : & RepoName,
173
target : & str ,
174
source : & str ,
175
) -> Result< ( Vec< ChangeView> , bool ) , crate:: repos:: RepoError> {
176
let Some ( ( fork, bookmark) ) = parse_source ( app, repo, source) else { return Ok ( ( vec! [ ] , false ) ) } ;
177
let target = target.to_string ( ) ;
178
let fork_dir = fork.as_ref ( ) .map ( | f | app.repos.dir ( f) ) ;
179
app.repos
180
.read ( repo, move | r, cache| {
181
let projection = match & fork_dir {
182
Some ( dir) => {
183
let fork_repo = oxy_core:: repo:: Repo:: open( dir) ? ;
184
let heads = fork_repo.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
185
pl:: project( r, cache, & target, Source:: Fork { fork: & fork_repo, heads } ) ?
186
}
187
None => {
188
let heads = r.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
189
pl:: project( r, cache, & target, Source:: Bookmark( heads) ) ?
190
}
191
} ;
192
Ok ( ( projection.changes, projection.conflicted) )
193
} )
194
.await
195
}
196
197
pub async fn new_form (
198
State( app ) : State< Shared> ,
199
viewer : Viewer,
200
Path( (owner , name ) ) : Path< ( String, String) > ,
201
Query( q) : Query< NewQuery> ,
202
) -> Result< Page< NewProposalPage> , Error> {
203
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposals/new" ) , & viewer) ;
204
require ( & viewer, & shell) ? ;
205
let ( repo, row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
206
let bookmarks = app
207
.repos
208
.read ( & repo, | r , _| Ok ( r.bookmarks ( ) ? .into_iter ( ) .map ( | b | b.name ) .collect:: < Vec< _ > > ( ) ) )
209
.await
210
.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
211
let target = q.target.unwrap_or_else ( | | row.default_bookmark.clone ( ) ) ;
212
let source = q.source.unwrap_or_default ( ) ;
213
let ( preview, conflicted) =
214
if source.is_empty ( ) { ( vec! [ ] , false ) } else { preview_for ( & app, & repo, & target, & source) .await.unwrap_or ( ( vec! [ ] , false ) ) } ;
215
Ok ( Page( NewProposalPage {
216
shell,
217
repo: RepoShell:: new( & app, & row, " proposals" ) .with_role ( role) ,
218
bookmarks,
219
source,
220
target,
221
error: None ,
222
preview,
223
conflicted,
224
} ) )
225
}
226
227
# [ derive ( Deserialize ) ]
228
pub struct NewForm {
229
#[serde(rename = "_csrf")]
230
csrf_token : String,
231
title : String,
232
#[serde(default)]
233
body : String,
234
target : String,
235
source : String,
236
#[serde(default)]
237
draft : Option< String> ,
238
}
239
b64e2537 Andy McCall 1 month ago ↶
240
241
# [ allow ( clippy::too_many_arguments ) ]
242
pub async fn open_proposal (
243
app : & Shared,
244
repo : & RepoName,
245
row : & db:: repos:: RepoRow,
246
me : & accounts:: Account,
247
title : & str ,
248
body : & str ,
249
target : & str ,
250
source : & str ,
251
draft : bool ,
252
) -> Result< pdb:: ProposalRow, String> {
253
if title.trim ( ) .is_empty ( ) {
254
return Err ( " Give the proposal a title." .into ( ) ) ;
de505df5 Andy McCall 1 month ago ↶
255
}
b64e2537 Andy McCall 1 month ago ↶
256
let bookmarks =
257
app.repos.read ( repo, | r , _| Ok ( r.bookmarks ( ) ? .into_iter ( ) .map ( | b | b.name ) .collect:: < Vec< _ > > ( ) ) ) .await.map_err ( | e | e.to_string ( ) ) ? ;
258
if ! bookmarks.iter ( ) .any ( | b | b = = target ) {
259
return Err ( " Pick a target bookmark of this repository." .into ( ) ) ;
de505df5 Andy McCall 1 month ago ↶
260
}
b64e2537 Andy McCall 1 month ago ↶
261
let Some ( ( fork, bookmark) ) = parse_source ( app, repo, source.trim ( ) ) else {
262
return Err ( " The source is a bookmark of this repository, or owner/name:bookmark of a fork." .into ( ) ) ;
de505df5 Andy McCall 1 month ago ↶
263
} ;
0b20f1ec Andy McCall 1 month ago ↶
264
if fork.is_none ( ) & & ! bookmarks.contains ( & bookmark) {
265
return Err ( format! ( " There is no bookmark {bookmark} in this repository." ) ) ;
266
}
b64e2537 Andy McCall 1 month ago ↶
267
if fork.is_none ( ) & & bookmark = = target {
268
return Err ( " The source and the target are the same bookmark." .into ( ) ) ;
de505df5 Andy McCall 1 month ago ↶
269
}
b64e2537 Andy McCall 1 month ago ↶
270
let ( preview, _ ) = preview_for ( app, repo, target, source.trim ( ) ) .await.map_err ( | e | e.to_string ( ) ) ? ;
de505df5 Andy McCall 1 month ago ↶
271
if preview.is_empty ( ) {
b64e2537 Andy McCall 1 month ago ↶
272
return Err ( " The source adds nothing to the target." .into ( ) ) ;
de505df5 Andy McCall 1 month ago ↶
273
}
274
let source_repo_id = match & fork {
b64e2537 Andy McCall 1 month ago ↶
275
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 ↶
276
None => None ,
277
} ;
278
let created = pdb:: create(
279
& app.db,
280
pdb:: NewProposal {
281
repo_id: row.id,
b64e2537 Andy McCall 1 month ago ↶
282
title: title.trim ( ) ,
283
body: body.trim ( ) ,
284
author_id: Some ( me.id) ,
285
author: & me.username,
286
draft,
287
target,
de505df5 Andy McCall 1 month ago ↶
288
source_kind: if fork.is_some ( ) { " fork" } else { " bookmark" } ,
289
source_repo_id,
290
source_bookmark: & bookmark,
291
source_changes: " " ,
292
} ,
293
)
294
.await
b64e2537 Andy McCall 1 month ago ↶
295
.map_err ( | e | e.to_string ( ) ) ? ;
296
pdb:: add_event( & app.db, created.id, & me.username, " opened" , " " ) .await.ok ( ) ;
297
accounts:: audit( & app.db, Some ( me) , " proposal.opened" , & format! ( " {} #{} " , row.slug ( ) , created.number) , title) .await.ok ( ) ;
18e381ea Andy McCall 1 month ago ↶
298
db:: notify:: index( & app.db, " proposal" , row.id, created.id, created.number, & created.title, & created.body) .await.ok ( ) ;
b64e2537 Andy McCall 1 month ago ↶
299
let url = format! ( " /{} /proposal/{} " , row.slug ( ) , created.number) ;
18e381ea Andy McCall 1 month ago ↶
300
crate :: notify:: deliver(
b64e2537 Andy McCall 1 month ago ↶
301
app,
18e381ea Andy McCall 1 month ago ↶
302
crate :: notify:: Event {
303
kind: " proposal.opened" ,
b64e2537 Andy McCall 1 month ago ↶
304
title: format! ( " {} #{} : {} " , row.slug ( ) , created.number, created.title) ,
305
url,
306
actor: me,
18e381ea Andy McCall 1 month ago ↶
307
repo_id: row.id,
308
thread: Some ( ( " proposal" , created.id) ) ,
b64e2537 Andy McCall 1 month ago ↶
309
mention_text: body,
18e381ea Andy McCall 1 month ago ↶
310
direct: vec! [ ] ,
311
} ,
312
)
313
.await;
b64e2537 Andy McCall 1 month ago ↶
314
crate :: hooks:: emit(
315
app,
316
row,
317
" proposal.opened" ,
318
& me.username,
319
serde_json:: json! ( { " number" : created.number, " title" : created.title, " target" : target, " source" : source } ) ,
320
)
321
.await;
322
Ok ( created)
323
}
324
325
pub async fn create (
326
State( app ) : State< Shared> ,
327
viewer : Viewer,
328
Path( (owner , name ) ) : Path< ( String, String) > ,
329
Form( f) : Form< NewForm> ,
330
) -> Result< Response, Error> {
331
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposals/new" ) , & viewer) ;
332
let me = require ( & viewer, & shell) ? ;
333
csrf ( & viewer, & f.csrf_token, & shell) ? ;
334
let ( repo, row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
335
match open_proposal ( & app, & repo, & row, & me.account, & f.title, & f.body, & f.target, & f.source, f.draft.is_some ( ) ) .await {
336
Ok ( created) => Ok ( Redirect:: to( & format! ( " /{owner} /{name} /proposal/{} " , created.number) ) .into_response ( ) ) ,
337
Err ( msg) => {
338
let bookmarks =
339
app.repos.read ( & repo, | r , _| Ok ( r.bookmarks ( ) ? .into_iter ( ) .map ( | b | b.name ) .collect:: < Vec< _ > > ( ) ) ) .await.unwrap_or_default ( ) ;
340
Ok ( Page( NewProposalPage {
341
shell,
342
repo: RepoShell:: new( & app, & row, " proposals" ) .with_role ( role) ,
343
bookmarks,
344
source: f.source.clone ( ) ,
345
target: f.target.clone ( ) ,
346
error: Some ( msg) ,
347
preview: vec! [ ] ,
348
conflicted: false ,
349
} )
350
.into_response ( ) )
351
}
352
}
de505df5 Andy McCall 1 month ago ↶
353
}
354
355
356
357
358
pub struct CommentView {
359
pub row : pdb:: CommentRow,
360
pub body_html : String,
361
pub line : Option< usize > ,
362
}
363
a1b98695 Andy McCall 1 month ago ↶
364
365
366
pub struct Entry {
367
pub kind : & 'static str ,
368
pub index : usize ,
369
}
370
de505df5 Andy McCall 1 month ago ↶
371
pub struct ReviewView {
372
pub row : pdb:: ReviewRow,
373
pub body_html : String,
374
pub sealed : bool ,
375
}
376
377
378
pub struct Loaded {
379
pub row : pdb:: ProposalRow,
380
pub changes : Vec< ChangeView> ,
381
pub hashes : Vec< ChangeHash> ,
382
pub heads : Vec< ChangeHash> ,
3f02e5ea Andy McCall 1 month ago ↶
383
pub target_heads : Vec< ChangeHash> ,
de505df5 Andy McCall 1 month ago ↶
384
pub state : String,
385
pub target_state : String,
386
pub conflicted : bool ,
387
pub conflicts : Vec< ConflictView> ,
388
pub files : Vec< FileRows> ,
9df855f2 Andy McCall 1 month ago ↶
389
390
pub diffs : Vec< oxy_core:: repo:: FileDiff> ,
391
pub bases : std:: collections:: BTreeMap< String, Vec< u8 > > ,
de505df5 Andy McCall 1 month ago ↶
392
393
pub atoms : HashMap< ( String, usize ) , ( String, u32 ) > ,
394
pub sealing_keys : Vec< String> ,
395
pub touched : Vec< String> ,
396
pub owners : Vec< String> ,
397
pub landed_already : bool ,
398
}
399
400
401
pub async fn load ( app : & Shared, repo : & RepoName, row : pdb:: ProposalRow) -> Result< Loaded, crate:: repos:: RepoError> {
402
let fork_dir = match ( row.source_kind.as_str ( ) , row.source_repo_id) {
403
( " fork" , Some ( id) ) => {
404
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) )
405
}
406
_ => None ,
407
} ;
408
let r2 = row.clone ( ) ;
409
let loaded = app
410
.repos
411
.read ( repo, move | r, cache| {
412
let source = match ( r2.source_kind.as_str ( ) , & fork_dir) {
413
( " changes" , _ ) => Source:: Changes( r2.source_changes ( ) .iter ( ) .filter_map ( | h | ChangeHash:: from_hex( h) ) .collect ( ) ) ,
414
( " fork" , Some ( dir) ) => {
415
let fork_repo = oxy_core:: repo:: Repo:: open( dir) ? ;
416
let heads =
417
fork_repo.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = r2.source_bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
418
419
let fork_state = fork_repo.load_state ( & heads) ? ;
420
let missing: Vec< ChangeHash> = fork_state.changes ( ) .map ( | ( h , _) | * h) .filter ( | h | ! r.store ( ) .has ( h) ) .collect ( ) ;
421
if ! missing.is_empty ( ) {
422
r.import_bundle ( & fork_repo.bundle_for ( & missing) ? , r.current_policy ( ) ? .is_some ( ) ) ? ;
423
}
424
Source:: Changes( heads)
425
}
426
_ => {
427
let heads = r.bookmarks ( ) ? .into_iter ( ) .find ( | b | b.name = = r2.source_bookmark ) .map ( | b | b.heads ) .unwrap_or_default ( ) ;
428
Source:: Bookmark( heads)
429
}
430
} ;
431
let p: Projection = pl:: project( r, cache, & r2.target, source) ? ;
432
let target_loaded = cache.load ( r, & p.target_heads) ? ;
433
let files = render_files ( & p.files, & p.bases) ;
434
let mut atoms = HashMap:: new( ) ;
435
for f in & files {
436
for l in & f.lines {
437
if let Some ( n) = l.new_no {
438
if let Some ( ( h, i) ) = pl:: atom_at( & p.loaded, & f.path, n as usize ) {
439
atoms.insert ( ( f.path.clone ( ) , n as usize ) , ( h.to_hex ( ) , i) ) ;
440
}
441
}
442
}
443
}
444
let touched: Vec< String> = p.files.iter ( ) .map ( | f | f.path.clone ( ) ) .collect ( ) ;
445
let owners = pl:: owners_for( & target_loaded, & touched) ;
446
let sealing = pl:: sealing_keys( r, & p.hashes) ? .into_iter ( ) .map ( | k | k.to_hex ( ) ) .collect ( ) ;
447
let landed_already = ! p.hashes.is_empty ( ) & & p.hashes.iter ( ) .all ( | h | target_loaded.state.contains ( h) ) ;
0b20f1ec Andy McCall 1 month ago ↶
448
449
450
let ( changes, hashes) = if r2.state = = " landed" & & p.hashes.is_empty ( ) {
451
let hashes: Vec< ChangeHash> = r2.projected_changes ( ) .iter ( ) .filter_map ( | h | ChangeHash:: from_hex( h) ) .collect ( ) ;
452
let labels = HashMap:: new( ) ;
453
let changes = hashes
454
.iter ( )
455
.filter_map ( | h | Some ( view:: change_view_pub( r, h, & r.store ( ) .get_change_meta ( h) .ok ( ) ? , false , & labels) ) )
456
.collect ( ) ;
457
( changes, hashes)
458
} else {
459
( p.changes, p.hashes)
460
} ;
de505df5 Andy McCall 1 month ago ↶
461
Ok ( Loaded {
462
row: r2,
0b20f1ec Andy McCall 1 month ago ↶
463
changes,
464
hashes,
de505df5 Andy McCall 1 month ago ↶
465
heads: p.heads,
3f02e5ea Andy McCall 1 month ago ↶
466
target_heads: p.target_heads.clone ( ) ,
de505df5 Andy McCall 1 month ago ↶
467
state: p.state.to_hex ( ) ,
468
target_state: p.target_state.to_hex ( ) ,
469
conflicted: p.conflicted,
470
conflicts: p.conflicts,
471
files,
9df855f2 Andy McCall 1 month ago ↶
472
diffs: p.files.clone ( ) ,
473
bases: p.bases.clone ( ) ,
de505df5 Andy McCall 1 month ago ↶
474
atoms,
475
sealing_keys: sealing,
476
touched,
477
owners,
478
landed_already,
479
} )
480
} )
481
.await? ;
0b20f1ec Andy McCall 1 month ago ↶
482
483
484
485
if ! loaded.row.is_open ( ) {
486
return Ok ( loaded) ;
487
}
de505df5 Andy McCall 1 month ago ↶
488
let heads_csv = loaded.heads.iter ( ) .map ( | h | h.to_hex ( ) ) .collect:: < Vec< _ > > ( ) .join ( " ," ) ;
489
let changes_csv = loaded.hashes.iter ( ) .map ( | h | h.to_hex ( ) ) .collect:: < Vec< _ > > ( ) .join ( " ," ) ;
490
pdb:: set_projection( & app.db, loaded.row.id, & loaded.state, & heads_csv, & loaded.target_state, & changes_csv, loaded.conflicted)
491
.await
492
.ok ( ) ;
493
Ok ( loaded)
494
}
495
496
497
pub struct Verdict {
498
pub reviews : Vec< ReviewView> ,
499
pub approvals : Vec< Approval> ,
500
pub blockers : Vec< String> ,
501
pub depends_on : Vec< i64 > ,
502
pub requirements : pdb:: Requirements,
503
}
504
505
pub async fn verdict ( app : & Shared, loaded : & Loaded, repo_id : i64 ) -> Result< Verdict, sqlx:: Error> {
506
let rows = pdb:: reviews( & app.db, loaded.row.id) .await? ;
507
let links = accounts:: identity_accounts( & app.db) .await? ;
508
let sealed_accounts: Vec< String> = links.iter ( ) .filter ( | ( k , _) | loaded.sealing_keys.contains ( k) ) .map ( | ( _, u ) | u.clone ( ) ) .collect ( ) ;
509
510
let mut latest: BTreeMap< String, & pdb:: ReviewRow> = BTreeMap:: new( ) ;
511
for r in & rows {
512
latest.insert ( r.author.clone ( ) , r) ;
513
}
514
let mut approvals = Vec :: new( ) ;
515
for ( who, r) in & latest {
516
if r.verdict = = " approve" {
517
let sealed = sealed_accounts.contains ( who) ;
518
let key = links.iter ( ) .find ( | ( k , u ) | u = = who & & loaded.sealing_keys.contains ( k) ) .map ( | ( k , _) | k.clone ( ) ) ;
519
approvals.push ( Approval { account: who.clone ( ) , sealed, key } ) ;
520
}
521
}
522
let reviews = rows
523
.iter ( )
524
.map ( | r | ReviewView {
525
row: r.clone ( ) ,
526
body_html: render:: markdown:: render( & r.body, " /" , " /" ) ,
527
sealed: r.verdict = = " approve" & & sealed_accounts.contains ( & r.author) ,
528
} )
529
.collect ( ) ;
530
let requirements = pdb:: requirements( & app.db, repo_id) .await? ;
531
let mut blockers = Vec :: new( ) ;
0b20f1ec Andy McCall 1 month ago ↶
532
533
if ! loaded.row.is_open ( ) {
534
return Ok ( Verdict { reviews, approvals, blockers, depends_on: vec! [ ] , requirements } ) ;
535
}
de505df5 Andy McCall 1 month ago ↶
536
if loaded.row.state = = " draft" {
537
blockers.push ( " the proposal is a draft" .into ( ) ) ;
538
}
539
if loaded.hashes.is_empty ( ) {
540
blockers.push ( " the proposal adds no changes" .into ( ) ) ;
541
}
542
let sealed_count = approvals.iter ( ) .filter ( | a | a.sealed ) .count ( ) as i64 ;
543
if sealed_count < requirements.required_approvals {
544
blockers.push ( format! ( " {sealed_count} of {} required sealed approvals" , requirements.required_approvals) ) ;
545
}
546
if requirements.require_owners {
547
let missing: Vec< & String> = loaded.owners.iter ( ) .filter ( | o | ! approvals.iter ( ) .any ( | a | a.sealed & & & a.account = = * o ) ) .collect ( ) ;
548
if ! missing.is_empty ( ) {
549
blockers.push ( format! ( " code owners still to approve: {} " , missing.iter ( ) .map ( | s | s.as_str ( ) ) .collect:: < Vec< _ > > ( ) .join ( " , " ) ) ) ;
550
}
551
}
552
if loaded.conflicted & & ! requirements.allow_conflicts {
1e23d010 Andy McCall 1 month ago ↶
553
blockers.push ( format! (
554
" landing would carry conflicts, which this repository refuses: resolve them on the source (oxy merge {} there, fix the marked files, oxy commit, push)" ,
555
loaded.row.target
556
) ) ;
de505df5 Andy McCall 1 month ago ↶
557
}
b64e2537 Andy McCall 1 month ago ↶
558
let required = db:: hooks:: required_checks( & app.db, repo_id) .await? ;
559
if ! required.is_empty ( ) {
560
let checks = db:: hooks:: checks_for_state( & app.db, repo_id, & loaded.state) .await? ;
561
let missing: Vec< String> =
562
required.iter ( ) .filter ( | n | ! checks.iter ( ) .any ( | c | & c.name = = * n & & c.status = = " passed" ) ) .cloned ( ) .collect ( ) ;
563
if ! missing.is_empty ( ) {
564
blockers.push ( format! ( " required checks not passed on the projected state: {} " , missing.join ( " , " ) ) ) ;
565
}
566
}
de505df5 Andy McCall 1 month ago ↶
567
let requesting: Vec< & String> = latest.iter ( ) .filter ( | ( _, r ) | r.verdict = = " changes" ) .map ( | ( who , _) | who ) .collect ( ) ;
568
if ! requesting.is_empty ( ) {
569
blockers.push ( format! ( " changes requested by {} " , requesting.iter ( ) .map ( | s | s.as_str ( ) ) .collect:: < Vec< _ > > ( ) .join ( " , " ) ) ) ;
570
}
571
572
let mut depends_on = Vec :: new( ) ;
573
for other in pdb:: list( & app.db, repo_id, & [ " open" , " draft" ] ) .await? {
574
if other.id = = loaded.row.id | | other.number > loaded.row.number {
575
continue ;
576
}
577
let theirs = other.projected_changes ( ) ;
578
if ! theirs.is_empty ( ) & & theirs.iter ( ) .all ( | h | loaded.hashes.iter ( ) .any ( | m | m.to_hex ( ) = = * h ) ) {
579
depends_on.push ( other.number) ;
580
}
581
}
582
if ! depends_on.is_empty ( ) {
583
blockers.push ( format! ( " depends on {} " , depends_on.iter ( ) .map ( | n | format! ( " #{n} " ) ) .collect:: < Vec< _ > > ( ) .join ( " , " ) ) ) ;
584
}
585
Ok ( Verdict { reviews, approvals, blockers, depends_on, requirements } )
586
}
587
588
# [ derive ( Template ) ]
589
# [ template ( path = " proposal.html" ) ]
590
pub struct ProposalPage {
591
shell : Shell,
592
repo : RepoShell,
593
p : pdb:: ProposalRow,
38833ed7 Andy McCall 1 month ago ↶
594
595
closes : Vec< super:: chain:: Link> ,
a1b98695 Andy McCall 1 month ago ↶
596
597
project_choices : Option< Vec< db:: projects:: Project> > ,
598
599
timeline : Vec< Entry> ,
600
601
can_triage : bool ,
de505df5 Andy McCall 1 month ago ↶
602
body_html : String,
603
tab : String,
604
changes : Vec< ChangeView> ,
605
files : Vec< FileRows> ,
9df855f2 Andy McCall 1 month ago ↶
606
diffs : Vec< oxy_core:: repo:: FileDiff> ,
607
bases : std:: collections:: BTreeMap< String, Vec< u8 > > ,
608
609
ignore_ws : bool ,
de505df5 Andy McCall 1 month ago ↶
610
conflicts : Vec< ConflictView> ,
611
conflicted : bool ,
612
comments : Vec< CommentView> ,
613
614
placed : HashMap< ( String, usize ) , Vec< usize > > ,
615
outdated : Vec< usize > ,
616
reviews : Vec< ReviewView> ,
617
approvals : Vec< Approval> ,
618
blockers : Vec< String> ,
619
depends_on : Vec< i64 > ,
620
events : Vec< pdb:: EventRow> ,
621
owners : Vec< String> ,
622
requirements : pdb:: Requirements,
623
landed_already : bool ,
624
can_edit : bool ,
625
can_land : bool ,
626
hub_can_land : bool ,
627
notice : Option< String> ,
628
error : Option< String> ,
629
heads : Vec< String> ,
630
state_hash : String,
631
source_label : String,
632
api_url : String,
18e381ea Andy McCall 1 month ago ↶
633
labels : Vec< db:: issues:: Label> ,
634
all_labels : Vec< db:: issues:: Label> ,
b64e2537 Andy McCall 1 month ago ↶
635
checks : Vec< db:: hooks:: Check> ,
636
required_checks : Vec< String> ,
e1ec9fbf Andy McCall 1 month ago ↶
637
638
projects : Vec< ( db:: projects:: Project, String) > ,
de505df5 Andy McCall 1 month ago ↶
639
}
640
641
# [ derive ( Deserialize ) ]
642
pub struct DetailQuery {
643
tab : Option< String> ,
a1b98695 Andy McCall 1 month ago ↶
644
9df855f2 Andy McCall 1 month ago ↶
645
#[serde(default)]
a1b98695 Andy McCall 1 month ago ↶
646
notice : Option< String> ,
647
#[serde(default)]
648
error : Option< String> ,
649
#[serde(default)]
9df855f2 Andy McCall 1 month ago ↶
650
w : Option< String> ,
de505df5 Andy McCall 1 month ago ↶
651
}
652
653
654
655
# [ allow ( clippy::too_many_arguments ) ]
656
async fn detail (
657
app : & Shared,
658
shell : Shell,
659
viewer : & Viewer,
660
owner : & str ,
661
name : & str ,
662
number : i64 ,
663
tab : String,
664
notice : Option< String> ,
665
error : Option< String> ,
666
) -> Result< Page< ProposalPage> , Error> {
667
let ( repo, row, role) = lookup ( app, & shell, viewer, owner, name) .await? ;
668
let p = pdb:: get( & app.db, row.id, number)
669
.await
670
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
671
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
672
let loaded = load ( app, & repo, p) .await.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
673
674
if loaded.landed_already & & loaded.row.is_open ( ) {
675
pdb:: set_state( & app.db, loaded.row.id, " landed" , & loaded.target_state) .await.ok ( ) ;
676
pdb:: add_event( & app.db, loaded.row.id, " " , " landed" , " every change reached the target" ) .await.ok ( ) ;
677
}
678
let p = pdb:: get( & app.db, row.id, number) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? .unwrap_or ( loaded.row.clone ( ) ) ;
679
let v = verdict ( app, & loaded, row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
680
let comment_rows = pdb:: comments( & app.db, loaded.row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
681
let events = pdb:: events( & app.db, loaded.row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
682
683
let mut by_atom: HashMap< ( String, String, u32 ) , usize > = HashMap:: new( ) ;
684
for ( ( path, line) , ( h, i) ) in & loaded.atoms {
685
by_atom.insert ( ( path.clone ( ) , h.clone ( ) , * i) , * line) ;
686
}
687
let mut comments = Vec :: new( ) ;
688
let mut placed: HashMap< ( String, usize ) , Vec< usize > > = HashMap:: new( ) ;
689
let mut outdated = Vec :: new( ) ;
690
for ( idx, c) in comment_rows.into_iter ( ) .enumerate ( ) {
691
let line = if c.anchor_change.is_empty ( ) {
692
None
693
} else {
694
by_atom.get ( & ( c.path.clone ( ) , c.anchor_change.clone ( ) , c.anchor_index as u32 ) ) .copied ( )
695
} ;
696
if ! c.anchor_change.is_empty ( ) {
697
match line {
698
Some ( l) => placed.entry ( ( c.path.clone ( ) , l) ) .or_default ( ) .push ( idx) ,
699
None => outdated.push ( idx) ,
700
}
701
}
702
comments.push ( CommentView { body_html: render:: markdown:: render( & c.body, " /" , " /" ) , row: c, line } ) ;
703
}
704
let mut changes = loaded.changes.clone ( ) ;
705
super :: attribute( app, & mut changes.iter_mut ( ) .collect:: < Vec< _ > > ( ) ) .await;
706
let me = viewer.account ( ) ;
707
let can_edit = me.is_some_and ( | a | Some ( a.id) = = p.author_id | | role > = Role:: Maintain) ;
708
let can_land = role > = Role:: Write & & p.is_open ( ) & & v.blockers.is_empty ( ) ;
14530604 Andy McCall 1 month ago ↶
709
let delegated = match viewer.account ( ) {
710
Some ( a) => super :: edit:: delegated_identity( app, a.id) .await.is_some ( ) ,
711
None => false ,
712
} ;
713
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 ↶
714
let source_label = match p.source_kind.as_str ( ) {
715
" fork" => format! (
716
" fork {} " ,
717
db:: repos:: get_by_id( & app.db, p.source_repo_id.unwrap_or ( 0 ) )
718
.await
719
.ok ( )
720
.flatten ( )
721
.map ( | r | format! ( " {} :{} " , r.slug ( ) , p.source_bookmark) )
722
.unwrap_or_default ( )
723
) ,
724
" changes" => format! ( " {} changes" , p.source_changes ( ) .len ( ) ) ,
725
_ => p.source_bookmark.clone ( ) ,
726
} ;
e1ec9fbf Andy McCall 1 month ago ↶
727
let projects = super :: projects:: placements_for( app, viewer, & row, p.number) .await;
38833ed7 Andy McCall 1 month ago ↶
728
let texts: Vec< String> = std:: iter:: once( p.body.clone ( ) ) .chain ( changes.iter ( ) .map ( | c | format! ( " {} \n {} " , c.title, c.body) ) ) .collect ( ) ;
729
let closes = super :: chain:: issues_closed_by( app, & row, & texts.iter ( ) .map ( String :: as_str) .collect:: < Vec< _ > > ( ) ) .await;
a1b98695 Andy McCall 1 month ago ↶
730
let project_choices = super :: projects:: project_choices( app, viewer, & row, & projects) .await;
731
let mut dated: Vec< ( i64 , Entry) > = Vec :: new( ) ;
732
for ( index, c) in comments.iter ( ) .enumerate ( ) {
733
if c.row.anchor_change.is_empty ( ) {
734
dated.push ( ( c.row.created_ms, Entry { kind: " comment" , index } ) ) ;
735
}
736
}
737
for ( index, r) in v.reviews.iter ( ) .enumerate ( ) {
738
dated.push ( ( r.row.created_ms, Entry { kind: " review" , index } ) ) ;
739
}
740
for ( index, e) in events.iter ( ) .enumerate ( ) {
741
dated.push ( ( e.at_ms, Entry { kind: " event" , index } ) ) ;
742
}
743
dated.sort_by_key ( | ( at , _) | * at) ;
744
let timeline: Vec< Entry> = dated.into_iter ( ) .map ( | ( _, e ) | e ) .collect ( ) ;
de505df5 Andy McCall 1 month ago ↶
745
Ok ( Page( ProposalPage {
a1b98695 Andy McCall 1 month ago ↶
746
can_triage: role > = Role:: Triage,
747
timeline,
38833ed7 Andy McCall 1 month ago ↶
748
closes,
a1b98695 Andy McCall 1 month ago ↶
749
project_choices,
e1ec9fbf Andy McCall 1 month ago ↶
750
projects,
de505df5 Andy McCall 1 month ago ↶
751
shell,
752
repo: RepoShell:: new( app, & row, " proposals" ) .with_role ( role) ,
c79a1111 Andy McCall 1 month ago ↶
753
body_html: super :: issues:: markdown( app, & row, & row.default_bookmark, & p.body) .await,
de505df5 Andy McCall 1 month ago ↶
754
p,
755
tab,
756
changes,
757
files: loaded.files,
9df855f2 Andy McCall 1 month ago ↶
758
diffs: loaded.diffs,
759
bases: loaded.bases,
760
ignore_ws: false ,
de505df5 Andy McCall 1 month ago ↶
761
conflicts: loaded.conflicts,
762
conflicted: loaded.conflicted,
763
comments,
764
placed,
765
outdated,
766
reviews: v.reviews,
767
approvals: v.approvals,
768
blockers: v.blockers,
769
depends_on: v.depends_on,
770
events,
771
owners: loaded.owners,
772
requirements: v.requirements,
773
landed_already: loaded.landed_already,
774
can_edit,
775
can_land,
776
hub_can_land,
777
notice,
778
error,
779
heads: loaded.heads.iter ( ) .map ( | h | h.to_hex ( ) ) .collect ( ) ,
b64e2537 Andy McCall 1 month ago ↶
780
state_hash: loaded.state.clone ( ) ,
de505df5 Andy McCall 1 month ago ↶
781
source_label,
782
api_url: format! ( " {} /api/v1/repos/{owner} /{name} /proposals/{number} " , app.config.base_url ( ) ) ,
18e381ea Andy McCall 1 month ago ↶
783
labels: db:: issues:: proposal_labels( & app.db, loaded.row.id) .await.unwrap_or_default ( ) ,
784
all_labels: db:: issues:: labels( & app.db, row.id) .await.unwrap_or_default ( ) ,
b64e2537 Andy McCall 1 month ago ↶
785
checks: db:: hooks:: checks_for_state( & app.db, row.id, & loaded.state) .await.unwrap_or_default ( ) ,
786
required_checks: db:: hooks:: required_checks( & app.db, row.id) .await.unwrap_or_default ( ) ,
de505df5 Andy McCall 1 month ago ↶
787
} ) )
788
}
789
a1b98695 Andy McCall 1 month ago ↶
790
791
792
fn back ( owner : & str , name : & str , number : i64 , tab : & str , notice : Option< String> , error : Option< String> ) -> Response {
793
let mut url = format! ( " /{owner} /{name} /proposal/{number} ?tab={tab} " ) ;
794
if let Some ( n) = notice {
795
url.push_str ( & format! ( " ¬ice={} " , super :: settings:: urlencode( & n) ) ) ;
796
}
797
if let Some ( e) = error {
798
url.push_str ( & format! ( " &error={} " , super :: settings:: urlencode( & e) ) ) ;
799
}
800
Redirect:: to( & url) .into_response ( )
801
}
802
de505df5 Andy McCall 1 month ago ↶
803
pub async fn show (
804
State( app ) : State< Shared> ,
805
viewer : Viewer,
806
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
807
Query( q) : Query< DetailQuery> ,
808
) -> Result< Page< ProposalPage> , Error> {
809
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
a1b98695 Andy McCall 1 month ago ↶
810
let mut page =
811
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 ↶
812
if q.w.as_deref ( ) = = Some ( " 1" ) {
813
814
page.0. files =
815
super :: history:: render_files_with( & page.0. diffs, & page.0. bases, crate :: render:: diff:: Options { ignore_whitespace: true } ) ;
816
page.0. ignore_ws = true ;
817
}
818
Ok ( page)
de505df5 Andy McCall 1 month ago ↶
819
}
820
821
822
823
# [ derive ( Deserialize ) ]
824
pub struct CommentForm {
825
#[serde(rename = "_csrf")]
826
csrf_token : String,
827
body : String,
828
#[serde(default)]
829
path : String,
830
#[serde(default)]
831
line : Option< usize > ,
832
}
833
834
pub async fn comment (
835
State( app ) : State< Shared> ,
836
viewer : Viewer,
837
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
838
Form( f) : Form< CommentForm> ,
a1b98695 Andy McCall 1 month ago ↶
839
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
840
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
841
let me = require ( & viewer, & shell) ? ;
842
csrf ( & viewer, & f.csrf_token, & shell) ? ;
843
let ( repo, row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
844
let p = pdb:: get( & app.db, row.id, number)
845
.await
846
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
847
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
848
if f.body.trim ( ) .is_empty ( ) {
a1b98695 Andy McCall 1 month ago ↶
849
return Ok ( back ( & owner, & name, number, " conversation" , None , Some ( " An empty comment says nothing." .into ( ) ) ) ) ;
de505df5 Andy McCall 1 month ago ↶
850
}
851
let anchor = match ( f.path.trim ( ) , f.line) {
852
( " " , _ ) | ( _ , None ) => None ,
853
( path, Some ( line) ) => {
854
let loaded = load ( & app, & repo, p.clone ( ) ) .await.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
855
loaded.atoms.get ( & ( path.to_string ( ) , line) ) .cloned ( )
856
}
857
} ;
858
let tab = if anchor.is_some ( ) { " files" } else { " conversation" } ;
859
pdb:: add_comment(
860
& app.db,
861
p.id,
862
Some ( me.account.id) ,
863
& me.account.username,
864
f.body.trim ( ) ,
865
f.path.trim ( ) ,
866
anchor.as_ref ( ) .map ( | ( h , i ) | ( h.as_str ( ) , * i as i64 ) ) ,
867
)
868
.await
869
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
a1b98695 Andy McCall 1 month ago ↶
870
Ok ( back ( & owner, & name, number, tab, None , None ) )
de505df5 Andy McCall 1 month ago ↶
871
}
872
873
# [ derive ( Deserialize ) ]
874
pub struct ReviewForm {
875
#[serde(rename = "_csrf")]
876
csrf_token : String,
877
verdict : String,
878
#[serde(default)]
879
body : String,
880
}
881
882
pub async fn review (
883
State( app ) : State< Shared> ,
884
viewer : Viewer,
885
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
886
Form( f) : Form< ReviewForm> ,
a1b98695 Andy McCall 1 month ago ↶
887
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
888
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
889
let me = require ( & viewer, & shell) ? ;
890
csrf ( & viewer, & f.csrf_token, & shell) ? ;
891
let ( _ , row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
892
let p = pdb:: get( & app.db, row.id, number)
893
.await
894
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
895
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
896
if ! matches! ( f.verdict.as_str ( ) , " comment" | " changes" | " approve" ) {
897
return Err ( Error:: bad( shell, " a review is comment, changes or approve" ) ) ;
898
}
899
if f.verdict = = " approve" & & Some ( me.account.id) = = p.author_id {
a1b98695 Andy McCall 1 month ago ↶
900
return Ok ( back ( & owner, & name, number, " conversation" , None , Some ( " You cannot approve your own proposal." .into ( ) ) ) ) ;
de505df5 Andy McCall 1 month ago ↶
901
}
902
pdb:: add_review( & app.db, p.id, me.account.id, & me.account.username, & f.verdict, f.body.trim ( ) )
903
.await
904
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
905
pdb:: add_event( & app.db, p.id, & me.account.username, & format! ( " review.{} " , f.verdict) , " " ) .await.ok ( ) ;
b64e2537 Andy McCall 1 month ago ↶
906
crate :: hooks:: emit( & app, & row, " review" , & me.account.username, serde_json:: json! ( { " number" : number, " verdict" : f.verdict } ) ) .await;
de505df5 Andy McCall 1 month ago ↶
907
let notice = if f.verdict = = " approve" {
908
Some ( format! (
909
" Approval recorded. It counts once you seal the changes: oxy seal --proposal {} /{owner} /{name} /proposal/{number} " ,
910
app.config.base_url ( )
911
) )
912
} else {
913
None
914
} ;
a1b98695 Andy McCall 1 month ago ↶
915
Ok ( back ( & owner, & name, number, " conversation" , notice, None ) )
de505df5 Andy McCall 1 month ago ↶
916
}
917
918
# [ derive ( Deserialize ) ]
919
pub struct EditForm {
920
#[serde(rename = "_csrf")]
921
csrf_token : String,
922
title : String,
923
#[serde(default)]
924
body : String,
925
target : String,
926
}
927
928
pub async fn edit (
929
State( app ) : State< Shared> ,
930
viewer : Viewer,
931
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
932
Form( f) : Form< EditForm> ,
a1b98695 Andy McCall 1 month ago ↶
933
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
934
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
935
let me = require ( & viewer, & shell) ? ;
936
csrf ( & viewer, & f.csrf_token, & shell) ? ;
937
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
938
let p = pdb:: get( & app.db, row.id, number)
939
.await
940
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
941
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
942
if Some ( me.account.id) ! = p.author_id & & role < Role:: Maintain {
943
return Err ( Error:: not_found( shell) ) ;
944
}
945
let target = if crate :: repos:: names:: valid_segment( f.target.trim ( ) ) { f.target.trim ( ) } else { & p.target } ;
946
pdb:: edit( & app.db, p.id, f.title.trim ( ) , f.body.trim ( ) , target) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
947
pdb:: add_event( & app.db, p.id, & me.account.username, " edited" , " " ) .await.ok ( ) ;
a1b98695 Andy McCall 1 month ago ↶
948
Ok ( back ( & owner, & name, number, " conversation" , Some ( " Saved." .into ( ) ) , None ) )
de505df5 Andy McCall 1 month ago ↶
949
}
950
951
# [ derive ( Deserialize ) ]
952
pub struct StateForm {
953
#[serde(rename = "_csrf")]
954
csrf_token : String,
955
action : String,
956
}
957
958
pub async fn state (
959
State( app ) : State< Shared> ,
960
viewer : Viewer,
961
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
962
Form( f) : Form< StateForm> ,
a1b98695 Andy McCall 1 month ago ↶
963
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
964
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
965
let me = require ( & viewer, & shell) ? ;
966
csrf ( & viewer, & f.csrf_token, & shell) ? ;
967
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
968
let p = pdb:: get( & app.db, row.id, number)
969
.await
970
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
971
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
972
if Some ( me.account.id) ! = p.author_id & & role < Role:: Triage {
973
return Err ( Error:: not_found( shell) ) ;
974
}
975
let new_state = match ( f.action.as_str ( ) , p.state.as_str ( ) ) {
976
( " close" , " open" | " draft" ) => " closed" ,
977
( " reopen" , " closed" ) => " open" ,
978
( " ready" , " draft" ) => " open" ,
979
( " draft" , " open" ) => " draft" ,
980
_ => return Err ( Error:: bad( shell, " that transition is not possible" ) ) ,
981
} ;
982
pdb:: set_state( & app.db, p.id, new_state, " " ) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
983
pdb:: add_event( & app.db, p.id, & me.account.username, new_state, " " ) .await.ok ( ) ;
b64e2537 Andy McCall 1 month ago ↶
984
crate :: hooks:: emit( & app, & row, & format! ( " proposal.{new_state} " ) , & me.account.username, serde_json:: json! ( { " number" : number } ) ) .await;
a1b98695 Andy McCall 1 month ago ↶
985
Ok ( back ( & owner, & name, number, " conversation" , None , None ) )
de505df5 Andy McCall 1 month ago ↶
986
}
987
988
pub async fn resolve_comment (
989
State( app ) : State< Shared> ,
990
viewer : Viewer,
991
Path( (owner , name , number , id ) ) : Path< ( String, String, i64 , i64 ) > ,
992
Form( f) : Form< super:: session:: CsrfForm> ,
a1b98695 Andy McCall 1 month ago ↶
993
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
994
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
995
require ( & viewer, & shell) ? ;
996
csrf ( & viewer, & f.csrf, & shell) ? ;
997
let ( _ , row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
998
let p = pdb:: get( & app.db, row.id, number)
999
.await
1000
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1001
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1002
let current: Option< bool > = sqlx:: query_scalar( " SELECT resolved FROM proposal_comments WHERE id = ? AND proposal_id = ?" )
1003
.bind ( id)
1004
.bind ( p.id)
1005
.fetch_optional ( & app.db)
1006
.await
1007
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1008
if let Some ( r) = current {
1009
pdb:: set_comment_resolved( & app.db, id, ! r) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1010
}
a1b98695 Andy McCall 1 month ago ↶
1011
Ok ( back ( & owner, & name, number, " files" , None , None ) )
de505df5 Andy McCall 1 month ago ↶
1012
}
1013
1014
1015
1016
pub async fn land (
1017
State( app ) : State< Shared> ,
1018
viewer : Viewer,
1019
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1020
Form( f) : Form< super:: session:: CsrfForm> ,
a1b98695 Andy McCall 1 month ago ↶
1021
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
1022
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1023
let me = require ( & viewer, & shell) ? ;
1024
csrf ( & viewer, & f.csrf, & shell) ? ;
1025
let ( repo, row, _ ) = lookup_role ( & app, & shell, & viewer, & owner, & name, Access:: Write) .await? ;
0b20f1ec Andy McCall 1 month ago ↶
1026
match land_as ( & app, & repo, & row, & me.account, number, " web" ) .await {
a1b98695 Andy McCall 1 month ago ↶
1027
Ok ( _ ) => Ok ( back ( & owner, & name, number, " conversation" , Some ( " Landed." .into ( ) ) , None ) ) ,
1f1eb06a Andy McCall 1 month ago ↶
1028
Err ( Landing:: NotFound) => Err ( Error:: not_found( shell) ) ,
a1b98695 Andy McCall 1 month ago ↶
1029
Err ( Landing:: Refused( m) ) => Ok ( back ( & owner, & name, number, " conversation" , None , Some ( m) ) ) ,
1f1eb06a Andy McCall 1 month ago ↶
1030
}
1031
}
1032
1033
1034
pub enum Landing {
1035
NotFound,
1036
Refused( String ) ,
1037
}
1038
1039
1040
1041
0b20f1ec Andy McCall 1 month ago ↶
1042
1043
1f1eb06a Andy McCall 1 month ago ↶
1044
pub async fn land_as (
1045
app : & Shared,
1046
repo : & RepoName,
1047
row : & db:: repos:: RepoRow,
1048
me : & accounts:: Account,
1049
number : i64 ,
0b20f1ec Andy McCall 1 month ago ↶
1050
via : & str ,
1f1eb06a Andy McCall 1 month ago ↶
1051
) -> Result< String, Landing> {
1052
let ( owner, name) = ( row.owner.clone ( ) , row.name.clone ( ) ) ;
1053
let refused = | e : String| Landing:: Refused( e) ;
1054
let p = pdb:: get( & app.db, row.id, number) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? .ok_or ( Landing:: NotFound) ? ;
1055
let loaded = load ( app, repo, p.clone ( ) ) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
1056
let v = verdict ( app, & loaded, row.id) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
1057
if ! p.is_open ( ) {
1058
return Err ( refused ( format! ( " Cannot land: the proposal is {} " , p.state) ) ) ;
1059
}
1060
if ! v.blockers.is_empty ( ) {
1061
return Err ( refused ( format! ( " Cannot land: {} " , v.blockers.join ( " ; " ) ) ) ) ;
de505df5 Andy McCall 1 month ago ↶
1062
}
1063
let target = p.target.clone ( ) ;
1064
let heads = loaded.heads.clone ( ) ;
14530604 Andy McCall 1 month ago ↶
1065
1066
1067
1068
1f1eb06a Andy McCall 1 month ago ↶
1069
let result = match super :: edit:: signer_for( app, me.id) .await {
1070
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 ↶
1071
Err ( why) => {
1072
app.repos
1f1eb06a Andy McCall 1 month ago ↶
1073
.write ( repo, move | r, _ | {
14530604 Andy McCall 1 month ago ↶
1074
if r.current_policy ( ) ? .is_some ( ) {
1075
return Err ( crate :: repos:: RepoError:: Oxy( oxy_core:: repo:: RepoError:: Msg( format! (
1076
" 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} "
1077
) ) ) ) ;
1078
}
1079
r.bookmark_set ( & target, & heads) ? ;
1080
Ok ( pl:: state_ref( & heads) .to_hex ( ) )
1081
} )
1082
.await
1083
}
1084
} ;
1f1eb06a Andy McCall 1 month ago ↶
1085
let state = result.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
0b20f1ec Andy McCall 1 month ago ↶
1086
pdb:: set_landed( & app.db, p.id, & state, & me.username, via) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
1087
let how = if v.approvals.is_empty ( ) { format! ( " {via} , with no approval" ) } else { via.to_string ( ) } ;
1088
pdb:: add_event( & app.db, p.id, & me.username, " landed" , & how) .await.ok ( ) ;
1f1eb06a Andy McCall 1 month ago ↶
1089
crate :: hooks:: emit(
1090
app,
1091
row,
1092
" proposal.landed" ,
1093
& me.username,
1094
serde_json:: json! ( { " number" : number, " target" : p.target, " state" : state } ) ,
1095
)
1096
.await;
1097
crate :: notify:: deliver(
1098
app,
1099
crate :: notify:: Event {
1100
kind: " proposal.landed" ,
1101
title: format! ( " {owner} /{name} #{number} : {} landed" , p.title) ,
1102
url: format! ( " /{owner} /{name} /proposal/{number} " ) ,
1103
actor: me,
1104
repo_id: row.id,
1105
thread: Some ( ( " proposal" , p.id) ) ,
1106
mention_text: " " ,
1107
direct: p.author_id.into_iter ( ) .collect ( ) ,
1108
} ,
1109
)
1110
.await;
1111
if p.target = = row.default_bookmark {
1112
let messages: Vec< ( String, String) > = loaded.changes.iter ( ) .map ( | c | ( c.hash.clone ( ) , format! ( " {} \n {} " , c.title, c.body) ) ) .collect ( ) ;
1113
super :: issues:: close_from_messages( app, row, & messages) .await;
de505df5 Andy McCall 1 month ago ↶
1114
}
0b20f1ec Andy McCall 1 month ago ↶
1115
accounts:: audit( & app.db, Some ( me) , " proposal.landed" , & format! ( " {owner} /{name} #{number} " ) , & how) .await.ok ( ) ;
1f1eb06a Andy McCall 1 month ago ↶
1116
db:: repos:: record_push(
1117
& app.db,
1118
row.id,
1119
Some ( ( me.id, me.username.as_str ( ) ) ) ,
1120
& [ db:: repos:: PushOutcome {
1121
reference: p.target.clone ( ) ,
1122
ok: true ,
0b20f1ec Andy McCall 1 month ago ↶
1123
reason: format! ( " landed #{number} ({how} )" ) ,
1f1eb06a Andy McCall 1 month ago ↶
1124
old_state: loaded.target_state.clone ( ) ,
1125
new_state: state.clone ( ) ,
1126
heads: loaded.heads.len ( ) as i64 ,
1127
changes: loaded.hashes.len ( ) as i64 ,
1128
} ] ,
1129
)
1130
.await
1131
.ok ( ) ;
1132
Ok ( state)
de505df5 Andy McCall 1 month ago ↶
1133
}
1134
18e381ea Andy McCall 1 month ago ↶
1135
# [ derive ( Deserialize ) ]
1136
pub struct LabelsForm {
1137
#[serde(rename = "_csrf")]
1138
csrf_token : String,
1139
#[serde(default)]
1140
label : Vec< i64 > ,
1141
}
1142
1143
pub async fn set_labels (
1144
State( app ) : State< Shared> ,
1145
viewer : Viewer,
1146
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1147
axum_extra:: extract:: Form( f) : axum_extra:: extract:: Form< LabelsForm> ,
a1b98695 Andy McCall 1 month ago ↶
1148
) -> Result< Response, Error> {
18e381ea Andy McCall 1 month ago ↶
1149
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1150
require ( & viewer, & shell) ? ;
1151
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1152
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1153
if role < Role:: Triage {
1154
return Err ( Error:: not_found( shell) ) ;
1155
}
1156
let p = pdb:: get( & app.db, row.id, number)
1157
.await
1158
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1159
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1160
for l in db:: issues:: labels( & app.db, row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? {
1161
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) ) ? ;
1162
}
a1b98695 Andy McCall 1 month ago ↶
1163
Ok ( back ( & owner, & name, number, " conversation" , None , None ) )
18e381ea Andy McCall 1 month ago ↶
1164
}
1165
b64e2537 Andy McCall 1 month ago ↶
1166
1167
1168
pub async fn events (
1169
State( app ) : State< Shared> ,
1170
viewer : Viewer,
1171
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1172
) -> Result< axum:: response:: Sse< impl futures:: Stream< Item = Result< axum:: response:: sse:: Event, std:: convert:: Infallible> > > , Error> {
1173
use futures:: StreamExt;
1174
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1175
let ( _ , row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1176
let rx = app.events.proposals.subscribe ( ) ;
1177
let repo_id = row.id;
1178
let stream = tokio_stream:: wrappers:: BroadcastStream:: new( rx) .filter_map ( move | item| async move {
1179
match item {
1180
Ok ( ( id, ev) ) if id = = repo_id => {
1181
Some ( Ok ( axum:: response:: sse:: Event:: default( ) .event ( ev.kind.clone ( ) ) .data ( serde_json:: to_string( & ev) .unwrap_or_default ( ) ) ) )
1182
}
1183
_ => None ,
1184
}
1185
} ) ;
1186
Ok ( axum:: response:: Sse:: new( stream) .keep_alive ( axum:: response:: sse:: KeepAlive:: default( ) ) )
1187
}
1188
de505df5 Andy McCall 1 month ago ↶
1189
1190
1191
pub async fn to_api ( app : & Shared, owner : & str , name : & str , loaded : & Loaded, v : & Verdict, source_url : Option< String> ) -> hub_api:: Proposal {
1192
let p = & loaded.row;
1193
hub_api:: Proposal {
1194
number: p.number,
1195
title: p.title.clone ( ) ,
1196
body: p.body.clone ( ) ,
1197
author: p.author.clone ( ) ,
1198
state: ProposalState:: parse( & p.state) .unwrap_or ( ProposalState:: Open) ,
1199
target: p.target.clone ( ) ,
1200
source: match p.source_kind.as_str ( ) {
1201
" fork" => {
1202
let ( o, n) = source_url
1203
.as_deref ( )
1204
.and_then ( | u | u.rsplit_once ( ' /' ) )
1205
.and_then ( | ( b , n ) | b.rsplit_once ( ' /' ) .map ( | ( _, o ) | ( o.to_string ( ) , n.to_string ( ) ) ) )
1206
.unwrap_or_default ( ) ;
1207
ProposalSource:: Fork { owner: o, name: n, bookmark: p.source_bookmark.clone ( ) }
1208
}
1209
" changes" => ProposalSource:: Changes { hashes: p.source_changes ( ) } ,
1210
_ => ProposalSource:: Bookmark { bookmark: p.source_bookmark.clone ( ) } ,
1211
} ,
1212
changes: loaded
1213
.changes
1214
.iter ( )
1215
.map ( | c | hub_api:: ChangeSummary {
1216
hash: c.hash.clone ( ) ,
1217
message: if c.body.is_empty ( ) { c.title.clone ( ) } else { format! ( " {} \n \n {} " , c.title, c.body) } ,
1218
author: hub_api:: Author {
1219
name: c.author.name.clone ( ) ,
1220
email: c.author.email.clone ( ) ,
1221
key: c.author.key.clone ( ) ,
1222
account: c.author.account.clone ( ) ,
760a7dd3 Andy McCall 1 month ago ↶
1223
note: hub_api:: Author:: note_for( & c.author.key, & c.author.account) ,
de505df5 Andy McCall 1 month ago ↶
1224
} ,
1225
when_ms: c.when_ms,
1226
deps: c.deps.clone ( ) ,
1227
head: c.head,
1228
signature: match & c.signature {
1229
view:: SigView:: Unsigned => hub_api:: Signature:: Unsigned,
1230
view:: SigView:: Valid { key, sealed, revoked, .. } => {
1231
hub_api:: Signature:: Valid { key: key.clone ( ) , sealed: * sealed, revoked: * revoked }
1232
}
1233
view:: SigView:: Invalid( why) => hub_api:: Signature:: Invalid { reason: why.clone ( ) } ,
1234
} ,
1235
} )
1236
.collect ( ) ,
1237
projected_heads: loaded.heads.iter ( ) .map ( | h | h.to_hex ( ) ) .collect ( ) ,
1238
projected_state: Some ( loaded.state.clone ( ) ) ,
1239
conflicted: loaded.conflicted,
1240
approvals: v.approvals.clone ( ) ,
1241
landable: p.is_open ( ) & & v.blockers.is_empty ( ) ,
1242
blockers: v.blockers.clone ( ) ,
1243
created_ms: p.created_ms,
1244
updated_ms: p.updated_ms,
1245
url: format! ( " {} /{owner} /{name} /proposal/{} " , app.config.base_url ( ) , p.number) ,
1246
repository_url: format! ( " {} /{owner} /{name} " , app.config.base_url ( ) ) ,
1247
source_url,
0b20f1ec Andy McCall 1 month ago ↶
1248
landed: ( p.state = = " landed" & & p.landed_ms > 0 ) .then ( | | hub_api:: Landed {
1249
by: p.landed_by.clone ( ) ,
1250
via: p.landed_via.clone ( ) ,
1251
when_ms: p.landed_ms,
1252
} ) ,
de505df5 Andy McCall 1 month ago ↶
1253
}
1254
}
1255
1256
1257
pub fn key ( path : & str , line : impl filters:: Num) -> ( String, usize ) {
1258
( path.to_string ( ) , line.as_u64 ( ) as usize )
1259
}
1260
1261
# [ allow ( dead_code ) ]
1262
fn _unused ( _ : & diff:: Line, _ : & ConflictView, _ : & Role) { }