Commit2a46702

authored

fix: Syntax highlighting with long lines and untar content with emojis (#5098)

1 parent44d3225 commit2a46702Copy full SHA for 2a46702

File tree

+20

-23

lines changed

+20

-23

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`declare module"js-untar"{`
`2`	`2`	`interfaceFile{`
`3`	`3`	`name:string`
`4`		`-readAsString:()=>string`
	`4`	`+blob:Blob`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`constUntar:(buffer:ArrayBuffer)=>{`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,9 @@ const useStyles = makeStyles((theme) => ({`
`30`	`30`	`background:theme.palette.background.paperLight,`
`31`	`31`	`borderRadius:theme.shape.borderRadius,`
`32`	`32`	`padding:theme.spacing(2,3),`
	`33`	`+// Line breaks are broken when used with line numbers on react-syntax-highlighter`
	`34`	`+// https://github.com/react-syntax-highlighter/react-syntax-highlighter/pull/483`
	`35`	`+overflowX:"auto",`
`33`	`36`
`34`	`37`	`"& code":{`
`35`	`38`	`color:theme.palette.text.secondary,`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,9 @@ const TEMPLATE_NAME = "coder-ts"`
`12`	`12`	`constVERSION_NAME="12345"`
`13`	`13`	`constTERRAFORM_FILENAME="main.tf"`
`14`	`14`	`constREADME_FILENAME="readme.md"`
`15`		`-constGPG_FILENAME="key.gpg"`
`16`	`15`	`constTEMPLATE_VERSION_FILES={`
`17`	`16`	`[TERRAFORM_FILENAME]:"{}",`
`18`	`17`	`[README_FILENAME]:"Readme",`
`19`		`-[GPG_FILENAME]:"Some sensitive info",`
`20`	`18`	`}`
`21`	`19`
`22`	`20`	`constsetup=async()=>{`
`@@ -38,10 +36,9 @@ const setup = async () => {`
`38`	`36`	`describe("TemplateVersionPage",()=>{`
`39`	`37`	`beforeEach(setup)`
`40`	`38`
`41`		`-it("showsthe tf and mdfiles only",()=>{`
	`39`	`+it("shows files",()=>{`
`42`	`40`	`expect(screen.queryByText(TERRAFORM_FILENAME)).toBeInTheDocument()`
`43`	`41`	`expect(screen.queryByText(README_FILENAME)).toBeInTheDocument()`
`44`		`-expect(screen.queryByText(GPG_FILENAME)).not.toBeInTheDocument()`
`45`	`42`	`})`
`46`	`43`
`47`	`44`	`it("shows the right content when click on the file name",async()=>{`

Lines changed: 14 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,26 +9,27 @@ export type TemplateVersionFiles = Record<string, string>`
`9`	`9`
`10`	`10`	`exportconstgetTemplateVersionFiles=async(`
`11`	`11`	`version:TemplateVersion,`
	`12`	`+allowedExtensions:string[],`
`12`	`13`	`):Promise<TemplateVersionFiles>=>{`
`13`	`14`	`constfiles:TemplateVersionFiles={}`
`14`	`15`	`consttarFile=awaitgetFile(version.job.file_id)`
	`16`	`+constblobs:Record<string,Blob>={}`
	`17`	`+`
`15`	`18`	`awaituntar(tarFile).then(undefined,undefined,async(file)=>{`
`16`	`19`	`constpaths=file.name.split("/")`
`17`	`20`	`constfilename=paths[paths.length-1]`
`18`		`-files[filename]=file.readAsString()`
	`21`	`+const[_,extension]=filename.split(".")`
	`22`	`+`
	`23`	`+if(allowedExtensions.includes(extension)){`
	`24`	`+blobs[filename]=file.blob`
	`25`	`+}`
`19`	`26`	`})`
`20`		`-returnfiles`
`21`		`-}`
`22`	`27`
`23`		`-exportconstfilterTemplateFilesByExtension=(`
`24`		`-files:TemplateVersionFiles,`
`25`		`-extensions:string[],`
`26`		`-):TemplateVersionFiles=>{`
`27`		`-returnObject.keys(files).reduce((filteredFiles,filename)=>{`
`28`		`-const[_,extension]=filename.split(".")`
	`28`	`+awaitPromise.all(`
	`29`	`+Object.entries(blobs).map(async([filename,blob])=>{`
	`30`	`+files[filename]=awaitblob.text()`
	`31`	`+}),`
	`32`	`+)`
`29`	`33`
`30`		`-returnextensions.includes(extension)`
`31`		`- ?{ ...filteredFiles,[filename]:files[filename]}`
`32`		`- :filteredFiles`
`33`		`-},{}asTemplateVersionFiles)`
	`34`	`+returnfiles`
`34`	`35`	`}`

Lines changed: 1 addition & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`import{getTemplateVersionByName}from"api/api"`
`2`	`2`	`import{TemplateVersion}from"api/typesGenerated"`
`3`	`3`	`import{`
`4`		`-filterTemplateFilesByExtension,`
`5`	`4`	`getTemplateVersionFiles,`
`6`	`5`	`TemplateVersionFiles,`
`7`	`6`	`}from"util/templateVersion"`
`@@ -86,10 +85,7 @@ export const templateVersionMachine = createMachine(`
`86`	`85`	`if(!version){`
`87`	`86`	`thrownewError("Version is not defined")`
`88`	`87`	`}`
`89`		`-returnfilterTemplateFilesByExtension(`
`90`		`-awaitgetTemplateVersionFiles(version),`
`91`		`-["tf","md"],`
`92`		`-)`
	`88`	`+returngetTemplateVersionFiles(version,["tf","md"])`
`93`	`89`	`},`
`94`	`90`	`},`
`95`	`91`	`},`

Comments

(0)