From 1d6d85600d73cf51e645b9e086734f806fa9807b Mon Sep 17 00:00:00 2001
From: Aditya Agarwal <132701661+adi790uu@users.noreply.github.com>
Date: Sun, 24 Dec 2023 01:17:44 +0530
Subject: [PATCH] Fixed postion of 'All Organizations' button and changed its
 name (#1208)

* Fixed postion of 'All Organizations' button and changed its name

* Changed 'Organizations' to 'My Organizations' and added translations

* fixed 'My Organizations' icon

---------

Co-authored-by: Aditya Agarwal <adi790u@Adityas-MacBook-Air.local>
---
 public/locales/en.json                             |  4 ++--
 public/locales/fr.json                             |  4 ++--
 public/locales/hi.json                             |  4 ++--
 public/locales/sp.json                             |  4 ++--
 public/locales/zh.json                             |  4 ++--
 .../IconComponent/IconComponent.test.tsx           |  4 ++--
 src/components/IconComponent/IconComponent.tsx     | 14 +++++++-------
 src/components/LeftDrawer/LeftDrawer.test.tsx      |  6 +++---
 src/components/LeftDrawer/LeftDrawer.tsx           | 10 ++++++----
 src/screens/OrgList/OrgList.tsx                    |  5 ++++-
 src/state/reducers/routesReducer.test.ts           | 12 ++++++------
 src/state/reducers/routesReducer.ts                |  2 +-
 12 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/public/locales/en.json b/public/locales/en.json
index 74b8ba070b..de4787b7b2 100644
--- a/public/locales/en.json
+++ b/public/locales/en.json
@@ -47,7 +47,7 @@
   "leftDrawer": {
     "talawaAdminPortal": "Talawa Admin Portal",
     "menu": "Menu",
-    "organizations": "Organizations",
+    "my organizations": "My Organizations",
     "requests": "Requests",
     "users": "Users",
     "logout": "Logout"
@@ -84,7 +84,7 @@
     "designation": "Designation",
     "email": "Email",
     "searchByName": "Search By Name",
-    "organizations": "Organizations",
+    "my organizations": "My Organizations",
     "createOrganization": "Create Organization",
     "createSampleOrganization": "Create Sample Organization",
     "description": "Description",
diff --git a/public/locales/fr.json b/public/locales/fr.json
index fc11526ccf..dacb926a6f 100644
--- a/public/locales/fr.json
+++ b/public/locales/fr.json
@@ -42,7 +42,7 @@
   "leftDrawer": {
     "talawaAdminPortal": "Portail d'administration Talawa",
     "menu": "Menu",
-    "organizations": "Organisations",
+    "my organizations": "Mes Organisations",
     "requests": "Demandes",
     "users": "Utilisateurs",
     "logout": "Déconnexion"
@@ -78,7 +78,7 @@
     "designation": "La désignation",
     "email": "E-mail",
     "searchByName": "Rechercher par nom",
-    "organizations": "Organisations",
+    "my organizations": "Mes Organisations",
     "createOrganization": "Créer une organisation",
     "createSampleOrganization": "Créer une organisation d'exemple",
     "description": "La description",
diff --git a/public/locales/hi.json b/public/locales/hi.json
index 241fb2ce47..f470e327a8 100644
--- a/public/locales/hi.json
+++ b/public/locales/hi.json
@@ -42,7 +42,7 @@
   "leftDrawer": {
     "talawaAdminPortal": "तलावा व्यवस्थापक पोर्टल",
     "menu": "मेन्यू",
-    "organizations": "संगठन",
+    "my organizations": "मेरे संगठन",
     "requests": "अनुरोध",
     "users": "उपयोगकर्ता",
     "logout": "लॉग आउट"
@@ -78,7 +78,7 @@
     "designation": "पद",
     "email": "ईमेल",
     "searchByName": "नाम से खोजें",
-    "organizations": "संगठन",
+    "my organizations": "मेरे संगठन",
     "createOrganization": "संगठन बनाएं",
     "createSampleOrganization": " सैंपल संगठन बनाएं",
     "description": "विवरण",
diff --git a/public/locales/sp.json b/public/locales/sp.json
index a7895a86f3..c273777949 100644
--- a/public/locales/sp.json
+++ b/public/locales/sp.json
@@ -42,7 +42,7 @@
   "leftDrawer": {
     "talawaAdminPortal": "Portal de administración de Talawa",
     "menu": "Menú",
-    "organizations": "Organizaciones",
+    "my organizations": "Mis Organizaciones",
     "requests": "Solicitudes",
     "users": "Usuarios",
     "logout": "Cerrar sesión"
@@ -78,7 +78,7 @@
     "designation": "Designacion",
     "email": "Correo electrónico",
     "searchByName": "Buscar por nombre",
-    "organizations": "Organizaciones",
+    "my organizations": "Mis Organizaciones.",
     "createOrganization": "Crear organización",
     "createSampleOrganization": "Crear organización de muestra",
     "description": "Descripción",
diff --git a/public/locales/zh.json b/public/locales/zh.json
index 13bbe0b2d8..b03c3ac8e2 100644
--- a/public/locales/zh.json
+++ b/public/locales/zh.json
@@ -42,7 +42,7 @@
   "leftDrawer": {
     "talawaAdminPortal": "塔拉瓦管理门户",
     "menu": "菜单",
-    "organizations": "组织",
+    "my organizations": "我的组织",
     "requests": "请求",
     "users": "用户",
     "logout": "退出登录"
@@ -78,7 +78,7 @@
     "designation": "指定",
     "email": "電子郵件",
     "searchByName": "按名稱搜索",
-    "organizations": "组织",
+    "my organizations": "我的组织",
     "createOrganization": "創建組織",
     "createSampleOrganization": "创建示范组织",
     "description": "描述",
diff --git a/src/components/IconComponent/IconComponent.test.tsx b/src/components/IconComponent/IconComponent.test.tsx
index ff83ebe57c..a66866b2ad 100644
--- a/src/components/IconComponent/IconComponent.test.tsx
+++ b/src/components/IconComponent/IconComponent.test.tsx
@@ -32,8 +32,8 @@ const screenTestIdMap: Record<string, Record<string, string>> = {
     testId: 'Icon-Component-SettingsIcon',
   },
   AllOrganizations: {
-    name: 'All Organizations',
-    testId: 'Icon-Component-AllOrganizationsIcon',
+    name: 'My Organizations',
+    testId: 'Icon-Component-MyOrganizationsIcon',
   },
   EventProject: {
     name: 'Add Event Project',
diff --git a/src/components/IconComponent/IconComponent.tsx b/src/components/IconComponent/IconComponent.tsx
index 4c490c9c94..891b08d9ee 100644
--- a/src/components/IconComponent/IconComponent.tsx
+++ b/src/components/IconComponent/IconComponent.tsx
@@ -22,6 +22,13 @@ export interface InterfaceIconComponent {
 
 const iconComponent = (props: InterfaceIconComponent): JSX.Element => {
   switch (props.name) {
+    case 'My Organizations':
+      return (
+        <OrganizationsIcon
+          stroke={props.fill}
+          data-testid="Icon-Component-MyOrganizationsIcon"
+        />
+      );
     case 'Dashboard':
       return (
         <DashboardIcon {...props} data-testid="Icon-Component-DashboardIcon" />
@@ -53,13 +60,6 @@ const iconComponent = (props: InterfaceIconComponent): JSX.Element => {
           data-testid="Icon-Component-SettingsIcon"
         />
       );
-    case 'All Organizations':
-      return (
-        <OrganizationsIcon
-          stroke={props.fill}
-          data-testid="Icon-Component-AllOrganizationsIcon"
-        />
-      );
     case 'Add Event Project':
       return (
         <AddEventProjectIcon
diff --git a/src/components/LeftDrawer/LeftDrawer.test.tsx b/src/components/LeftDrawer/LeftDrawer.test.tsx
index a5aa6c1851..dc370da8cc 100644
--- a/src/components/LeftDrawer/LeftDrawer.test.tsx
+++ b/src/components/LeftDrawer/LeftDrawer.test.tsx
@@ -19,7 +19,7 @@ const props = {
 
 const propsOrg: InterfaceLeftDrawerProps = {
   ...props,
-  screenName: 'Organizations',
+  screenName: 'My Organizations',
 };
 const propsReq: InterfaceLeftDrawerProps = {
   ...props,
@@ -79,7 +79,7 @@ describe('Testing Left Drawer component for SUPERADMIN', () => {
       </MockedProvider>
     );
 
-    expect(screen.getByText('Organizations')).toBeInTheDocument();
+    expect(screen.getByText('My Organizations')).toBeInTheDocument();
     expect(screen.getByText('Requests')).toBeInTheDocument();
     expect(screen.getByText('Users')).toBeInTheDocument();
     expect(screen.getByText('Talawa Admin Portal')).toBeInTheDocument();
@@ -231,7 +231,7 @@ describe('Testing Left Drawer component for ADMIN', () => {
       </MockedProvider>
     );
 
-    expect(screen.getByText('Organizations')).toBeInTheDocument();
+    expect(screen.getByText('My Organizations')).toBeInTheDocument();
     expect(screen.getByText('Talawa Admin Portal')).toBeInTheDocument();
 
     expect(screen.getByText(/John Doe/i)).toBeInTheDocument();
diff --git a/src/components/LeftDrawer/LeftDrawer.tsx b/src/components/LeftDrawer/LeftDrawer.tsx
index d2fdfedbcb..224cfeb2ec 100644
--- a/src/components/LeftDrawer/LeftDrawer.tsx
+++ b/src/components/LeftDrawer/LeftDrawer.tsx
@@ -67,9 +67,11 @@ const leftDrawer = ({
         <h5 className={styles.titleHeader}>{t('menu')}</h5>
         <div className={styles.optionList}>
           <Button
-            variant={screenName === 'Organizations' ? 'success' : 'light'}
+            variant={screenName === 'My Organizations' ? 'success' : 'light'}
             className={`${
-              screenName === 'Organizations' ? 'text-white' : 'text-secondary'
+              screenName === 'My Organizations'
+                ? 'text-white'
+                : 'text-secondary'
             }`}
             data-testid="orgsBtn"
             onClick={(): void => {
@@ -79,13 +81,13 @@ const leftDrawer = ({
             <div className={styles.iconWrapper}>
               <OrganizationsIcon
                 stroke={`${
-                  screenName === 'Organizations'
+                  screenName === 'My Organizations'
                     ? 'var(--bs-white)'
                     : 'var(--bs-secondary)'
                 }`}
               />
             </div>
-            {t('organizations')}
+            {t('my organizations')}
           </Button>
           {userType === 'SUPERADMIN' && (
             <Button
diff --git a/src/screens/OrgList/OrgList.tsx b/src/screens/OrgList/OrgList.tsx
index ed10613710..ffc2f2387e 100644
--- a/src/screens/OrgList/OrgList.tsx
+++ b/src/screens/OrgList/OrgList.tsx
@@ -270,7 +270,10 @@ function orgList(): JSX.Element {
 
   return (
     <>
-      <SuperAdminScreen title={t('organizations')} screenName="Organizations">
+      <SuperAdminScreen
+        title={t('my organizations')}
+        screenName="My Organizations"
+      >
         {/* Buttons Container */}
         <div className={styles.btnsContainer}>
           <div className={styles.input}>
diff --git a/src/state/reducers/routesReducer.test.ts b/src/state/reducers/routesReducer.test.ts
index 765920e6f3..33b7e476d7 100644
--- a/src/state/reducers/routesReducer.test.ts
+++ b/src/state/reducers/routesReducer.test.ts
@@ -10,6 +10,7 @@ describe('Testing Routes reducer', () => {
       })
     ).toEqual({
       targets: [
+        { name: 'My Organizations', url: '/orglist/id=undefined' },
         { name: 'Dashboard', url: '/orgdash/id=undefined' },
         { name: 'People', url: '/orgpeople/id=undefined' },
         { name: 'Events', url: '/orgevents/id=undefined' },
@@ -30,10 +31,10 @@ describe('Testing Routes reducer', () => {
           ],
         },
         { name: 'Settings', url: '/orgsetting/id=undefined' },
-        { name: 'All Organizations', url: '/orglist/id=undefined' },
       ],
       configUrl: 'undefined',
       components: [
+        { name: 'My Organizations', comp_id: 'orglist', component: 'OrgList' },
         {
           name: 'Dashboard',
           comp_id: 'orgdash',
@@ -70,7 +71,6 @@ describe('Testing Routes reducer', () => {
           ],
         },
         { name: 'Settings', comp_id: 'orgsetting', component: 'OrgSettings' },
-        { name: 'All Organizations', comp_id: 'orglist', component: 'OrgList' },
         { name: '', comp_id: 'member', component: 'MemberDetail' },
       ],
     });
@@ -84,6 +84,7 @@ describe('Testing Routes reducer', () => {
       })
     ).toEqual({
       targets: [
+        { name: 'My Organizations', url: '/orglist/id=undefined' },
         { name: 'Dashboard', url: '/orgdash/id=undefined' },
         { name: 'People', url: '/orgpeople/id=undefined' },
         { name: 'Events', url: '/orgevents/id=undefined' },
@@ -101,11 +102,11 @@ describe('Testing Routes reducer', () => {
           ],
         },
         { name: 'Settings', url: '/orgsetting/id=undefined' },
-        { name: 'All Organizations', url: '/orglist/id=undefined' },
         { test: 'testupdate' },
       ],
       configUrl: 'undefined',
       components: [
+        { name: 'My Organizations', comp_id: 'orglist', component: 'OrgList' },
         {
           name: 'Dashboard',
           comp_id: 'orgdash',
@@ -142,7 +143,6 @@ describe('Testing Routes reducer', () => {
           ],
         },
         { name: 'Settings', comp_id: 'orgsetting', component: 'OrgSettings' },
-        { name: 'All Organizations', comp_id: 'orglist', component: 'OrgList' },
         { name: '', comp_id: 'member', component: 'MemberDetail' },
       ],
     });
@@ -156,6 +156,7 @@ describe('Testing Routes reducer', () => {
       })
     ).toEqual({
       targets: [
+        { name: 'My Organizations', url: '/orglist/id=undefined' },
         { name: 'Dashboard', url: '/orgdash/id=undefined' },
         { name: 'People', url: '/orgpeople/id=undefined' },
         { name: 'Events', url: '/orgevents/id=undefined' },
@@ -166,7 +167,6 @@ describe('Testing Routes reducer', () => {
         },
         { name: 'Advertisement', url: '/orgads/id=undefined' },
         { name: 'Settings', url: '/orgsetting/id=undefined' },
-        { name: 'All Organizations', url: '/orglist/id=undefined' },
         {
           comp_id: null,
           component: null,
@@ -183,6 +183,7 @@ describe('Testing Routes reducer', () => {
       ],
       configUrl: 'undefined',
       components: [
+        { name: 'My Organizations', comp_id: 'orglist', component: 'OrgList' },
         {
           name: 'Dashboard',
           comp_id: 'orgdash',
@@ -220,7 +221,6 @@ describe('Testing Routes reducer', () => {
           ],
         },
         { name: 'Settings', comp_id: 'orgsetting', component: 'OrgSettings' },
-        { name: 'All Organizations', comp_id: 'orglist', component: 'OrgList' },
         { name: '', comp_id: 'member', component: 'MemberDetail' },
       ],
     });
diff --git a/src/state/reducers/routesReducer.ts b/src/state/reducers/routesReducer.ts
index 4fafbd1ebb..7157feb23f 100644
--- a/src/state/reducers/routesReducer.ts
+++ b/src/state/reducers/routesReducer.ts
@@ -63,6 +63,7 @@ export type TargetsType = {
 
 // Note: Routes with names appear on NavBar
 const components: ComponentType[] = [
+  { name: 'My Organizations', comp_id: 'orglist', component: 'OrgList' },
   { name: 'Dashboard', comp_id: 'orgdash', component: 'OrganizationDashboard' },
   { name: 'People', comp_id: 'orgpeople', component: 'OrganizationPeople' },
   { name: 'Events', comp_id: 'orgevents', component: 'OrganizationEvents' },
@@ -84,7 +85,6 @@ const components: ComponentType[] = [
   },
 
   { name: 'Settings', comp_id: 'orgsetting', component: 'OrgSettings' },
-  { name: 'All Organizations', comp_id: 'orglist', component: 'OrgList' },
   { name: '', comp_id: 'member', component: 'MemberDetail' },
 ];