Commitf8b0c87

authored

fix: langs_count overflow when hide is set (anuraghazra#989)

1 parent7a096ac commitf8b0c87Copy full SHA for f8b0c87

File tree

+27

-21

lines changed

+27

-21

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,6 @@ module.exports = async (req, res) => {`
`46`	`46`	`try{`
`47`	`47`	`topLangs=awaitfetchTopLanguages(`
`48`	`48`	`username,`
`49`		`-langs_count,`
`50`	`49`	`parseArray(exclude_repo),`
`51`	`50`	`parseArray(hide),`
`52`	`51`	`);`
`@@ -71,6 +70,7 @@ module.exports = async (req, res) => {`
`71`	`70`	`bg_color,`
`72`	`71`	`theme,`
`73`	`72`	`layout,`
	`73`	`+ langs_count,`
`74`	`74`	`border_radius,`
`75`	`75`	`border_color,`
`76`	`76`	`locale:locale ?locale.toLowerCase() :null,`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`constCard=require("../common/Card");`
`2`		`-const{ getCardColors, FlexLayout}=require("../common/utils");`
	`2`	`+const{clampValue,getCardColors, FlexLayout}=require("../common/utils");`
`3`	`3`	`const{ createProgressNode}=require("../common/createProgressNode");`
`4`	`4`	`const{ langCardLocales}=require("../translations");`
`5`	`5`	`constI18n=require("../common/I18n");`
`@@ -73,8 +73,9 @@ const renderTopLanguages = (topLangs, options = {}) => {`
`73`	`73`	`layout,`
`74`	`74`	`custom_title,`
`75`	`75`	`locale,`
	`76`	`+ langs_count=5,`
`76`	`77`	`border_radius,`
`77`		`- border_color,`
	`78`	`+ border_color`
`78`	`79`	`}=options;`
`79`	`80`
`80`	`81`	`consti18n=newI18n({`
`@@ -85,6 +86,8 @@ const renderTopLanguages = (topLangs, options = {}) => {`
`85`	`86`	`letlangs=Object.values(topLangs);`
`86`	`87`	`letlangsToHide={};`
`87`	`88`
	`89`	`+langsCount=clampValue(parseInt(langs_count),1,10);`
	`90`	`+`
`88`	`91`	`// populate langsToHide map for quick lookup`
`89`	`92`	`// while filtering out`
`90`	`93`	`if(hide){`
`@@ -98,7 +101,8 @@ const renderTopLanguages = (topLangs, options = {}) => {`
`98`	`101`	`.sort((a,b)=>b.size-a.size)`
`99`	`102`	`.filter((lang)=>{`
`100`	`103`	`return!langsToHide[lowercaseTrim(lang.name)];`
`101`		`-});`
	`104`	`+})`
	`105`	`+.slice(0,langsCount);`
`102`	`106`
`103`	`107`	`consttotalLanguageSize=langs.reduce((acc,curr)=>{`
`104`	`108`	`returnacc+curr.size;`

Lines changed: 0 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -36,13 +36,10 @@ const fetcher = (variables, token) => {`
`36`	`36`
`37`	`37`	`asyncfunctionfetchTopLanguages(`
`38`	`38`	`username,`
`39`		`-langsCount=5,`
`40`	`39`	`exclude_repo=[],`
`41`	`40`	`hide=[],`
`42`	`41`	`){`
`43`	`42`	`if(!username)throwError("Invalid username");`
`44`		`-langsCount=parseInt(langsCount)+hide.length;`
`45`		`-langsCount=clampValue(langsCount,1,10+hide.length);`
`46`	`43`
`47`	`44`	`constres=awaitretryer(fetcher,{login:username});`
`48`	`45`
`@@ -97,7 +94,6 @@ async function fetchTopLanguages(`
`97`	`94`
`98`	`95`	`consttopLangs=Object.keys(repoNodes)`
`99`	`96`	`.sort((a,b)=>repoNodes[b].size-repoNodes[a].size)`
`100`		`-.slice(0,langsCount)`
`101`	`97`	`.reduce((result,key)=>{`
`102`	`98`	`result[key]=repoNodes[key];`
`103`	`99`	`returnresult;`

Lines changed: 0 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,19 +74,6 @@ describe("FetchTopLanguages", () => {`
`74`	`74`	`});`
`75`	`75`	`});`
`76`	`76`
`77`		`-it("should fetch langs with specified langs_count",async()=>{`
`78`		`-mock.onPost("https://api.github.com/graphql").reply(200,data_langs);`
`79`		`-`
`80`		`-letrepo=awaitfetchTopLanguages("anuraghazra",1);`
`81`		`-expect(repo).toStrictEqual({`
`82`		`-javascript:{`
`83`		`-color:"#0ff",`
`84`		`-name:"javascript",`
`85`		`-size:200,`
`86`		`-},`
`87`		`-});`
`88`		`-});`
`89`		`-`
`90`	`77`	`it("should throw error",async()=>{`
`91`	`78`	`mock.onPost("https://api.github.com/graphql").reply(200,error);`
`92`	`79`

Lines changed: 19 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`require("@testing-library/jest-dom");`
`2`	`2`	`constcssToObject=require("css-to-object");`
	`3`	`+constfetchTopLanguages=require("../src/fetchers/top-languages-fetcher");`
`3`	`4`	`constrenderTopLanguages=require("../src/cards/top-languages-card");`
`4`	`5`
`5`	`6`	`const{ queryByTestId, queryAllByTestId}=require("@testing-library/dom");`
`@@ -230,4 +231,22 @@ describe("Test renderTopLanguages", () => {`
`230`	`231`	`document.body.innerHTML=renderTopLanguages(langs,{});`
`231`	`232`	`expect(document.querySelector("rect")).toHaveAttribute("rx","4.5");`
`232`	`233`	`});`
	`234`	`+`
	`235`	`+it("should render langs with specified langs_count",async()=>{`
	`236`	`+options={`
	`237`	`+langs_count:1`
	`238`	`+}`
	`239`	`+document.body.innerHTML=renderTopLanguages(langs,{ ...options});`
	`240`	`+expect(queryAllByTestId(document.body,"lang-name").length).toBe(options.langs_count)`
	`241`	`+});`
	`242`	`+`
	`243`	`+it("should render langs with specified langs_count even when hide is set",async()=>{`
	`244`	`+options={`
	`245`	`+hide:["HTML"],`
	`246`	`+langs_count:2`
	`247`	`+}`
	`248`	`+document.body.innerHTML=renderTopLanguages(langs,{ ...options});`
	`249`	`+expect(queryAllByTestId(document.body,"lang-name").length).toBe(options.langs_count)`
	`250`	`+});`
	`251`	`+`
`233`	`252`	`});`

Comments

(0)