Search mobile apps (#1043)

Author: sethvargo

cmd/server/assets/mobileapps/index.html

@@ -23,8 +23,23 @@
         </a>
       </div>
 
+      <div class="card-body">
+        <form method="GET" action="/mobile-apps" id="search-form">
+          <div class="input-group">
+            <input type="search" name="q" id="search" value="{{.query}}" placeholder="Search..."
+              autocomplete="off" class="form-control" />
+            <div class="input-group-append">
+              <button type="submit" class="btn btn-primary">
+                <span class="oi oi-magnifying-glass" aria-hidden="true"></span>
+                <span class="sr-only">Search</span>
+              </button>
+            </div>
+          </div>
+        </form>
+      </div>
+
       {{if $apps}}
-        <table class="table table-bordered table-striped table-fixed table-inner-border-only mb-0">
+        <table class="table table-bordered table-striped table-fixed table-inner-border-only border-top mb-0">
           <thead>
             <tr>
               <th scope="col" width="40"></th>
@@ -72,7 +87,7 @@
         </table>
       {{else}}
         <p class="card-body text-center mb-0">
-          <em>There are no mobile apps.</em>
+          <em>There are no mobile apps{{if .query}} that match the query{{end}}.</em>
         </p>
       {{end}}
     </div>

pkg/controller/mobileapps/index.go

@@ -23,6 +23,11 @@ import (
 	"github.com/google/exposure-notifications-verification-server/pkg/pagination"
 )
 
+const (
+	// QueryKeySearch is the query key where the search query exists.
+	QueryKeySearch = "q"
+)
+
 func (c *Controller) HandleIndex() http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
@@ -39,22 +44,27 @@ func (c *Controller) HandleIndex() http.Handler {
 			return
 		}
 
+		var scopes []database.Scope
+		q := r.FormValue(QueryKeySearch)
+		scopes = append(scopes, database.WithMobileAppSearch(q))
+
 		// Perform the lazy load on authorized apps for the realm.
-		apps, paginator, err := realm.ListMobileApps(c.db, pageParams)
+		apps, paginator, err := realm.ListMobileApps(c.db, pageParams, scopes...)
 		if err != nil {
 			controller.InternalError(w, r, c.h, err)
 			return
 		}
 
-		c.renderIndex(ctx, w, apps, paginator)
+		c.renderIndex(ctx, w, apps, paginator, q)
 	})
 }
 
 // renderIndex renders the index page.
-func (c *Controller) renderIndex(ctx context.Context, w http.ResponseWriter, apps []*database.MobileApp, paginator *pagination.Paginator) {
+func (c *Controller) renderIndex(ctx context.Context, w http.ResponseWriter, apps []*database.MobileApp, paginator *pagination.Paginator, query string) {
 	m := templateMap(ctx)
 	m.Title("Mobile apps")
 	m["apps"] = apps
+	m["query"] = query
 	m["paginator"] = paginator
 	c.h.RenderHTML(w, "mobileapps/index", m)
 }

pkg/database/realm.go

@@ -735,11 +735,12 @@ func (r *Realm) FindAuthorizedApp(db *Database, id interface{}) (*AuthorizedApp,
 }
 
 // ListMobileApps gets all the mobile apps for the realm.
-func (r *Realm) ListMobileApps(db *Database, p *pagination.PageParams) ([]*MobileApp, *pagination.Paginator, error) {
+func (r *Realm) ListMobileApps(db *Database, p *pagination.PageParams, scopes ...Scope) ([]*MobileApp, *pagination.Paginator, error) {
 	var mobileApps []*MobileApp
 	query := db.db.
 		Unscoped().
 		Model(&MobileApp{}).
+		Scopes(scopes...).
 		Where("realm_id = ?", r.ID).
 		Order("mobile_apps.deleted_at DESC, LOWER(mobile_apps.name)")
 

pkg/database/scopes.go

@@ -83,6 +83,20 @@ func WithAuthorizedAppSearch(q string) Scope {
 	}
 }
 
+// WithMobileAppSearch returns a scope that adds querying for mobile apps by
+// name, case-insensitive. It's only applicable to functions that query
+// MobileApp.
+func WithMobileAppSearch(q string) Scope {
+	return func(db *gorm.DB) *gorm.DB {
+		q = project.TrimSpace(q)
+		if q != "" {
+			q = `%` + q + `%`
+			return db.Where("mobile_apps.name ILIKE ?", q)
+		}
+		return db
+	}
+}
+
 // WithRealmSearch returns a scope that adds querying for realms by name. It's
 // only applicable to functions that query Realm.
 func WithRealmSearch(q string) Scope {