Merge pull request #1294 from ItzNotABug/fix-feedback-form

Fix Feedback Forms
appwrite · Sep 25, 2024 · 2248351 · 2248351
2 parents 5993684 + b125a4f
commit 2248351
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 32 deletions.
diff --git a/src/lib/components/feedback/feedback.svelte b/src/lib/components/feedback/feedback.svelte
@@ -6,7 +6,10 @@
         feedbackOptions,
         feedbackData
     } from '$lib/stores/feedback';
+    import { user } from '$lib/stores/user';
+    import { organization } from '$lib/stores/organization';
     import { addNotification } from '$lib/stores/notifications';
+    import { page } from '$app/stores';
 
     $: $selectedFeedback = feedbackOptions.find((option) => option.type === $feedback.type);
 
@@ -15,8 +18,11 @@
             await feedback.submitFeedback(
                 `feedback-${$feedback.type}`,
                 $feedbackData.message,
-                $feedbackData.name,
-                $feedbackData.email
+                $user.name,
+                $user.email,
+                $organization.billingPlan,
+                $page.url.href,
+                $feedbackData.value
             );
             addNotification({
                 type: 'success',

diff --git a/src/lib/components/feedback/feedbackGeneral.svelte b/src/lib/components/feedback/feedbackGeneral.svelte
@@ -1,15 +1,9 @@
 <script lang="ts">
-    import { FormList, InputTextarea, InputText, InputEmail } from '$lib/elements/forms';
+    import { FormList, InputTextarea } from '$lib/elements/forms';
     import { feedbackData } from '$lib/stores/feedback';
 </script>
 
 <FormList>
-    <InputText label="Name" id="name" bind:value={$feedbackData.name} placeholder="Enter name" />
-    <InputEmail
-        label="Email"
-        id="email"
-        bind:value={$feedbackData.email}
-        placeholder="Enter email" />
     <InputTextarea
         id="feedback"
         placeholder="Your message here"

diff --git a/src/lib/components/feedback/feedbackNPS.svelte b/src/lib/components/feedback/feedbackNPS.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-    import { FormList, InputTextarea, InputText, InputEmail } from '$lib/elements/forms';
+    import { FormList, InputTextarea } from '$lib/elements/forms';
     import { feedbackData } from '$lib/stores/feedback';
     import Evaluation from './evaluation.svelte';
 </script>
@@ -16,15 +16,5 @@
             required
             bind:value={$feedbackData.message}
             showLabel={false} />
-        <InputText
-            label="Name"
-            id="name"
-            bind:value={$feedbackData.name}
-            placeholder="Enter name" />
-        <InputEmail
-            label="Email"
-            id="email"
-            bind:value={$feedbackData.email}
-            placeholder="Enter email" />
     {/if}
 </FormList>
diff --git a/src/lib/stores/feedback.ts b/src/lib/stores/feedback.ts
@@ -15,8 +15,6 @@ export type Feedback = {
 
 export type FeedbackData = {
     message: string;
-    name?: string;
-    email?: string;
     value?: number;
 };
 
@@ -47,8 +45,6 @@ export const selectedFeedback = writable<FeedbackOption>();
 function createFeedbackDataStore() {
     const { set, subscribe, update } = writable<FeedbackData>({
         message: '',
-        name: '',
-        email: '',
         value: null
     });
     return {
@@ -58,8 +54,6 @@ function createFeedbackDataStore() {
         reset: () => {
             update((feedbackData) => {
                 feedbackData.message = '';
-                feedbackData.name = '';
-                feedbackData.email = '';
                 feedbackData.value = null;
                 return feedbackData;
             });
@@ -110,11 +104,16 @@ function createFeedbackStore() {
                 return feedback;
             });
         },
+        // TODO: update growth server to accept `billingPlan` and other keys.
         submitFeedback: async (
             subject: string,
             message: string,
-            firstname?: string,
+            name?: string,
             email?: string,
+            // eslint-disable-next-line
+            // @ts-expect-error
+            billingPlan?: string,
+            currentPage?: string,
             value?: number
         ) => {
             if (!VARS.GROWTH_ENDPOINT) return;
@@ -127,8 +126,12 @@ function createFeedbackStore() {
                     subject,
                     message,
                     email,
-                    firstname: firstname ? firstname : undefined,
-                    customFields: value ? [{ id: '40655', value }] : undefined
+                    // billingPlan,
+                    firstname: name || 'Unknown',
+                    customFields: [
+                        { id: '47364', currentPage },
+                        ...(value ? [{ id: '40655', value }] : [])
+                    ]
                 })
             });
             if (response.status >= 400) {

diff --git a/src/routes/(console)/project-[project]/settings/migrations/exportModal.svelte b/src/routes/(console)/project-[project]/settings/migrations/exportModal.svelte
@@ -55,7 +55,7 @@
             await feedback.submitFeedback(`feedback-${$feedback.type}`, message);
         } catch (error) {
             console.error(
-                'Feedback cound bot be submitted, but we continue to reditect to do export.'
+                'Feedback could not be submitted, but we continue to redirect to do export.'
             );
             console.error(error);
         }

diff --git a/src/routes/(console)/wizard/feedback/step1.svelte b/src/routes/(console)/wizard/feedback/step1.svelte
@@ -6,7 +6,10 @@
         feedbackOptions,
         feedback
     } from '$lib/stores/feedback';
+    import { user } from '$lib/stores/user';
+    import { organization } from '$lib/stores/organization';
     import { addNotification } from '$lib/stores/notifications';
+    import { page } from '$app/stores';
 
     $: $selectedFeedback = feedbackOptions.find((option) => option.type === $feedback.type);
 
@@ -15,8 +18,11 @@
             await feedback.submitFeedback(
                 `feedback-${$feedback.type}`,
                 $feedbackData.message,
-                $feedbackData.name,
-                $feedbackData.email
+                $user.name,
+                $user.email,
+                $organization.billingPlan,
+                $page.url.href,
+                $feedbackData.value
             );
             addNotification({
                 type: 'success',