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