Commit3024bde

authored

chore: support 'me' as the username for template author (#19204)

`author:me` to find my templates. Much nicer than knowing my ownusername

1 parent5b80c47 commit3024bdeCopy full SHA for 3024bde

File tree

+21

-6

lines changed

+21

-6

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ func Workspaces(ctx context.Context, db database.Store, query string, page coder`
`263`	`263`	`returnfilter,parser.Errors`
`264`	`264`	`}`
`265`	`265`
`266`		`-funcTemplates(ctx context.Context,db database.Store,querystring) (database.GetTemplatesWithFilterParams, []codersdk.ValidationError) {`
	`266`	`+funcTemplates(ctx context.Context,db database.Store,actorID uuid.UUID,querystring) (database.GetTemplatesWithFilterParams, []codersdk.ValidationError) {`
`267`	`267`	`// Always lowercase for all searches.`
`268`	`268`	`query=strings.ToLower(query)`
`269`	`269`	`values,errors:=searchTerms(query,func(termstring,values url.Values)error {`
`@@ -288,6 +288,11 @@ func Templates(ctx context.Context, db database.Store, query string) (database.G`
`288`	`288`	`AuthorUsername:parser.String(values,"","author"),`
`289`	`289`	`}`
`290`	`290`
	`291`	`+iffilter.AuthorUsername==codersdk.Me {`
	`292`	`+filter.AuthorID=actorID`
	`293`	`+filter.AuthorUsername=""`
	`294`	`+}`
	`295`	`+`
`291`	`296`	`parser.ErrorExcessParams(values)`
`292`	`297`	`returnfilter,parser.Errors`
`293`	`298`	`}`

Lines changed: 10 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -640,6 +640,7 @@ func TestSearchUsers(t *testing.T) {`
`640`	`640`
`641`	`641`	`funcTestSearchTemplates(t*testing.T) {`
`642`	`642`	`t.Parallel()`
	`643`	`+userID:=uuid.New()`
`643`	`644`	`testCases:= []struct {`
`644`	`645`	`Namestring`
`645`	`646`	`Querystring`
`@@ -688,6 +689,14 @@ func TestSearchTemplates(t *testing.T) {`
`688`	`689`	`},`
`689`	`690`	`},`
`690`	`691`	`},`
	`692`	`+{`
	`693`	`+Name:"MyTemplates",`
	`694`	`+Query:"author:me",`
	`695`	`+Expected: database.GetTemplatesWithFilterParams{`
	`696`	`+AuthorUsername:"",`
	`697`	`+AuthorID:userID,`
	`698`	`+},`
	`699`	`+},`
`691`	`700`	`}`
`692`	`701`
`693`	`702`	`for_,c:=rangetestCases {`
`@@ -696,7 +705,7 @@ func TestSearchTemplates(t *testing.T) {`
`696`	`705`	`// Do not use a real database, this is only used for an`
`697`	`706`	`// organization lookup.`
`698`	`707`	`db,_:=dbtestutil.NewDB(t)`
`699`		`-values,errs:=searchquery.Templates(context.Background(),db,c.Query)`
	`708`	`+values,errs:=searchquery.Templates(context.Background(),db,userID,c.Query)`
`700`	`709`	`ifc.ExpectedErrorContains!="" {`
`701`	`710`	`require.True(t,len(errs)>0,"expect some errors")`
`702`	`711`	`vars strings.Builder`

Lines changed: 2 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -544,9 +544,10 @@ func (api *API) templatesByOrganization() http.HandlerFunc {`
`544`	`544`	`func (apiAPI)fetchTemplates(mutatefunc(rhttp.Request,arg*database.GetTemplatesWithFilterParams)) http.HandlerFunc {`
`545`	`545`	`returnfunc(rw http.ResponseWriter,r*http.Request) {`
`546`	`546`	`ctx:=r.Context()`
	`547`	`+key:=httpmw.APIKey(r)`
`547`	`548`
`548`	`549`	`queryStr:=r.URL.Query().Get("q")`
`549`		`-filter,errs:=searchquery.Templates(ctx,api.Database,queryStr)`
	`550`	`+filter,errs:=searchquery.Templates(ctx,api.Database,key.UserID,queryStr)`
`550`	`551`	`iflen(errs)>0 {`
`551`	`552`	`httpapi.Write(ctx,rw,http.StatusBadRequest, codersdk.Response{`
`552`	`553`	`Message:"Invalid template search query.",`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -820,7 +820,7 @@ func TestTemplatesByOrganization(t *testing.T) {`
`820`	`820`	`client:=coderdtest.New(t,nil)`
`821`	`821`	`owner:=coderdtest.CreateFirstUser(t,client)`
`822`	`822`	`adminAlpha,adminAlphaData:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID,rbac.RoleTemplateAdmin())`
`823`		`-adminBravo,adminBravoData:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID,rbac.RoleTemplateAdmin())`
	`823`	`+adminBravo,_:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID,rbac.RoleTemplateAdmin())`
`824`	`824`	`adminCharlie,_:=coderdtest.CreateAnotherUser(t,client,owner.OrganizationID,rbac.RoleTemplateAdmin())`
`825`	`825`
`826`	`826`	`versionA:=coderdtest.CreateTemplateVersion(t,client,owner.OrganizationID,nil)`
`@@ -847,8 +847,8 @@ func TestTemplatesByOrganization(t *testing.T) {`
`847`	`847`	`require.Equal(t,foo.ID,alpha[0].ID)`
`848`	`848`
`849`	`849`	`// List bravo`
`850`		`-bravo,err:=client.Templates(ctx, codersdk.TemplateFilter{`
`851`		`-AuthorUsername:adminBravoData.Username,`
	`850`	`+bravo,err:=adminBravo.Templates(ctx, codersdk.TemplateFilter{`
	`851`	`+AuthorUsername:codersdk.Me,`
`852`	`852`	`})`
`853`	`853`	`require.NoError(t,err)`
`854`	`854`	`require.Len(t,bravo,1)`

Comments

(0)