From cdaa490ab733ef6c830f526d60fd0f659b47a670 Mon Sep 17 00:00:00 2001
From: barshathakuri <barshathakuri708@gmail.com>
Date: Fri, 20 Dec 2024 11:09:24 +0545
Subject: [PATCH] Add email subscription chip and update PR template.

---
 .github/pull_request_template.md              | 31 ++++++++++++-------
 .../SubscriptionTableItem/i18n.json           |  5 ++-
 .../SubscriptionTableItem/index.tsx           | 29 +++++++++++++++++
 src/views/MySubscriptions/index.tsx           |  4 +--
 4 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index dd9ff228..42301e6d 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,18 +1,27 @@
-## Addresses:
-- XXX
+## Summary
+Provide a brief description of what this PR addresses and its purpose.
 
-## Depends on:
-- XXX
+## Addresses
+- Issue(s): _List related issues or tickets._
+
+## Depends On
+- Other PRs or Dependencies: _List PRs or dependencies this PR relies on._
 
 ## Changes
 - Detailed list or prose of changes
 - Breaking changes
 - Changes to configurations
 
-## This PR doesn't introduce:
-- [ ] typos
-- [ ] conflict markers
-- [ ] unwanted comments
-- [ ] temporary files, auto-generated files or secret keys
-- [ ] `console.log` meant for debugging
-- [ ] codegen errors
+## This PR Ensures:
+- [ ] No typos or grammatical errors
+- [ ] No conflict markers left in the code
+- [ ] No unwanted comments, temporary files, or auto-generated files
+- [ ] No inclusion of secret keys or sensitive data
+- [ ] No `console.log` statements meant for debugging
+- [ ] `pnpm lint` runs without errors
+- [ ] `pnpm typecheck` passes (no type errors)
+- [ ] `pnpm knip` passes
+- [ ] `pnpm build` completes successfully
+
+## Additional Notes
+_Optional: Add any other relevant context, screenshots, or details here._
\ No newline at end of file
diff --git a/src/views/MySubscriptions/SubscriptionTableItem/i18n.json b/src/views/MySubscriptions/SubscriptionTableItem/i18n.json
index bd8f896c..09f4e5d0 100644
--- a/src/views/MySubscriptions/SubscriptionTableItem/i18n.json
+++ b/src/views/MySubscriptions/SubscriptionTableItem/i18n.json
@@ -7,6 +7,9 @@
         "subscriptionUrgency": "Urgency",
         "subscriptionCertainty": "Certainty",
         "subscriptionSeverity": "Severity",
-        "subscriptionCategory": "Category"
+        "subscriptionCategory": "Category",
+        "subscriptionEmail": "Email Subscription",
+        "subscriptionYes": "Yes",
+        "subscriptionNo": "No"
     }
 }
\ No newline at end of file
diff --git a/src/views/MySubscriptions/SubscriptionTableItem/index.tsx b/src/views/MySubscriptions/SubscriptionTableItem/index.tsx
index 0c8d7118..5a3a7b95 100644
--- a/src/views/MySubscriptions/SubscriptionTableItem/index.tsx
+++ b/src/views/MySubscriptions/SubscriptionTableItem/index.tsx
@@ -21,6 +21,7 @@ interface Props {
     filterAlertCategories: string[];
     filterAlertCountry: string;
     filterAlertAdmin1s: string[];
+    notifyByEmail: boolean;
     actions: React.ReactNode;
 }
 
@@ -35,6 +36,7 @@ function SubscriptionTableItem(props: Props) {
         filterAlertSeverities,
         filterAlertAdmin1s,
         filterAlertCountry,
+        notifyByEmail,
         actions,
     } = props;
 
@@ -141,6 +143,33 @@ function SubscriptionTableItem(props: Props) {
                     />
                 )}
             />
+            {notifyByEmail ? (
+                <Chip
+                    name={undefined}
+                    variant="tertiary"
+                    className={styles.filterItem}
+                    label={(
+                        <TextOutput
+                            label={strings.subscriptionEmail}
+                            value={strings.subscriptionYes}
+                            strongLabel
+                        />
+                    )}
+                />
+            ) : (
+                <Chip
+                    name={undefined}
+                    variant="tertiary"
+                    className={styles.filterItem}
+                    label={(
+                        <TextOutput
+                            label={strings.subscriptionEmail}
+                            value={strings.subscriptionNo}
+                            strongLabel
+                        />
+                    )}
+                />
+            )}
         </Container>
     );
 }
diff --git a/src/views/MySubscriptions/index.tsx b/src/views/MySubscriptions/index.tsx
index 24b67e68..f790aa23 100644
--- a/src/views/MySubscriptions/index.tsx
+++ b/src/views/MySubscriptions/index.tsx
@@ -336,7 +336,7 @@ export function Component() {
         filterAlertAdmin1s: value?.filterAlertAdmin1sDisplay?.map(
             (admin) => admin.name,
         ),
-        isActive: value?.isActive,
+        notifyByEmail: value?.notifyByEmail,
         actions: <ActiveTableActions
             onArchiveClick={() => handleArchiveUnarchive(value.id, false)}
             onEditClick={() => handleEditSubscription(key)}
@@ -360,7 +360,7 @@ export function Component() {
         filterAlertAdmin1s: value?.filterAlertAdmin1sDisplay?.map(
             (admin) => admin.name,
         ),
-        isActive: value?.isActive,
+        notifyByEmail: value?.notifyByEmail,
         actions: <ArchiveTableActions
             onUnArchive={() => handleArchiveUnarchive(value.id, true)}
             onSubscriptionRemove={() => handleDeleteSubscription(value.id)}