Commite0a32e0

authored

fix(site): do not render invalid task status URI, fix GitHub new links (#20858)

1 parent2a9afc7 commite0a32e0Copy full SHA for e0a32e0

File tree

+37

-6

lines changed

+37

-6

lines changed

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,12 @@ const meta: Meta<typeof TaskStatusLink> = {`
`17`	`17`	`exportdefaultmeta;`
`18`	`18`	`typeStory=StoryObj<typeofTaskStatusLink>;`
`19`	`19`
	`20`	`+exportconstGitHubNewPR:Story={`
	`21`	`+args:{`
	`22`	`+uri:"https://github.com/coder/coder/pull/new/fix-deleted-template-button",`
	`23`	`+},`
	`24`	`+};`
	`25`	`+`
`20`	`26`	`exportconstGithubPRNumber:Story={`
`21`	`27`	`args:{`
`22`	`28`	`uri:"https://github.com/org/repo/pull/1234",`
`@@ -29,6 +35,12 @@ export const GitHubPRNoNumber: Story = {`
`29`	`35`	`},`
`30`	`36`	`};`
`31`	`37`
	`38`	`+exportconstGitHubNewIssue:Story={`
	`39`	`+args:{`
	`40`	`+uri:"https://github.com/coder/coder/issues/new?template=BLANK_ISSUE",`
	`41`	`+},`
	`42`	`+};`
	`43`	`+`
`32`	`44`	`exportconstGithubIssueNumber:Story={`
`33`	`45`	`args:{`
`34`	`46`	`uri:"https://github.com/org/repo/issues/4321",`
`@@ -70,3 +82,15 @@ export const Long: Story = {`
`70`	`82`	`uri:"https://dev.coder.com/this-is-a/long-url/to-test/how-the-truncation/looks",`
`71`	`83`	`},`
`72`	`84`	`};`
	`85`	`+`
	`86`	`+exportconstInvalidPathNotRendered:Story={`
	`87`	`+args:{`
	`88`	`+uri:"/path/to/foo",`
	`89`	`+},`
	`90`	`+};`
	`91`	`+`
	`92`	`+exportconstInvalidRelativePathNotRendered:Story={`
	`93`	`+args:{`
	`94`	`+uri:"path/to/foo",`
	`95`	`+},`
	`96`	`+};`

Lines changed: 13 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,15 +30,21 @@ export const TaskStatusLink: FC<TaskStatusLinkProps> = ({ uri }) => {`
`30`	`30`	`switch(type){`
`31`	`31`	`case"pull":`
`32`	`32`	`icon=<GitPullRequestArrowIcon/>;`
`33`		`-label=number`
`34`		-?`${org}/${repo}#${number}`
`35`		-:`${org}/${repo} pull request`;
	`33`	`+label=`
	`34`	`+number==="new"`
	`35`	+?`${org}/${repo} open pull request`
	`36`	`+:number`
	`37`	+?`${org}/${repo}#${number}`
	`38`	+:`${org}/${repo} pull request`;
`36`	`39`	`break;`
`37`	`40`	`case"issues":`
`38`	`41`	`icon=<BugIcon/>;`
`39`		`-label=number`
`40`		-?`${org}/${repo}#${number}`
`41`		-:`${org}/${repo} issue`;
	`42`	`+label=`
	`43`	`+number==="new"`
	`44`	+?`${org}/${repo} create new issue`
	`45`	`+:number`
	`46`	+?`${org}/${repo}#${number}`
	`47`	+:`${org}/${repo} issue`;
`42`	`48`	`break;`
`43`	`49`	`default:`
`44`	`50`	`icon=<ExternalImagesrc="/icon/github.svg"/>;`
`@@ -52,6 +58,7 @@ export const TaskStatusLink: FC<TaskStatusLinkProps> = ({ uri }) => {`
`52`	`58`	`}`
`53`	`59`	`}catch(_error){`
`54`	`60`	`// Invalid URL, probably.`
	`61`	`+returnnull;`
`55`	`62`	`}`
`56`	`63`
`57`	`64`	`return(`

Comments

(0)