Block/Unblock Page Improvements (#885)

* Added Radio Buttons * Optimized Queries * Optimized Query and Added Last Name Filter * Radio Button Working * Added Translations * Fixed Filter Name * Fixed Debounce * Fixed Asynchronous Debounce * Added Tests * Better Error and Loading State Handline * Fixed Loader * Fixed Loader * Modulrised Mock Data * Minor Change * Fixed Tests * Increase Coverage * User query replaced with OrgMemberConnection * Fixed Tests * Code Coverage Increase * Code Cov * Fixed Translations * Fixed Failing Tests
PalisadoesFoundation · May 8, 2023 · e22b3cb · e22b3cb
1 parent b3d7cce
commit e22b3cb
Show file tree

Hide file tree

Showing 9 changed files with 626 additions and 199 deletions.
diff --git a/public/locales/en.json b/public/locales/en.json
@@ -290,7 +290,11 @@
     "orgName": "Enter Name",
     "blockedSuccessfully": "User blocked successfully",
     "Un-BlockedSuccessfully": "User Un-Blocked successfully",
-    "talawaApiUnavailable": "Talawa-API service is unavailable. Is it running? Check your network connectivity too."
+    "talawaApiUnavailable": "Talawa-API service is unavailable. Is it running? Check your network connectivity too.",
+    "allMembers": "All Members",
+    "blockedUsers": "Blocked Users",
+    "searchFirstName": "Enter First Name",
+    "searchLastName": "Enter Last Name"
   },
   "forgotPassword": {
     "title": "Talawa Forgot Password",

diff --git a/public/locales/fr.json b/public/locales/fr.json
@@ -286,7 +286,11 @@
     "orgName": "Entrez le nom",
     "blockedSuccessfully": "Utilisateur bloqué avec succès",
     "Un-BlockedSuccessfully": "Utilisateur débloqué avec succès",
-    "talawaApiUnavailable": "Le service Talawa-API n'est pas disponible. Est-il en cours d'exécution ? Vérifiez également votre connectivité réseau."
+    "talawaApiUnavailable": "Le service Talawa-API n'est pas disponible. Est-il en cours d'exécution ? Vérifiez également votre connectivité réseau.",
+    "allMembers": "Tous les membres",
+    "blockedUsers": "Utilisateurs bloqués",
+    "searchFirstName": "Entrez votre prénom",
+    "searchLastName": "Entrer le nom de famille"
   },
   "forgotPassword": {
     "title": "Mot de passe oublié Talawa",

diff --git a/public/locales/hi.json b/public/locales/hi.json
@@ -286,7 +286,11 @@
     "orgName": "नाम दर्ज करें",
     "blockedSuccessfully": "उपयोगकर्ता को सफलतापूर्वक अवरोधित किया गया",
     "Un-BlockedSuccessfully": "उपयोगकर्ता अन-ब्लॉक किया गया सफलतापूर्वक",
-    "talawaApiUnavailable": "तलवा-एपीआई सेवा उपलब्ध नहीं है। क्या यह चल रहा है? अपनी नेटवर्क कनेक्टिविटी भी जांचें।"
+    "talawaApiUnavailable": "तलवा-एपीआई सेवा उपलब्ध नहीं है। क्या यह चल रहा है? अपनी नेटवर्क कनेक्टिविटी भी जांचें।",
+    "allMembers": "सभी सदस्य",
+    "blockedUsers": "रोके गए उपयोगकर्ता",
+    "searchFirstName": "प्रथम नाम दर्ज करें",
+    "searchLastName": "अंतिम नाम दर्ज करो"
   },
   "forgotPassword": {
     "title": "तलवा पासवर्ड भूल गए",

diff --git a/public/locales/sp.json b/public/locales/sp.json
@@ -286,7 +286,11 @@
     "orgName": "Ingrese su nombre",
     "blockedSuccessfully": "Usuario bloqueado con éxito",
     "Un-BlockedSuccessfully": "Usuario desbloqueado con éxito",
-    "talawaApiUnavailable": "El servicio Talawa-API no está disponible. ¿Está funcionando? Compruebe también la conectividad de su red."
+    "talawaApiUnavailable": "El servicio Talawa-API no está disponible. ¿Está funcionando? Compruebe también la conectividad de su red.",
+    "allMembers": "Todos los miembros",
+    "blockedUsers": "Usuarios bloqueados",
+    "searchFirstName": "Ingrese el nombre",
+    "searchLastName": "Introduzca el apellido"
   },
   "forgotPassword": {
     "title": "Talawa olvidó su contraseña",

diff --git a/public/locales/zh.json b/public/locales/zh.json
@@ -286,7 +286,11 @@
     "orgName": "輸入名字",
     "blockedSuccessfully": "用戶被成功阻止",
     "Un-BlockedSuccessfully": "用戶解封成功",
-    "talawaApiUnavailable": "服務不可用。它在運行嗎？還要檢查您的網絡連接。"
+    "talawaApiUnavailable": "服務不可用。它在運行嗎？還要檢查您的網絡連接。",
+    "allMembers": "所有成员",
+    "blockedUsers": "被阻止的用户",
+    "searchFirstName": "输入名字",
+    "searchLastName": "输入姓氏"
   },
   "forgotPassword": {
     "title": "塔拉瓦忘記密碼",

diff --git a/src/GraphQl/Queries/Queries.ts b/src/GraphQl/Queries/Queries.ts
@@ -150,6 +150,35 @@ export const MEMBERS_LIST = gql`
         image
         email
         createdAt
+        organizationsBlockedBy {
+          _id
+        }
+      }
+    }
+  }
+`;
+
+export const BLOCK_PAGE_MEMBER_LIST = gql`
+  query Organizations(
+    $orgId: ID!
+    $firstName_contains: String
+    $lastName_contains: String
+  ) {
+    organizationsMemberConnection(
+      orgId: $orgId
+      where: {
+        firstName_contains: $firstName_contains
+        lastName_contains: $lastName_contains
+      }
+    ) {
+      edges {
+        _id
+        firstName
+        lastName
+        email
+        organizationsBlockedBy {
+          _id
+        }
       }
     }
   }

diff --git a/src/screens/BlockUser/BlockUser.module.css b/src/screens/BlockUser/BlockUser.module.css
@@ -78,6 +78,24 @@
   justify-content: space-between;
 }
 
+.radio_buttons {
+  color: #707070;
+  font-weight: 600;
+  font-size: 14px;
+}
+.radio_buttons > input {
+  transform: scale(1.2);
+}
+.radio_buttons > label {
+  margin-top: -4px;
+  margin-left: 5px;
+  margin-right: 15px;
+}
+
+.loader {
+  text-align: center;
+}
+
 @media screen and (max-width: 575.5px) {
   .justifysp {
     padding-left: 55px;