From dabbebf2787dc3e407e0c1cfdc564fb8ed4032e6 Mon Sep 17 00:00:00 2001
From: Arman <arman@appwrite.io>
Date: Fri, 18 Aug 2023 12:42:24 +0200
Subject: [PATCH] fix: git template creation

---
 src/lib/elements/forms/inputChoice.svelte             |  6 ++++--
 src/lib/elements/forms/inputSelectSearch.svelte       | 11 +++++++----
 src/lib/elements/forms/label.svelte                   |  8 +++++++-
 .../wizards/functions/steps/gitConfiguration.svelte   |  4 +++-
 4 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/src/lib/elements/forms/inputChoice.svelte b/src/lib/elements/forms/inputChoice.svelte
index 4e4d73856..4a6b53c5a 100644
--- a/src/lib/elements/forms/inputChoice.svelte
+++ b/src/lib/elements/forms/inputChoice.svelte
@@ -40,8 +40,10 @@
             on:invalid={handleInvalid} />
 
         <div class="choice-item-content">
-            <div class:u-hide={!showLabel} class="choice-item-title u-flex u-cross-center u-gap-4">
-                {label}
+            <div class="u-flex u-cross-center u-gap-4">
+                <h6 class:u-hide={!showLabel} class="choice-item-title">
+                    {label}
+                </h6>
                 {#if tooltip}
                     <button class="tooltip" aria-label="variables info">
                         <span
diff --git a/src/lib/elements/forms/inputSelectSearch.svelte b/src/lib/elements/forms/inputSelectSearch.svelte
index a7e40151b..b5ead1e7e 100644
--- a/src/lib/elements/forms/inputSelectSearch.svelte
+++ b/src/lib/elements/forms/inputSelectSearch.svelte
@@ -16,9 +16,11 @@
     export let label: string;
     export let name = 'elements';
     export let optionalText: string | undefined = undefined;
+    export let tooltip: string | undefined = undefined;
     export let showLabel = true;
     export let placeholder = '';
     export let required = false;
+    export let hideRequired = false;
     export let disabled = false;
     export let fullWidth = false;
     export let autofocus = false;
@@ -84,11 +86,12 @@
         value = option.value;
         search = option.label;
         // It's not working without this line.
-        if ($$slots.output) {
-            search = '';
-        } else {
+        if (!$$slots.output) {
             element.value = search;
+        } else {
+            search = '';
         }
+
         hasFocus = false;
         dispatch('select', option);
     }
@@ -117,7 +120,7 @@
         position="static"
         fullWidth={true}
         fixed>
-        <Label {required} {optionalText} hide={!showLabel} for={id}>
+        <Label {required} {hideRequired} {optionalText} hide={!showLabel} for={id} {tooltip}>
             {label}
         </Label>
 
diff --git a/src/lib/elements/forms/label.svelte b/src/lib/elements/forms/label.svelte
index d841a72f9..231393d27 100644
--- a/src/lib/elements/forms/label.svelte
+++ b/src/lib/elements/forms/label.svelte
@@ -1,6 +1,7 @@
 <script lang="ts">
     interface $$Props extends Partial<HTMLLabelElement> {
         required?: boolean;
+        hideRequired?: boolean;
         optionalText?: string | undefined;
         hide?: boolean;
         tooltip?: string;
@@ -8,12 +9,17 @@
     }
 
     export let required: $$Props['required'] = false;
+    export let hideRequired: $$Props['hideRequired'] = false;
     export let optionalText: $$Props['optionalText'] = undefined;
     export let hide: $$Props['hide'] = false;
     export let tooltip: $$Props['tooltip'] = null;
 </script>
 
-<label class:is-required={required} class:u-hide={hide} class="label" {...$$restProps}>
+<label
+    class:is-required={required && !hideRequired}
+    class:u-hide={hide}
+    class="label"
+    {...$$restProps}>
     <slot />
 </label>
 
diff --git a/src/lib/wizards/functions/steps/gitConfiguration.svelte b/src/lib/wizards/functions/steps/gitConfiguration.svelte
index 192057c07..1a5fb8510 100644
--- a/src/lib/wizards/functions/steps/gitConfiguration.svelte
+++ b/src/lib/wizards/functions/steps/gitConfiguration.svelte
@@ -64,6 +64,8 @@
                         id="branch"
                         label="Select branch"
                         placeholder="main"
+                        tooltip="Every commit pushed to this branch will activate the deployment after a successful build"
+                        hideRequired
                         bind:value={$choices.branch}
                         bind:search={$choices.branch}
                         on:select={(event) => {
@@ -84,7 +86,7 @@
                     <InputChoice
                         id="silent"
                         label="Silent mode"
-                        tooltip="Don't create comments when pushing to this repository"
+                        tooltip="When enabled, comments will not be made on pull requests in this repository"
                         bind:value={$choices.silentMode} />
                 </FormList>
             </div>