From ed37d4dbccf252993faf036113d46931465aed88 Mon Sep 17 00:00:00 2001
From: Gisle Aune <dev@gisle.me>
Date: Sat, 4 Dec 2021 15:19:36 +0100
Subject: [PATCH] Change None -> Any in logs page.

---
 svelte-ui/src/components/ItemProgress.svelte       | 2 +-
 svelte-ui/src/components/ItemSelect.svelte         | 3 ++-
 svelte-ui/src/components/ProjectGroupSelect.svelte | 3 ++-
 svelte-ui/src/components/ProjectSelect.svelte      | 6 ++++--
 svelte-ui/src/pages/LogsPage.svelte                | 6 +++---
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/svelte-ui/src/components/ItemProgress.svelte b/svelte-ui/src/components/ItemProgress.svelte
index 7741bed..241b620 100644
--- a/svelte-ui/src/components/ItemProgress.svelte
+++ b/svelte-ui/src/components/ItemProgress.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import type Item from "../models/item";
-import type { LogResult } from "../models/log";
+  import type { LogResult } from "../models/log";
   import type { ProjectResult } from "../models/project";
   import Icon from "./Icon.svelte";
 
diff --git a/svelte-ui/src/components/ItemSelect.svelte b/svelte-ui/src/components/ItemSelect.svelte
index f93d84f..df6f62d 100644
--- a/svelte-ui/src/components/ItemSelect.svelte
+++ b/svelte-ui/src/components/ItemSelect.svelte
@@ -3,6 +3,7 @@
 
   export let value = "";
   export let name = "";
+  export let placeholder = "None"
   export let disabled = false;
   export let optional = false;
   export let enableWholeGroup = false;
@@ -25,7 +26,7 @@
 
 <select name={name} bind:value={value} disabled={disabled || $groupStore.loading}>
   {#if optional}
-    <option value={""} selected={"" === value}>None</option>
+    <option value={""} selected={"" === value}>{placeholder}</option>
   {/if}
   {#each $groupStore.groups as group (group.id)}
     <optgroup label={group.name}>
diff --git a/svelte-ui/src/components/ProjectGroupSelect.svelte b/svelte-ui/src/components/ProjectGroupSelect.svelte
index 2df0f34..e202ca2 100644
--- a/svelte-ui/src/components/ProjectGroupSelect.svelte
+++ b/svelte-ui/src/components/ProjectGroupSelect.svelte
@@ -3,13 +3,14 @@
 
   export let value = "";
   export let name = "";
+  export let placeholder = "None"
   export let disabled = false;
   export let optional = false;
 </script>
 
 <select name={name} bind:value={value} disabled={disabled || $projectGroupStore.loading}>
   {#if optional}
-    <option value={""} selected={"" === value}>{$projectGroupStore.loading ? "Loading..." : "None"}</option>
+    <option value={""} selected={"" === value}>{$projectGroupStore.loading ? "Loading..." : placeholder}</option>
   {/if}
   {#each $projectGroupStore.groups as group (group.id)}
     {#if group.id !== "META_UNGROUPED"}
diff --git a/svelte-ui/src/components/ProjectSelect.svelte b/svelte-ui/src/components/ProjectSelect.svelte
index 12ffbb9..d5c4ea6 100644
--- a/svelte-ui/src/components/ProjectSelect.svelte
+++ b/svelte-ui/src/components/ProjectSelect.svelte
@@ -1,7 +1,8 @@
 <script lang="ts">
   import type Project from "../models/project";
   import projectStore from "../stores/project";
-import projectGroupStore from "../stores/projectGroup";
+  import projectGroupStore from "../stores/projectGroup";
+  
   interface OptGroup {
     status: string
     projects: Project[]
@@ -10,6 +11,7 @@ import projectGroupStore from "../stores/projectGroup";
   export let value = "";
   export let name = "";
   export let groupId = "";
+  export let placeholder = "None";
   export let disabled = false;
   export let optional = false;
   export let forceGroup = false;
@@ -85,7 +87,7 @@ import projectGroupStore from "../stores/projectGroup";
 
 <select name={name} bind:value={value} disabled={disabled || $projectStore.loading}>
   {#if optional}
-    <option value={""} selected={"" === value}>{$projectStore.loading ? "Loading..." : "None"}</option>
+    <option value={""} selected={"" === value}>{$projectStore.loading ? "Loading..." : placeholder}</option>
   {/if}
   {#each optGroups as group (group.status)}
     {#if group.projects.length > 0}
diff --git a/svelte-ui/src/pages/LogsPage.svelte b/svelte-ui/src/pages/LogsPage.svelte
index 6518fd7..382df6f 100644
--- a/svelte-ui/src/pages/LogsPage.svelte
+++ b/svelte-ui/src/pages/LogsPage.svelte
@@ -136,15 +136,15 @@
   <div class="extra-filters">
     <div class="filter-group">
       <label for="projectGroup">Project Group</label>
-      <ProjectGroupSelect name="projectGroup" optional bind:value={projectGroupId} />
+      <ProjectGroupSelect name="projectGroup" optional bind:value={projectGroupId} placeholder="Any" />
     </div>
     <div class="filter-group">
       <label for="project">Project</label>
-      <ProjectSelect name="project" disabled={projectGroupId === ""} optional bind:value={projectId} groupId={projectGroupId} forceGroup />
+      <ProjectSelect name="project" disabled={projectGroupId === ""} optional bind:value={projectId} groupId={projectGroupId} forceGroup placeholder="Any" />
     </div>
     <div class="filter-group">
       <label for="item">Item</label>
-      <ItemSelect name="item" optional bind:value={itemId} enableWholeGroup />
+      <ItemSelect name="item" optional bind:value={itemId} enableWholeGroup placeholder="Any" />
     </div>
   </div>
   <div class="error">{error}</div>