Redesign: Standardise User Management Screens for Admin and Super Admin

public/locales/en/translation.json

@@ -172,6 +172,17 @@
     "admins": "admins",
     "members": "members"
   },
+  "orgPeopleOrganizationsCard": {
+    "manage": "Manage",
+    "notMember": "User is not a member",
+    "unblock": "UnBlock",
+    "block": "Block",
+    "blockedSuccessfully": "User blocked successfully",
+    "unBlockedSuccessfully": "User Un-Blocked successfully",
+    "blockedUser": "User is blocked",
+    "roleUpdated": "Role Updated.",
+    "memberRemoved": "The Member is removed"
+  },
   "paginationList": {
     "rowsPerPage": "rows per page",
     "all": "All"
@@ -269,7 +280,8 @@
     "talawaApiUnavailable": "talawaApiUnavailable"
   },
   "organizationPeople": {
-    "title": "Talawa Members",
+    "title": "Members",
+    "title_superadmin": "Users",
     "filterByName": "Filter by Name",
     "filterByLocation": "Filter by Location",
     "filterByEvent": "Filter by Event",
@@ -863,6 +875,14 @@
     "installMsg": "This feature is now enabled in your organization"
   },
   "memberDetail": {
+    "overview": "Overview",
+    "organizations": "Organizations",
+    "events": "Events",
+    "tags": "Tags",
+    "title_superadmin": "User Details",
+    "title": "Member Details"
+  },
+  "orgMemberDetail": {
     "title": "User Details",
     "addAdmin": "Add Admin",
     "alreadyIsAdmin": "Member is already an Admin",
@@ -904,9 +924,11 @@
     "joined": "joined",
     "talawaApiUnavailable": "talawaApiUnavailable"
   },
-  "people": {
-    "title": "People",
-    "searchUsers": "Search users"
+  "memberOrganization": {
+    "sort": "Sort",
+    "noOrgError": "Organizations not found, please create an organization through dashboard",
+    "noOrgErrorTitle": "Organizations Not Found",
+    "noOrgErrorDescription": "Please create an organization through dashboard"
   },
   "userLogin": {
     "login": "Login",
@@ -922,6 +944,10 @@
     "register": "register",
     "talawaApiUnavailable": "talawaApiUnavailable"
   },
+  "people": {
+    "title": "People",
+    "searchUsers": "Search People"
+  },
   "userRegister": {
     "enterFirstName": "Enter your first name",
     "enterLastName": "Enter your last name",

public/locales/fr/translation.json

@@ -172,6 +172,17 @@
     "admins": "Administrateurs",
     "members": "Membres"
   },
+  "orgPeopleOrganizationsCard": {
+    "manage": "Gérer",
+    "notMember": "L'utilisateur n'est pas un membre",
+    "unblock": "Débloquer",
+    "block": "Bloc",
+    "blockedSuccessfully": "Utilisateur bloqué avec succès",
+    "unBlockedSuccessfully": "Utilisateur débloqué avec succès",
+    "blockedUser": "Utilisateur bloqué",
+    "roleUpdated": "Rôle mis à jour.",
+    "memberRemoved": "Le membre est supprimé"
+  },
   "paginationList": {
     "rowsPerPage": "lignes par page",
     "all": "Tous"
@@ -863,6 +874,13 @@
     "installMsg": "Cette fonctionnalité est désormais activée dans votre organisation"
   },
   "memberDetail": {
+    "overview": "Aperçu",
+    "organizations": "Organisations",
+    "events": "Événements",
+    "tags": "Balises",
+    "title": "Détails de l'utilisateur"
+  },
+  "orgMemberDetail": {
     "title": "Détails de l'utilisateur",
     "addAdmin": "Ajouter un administrateur",
     "alreadyIsAdmin": "Le membre est déjà un administrateur",
@@ -904,9 +922,11 @@
     "joined": "Rejoint",
     "talawaApiUnavailable": "API Talawa non disponible"
   },
-  "people": {
-    "title": "Personnes",
-    "searchUsers": "Rechercher des utilisateurs"
+  "memberOrganization": {
+    "sort": "Trier",
+    "noOrgError": "Organisations non trouvées, veuillez créer une organisation via le tableau de bord",
+    "noOrgErrorTitle": "Organisations non trouvées",
+    "noOrgErrorDescription": "Veuillez créer une organisation via le tableau de bord"
   },
   "userLogin": {
     "login": "Se connecter",
@@ -922,6 +942,10 @@
     "register": "Inscription",
     "talawaApiUnavailable": "API Talawa non disponible"
   },
+  "people": {
+    "title": "Personnes",
+    "searchUsers": "Rechercher des utilisateurs"
+  },
   "userRegister": {
     "enterFirstName": "Entrez votre prénom",
     "enterLastName": "Entrez votre nom de famille",

public/locales/hi/translation.json

@@ -172,6 +172,17 @@
     "admins": "प्रशासक",
     "members": "सदस्य"
   },
+  "orgPeopleOrganizationsCard": {
+    "manage": "प्रबंधित करें",
+    "notMember": "उपयोगकर्ता सदस्य नहीं है",
+    "unblock": "अनब्लॉक करें",
+    "block": "ब्लॉक करें",
+    "blockedSuccessfully": "उपयोगकर्ता को सफलतापूर्वक ब्लॉक किया गया",
+    "unBlockedSuccessfully": "उपयोगकर्ता को सफलतापूर्वक अनब्लॉक किया गया",
+    "blockedUser": "उपयोगकर्ता ब्लॉक है",
+    "roleUpdated": "भूमिका अद्यतन की गई।",
+    "memberRemoved": "सदस्य को हटा दिया गया"
+  },
   "paginationList": {
     "rowsPerPage": "प्रति पृष्ठ पंक्तियाँ",
     "all": "सभी"
@@ -863,6 +874,13 @@
     "installMsg": "यह सुविधा अब आपके संगठन में सक्षम है"
   },
   "memberDetail": {
+    "overview": "अवलोकन",
+    "organizations": "संगठन",
+    "events": "घटनाएँ",
+    "tags": "टैग",
+    "title": "उपयोगकर्ता विवरण"
+  },
+  "orgMemberDetail": {
     "title": "उपयोगकर्ता विवरण",
     "addAdmin": "व्यवस्थापक जोड़ें",
     "alreadyIsAdmin": "सदस्य पहले से ही एक व्यवस्थापक है",
@@ -904,9 +922,11 @@
     "joined": "शामिल हुए",
     "talawaApiUnavailable": "Talawa API अनुपलब्ध"
   },
-  "people": {
-    "title": "लोग",
-    "searchUsers": "उपयोगकर्ताओं को खोजें"
+  "memberOrganization": {
+    "sort": "क्रम से लगाना",
+    "noOrgError": "संगठन नहीं मिला, कृपया डैशबोर्ड के माध्यम से एक संगठन बनाएं",
+    "noOrgErrorTitle": "संगठन नहीं मिले",
+    "noOrgErrorDescription": "कृपया डैशबोर्ड के माध्यम से एक संगठन बनाएं"
   },
   "userLogin": {
     "login": "लॉग इन करें",
@@ -922,6 +942,10 @@
     "register": "पंजीकरण करें",
     "talawaApiUnavailable": "Talawa API अनुपलब्ध"
   },
+  "people": {
+    "title": "लोग",
+    "searchUsers": "उपयोगकर्ता खोजें"
+  },
   "userRegister": {
     "enterFirstName": "अपना पहला नाम दर्ज करें",
     "enterLastName": "अपना अंतिम नाम दर्ज करें",

public/locales/sp/translation.json

@@ -172,6 +172,17 @@
     "manage": "Administrar",
     "sampleOrganization": "Organización de muestra"
   },
+  "orgPeopleOrganizationsCard": {
+    "manage": "Gestionar",
+    "notMember": "El usuario no es miembro",
+    "unblock": "Desbloquear",
+    "block": "Bloquear",
+    "blockedSuccessfully": "Usuario bloqueado con éxito",
+    "unBlockedSuccessfully": "Usuario desbloqueado exitosamente",
+    "blockedUser": "Usuario bloqueado",
+    "roleUpdated": "Rol actualizado.",
+    "memberRemoved": "El miembro ha sido eliminado"
+  },
   "paginationList": {
     "rowsPerPage": "filas por página",
     "all": "Todos"
@@ -269,7 +280,8 @@
     "talawaApiUnavailable": "El servicio Talawa-API no está disponible. ¿Está funcionando? Compruebe también la conectividad de su red."
   },
   "organizationPeople": {
-    "title": "Miembros Talawa",
+    "title": "Miembros",
+    "title_superadmin": "Usuarios",
     "filterByName": "Filtrar por nombre",
     "filterByLocation": "Filtrar por Ubicación",
     "filterByEvent": "Filtrar por Evento",
@@ -864,6 +876,21 @@
     "installMsg": "Mensaje de instalación"
   },
   "memberDetail": {
+    "overview": "Resumen",
+    "organizations": "Organizaciones",
+    "events": "Eventos",
+    "tags": "Etiquetas",
+    "title": "Detalles del Usuario"
+  },
+  "memberOrganization": {
+    "sort": "Ordenar",
+    "noOrgError": "Organizaciones no encontradas, por favor crea una organización a través del panel de control",
+    "noOrgErrorTitle": "Organizaciones no encontradas",
+    "noOrgErrorDescription": "Por favor, crea una organización a través del panel de control",
+    "noResultsFoundFor": "No se encontraron resultados para",
+    "endOfResults": "Fin de los resultados"
+  },
+  "orgMemberDetail": {
     "title": "Detalles del usuario",
     "addAdmin": "Agregar administrador",
     "alreadyIsAdmin": "El Miembro ya es Administrador",

public/locales/zh/translation.json

@@ -172,6 +172,17 @@
     "admins": "管理员",
     "members": "成员"
   },
+  "orgPeopleOrganizationsCard": {
+    "manage": "管理",
+    "notMember": "不是会员",
+    "unblock": "解锁",
+    "block": "堵塞",
+    "blockedSuccessfully": "用户被成功屏蔽",
+    "unBlockedSuccessfully": "用户解封成功",
+    "blockedUser": "被阻止的用户",
+    "roleUpdated": "角色已更新。",
+    "memberRemoved": "该会员已被删除"
+  },
   "paginationList": {
     "rowsPerPage": "每页行数",
     "all": "全部"
@@ -863,7 +874,15 @@
     "installMsg": "您的组织现已启用此功能"
   },
   "memberDetail": {
-    "title": "用户详细信息",
+    "overview": "概览",
+    "organizations": "组织",
+    "events": "活动",
+    "tags": "标签",
+    "title": "用户详情"
+  },
+
+  "orgMemberDetail": {
+    "title": "用户详情",
     "addAdmin": "添加管理员",
     "alreadyIsAdmin": "会员已经是管理员",
     "organizations": "组织机构",
@@ -904,6 +923,13 @@
     "joined": "已加入",
     "talawaApiUnavailable": "塔拉瓦 API 不可用"
   },
+
+  "memberOrganization": {
+    "sort": "按角色搜索",
+    "noOrgError": "未找到组织，请通过仪表板创建组织",
+    "noOrgErrorTitle": "未找到组织",
+    "noOrgErrorDescription": "请通过仪表板创建组织"
+  },
   "userLogin": {
     "login": "登录",
     "loginIntoYourAccount": "登录您的帐户",

src/GraphQl/Queries/Queries.ts

@@ -98,6 +98,13 @@ export const ORGANIZATION_CONNECTION_LIST = gql`
         sortingCode
         state
       }
+      blockedUsers {
+        _id
+        firstName
+        lastName
+        email
+      }
+      description
     }
   }
 `;

src/components/LeftDrawerOrg/LeftDrawerOrg.test.tsx

@@ -215,9 +215,20 @@ const MOCKS_EMPTY = [
   },
 ];
 
+const defaultScreensForSuperadmin = [
+  'Dashboard',
+  'Users',
+  'Events',
+  'Posts',
+  'Block/Unblock',
+  'Plugins',
+  'Settings',
+  'All Organizations',
+];
+
 const defaultScreens = [
   'Dashboard',
-  'People',
+  'Members',
   'Events',
   'Posts',
   'Block/Unblock',
@@ -268,7 +279,7 @@ const linkEmpty = new StaticMockLink(MOCKS_EMPTY, true);
 describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
   test('Component should be rendered properly', async () => {
     setItem('UserImage', '');
-    setItem('SuperAdmin', true);
+    setItem('SuperAdmin', false);
     setItem('FirstName', 'John');
     setItem('LastName', 'Doe');
     render(
@@ -288,6 +299,28 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
     });
   });
 
+  test('Component should be rendered properly for superadmin', async () => {
+    setItem('UserImage', '');
+    setItem('SuperAdmin', true);
+    setItem('FirstName', 'John');
+    setItem('LastName', 'Doe');
+    render(
+      <MockedProvider addTypename={false} link={link}>
+        <BrowserRouter>
+          <Provider store={store}>
+            <I18nextProvider i18n={i18nForTest}>
+              <LeftDrawerOrg {...props} />
+            </I18nextProvider>
+          </Provider>
+        </BrowserRouter>
+      </MockedProvider>,
+    );
+    await wait();
+    defaultScreensForSuperadmin.map((screenName) => {
+      expect(screen.getByText(screenName)).toBeInTheDocument();
+    });
+  });
+
   test('Testing Profile Page & Organization Detail Modal', async () => {
     setItem('UserImage', '');
     setItem('SuperAdmin', true);
@@ -329,7 +362,7 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
     expect(global.window.location.pathname).toContain('/orgdash/123');
   });
 
-  test('Testing when screen size is less than 820px', async () => {
+  test('Testing when screen size is less than 820px for superadmins', async () => {
     setItem('SuperAdmin', true);
     render(
       <MockedProvider addTypename={false} link={link}>
@@ -344,6 +377,7 @@ describe('Testing LeftDrawerOrg component for SUPERADMIN', () => {
     );
     await wait();
     resizeWindow(800);
+
     expect(screen.getAllByText(/Dashboard/i)[0]).toBeInTheDocument();
     expect(screen.getAllByText(/People/i)[0]).toBeInTheDocument();