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 {
553
blockers.push ( " landing would carry conflicts, which this repository refuses" .into ( ) ) ;
554
}
b64e2537 Andy McCall 1 month ago ↶
555
let required = db:: hooks:: required_checks( & app.db, repo_id) .await? ;
556
if ! required.is_empty ( ) {
557
let checks = db:: hooks:: checks_for_state( & app.db, repo_id, & loaded.state) .await? ;
558
let missing: Vec< String> =
559
required.iter ( ) .filter ( | n | ! checks.iter ( ) .any ( | c | & c.name = = * n & & c.status = = " passed" ) ) .cloned ( ) .collect ( ) ;
560
if ! missing.is_empty ( ) {
561
blockers.push ( format! ( " required checks not passed on the projected state: {} " , missing.join ( " , " ) ) ) ;
562
}
563
}
de505df5 Andy McCall 1 month ago ↶
564
let requesting: Vec< & String> = latest.iter ( ) .filter ( | ( _, r ) | r.verdict = = " changes" ) .map ( | ( who , _) | who ) .collect ( ) ;
565
if ! requesting.is_empty ( ) {
566
blockers.push ( format! ( " changes requested by {} " , requesting.iter ( ) .map ( | s | s.as_str ( ) ) .collect:: < Vec< _ > > ( ) .join ( " , " ) ) ) ;
567
}
568
569
let mut depends_on = Vec :: new( ) ;
570
for other in pdb:: list( & app.db, repo_id, & [ " open" , " draft" ] ) .await? {
571
if other.id = = loaded.row.id | | other.number > loaded.row.number {
572
continue ;
573
}
574
let theirs = other.projected_changes ( ) ;
575
if ! theirs.is_empty ( ) & & theirs.iter ( ) .all ( | h | loaded.hashes.iter ( ) .any ( | m | m.to_hex ( ) = = * h ) ) {
576
depends_on.push ( other.number) ;
577
}
578
}
579
if ! depends_on.is_empty ( ) {
580
blockers.push ( format! ( " depends on {} " , depends_on.iter ( ) .map ( | n | format! ( " #{n} " ) ) .collect:: < Vec< _ > > ( ) .join ( " , " ) ) ) ;
581
}
582
Ok ( Verdict { reviews, approvals, blockers, depends_on, requirements } )
583
}
584
585
# [ derive ( Template ) ]
586
# [ template ( path = " proposal.html" ) ]
587
pub struct ProposalPage {
588
shell : Shell,
589
repo : RepoShell,
590
p : pdb:: ProposalRow,
38833ed7 Andy McCall 1 month ago ↶
591
592
closes : Vec< super:: chain:: Link> ,
a1b98695 Andy McCall 1 month ago ↶
593
594
project_choices : Option< Vec< db:: projects:: Project> > ,
595
596
timeline : Vec< Entry> ,
597
598
can_triage : bool ,
de505df5 Andy McCall 1 month ago ↶
599
body_html : String,
600
tab : String,
601
changes : Vec< ChangeView> ,
602
files : Vec< FileRows> ,
9df855f2 Andy McCall 1 month ago ↶
603
diffs : Vec< oxy_core:: repo:: FileDiff> ,
604
bases : std:: collections:: BTreeMap< String, Vec< u8 > > ,
605
606
ignore_ws : bool ,
de505df5 Andy McCall 1 month ago ↶
607
conflicts : Vec< ConflictView> ,
608
conflicted : bool ,
609
comments : Vec< CommentView> ,
610
611
placed : HashMap< ( String, usize ) , Vec< usize > > ,
612
outdated : Vec< usize > ,
613
reviews : Vec< ReviewView> ,
614
approvals : Vec< Approval> ,
615
blockers : Vec< String> ,
616
depends_on : Vec< i64 > ,
617
events : Vec< pdb:: EventRow> ,
618
owners : Vec< String> ,
619
requirements : pdb:: Requirements,
620
landed_already : bool ,
621
can_edit : bool ,
622
can_land : bool ,
623
hub_can_land : bool ,
624
notice : Option< String> ,
625
error : Option< String> ,
626
heads : Vec< String> ,
627
state_hash : String,
628
source_label : String,
629
api_url : String,
18e381ea Andy McCall 1 month ago ↶
630
labels : Vec< db:: issues:: Label> ,
631
all_labels : Vec< db:: issues:: Label> ,
b64e2537 Andy McCall 1 month ago ↶
632
checks : Vec< db:: hooks:: Check> ,
633
required_checks : Vec< String> ,
e1ec9fbf Andy McCall 1 month ago ↶
634
635
projects : Vec< ( db:: projects:: Project, String) > ,
de505df5 Andy McCall 1 month ago ↶
636
}
637
638
# [ derive ( Deserialize ) ]
639
pub struct DetailQuery {
640
tab : Option< String> ,
a1b98695 Andy McCall 1 month ago ↶
641
9df855f2 Andy McCall 1 month ago ↶
642
#[serde(default)]
a1b98695 Andy McCall 1 month ago ↶
643
notice : Option< String> ,
644
#[serde(default)]
645
error : Option< String> ,
646
#[serde(default)]
9df855f2 Andy McCall 1 month ago ↶
647
w : Option< String> ,
de505df5 Andy McCall 1 month ago ↶
648
}
649
650
651
652
# [ allow ( clippy::too_many_arguments ) ]
653
async fn detail (
654
app : & Shared,
655
shell : Shell,
656
viewer : & Viewer,
657
owner : & str ,
658
name : & str ,
659
number : i64 ,
660
tab : String,
661
notice : Option< String> ,
662
error : Option< String> ,
663
) -> Result< Page< ProposalPage> , Error> {
664
let ( repo, row, role) = lookup ( app, & shell, viewer, owner, name) .await? ;
665
let p = pdb:: get( & app.db, row.id, number)
666
.await
667
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
668
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
669
let loaded = load ( app, & repo, p) .await.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
670
671
if loaded.landed_already & & loaded.row.is_open ( ) {
672
pdb:: set_state( & app.db, loaded.row.id, " landed" , & loaded.target_state) .await.ok ( ) ;
673
pdb:: add_event( & app.db, loaded.row.id, " " , " landed" , " every change reached the target" ) .await.ok ( ) ;
674
}
675
let p = pdb:: get( & app.db, row.id, number) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? .unwrap_or ( loaded.row.clone ( ) ) ;
676
let v = verdict ( app, & loaded, row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
677
let comment_rows = pdb:: comments( & app.db, loaded.row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
678
let events = pdb:: events( & app.db, loaded.row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
679
680
let mut by_atom: HashMap< ( String, String, u32 ) , usize > = HashMap:: new( ) ;
681
for ( ( path, line) , ( h, i) ) in & loaded.atoms {
682
by_atom.insert ( ( path.clone ( ) , h.clone ( ) , * i) , * line) ;
683
}
684
let mut comments = Vec :: new( ) ;
685
let mut placed: HashMap< ( String, usize ) , Vec< usize > > = HashMap:: new( ) ;
686
let mut outdated = Vec :: new( ) ;
687
for ( idx, c) in comment_rows.into_iter ( ) .enumerate ( ) {
688
let line = if c.anchor_change.is_empty ( ) {
689
None
690
} else {
691
by_atom.get ( & ( c.path.clone ( ) , c.anchor_change.clone ( ) , c.anchor_index as u32 ) ) .copied ( )
692
} ;
693
if ! c.anchor_change.is_empty ( ) {
694
match line {
695
Some ( l) => placed.entry ( ( c.path.clone ( ) , l) ) .or_default ( ) .push ( idx) ,
696
None => outdated.push ( idx) ,
697
}
698
}
699
comments.push ( CommentView { body_html: render:: markdown:: render( & c.body, " /" , " /" ) , row: c, line } ) ;
700
}
701
let mut changes = loaded.changes.clone ( ) ;
702
super :: attribute( app, & mut changes.iter_mut ( ) .collect:: < Vec< _ > > ( ) ) .await;
703
let me = viewer.account ( ) ;
704
let can_edit = me.is_some_and ( | a | Some ( a.id) = = p.author_id | | role > = Role:: Maintain) ;
705
let can_land = role > = Role:: Write & & p.is_open ( ) & & v.blockers.is_empty ( ) ;
14530604 Andy McCall 1 month ago ↶
706
let delegated = match viewer.account ( ) {
707
Some ( a) => super :: edit:: delegated_identity( app, a.id) .await.is_some ( ) ,
708
None => false ,
709
} ;
710
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 ↶
711
let source_label = match p.source_kind.as_str ( ) {
712
" fork" => format! (
713
" fork {} " ,
714
db:: repos:: get_by_id( & app.db, p.source_repo_id.unwrap_or ( 0 ) )
715
.await
716
.ok ( )
717
.flatten ( )
718
.map ( | r | format! ( " {} :{} " , r.slug ( ) , p.source_bookmark) )
719
.unwrap_or_default ( )
720
) ,
721
" changes" => format! ( " {} changes" , p.source_changes ( ) .len ( ) ) ,
722
_ => p.source_bookmark.clone ( ) ,
723
} ;
e1ec9fbf Andy McCall 1 month ago ↶
724
let projects = super :: projects:: placements_for( app, viewer, & row, p.number) .await;
38833ed7 Andy McCall 1 month ago ↶
725
let texts: Vec< String> = std:: iter:: once( p.body.clone ( ) ) .chain ( changes.iter ( ) .map ( | c | format! ( " {} \n {} " , c.title, c.body) ) ) .collect ( ) ;
726
let closes = super :: chain:: issues_closed_by( app, & row, & texts.iter ( ) .map ( String :: as_str) .collect:: < Vec< _ > > ( ) ) .await;
a1b98695 Andy McCall 1 month ago ↶
727
let project_choices = super :: projects:: project_choices( app, viewer, & row, & projects) .await;
728
let mut dated: Vec< ( i64 , Entry) > = Vec :: new( ) ;
729
for ( index, c) in comments.iter ( ) .enumerate ( ) {
730
if c.row.anchor_change.is_empty ( ) {
731
dated.push ( ( c.row.created_ms, Entry { kind: " comment" , index } ) ) ;
732
}
733
}
734
for ( index, r) in v.reviews.iter ( ) .enumerate ( ) {
735
dated.push ( ( r.row.created_ms, Entry { kind: " review" , index } ) ) ;
736
}
737
for ( index, e) in events.iter ( ) .enumerate ( ) {
738
dated.push ( ( e.at_ms, Entry { kind: " event" , index } ) ) ;
739
}
740
dated.sort_by_key ( | ( at , _) | * at) ;
741
let timeline: Vec< Entry> = dated.into_iter ( ) .map ( | ( _, e ) | e ) .collect ( ) ;
de505df5 Andy McCall 1 month ago ↶
742
Ok ( Page( ProposalPage {
a1b98695 Andy McCall 1 month ago ↶
743
can_triage: role > = Role:: Triage,
744
timeline,
38833ed7 Andy McCall 1 month ago ↶
745
closes,
a1b98695 Andy McCall 1 month ago ↶
746
project_choices,
e1ec9fbf Andy McCall 1 month ago ↶
747
projects,
de505df5 Andy McCall 1 month ago ↶
748
shell,
749
repo: RepoShell:: new( app, & row, " proposals" ) .with_role ( role) ,
c79a1111 Andy McCall 1 month ago ↶
750
body_html: super :: issues:: markdown( app, & row, & row.default_bookmark, & p.body) .await,
de505df5 Andy McCall 1 month ago ↶
751
p,
752
tab,
753
changes,
754
files: loaded.files,
9df855f2 Andy McCall 1 month ago ↶
755
diffs: loaded.diffs,
756
bases: loaded.bases,
757
ignore_ws: false ,
de505df5 Andy McCall 1 month ago ↶
758
conflicts: loaded.conflicts,
759
conflicted: loaded.conflicted,
760
comments,
761
placed,
762
outdated,
763
reviews: v.reviews,
764
approvals: v.approvals,
765
blockers: v.blockers,
766
depends_on: v.depends_on,
767
events,
768
owners: loaded.owners,
769
requirements: v.requirements,
770
landed_already: loaded.landed_already,
771
can_edit,
772
can_land,
773
hub_can_land,
774
notice,
775
error,
776
heads: loaded.heads.iter ( ) .map ( | h | h.to_hex ( ) ) .collect ( ) ,
b64e2537 Andy McCall 1 month ago ↶
777
state_hash: loaded.state.clone ( ) ,
de505df5 Andy McCall 1 month ago ↶
778
source_label,
779
api_url: format! ( " {} /api/v1/repos/{owner} /{name} /proposals/{number} " , app.config.base_url ( ) ) ,
18e381ea Andy McCall 1 month ago ↶
780
labels: db:: issues:: proposal_labels( & app.db, loaded.row.id) .await.unwrap_or_default ( ) ,
781
all_labels: db:: issues:: labels( & app.db, row.id) .await.unwrap_or_default ( ) ,
b64e2537 Andy McCall 1 month ago ↶
782
checks: db:: hooks:: checks_for_state( & app.db, row.id, & loaded.state) .await.unwrap_or_default ( ) ,
783
required_checks: db:: hooks:: required_checks( & app.db, row.id) .await.unwrap_or_default ( ) ,
de505df5 Andy McCall 1 month ago ↶
784
} ) )
785
}
786
a1b98695 Andy McCall 1 month ago ↶
787
788
789
fn back ( owner : & str , name : & str , number : i64 , tab : & str , notice : Option< String> , error : Option< String> ) -> Response {
790
let mut url = format! ( " /{owner} /{name} /proposal/{number} ?tab={tab} " ) ;
791
if let Some ( n) = notice {
792
url.push_str ( & format! ( " ¬ice={} " , super :: settings:: urlencode( & n) ) ) ;
793
}
794
if let Some ( e) = error {
795
url.push_str ( & format! ( " &error={} " , super :: settings:: urlencode( & e) ) ) ;
796
}
797
Redirect:: to( & url) .into_response ( )
798
}
799
de505df5 Andy McCall 1 month ago ↶
800
pub async fn show (
801
State( app ) : State< Shared> ,
802
viewer : Viewer,
803
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
804
Query( q) : Query< DetailQuery> ,
805
) -> Result< Page< ProposalPage> , Error> {
806
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
a1b98695 Andy McCall 1 month ago ↶
807
let mut page =
808
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 ↶
809
if q.w.as_deref ( ) = = Some ( " 1" ) {
810
811
page.0. files =
812
super :: history:: render_files_with( & page.0. diffs, & page.0. bases, crate :: render:: diff:: Options { ignore_whitespace: true } ) ;
813
page.0. ignore_ws = true ;
814
}
815
Ok ( page)
de505df5 Andy McCall 1 month ago ↶
816
}
817
818
819
820
# [ derive ( Deserialize ) ]
821
pub struct CommentForm {
822
#[serde(rename = "_csrf")]
823
csrf_token : String,
824
body : String,
825
#[serde(default)]
826
path : String,
827
#[serde(default)]
828
line : Option< usize > ,
829
}
830
831
pub async fn comment (
832
State( app ) : State< Shared> ,
833
viewer : Viewer,
834
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
835
Form( f) : Form< CommentForm> ,
a1b98695 Andy McCall 1 month ago ↶
836
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
837
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
838
let me = require ( & viewer, & shell) ? ;
839
csrf ( & viewer, & f.csrf_token, & shell) ? ;
840
let ( repo, row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
841
let p = pdb:: get( & app.db, row.id, number)
842
.await
843
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
844
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
845
if f.body.trim ( ) .is_empty ( ) {
a1b98695 Andy McCall 1 month ago ↶
846
return Ok ( back ( & owner, & name, number, " conversation" , None , Some ( " An empty comment says nothing." .into ( ) ) ) ) ;
de505df5 Andy McCall 1 month ago ↶
847
}
848
let anchor = match ( f.path.trim ( ) , f.line) {
849
( " " , _ ) | ( _ , None ) => None ,
850
( path, Some ( line) ) => {
851
let loaded = load ( & app, & repo, p.clone ( ) ) .await.map_err ( | e | Error:: from_repo( shell.clone ( ) , e) ) ? ;
852
loaded.atoms.get ( & ( path.to_string ( ) , line) ) .cloned ( )
853
}
854
} ;
855
let tab = if anchor.is_some ( ) { " files" } else { " conversation" } ;
856
pdb:: add_comment(
857
& app.db,
858
p.id,
859
Some ( me.account.id) ,
860
& me.account.username,
861
f.body.trim ( ) ,
862
f.path.trim ( ) ,
863
anchor.as_ref ( ) .map ( | ( h , i ) | ( h.as_str ( ) , * i as i64 ) ) ,
864
)
865
.await
866
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
a1b98695 Andy McCall 1 month ago ↶
867
Ok ( back ( & owner, & name, number, tab, None , None ) )
de505df5 Andy McCall 1 month ago ↶
868
}
869
870
# [ derive ( Deserialize ) ]
871
pub struct ReviewForm {
872
#[serde(rename = "_csrf")]
873
csrf_token : String,
874
verdict : String,
875
#[serde(default)]
876
body : String,
877
}
878
879
pub async fn review (
880
State( app ) : State< Shared> ,
881
viewer : Viewer,
882
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
883
Form( f) : Form< ReviewForm> ,
a1b98695 Andy McCall 1 month ago ↶
884
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
885
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
886
let me = require ( & viewer, & shell) ? ;
887
csrf ( & viewer, & f.csrf_token, & shell) ? ;
888
let ( _ , row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
889
let p = pdb:: get( & app.db, row.id, number)
890
.await
891
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
892
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
893
if ! matches! ( f.verdict.as_str ( ) , " comment" | " changes" | " approve" ) {
894
return Err ( Error:: bad( shell, " a review is comment, changes or approve" ) ) ;
895
}
896
if f.verdict = = " approve" & & Some ( me.account.id) = = p.author_id {
a1b98695 Andy McCall 1 month ago ↶
897
return Ok ( back ( & owner, & name, number, " conversation" , None , Some ( " You cannot approve your own proposal." .into ( ) ) ) ) ;
de505df5 Andy McCall 1 month ago ↶
898
}
899
pdb:: add_review( & app.db, p.id, me.account.id, & me.account.username, & f.verdict, f.body.trim ( ) )
900
.await
901
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
902
pdb:: add_event( & app.db, p.id, & me.account.username, & format! ( " review.{} " , f.verdict) , " " ) .await.ok ( ) ;
b64e2537 Andy McCall 1 month ago ↶
903
crate :: hooks:: emit( & app, & row, " review" , & me.account.username, serde_json:: json! ( { " number" : number, " verdict" : f.verdict } ) ) .await;
de505df5 Andy McCall 1 month ago ↶
904
let notice = if f.verdict = = " approve" {
905
Some ( format! (
906
" Approval recorded. It counts once you seal the changes: oxy seal --proposal {} /{owner} /{name} /proposal/{number} " ,
907
app.config.base_url ( )
908
) )
909
} else {
910
None
911
} ;
a1b98695 Andy McCall 1 month ago ↶
912
Ok ( back ( & owner, & name, number, " conversation" , notice, None ) )
de505df5 Andy McCall 1 month ago ↶
913
}
914
915
# [ derive ( Deserialize ) ]
916
pub struct EditForm {
917
#[serde(rename = "_csrf")]
918
csrf_token : String,
919
title : String,
920
#[serde(default)]
921
body : String,
922
target : String,
923
}
924
925
pub async fn edit (
926
State( app ) : State< Shared> ,
927
viewer : Viewer,
928
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
929
Form( f) : Form< EditForm> ,
a1b98695 Andy McCall 1 month ago ↶
930
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
931
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
932
let me = require ( & viewer, & shell) ? ;
933
csrf ( & viewer, & f.csrf_token, & shell) ? ;
934
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
935
let p = pdb:: get( & app.db, row.id, number)
936
.await
937
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
938
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
939
if Some ( me.account.id) ! = p.author_id & & role < Role:: Maintain {
940
return Err ( Error:: not_found( shell) ) ;
941
}
942
let target = if crate :: repos:: names:: valid_segment( f.target.trim ( ) ) { f.target.trim ( ) } else { & p.target } ;
943
pdb:: edit( & app.db, p.id, f.title.trim ( ) , f.body.trim ( ) , target) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
944
pdb:: add_event( & app.db, p.id, & me.account.username, " edited" , " " ) .await.ok ( ) ;
a1b98695 Andy McCall 1 month ago ↶
945
Ok ( back ( & owner, & name, number, " conversation" , Some ( " Saved." .into ( ) ) , None ) )
de505df5 Andy McCall 1 month ago ↶
946
}
947
948
# [ derive ( Deserialize ) ]
949
pub struct StateForm {
950
#[serde(rename = "_csrf")]
951
csrf_token : String,
952
action : String,
953
}
954
955
pub async fn state (
956
State( app ) : State< Shared> ,
957
viewer : Viewer,
958
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
959
Form( f) : Form< StateForm> ,
a1b98695 Andy McCall 1 month ago ↶
960
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
961
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
962
let me = require ( & viewer, & shell) ? ;
963
csrf ( & viewer, & f.csrf_token, & shell) ? ;
964
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
965
let p = pdb:: get( & app.db, row.id, number)
966
.await
967
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
968
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
969
if Some ( me.account.id) ! = p.author_id & & role < Role:: Triage {
970
return Err ( Error:: not_found( shell) ) ;
971
}
972
let new_state = match ( f.action.as_str ( ) , p.state.as_str ( ) ) {
973
( " close" , " open" | " draft" ) => " closed" ,
974
( " reopen" , " closed" ) => " open" ,
975
( " ready" , " draft" ) => " open" ,
976
( " draft" , " open" ) => " draft" ,
977
_ => return Err ( Error:: bad( shell, " that transition is not possible" ) ) ,
978
} ;
979
pdb:: set_state( & app.db, p.id, new_state, " " ) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
980
pdb:: add_event( & app.db, p.id, & me.account.username, new_state, " " ) .await.ok ( ) ;
b64e2537 Andy McCall 1 month ago ↶
981
crate :: hooks:: emit( & app, & row, & format! ( " proposal.{new_state} " ) , & me.account.username, serde_json:: json! ( { " number" : number } ) ) .await;
a1b98695 Andy McCall 1 month ago ↶
982
Ok ( back ( & owner, & name, number, " conversation" , None , None ) )
de505df5 Andy McCall 1 month ago ↶
983
}
984
985
pub async fn resolve_comment (
986
State( app ) : State< Shared> ,
987
viewer : Viewer,
988
Path( (owner , name , number , id ) ) : Path< ( String, String, i64 , i64 ) > ,
989
Form( f) : Form< super:: session:: CsrfForm> ,
a1b98695 Andy McCall 1 month ago ↶
990
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
991
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
992
require ( & viewer, & shell) ? ;
993
csrf ( & viewer, & f.csrf, & shell) ? ;
994
let ( _ , row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
995
let p = pdb:: get( & app.db, row.id, number)
996
.await
997
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
998
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
999
let current: Option< bool > = sqlx:: query_scalar( " SELECT resolved FROM proposal_comments WHERE id = ? AND proposal_id = ?" )
1000
.bind ( id)
1001
.bind ( p.id)
1002
.fetch_optional ( & app.db)
1003
.await
1004
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1005
if let Some ( r) = current {
1006
pdb:: set_comment_resolved( & app.db, id, ! r) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? ;
1007
}
a1b98695 Andy McCall 1 month ago ↶
1008
Ok ( back ( & owner, & name, number, " files" , None , None ) )
de505df5 Andy McCall 1 month ago ↶
1009
}
1010
1011
1012
1013
pub async fn land (
1014
State( app ) : State< Shared> ,
1015
viewer : Viewer,
1016
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1017
Form( f) : Form< super:: session:: CsrfForm> ,
a1b98695 Andy McCall 1 month ago ↶
1018
) -> Result< Response, Error> {
de505df5 Andy McCall 1 month ago ↶
1019
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1020
let me = require ( & viewer, & shell) ? ;
1021
csrf ( & viewer, & f.csrf, & shell) ? ;
1022
let ( repo, row, _ ) = lookup_role ( & app, & shell, & viewer, & owner, & name, Access:: Write) .await? ;
0b20f1ec Andy McCall 1 month ago ↶
1023
match land_as ( & app, & repo, & row, & me.account, number, " web" ) .await {
a1b98695 Andy McCall 1 month ago ↶
1024
Ok ( _ ) => Ok ( back ( & owner, & name, number, " conversation" , Some ( " Landed." .into ( ) ) , None ) ) ,
1f1eb06a Andy McCall 1 month ago ↶
1025
Err ( Landing:: NotFound) => Err ( Error:: not_found( shell) ) ,
a1b98695 Andy McCall 1 month ago ↶
1026
Err ( Landing:: Refused( m) ) => Ok ( back ( & owner, & name, number, " conversation" , None , Some ( m) ) ) ,
1f1eb06a Andy McCall 1 month ago ↶
1027
}
1028
}
1029
1030
1031
pub enum Landing {
1032
NotFound,
1033
Refused( String ) ,
1034
}
1035
1036
1037
1038
0b20f1ec Andy McCall 1 month ago ↶
1039
1040
1f1eb06a Andy McCall 1 month ago ↶
1041
pub async fn land_as (
1042
app : & Shared,
1043
repo : & RepoName,
1044
row : & db:: repos:: RepoRow,
1045
me : & accounts:: Account,
1046
number : i64 ,
0b20f1ec Andy McCall 1 month ago ↶
1047
via : & str ,
1f1eb06a Andy McCall 1 month ago ↶
1048
) -> Result< String, Landing> {
1049
let ( owner, name) = ( row.owner.clone ( ) , row.name.clone ( ) ) ;
1050
let refused = | e : String| Landing:: Refused( e) ;
1051
let p = pdb:: get( & app.db, row.id, number) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? .ok_or ( Landing:: NotFound) ? ;
1052
let loaded = load ( app, repo, p.clone ( ) ) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
1053
let v = verdict ( app, & loaded, row.id) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
1054
if ! p.is_open ( ) {
1055
return Err ( refused ( format! ( " Cannot land: the proposal is {} " , p.state) ) ) ;
1056
}
1057
if ! v.blockers.is_empty ( ) {
1058
return Err ( refused ( format! ( " Cannot land: {} " , v.blockers.join ( " ; " ) ) ) ) ;
de505df5 Andy McCall 1 month ago ↶
1059
}
1060
let target = p.target.clone ( ) ;
1061
let heads = loaded.heads.clone ( ) ;
14530604 Andy McCall 1 month ago ↶
1062
1063
1064
1065
1f1eb06a Andy McCall 1 month ago ↶
1066
let result = match super :: edit:: signer_for( app, me.id) .await {
1067
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 ↶
1068
Err ( why) => {
1069
app.repos
1f1eb06a Andy McCall 1 month ago ↶
1070
.write ( repo, move | r, _ | {
14530604 Andy McCall 1 month ago ↶
1071
if r.current_policy ( ) ? .is_some ( ) {
1072
return Err ( crate :: repos:: RepoError:: Oxy( oxy_core:: repo:: RepoError:: Msg( format! (
1073
" 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} "
1074
) ) ) ) ;
1075
}
1076
r.bookmark_set ( & target, & heads) ? ;
1077
Ok ( pl:: state_ref( & heads) .to_hex ( ) )
1078
} )
1079
.await
1080
}
1081
} ;
1f1eb06a Andy McCall 1 month ago ↶
1082
let state = result.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
0b20f1ec Andy McCall 1 month ago ↶
1083
pdb:: set_landed( & app.db, p.id, & state, & me.username, via) .await.map_err ( | e | refused ( e.to_string ( ) ) ) ? ;
1084
let how = if v.approvals.is_empty ( ) { format! ( " {via} , with no approval" ) } else { via.to_string ( ) } ;
1085
pdb:: add_event( & app.db, p.id, & me.username, " landed" , & how) .await.ok ( ) ;
1f1eb06a Andy McCall 1 month ago ↶
1086
crate :: hooks:: emit(
1087
app,
1088
row,
1089
" proposal.landed" ,
1090
& me.username,
1091
serde_json:: json! ( { " number" : number, " target" : p.target, " state" : state } ) ,
1092
)
1093
.await;
1094
crate :: notify:: deliver(
1095
app,
1096
crate :: notify:: Event {
1097
kind: " proposal.landed" ,
1098
title: format! ( " {owner} /{name} #{number} : {} landed" , p.title) ,
1099
url: format! ( " /{owner} /{name} /proposal/{number} " ) ,
1100
actor: me,
1101
repo_id: row.id,
1102
thread: Some ( ( " proposal" , p.id) ) ,
1103
mention_text: " " ,
1104
direct: p.author_id.into_iter ( ) .collect ( ) ,
1105
} ,
1106
)
1107
.await;
1108
if p.target = = row.default_bookmark {
1109
let messages: Vec< ( String, String) > = loaded.changes.iter ( ) .map ( | c | ( c.hash.clone ( ) , format! ( " {} \n {} " , c.title, c.body) ) ) .collect ( ) ;
1110
super :: issues:: close_from_messages( app, row, & messages) .await;
de505df5 Andy McCall 1 month ago ↶
1111
}
0b20f1ec Andy McCall 1 month ago ↶
1112
accounts:: audit( & app.db, Some ( me) , " proposal.landed" , & format! ( " {owner} /{name} #{number} " ) , & how) .await.ok ( ) ;
1f1eb06a Andy McCall 1 month ago ↶
1113
db:: repos:: record_push(
1114
& app.db,
1115
row.id,
1116
Some ( ( me.id, me.username.as_str ( ) ) ) ,
1117
& [ db:: repos:: PushOutcome {
1118
reference: p.target.clone ( ) ,
1119
ok: true ,
0b20f1ec Andy McCall 1 month ago ↶
1120
reason: format! ( " landed #{number} ({how} )" ) ,
1f1eb06a Andy McCall 1 month ago ↶
1121
old_state: loaded.target_state.clone ( ) ,
1122
new_state: state.clone ( ) ,
1123
heads: loaded.heads.len ( ) as i64 ,
1124
changes: loaded.hashes.len ( ) as i64 ,
1125
} ] ,
1126
)
1127
.await
1128
.ok ( ) ;
1129
Ok ( state)
de505df5 Andy McCall 1 month ago ↶
1130
}
1131
18e381ea Andy McCall 1 month ago ↶
1132
# [ derive ( Deserialize ) ]
1133
pub struct LabelsForm {
1134
#[serde(rename = "_csrf")]
1135
csrf_token : String,
1136
#[serde(default)]
1137
label : Vec< i64 > ,
1138
}
1139
1140
pub async fn set_labels (
1141
State( app ) : State< Shared> ,
1142
viewer : Viewer,
1143
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1144
axum_extra:: extract:: Form( f) : axum_extra:: extract:: Form< LabelsForm> ,
a1b98695 Andy McCall 1 month ago ↶
1145
) -> Result< Response, Error> {
18e381ea Andy McCall 1 month ago ↶
1146
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1147
require ( & viewer, & shell) ? ;
1148
csrf ( & viewer, & f.csrf_token, & shell) ? ;
1149
let ( _ , row, role) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1150
if role < Role:: Triage {
1151
return Err ( Error:: not_found( shell) ) ;
1152
}
1153
let p = pdb:: get( & app.db, row.id, number)
1154
.await
1155
.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ?
1156
.ok_or_else ( | | Error:: not_found( shell.clone ( ) ) ) ? ;
1157
for l in db:: issues:: labels( & app.db, row.id) .await.map_err ( | e | Error:: from_db( shell.clone ( ) , e) ) ? {
1158
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) ) ? ;
1159
}
a1b98695 Andy McCall 1 month ago ↶
1160
Ok ( back ( & owner, & name, number, " conversation" , None , None ) )
18e381ea Andy McCall 1 month ago ↶
1161
}
1162
b64e2537 Andy McCall 1 month ago ↶
1163
1164
1165
pub async fn events (
1166
State( app ) : State< Shared> ,
1167
viewer : Viewer,
1168
Path( (owner , name , number ) ) : Path< ( String, String, i64 ) > ,
1169
) -> Result< axum:: response:: Sse< impl futures:: Stream< Item = Result< axum:: response:: sse:: Event, std:: convert:: Infallible> > > , Error> {
1170
use futures:: StreamExt;
1171
let shell = Shell:: new( & app, & format! ( " /{owner} /{name} /proposal/{number} " ) , & viewer) ;
1172
let ( _ , row, _ ) = lookup ( & app, & shell, & viewer, & owner, & name) .await? ;
1173
let rx = app.events.proposals.subscribe ( ) ;
1174
let repo_id = row.id;
1175
let stream = tokio_stream:: wrappers:: BroadcastStream:: new( rx) .filter_map ( move | item| async move {
1176
match item {
1177
Ok ( ( id, ev) ) if id = = repo_id => {
1178
Some ( Ok ( axum:: response:: sse:: Event:: default( ) .event ( ev.kind.clone ( ) ) .data ( serde_json:: to_string( & ev) .unwrap_or_default ( ) ) ) )
1179
}
1180
_ => None ,
1181
}
1182
} ) ;
1183
Ok ( axum:: response:: Sse:: new( stream) .keep_alive ( axum:: response:: sse:: KeepAlive:: default( ) ) )
1184
}
1185
de505df5 Andy McCall 1 month ago ↶
1186
1187
1188
pub async fn to_api ( app : & Shared, owner : & str , name : & str , loaded : & Loaded, v : & Verdict, source_url : Option< String> ) -> hub_api:: Proposal {
1189
let p = & loaded.row;
1190
hub_api:: Proposal {
1191
number: p.number,
1192
title: p.title.clone ( ) ,
1193
body: p.body.clone ( ) ,
1194
author: p.author.clone ( ) ,
1195
state: ProposalState:: parse( & p.state) .unwrap_or ( ProposalState:: Open) ,
1196
target: p.target.clone ( ) ,
1197
source: match p.source_kind.as_str ( ) {
1198
" fork" => {
1199
let ( o, n) = source_url
1200
.as_deref ( )
1201
.and_then ( | u | u.rsplit_once ( ' /' ) )
1202
.and_then ( | ( b , n ) | b.rsplit_once ( ' /' ) .map ( | ( _, o ) | ( o.to_string ( ) , n.to_string ( ) ) ) )
1203
.unwrap_or_default ( ) ;
1204
ProposalSource:: Fork { owner: o, name: n, bookmark: p.source_bookmark.clone ( ) }
1205
}
1206
" changes" => ProposalSource:: Changes { hashes: p.source_changes ( ) } ,
1207
_ => ProposalSource:: Bookmark { bookmark: p.source_bookmark.clone ( ) } ,
1208
} ,
1209
changes: loaded
1210
.changes
1211
.iter ( )
1212
.map ( | c | hub_api:: ChangeSummary {
1213
hash: c.hash.clone ( ) ,
1214
message: if c.body.is_empty ( ) { c.title.clone ( ) } else { format! ( " {} \n \n {} " , c.title, c.body) } ,
1215
author: hub_api:: Author {
1216
name: c.author.name.clone ( ) ,
1217
email: c.author.email.clone ( ) ,
1218
key: c.author.key.clone ( ) ,
1219
account: c.author.account.clone ( ) ,
760a7dd3 Andy McCall 1 month ago ↶
1220
note: hub_api:: Author:: note_for( & c.author.key, & c.author.account) ,
de505df5 Andy McCall 1 month ago ↶
1221
} ,
1222
when_ms: c.when_ms,
1223
deps: c.deps.clone ( ) ,
1224
head: c.head,
1225
signature: match & c.signature {
1226
view:: SigView:: Unsigned => hub_api:: Signature:: Unsigned,
1227
view:: SigView:: Valid { key, sealed, revoked, .. } => {
1228
hub_api:: Signature:: Valid { key: key.clone ( ) , sealed: * sealed, revoked: * revoked }
1229
}
1230
view:: SigView:: Invalid( why) => hub_api:: Signature:: Invalid { reason: why.clone ( ) } ,
1231
} ,
1232
} )
1233
.collect ( ) ,
1234
projected_heads: loaded.heads.iter ( ) .map ( | h | h.to_hex ( ) ) .collect ( ) ,
1235
projected_state: Some ( loaded.state.clone ( ) ) ,
1236
conflicted: loaded.conflicted,
1237
approvals: v.approvals.clone ( ) ,
1238
landable: p.is_open ( ) & & v.blockers.is_empty ( ) ,
1239
blockers: v.blockers.clone ( ) ,
1240
created_ms: p.created_ms,
1241
updated_ms: p.updated_ms,
1242
url: format! ( " {} /{owner} /{name} /proposal/{} " , app.config.base_url ( ) , p.number) ,
1243
repository_url: format! ( " {} /{owner} /{name} " , app.config.base_url ( ) ) ,
1244
source_url,
0b20f1ec Andy McCall 1 month ago ↶
1245
landed: ( p.state = = " landed" & & p.landed_ms > 0 ) .then ( | | hub_api:: Landed {
1246
by: p.landed_by.clone ( ) ,
1247
via: p.landed_via.clone ( ) ,
1248
when_ms: p.landed_ms,
1249
} ) ,
de505df5 Andy McCall 1 month ago ↶
1250
}
1251
}
1252
1253
1254
pub fn key ( path : & str , line : impl filters:: Num) -> ( String, usize ) {
1255
( path.to_string ( ) , line.as_u64 ( ) as usize )
1256
}
1257
1258
# [ allow ( dead_code ) ]
1259
fn _unused ( _ : & diff:: Line, _ : & ConflictView, _ : & Role) { }