Commit3be3bc2

authored

fix: handle owner but no name syntax (#2045)

1 parent77d0682 commit3be3bc2Copy full SHA for 3be3bc2

File tree

+14

-10

lines changed

+14

-10

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,6 +71,7 @@ describe("util > workspace", () => {`
`71`	`71`	`["owner:me",{owner:"me"}],`
`72`	`72`	`["owner:me owner:me2",{owner:"me"}],`
`73`	`73`	`["me/dev",{owner:"me",name:"dev"}],`
	`74`	`+["me/",{owner:"me"}],`
`74`	`75`	`[" key:val owner:me ",{owner:"me"}],`
`75`	`76`	])(`query=%p, filter=%p`,(query,filter)=>{
`76`	`77`	`expect(workspaceQueryToFilter(query)).toEqual(filter)`

Lines changed: 13 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -218,24 +218,27 @@ export const workspaceQueryToFilter = (query?: string): TypesGen.WorkspaceFilter`
`218`	`218`	`constparts=preparedQuery.split(" ")`
`219`	`219`
`220`	`220`	`for(constpartofparts){`
`221`		`-const[key,val]=part.split(":")`
`222`		`-if(key&&val){`
`223`		`-if(key==="owner"){`
`224`		`-return{`
`225`		`-owner:val,`
	`221`	`+if(part.includes(":")){`
	`222`	`+const[key,val]=part.split(":")`
	`223`	`+if(key&&val){`
	`224`	`+if(key==="owner"){`
	`225`	`+return{`
	`226`	`+owner:val,`
	`227`	`+}`
`226`	`228`	`}`
	`229`	`+// skip invalid key pairs`
	`230`	`+continue`
`227`	`231`	`}`
`228`		`-// skip invalid key pairs`
`229`		`-continue`
`230`	`232`	`}`
`231`	`233`
`232`		`-const[username,name]=part.split("/")`
`233`		`-if(username&&name){`
	`234`	`+if(part.includes("/")){`
	`235`	`+const[username,name]=part.split("/")`
`234`	`236`	`return{`
`235`	`237`	`owner:username,`
`236`		`-name:name,`
	`238`	`+name:name==="" ?undefined :name,`
`237`	`239`	`}`
`238`	`240`	`}`
	`241`	`+`
`239`	`242`	`return{`
`240`	`243`	`name:part,`
`241`	`244`	`}`

Comments

(0)