search on display_name, default to name if display_name is empty

rafrdz · rafrdz · commit 8c780dc5c717 · 2025-08-26T23:11:20.000Z
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/database/queries/templates.sql b/coderd/database/queries/templates.sql
@@ -42,10 +42,16 @@ WHERE
 			lower(t.name) ILIKE '%' || lower(@fuzzy_name) || '%'
 		ELSE true
 	END
-	-- Filter by display_name, matching on substring
+	-- Filter by display_name, matching on substring (fallback to name if display_name is empty)
 	AND CASE
 		WHEN @fuzzy_display_name :: text != '' THEN
-			lower(t.display_name) ILIKE '%' || lower(@fuzzy_display_name) || '%'
+			CASE
+				WHEN t.display_name IS NOT NULL AND t.display_name != '' THEN
+					lower(t.display_name) ILIKE '%' || lower(@fuzzy_display_name) || '%'
+				ELSE
+					-- Remove spaces if present since 't.name' cannot have any spaces
+					lower(t.name) ILIKE '%' || REPLACE(lower(@fuzzy_display_name), ' ', '') || '%'
+			END
 		ELSE true
 	END
 	-- Filter by ids
diff --git a/coderd/searchquery/search.go b/coderd/searchquery/search.go
@@ -268,8 +268,7 @@ func Templates(ctx context.Context, db database.Store, actorID uuid.UUID, query
 	// Always lowercase for all searches.
 	query = strings.ToLower(query)
 	values, errors := searchTerms(query, func(term string, values url.Values) error {
-		// Default to the template name and display name
-		values.Add("name", term)
+		// Default to the display name
 		values.Add("display_name", term)
 		return nil
 	})
diff --git a/coderd/searchquery/search_test.go b/coderd/searchquery/search_test.go
@@ -686,7 +686,6 @@ func TestSearchTemplates(t *testing.T) {
 			Name:  "OnlyName",
 			Query: "foobar",
 			Expected: database.GetTemplatesWithFilterParams{
-				FuzzyName:        "foobar",
 				FuzzyDisplayName: "foobar",
 			},
 		},
@@ -759,10 +758,9 @@ func TestSearchTemplates(t *testing.T) {
 			},
 		},
 		{
-			Name:  "SearchOnNameAndDisplayName",
+			Name:  "SearchOnDisplayName",
 			Query: "test name",
 			Expected: database.GetTemplatesWithFilterParams{
-				FuzzyName:        "test name",
 				FuzzyDisplayName: "test name",
 			},
 		},
@@ -785,7 +783,6 @@ func TestSearchTemplates(t *testing.T) {
 			Query: `foo bar exact_name:"test display name"`,
 			Expected: database.GetTemplatesWithFilterParams{
 				ExactName:        "test display name",
-				FuzzyName:        "foo bar",
 				FuzzyDisplayName: "foo bar",
 			},
 		},
@@ -794,7 +791,6 @@ func TestSearchTemplates(t *testing.T) {
 			Query: "deprecated:false test template",
 			Expected: database.GetTemplatesWithFilterParams{
 				Deprecated:       sql.NullBool{Bool: false, Valid: true},
-				FuzzyName:        "test template",
 				FuzzyDisplayName: "test template",
 			},
 		},
