File tree Expand file tree Collapse file tree 4 files changed +10
-8
lines changed
routes/[projectId]/remote/[...name] Expand file tree Collapse file tree 4 files changed +10
-8
lines changed Original file line number Diff line number Diff line change @@ -31,7 +31,7 @@ export class CombinedBranch {
31
31
}
32
32
33
33
get displayName ( ) : string {
34
- return this . pr ?. title || this . remoteBranch ?. displayName || this . vbranch ?. name || 'unknown' ;
34
+ return this . remoteBranch ?. displayName || this . vbranch ?. name || 'unknown' ;
35
35
}
36
36
37
37
get authors ( ) : Author [ ] {
Original file line number Diff line number Diff line change 54
54
<ScrollableContainer wide >
55
55
<div class =" branch-preview" >
56
56
<BranchPreviewHeader base ={$baseBranch } {branch } {pr } />
57
- {#if pr ?. body }
57
+ {#if pr }
58
58
<div class =" card" >
59
- <div class =" card__header text-base-body-14 text-semibold" >PR Description</div >
60
- <div class =" markdown card__content text-base-body-13" >
61
- {@html marked .parse (pr .body , { renderer })}
62
- </div >
59
+ <div class ="card__header text-base-body-14 text-semibold" >{pr .title }</div >
60
+ {#if pr .body }
61
+ <div class =" markdown card__content text-base-body-13" >
62
+ {@html marked .parse (pr .body , { renderer })}
63
+ </div >
64
+ {/if }
63
65
</div >
64
66
{/if }
65
67
{#await getRemoteBranchData (project .id , branch .name ) then branchData }
Original file line number Diff line number Diff line change 11
11
function getBranchLink(b : CombinedBranch ): string | undefined {
12
12
if (b .vbranch ?.active ) return ` /${projectId }/board/ ` ;
13
13
if (b .vbranch ) return ` /${projectId }/stashed/${b .vbranch .id } ` ;
14
- if (b .remoteBranch ) return ` /${projectId }/remote/${branch ?.remoteBranch ?. sha } ` ;
14
+ if (b .remoteBranch ) return ` /${projectId }/remote/${branch ?.displayName } ` ;
15
15
if (b .pr ) return ` /${projectId }/pull/${b .pr .number } ` ;
16
16
}
17
17
Original file line number Diff line number Diff line change 16
16
17
17
$ : ({ error , branches } = data .remoteBranchService );
18
18
19
- $ : branch = $branches ?.find ((b ) => b .sha === $page .params .sha );
19
+ $ : branch = $branches ?.find ((b ) => b .displayName === $page .params .name );
20
20
$ : pr = branch && githubService .getListedPr (branch .sha );
21
21
</script >
22
22
You can’t perform that action at this time.
0 commit comments