diff --git a/coderd/searchquery/search.go b/coderd/searchquery/search.go
index 4f3f3259c09d9..cbaaa74a848eb 100644
--- a/coderd/searchquery/search.go
+++ b/coderd/searchquery/search.go
@@ -263,7 +263,7 @@ func Workspaces(ctx context.Context, db database.Store, query string, page coder
return filter, parser.Errors
}
-func Templates(ctx context.Context, db database.Store, query string) (database.GetTemplatesWithFilterParams, []codersdk.ValidationError) {
+func Templates(ctx context.Context, db database.Store, actorID uuid.UUID, query string) (database.GetTemplatesWithFilterParams, []codersdk.ValidationError) {
// Always lowercase for all searches.
query = strings.ToLower(query)
values, errors := searchTerms(query, func(term string, values url.Values) error {
@@ -288,6 +288,11 @@ func Templates(ctx context.Context, db database.Store, query string) (database.G
AuthorUsername: parser.String(values, "", "author"),
}
+ if filter.AuthorUsername == codersdk.Me {
+ filter.AuthorID = actorID
+ filter.AuthorUsername = ""
+ }
+
parser.ErrorExcessParams(values)
return filter, parser.Errors
}
diff --git a/coderd/searchquery/search_test.go b/coderd/searchquery/search_test.go
index 4744b57edff4a..5c45274668b25 100644
--- a/coderd/searchquery/search_test.go
+++ b/coderd/searchquery/search_test.go
@@ -640,6 +640,7 @@ func TestSearchUsers(t *testing.T) {
func TestSearchTemplates(t *testing.T) {
t.Parallel()
+ userID := uuid.New()
testCases := []struct {
Name string
Query string
@@ -688,6 +689,14 @@ func TestSearchTemplates(t *testing.T) {
},
},
},
+ {
+ Name: "MyTemplates",
+ Query: "author:me",
+ Expected: database.GetTemplatesWithFilterParams{
+ AuthorUsername: "",
+ AuthorID: userID,
+ },
+ },
}
for _, c := range testCases {
@@ -696,7 +705,7 @@ func TestSearchTemplates(t *testing.T) {
// Do not use a real database, this is only used for an
// organization lookup.
db, _ := dbtestutil.NewDB(t)
- values, errs := searchquery.Templates(context.Background(), db, c.Query)
+ values, errs := searchquery.Templates(context.Background(), db, userID, c.Query)
if c.ExpectedErrorContains != "" {
require.True(t, len(errs) > 0, "expect some errors")
var s strings.Builder
diff --git a/coderd/templates.go b/coderd/templates.go
index 694bb90b86a4d..f9c5d8271a1e6 100644
--- a/coderd/templates.go
+++ b/coderd/templates.go
@@ -544,9 +544,10 @@ func (api *API) templatesByOrganization() http.HandlerFunc {
func (api *API) fetchTemplates(mutate func(r *http.Request, arg *database.GetTemplatesWithFilterParams)) http.HandlerFunc {
return func(rw http.ResponseWriter, r *http.Request) {
ctx := r.Context()
+ key := httpmw.APIKey(r)
queryStr := r.URL.Query().Get("q")
- filter, errs := searchquery.Templates(ctx, api.Database, queryStr)
+ filter, errs := searchquery.Templates(ctx, api.Database, key.UserID, queryStr)
if len(errs) > 0 {
httpapi.Write(ctx, rw, http.StatusBadRequest, codersdk.Response{
Message: "Invalid template search query.",
diff --git a/coderd/templates_test.go b/coderd/templates_test.go
index 8cd5a6ba9bf30..050ae77f8ca49 100644
--- a/coderd/templates_test.go
+++ b/coderd/templates_test.go
@@ -820,7 +820,7 @@ func TestTemplatesByOrganization(t *testing.T) {
client := coderdtest.New(t, nil)
owner := coderdtest.CreateFirstUser(t, client)
adminAlpha, adminAlphaData := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.RoleTemplateAdmin())
- adminBravo, adminBravoData := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.RoleTemplateAdmin())
+ adminBravo, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.RoleTemplateAdmin())
adminCharlie, _ := coderdtest.CreateAnotherUser(t, client, owner.OrganizationID, rbac.RoleTemplateAdmin())
versionA := coderdtest.CreateTemplateVersion(t, client, owner.OrganizationID, nil)
@@ -847,8 +847,8 @@ func TestTemplatesByOrganization(t *testing.T) {
require.Equal(t, foo.ID, alpha[0].ID)
// List bravo
- bravo, err := client.Templates(ctx, codersdk.TemplateFilter{
- AuthorUsername: adminBravoData.Username,
+ bravo, err := adminBravo.Templates(ctx, codersdk.TemplateFilter{
+ AuthorUsername: codersdk.Me,
})
require.NoError(t, err)
require.Len(t, bravo, 1)
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy