Commit0ea89a3

authored

chore: add cleanup callbacks to someuseEffect calls (#13444)

1 parent213848e commit0ea89a3Copy full SHA for 0ea89a3

File tree

+29

-10

lines changed

+29

-10

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,10 @@ export const useProxyLatency = (`
`225`	`225`	`// Local storage cleanup`
`226`	`226`	`garbageCollectStoredLatencies(proxies,maxStoredLatencies);`
`227`	`227`	`});`
	`228`	`+`
	`229`	`+return()=>{`
	`230`	`+observer.disconnect();`
	`231`	`+};`
`228`	`232`	`},[proxies,latestFetchRequest,maxStoredLatencies]);`
`229`	`233`
`230`	`234`	`return{`

Lines changed: 19 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -245,20 +245,32 @@ const useFileTree = (templateVersion: TemplateVersion \| undefined) => {`
`245`	`245`	`fileTree:undefined,`
`246`	`246`	`tarFile:undefined,`
`247`	`247`	`});`
	`248`	`+`
`248`	`249`	`useEffect(()=>{`
	`250`	`+letstale=false;`
`249`	`251`	`constinitializeFileTree=async(file:ArrayBuffer)=>{`
`250`	`252`	`consttarFile=newTarReader();`
`251`		`-awaittarFile.readFile(file);`
`252`		`-constfileTree=awaitcreateTemplateVersionFileTree(tarFile);`
`253`		`-setState({ fileTree, tarFile});`
	`253`	`+try{`
	`254`	`+awaittarFile.readFile(file);`
	`255`	`+// Ignore stale updates if this effect has been cancelled.`
	`256`	`+if(stale){`
	`257`	`+return;`
	`258`	`+}`
	`259`	`+constfileTree=createTemplateVersionFileTree(tarFile);`
	`260`	`+setState({ fileTree, tarFile});`
	`261`	`+}catch(error){`
	`262`	`+console.error(error);`
	`263`	`+displayError("Error on initializing the editor");`
	`264`	`+}`
`254`	`265`	`};`
`255`	`266`
`256`	`267`	`if(fileQuery.data){`
`257`		`-initializeFileTree(fileQuery.data).catch((reason)=>{`
`258`		`-console.error(reason);`
`259`		`-displayError("Error on initializing the editor");`
`260`		`-});`
	`268`	`+voidinitializeFileTree(fileQuery.data);`
`261`	`269`	`}`
	`270`	`+`
	`271`	`+return()=>{`
	`272`	`+stale=true;`
	`273`	`+};`
`262`	`274`	`},[fileQuery.data]);`
`263`	`275`
`264`	`276`	`returnstate;`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,10 @@ export const WorkspaceBuildProgress: FC<WorkspaceBuildProgressProps> = ({`
`97`	`97`	`setProgressValue(est);`
`98`	`98`	`setProgressText(text);`
`99`	`99`	`};`
`100`		`-setTimeout(updateProgress,5);`
	`100`	`+constupdateTimer=requestAnimationFrame(updateProgress);`
	`101`	`+return()=>{`
	`102`	`+cancelAnimationFrame(updateTimer);`
	`103`	`+};`
`101`	`104`	`},[progressValue,job,transitionStats]);`
`102`	`105`
`103`	`106`	`// HACK: the codersdk type generator doesn't support null values, but this`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,9 +23,9 @@ export const getTemplateVersionFiles = async (`
`23`	`23`	`returnfiles;`
`24`	`24`	`};`
`25`	`25`
`26`		`-exportconstcreateTemplateVersionFileTree=async(`
	`26`	`+exportconstcreateTemplateVersionFileTree=(`
`27`	`27`	`tarReader:TarReader,`
`28`		`-):Promise<FileTree>=>{`
	`28`	`+):FileTree=>{`
`29`	`29`	`letfileTree:FileTree={};`
`30`	`30`	`for(constfileoftarReader.fileInfo){`
`31`	`31`	`fileTree=set(`

Comments

(0)