From b26950c427a53b6cd45c64c5d535f70c6e32d9fc Mon Sep 17 00:00:00 2001
From: Kailash Nadh <kailash@nadh.in>
Date: Sat, 22 Jul 2023 16:23:57 +0530
Subject: [PATCH] Add new subscription list table to the subscriber edit UI
 modal.

---
 frontend/src/assets/style.scss        |  9 ++++--
 frontend/src/views/SubscriberForm.vue | 40 +++++++++++++++++++++++++--
 frontend/src/views/Subscribers.vue    |  3 +-
 3 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/frontend/src/assets/style.scss b/frontend/src/assets/style.scss
index e5b697f..a968015 100644
--- a/frontend/src/assets/style.scss
+++ b/frontend/src/assets/style.scss
@@ -657,9 +657,14 @@ section.lists {
   .toggle-advanced {
     margin-top: 10px;
   }
+}
 
-  .b-table {
-    margin-top: 25px;
+.b-table.subscriptions {
+  overflow-y: scroll;
+  max-height: 250px;
+
+  thead th, tbody td {
+    padding: 10px;
   }
 }
 
diff --git a/frontend/src/views/SubscriberForm.vue b/frontend/src/views/SubscriberForm.vue
index e78bf56..0985d23 100644
--- a/frontend/src/views/SubscriberForm.vue
+++ b/frontend/src/views/SubscriberForm.vue
@@ -47,7 +47,6 @@
           :selected="form.lists"
           :all="lists.results"
         ></list-selector>
-
         <div class="columns mb-5">
           <div class="column is-7">
             <b-field :message="$t('subscribers.preconfirmHelp')">
@@ -65,9 +64,9 @@
           </div>
         </div>
 
-        <b-field :label="$t('subscribers.attribs')" label-position="on-border"
-          :message="$t('subscribers.attribsHelp') + ' ' + egAttribs">
+        <b-field :message="$t('subscribers.attribsHelp') + ' ' + egAttribs" class="mb-5">
           <div>
+            <h5>{{ $t('subscribers.attribs') }}</h5>
             <b-input v-model="form.strAttribs" name="attribs" type="textarea" />
             <a href="https://listmonk.app/docs/concepts"
               target="_blank" rel="noopener noreferrer" class="is-size-7">
@@ -76,6 +75,41 @@
           </div>
         </b-field>
 
+        <div>
+          <h5>{{ $tc('globals.terms.subscriptions', 2) }} ({{ data.lists.length }})</h5>
+          <div class="mb-5">
+            <b-table :data="data.lists" hoverable default-sort="createdAt" class="subscriptions"
+            >
+              <b-table-column v-slot="props" field="name"
+                :label="$tc('globals.terms.list', 1)">
+                <div>
+                  <router-link :to="`/lists/${props.row.id}`">
+                    {{ props.row.name }}
+                  </router-link>
+                  <br />
+                  <b-tag :class="props.row.optin" :data-cy="`optin-${props.row.optin}`">
+                    <b-icon :icon="props.row.optin === 'double' ?
+                      'account-check-outline' : 'account-off-outline'" size="is-small" />
+                    {{ ' ' }}
+                    {{ $t(`lists.optins.${props.row.optin}`) }}
+                  </b-tag>{{ ' ' }}
+                </div>
+              </b-table-column>
+              <b-table-column v-slot="props" field="status" :label="$t('globals.fields.status')">
+                {{ props.row.optin === 'double' ? props.row.subscriptionStatus : '-' }}
+              </b-table-column>
+              <b-table-column v-slot="props" field="createdAt"
+                :label="$t('globals.fields.createdAt')">
+                {{ $utils.niceDate(props.row.subscriptionCreatedAt, true) }}
+              </b-table-column>
+              <b-table-column v-slot="props" field="updatedAt"
+                :label="$t('globals.fields.updatedAt')">
+                {{ $utils.niceDate(props.row.subscriptionCreatedAt, true) }}
+              </b-table-column>
+            </b-table>
+          </div>
+        </div>
+
         <div class="bounces" v-show="bounces.length > 0">
           <a href="#" class="is-size-6" disabed="true"
             @click.prevent="toggleBounces">
diff --git a/frontend/src/views/Subscribers.vue b/frontend/src/views/Subscribers.vue
index 7ca56e0..29919ff 100644
--- a/frontend/src/views/Subscribers.vue
+++ b/frontend/src/views/Subscribers.vue
@@ -71,6 +71,7 @@
       </div>
     </section><!-- control -->
 
+    <br />
     <b-table
       :data="subscribers.results"
       :loading="loading.subscribers"
@@ -200,7 +201,7 @@
     </b-modal>
 
     <!-- Add / edit form modal -->
-    <b-modal scroll="keep" :aria-modal="true" :active.sync="isFormVisible" :width="600"
+    <b-modal scroll="keep" :aria-modal="true" :active.sync="isFormVisible" :width="800"
       @close="onFormClose">
       <subscriber-form :data="curItem" :isEditing="isEditing"
         @finished="querySubscribers"></subscriber-form>