From 857ee2f18bb42785b0473c4c94285a98c69d96e4 Mon Sep 17 00:00:00 2001
From: Chris Amico <eyeseast@gmail.com>
Date: Fri, 22 Nov 2024 18:11:12 -0500
Subject: [PATCH 1/2] Add a slot to show search tips

---
 src/langs/json/en.json                        |  5 +-
 src/lib/components/forms/Search.svelte        | 82 ++++++++++++-------
 .../forms/stories/Search.stories.svelte       | 15 +++-
 .../components/layouts/DocumentBrowser.svelte | 23 ++++--
 4 files changed, 85 insertions(+), 40 deletions(-)

diff --git a/src/langs/json/en.json b/src/langs/json/en.json
index 0ec1235fb..1f93efbcc 100644
--- a/src/langs/json/en.json
+++ b/src/langs/json/en.json
@@ -11,7 +11,10 @@
     "title": "Title"
   },
   "search": {
-    "matchingResults": "{n, plural, one {# matching result} other {# matching results}}"
+    "matchingResults": "{n, plural, one {# matching result} other {# matching results}}",
+    "reset": "Clear Search",
+    "help": "Use filters like <code>user:</code>, <code>project:</code> or <code>organization:</code> to refine searches. Use <code>sort:</code> to order results.",
+    "more": "Learn more"
   },
   "homeTemplate": {
     "signedIn": "Signed in as {name}",
diff --git a/src/lib/components/forms/Search.svelte b/src/lib/components/forms/Search.svelte
index d38672ff9..d684b573f 100644
--- a/src/lib/components/forms/Search.svelte
+++ b/src/lib/components/forms/Search.svelte
@@ -11,6 +11,7 @@
   export let query: string = "";
   export let placeholder: string = $_("common.search");
   export let action: Maybe<string> = undefined;
+  export let id = "query";
 
   let input: HTMLInputElement;
   let form: HTMLFormElement;
@@ -48,50 +49,46 @@
   on:reset={clear}
   bind:this={form}
 >
-  <label for="query" title="Search">
+  <label for={id} title={$_("common.search")}>
     <Search16 />
     <span class="sr-only">{$_("common.search")}</span>
+    <input
+      type="search"
+      {id}
+      autocomplete="off"
+      spellcheck="false"
+      {name}
+      {placeholder}
+      bind:value={query}
+      bind:this={input}
+      on:change
+      on:input
+    />
+    <button
+      title={$_("search.reset")}
+      type="reset"
+      class:hidden={!query}
+      on:click={clear}
+    >
+      <XCircleFill24 />
+    </button>
   </label>
-  <input
-    type="search"
-    id="query"
-    autocomplete="off"
-    {name}
-    {placeholder}
-    bind:value={query}
-    bind:this={input}
-    on:change
-    on:input
-  />
-  <button
-    title="Clear Search"
-    type="reset"
-    class:hidden={!query}
-    on:click={clear}
-  >
-    <XCircleFill24 />
-  </button>
+  {#if $$slots.help}<div class="help"><slot name="help" /></div>{/if}
 </form>
 
 <style>
   form {
     display: flex;
+    flex-direction: column;
     align-self: stretch;
+    align-items: baseline;
     gap: 0.25rem;
-    padding: 0 0.5rem;
+    margin: 0.25rem;
 
     color: var(--gray-5, #233944);
     fill: var(--gray-5, #233944);
-    border: 1px solid var(--gray-2);
-    border-radius: 0.5rem;
-
-    overflow: hidden;
-  }
-  form:focus-within {
-    outline: inherit;
-    border-color: var(--blue-3);
-    box-shadow: 0 0 0 1px var(--blue-3);
   }
+
   input {
     flex: 1 0 0;
     appearance: none;
@@ -103,21 +100,39 @@
     font-size: var(--font-md, 1rem);
     box-shadow: none;
   }
+
   input:focus {
     outline: none;
   }
+
   input::placeholder {
     color: var(--gray-4, #5c717c);
   }
+
   input[type="search"]::-webkit-search-cancel-button,
   input[type="search"]::-webkit-search-decoration {
     -webkit-appearance: none;
     appearance: none;
   }
+
   label {
     display: flex;
     align-items: center;
+    width: 100%;
+
+    border: 1px solid var(--gray-2);
+    border-radius: 0.5rem;
+    padding: 0 0.5rem;
+
+    overflow: hidden;
+  }
+
+  label:focus-within {
+    outline: inherit;
+    border-color: var(--blue-3);
+    box-shadow: 0 0 0 1px var(--blue-3);
   }
+
   button {
     flex: 0 0 0;
     appearance: none;
@@ -139,6 +154,7 @@
       opacity 0.125s linear,
       visibility 0s;
   }
+
   button.hidden {
     visibility: hidden;
     opacity: 0;
@@ -149,4 +165,10 @@
       visibility 0s linear 0.25s,
       position 0s linear 0.25s;
   }
+
+  .help {
+    flex: 1 1 100%;
+    font-size: var(--font-s);
+    color: var(--gray-4);
+  }
 </style>
diff --git a/src/lib/components/forms/stories/Search.stories.svelte b/src/lib/components/forms/stories/Search.stories.svelte
index 46c450756..86e2f5eb1 100644
--- a/src/lib/components/forms/stories/Search.stories.svelte
+++ b/src/lib/components/forms/stories/Search.stories.svelte
@@ -4,7 +4,7 @@
   import Search from "../Search.svelte";
 
   export const meta = {
-    title: "Components / Search",
+    title: "Forms / Search",
     component: Search,
     parameters: { layout: "centered" },
   };
@@ -25,3 +25,16 @@
 
 <Story name="With Query" {args} />
 <Story name="Without Query" args={{ query: "" }} />
+
+<Story name="With help">
+  <div style="width: 60ch">
+    <Search {...args} on:submit={submit} on:change={change}>
+      <span slot="help">
+        Search tips: add filters by typing <code>user:</code>,
+        <code>project:</code>, or <code>organization:</code>, etc. Use
+        <code>sort:</code> to order results.
+      </span>
+      <a href="https://www.documentcloud.org/help/search">Learn more</a>
+    </Search>
+  </div>
+</Story>
diff --git a/src/lib/components/layouts/DocumentBrowser.svelte b/src/lib/components/layouts/DocumentBrowser.svelte
index f04d5d359..36c2c39cf 100644
--- a/src/lib/components/layouts/DocumentBrowser.svelte
+++ b/src/lib/components/layouts/DocumentBrowser.svelte
@@ -72,10 +72,10 @@
   export let query: string = "";
   export let project: Nullable<Project> = null;
   export let uiText: UITextProps = {
-    loading: $_("common.loading"),
-    error: $_("common.error"),
-    empty: $_("common.empty"),
-    search: $_("common.search"),
+    loading: "common.loading",
+    error: "common.error",
+    empty: "common.empty",
+    search: "common.search",
   };
 
   let width: number;
@@ -154,7 +154,14 @@
             <PageToolbar>
               <Flex slot="right">
                 <div style:flex="1 1 auto">
-                  <Search name="q" {query} placeholder={uiText.search} />
+                  <Search name="q" {query} placeholder={$_(uiText.search)}>
+                    <span slot="help">
+                      {@html $_("search.help")}
+                      <a target="_blank" href="/help/search/">
+                        {$_("search.more")}
+                      </a>
+                    </span>
+                  </Search>
                 </div>
               </Flex>
             </PageToolbar>
@@ -173,10 +180,10 @@
         {/if}
       </svelte:fragment>
       {#await searchResults}
-        <Empty icon={Hourglass24}>{uiText.loading}</Empty>
+        <Empty icon={Hourglass24}>{$_(uiText.loading)}</Empty>
       {:then documentsResults}
         {#if !query && !documentsResults.results?.length}
-          <Empty icon={FileDirectory24}>{uiText.empty}</Empty>
+          <Empty icon={FileDirectory24}>{$_(uiText.empty)}</Empty>
         {:else}
           <ResultsList
             results={documentsResults.results}
@@ -192,7 +199,7 @@
           </ResultsList>
         {/if}
       {:catch}
-        <Error>{uiText.error}</Error>
+        <Error>{$_(uiText.error)}</Error>
       {/await}
       <svelte:fragment slot="footer">
         {#if !embed}

From 1b0a4203528a9980d51c51a65dfbef743c317db9 Mon Sep 17 00:00:00 2001
From: Chris Amico <eyeseast@gmail.com>
Date: Mon, 25 Nov 2024 09:49:35 -0500
Subject: [PATCH 2/2] Update src/lib/components/forms/Search.svelte

Co-authored-by: Allan Lasser <lasser.allan@gmail.com>
---
 src/lib/components/forms/Search.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/components/forms/Search.svelte b/src/lib/components/forms/Search.svelte
index d684b573f..efecc6869 100644
--- a/src/lib/components/forms/Search.svelte
+++ b/src/lib/components/forms/Search.svelte
@@ -168,7 +168,7 @@
 
   .help {
     flex: 1 1 100%;
-    font-size: var(--font-s);
+    font-size: var(--font-sm);
     color: var(--gray-4);
   }
 </style>