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> = { 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 ( + + ); case 'Dashboard': return ( @@ -53,13 +60,6 @@ const iconComponent = (props: InterfaceIconComponent): JSX.Element => { data-testid="Icon-Component-SettingsIcon" /> ); - case 'All Organizations': - return ( - - ); case 'Add Event Project': return ( { ); - 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', () => { ); - 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 = ({
{t('menu')}
{userType === 'SUPERADMIN' && (