[#1123] Changes position and text of "All Organizations" button (#1124)

* Changes position and text of all organization button * Made changes to the routesReducer.test file * Made changes in IconComponent.test file * Fetched changes from main repo * Fixed unnecessary changes --------- Co-authored-by: Aditya Agarwal <adi790u@gmail.com>
PalisadoesFoundation · Dec 10, 2023 · 1fd4105 · 1fd4105
1 parent f71bc11
commit 1fd4105
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/src/GraphQl/Queries/Queries.ts b/src/GraphQl/Queries/Queries.ts
@@ -1,6 +1,6 @@
 import gql from 'graphql-tag';
 
-//Query List
+// Query List
 
 // Check Auth
 

diff --git a/src/components/IconComponent/IconComponent.test.tsx b/src/components/IconComponent/IconComponent.test.tsx
@@ -3,6 +3,10 @@ import { render, screen } from '@testing-library/react';
 import IconComponent from './IconComponent';
 
 const screenTestIdMap: Record<string, Record<string, string>> = {
+  AllOrganizations: {
+    name: 'My Organizations',
+    testId: 'Icon-Component-AllOrganizationsIcon',
+  },
   Dashboard: {
     name: 'Dashboard',
     testId: 'Icon-Component-DashboardIcon',
@@ -31,10 +35,6 @@ const screenTestIdMap: Record<string, Record<string, string>> = {
     name: 'Settings',
     testId: 'Icon-Component-SettingsIcon',
   },
-  AllOrganizations: {
-    name: 'All Organizations',
-    testId: 'Icon-Component-AllOrganizationsIcon',
-  },
   EventProject: {
     name: 'Add Event Project',
     testId: 'Icon-Component-Add-Event-Project',

diff --git a/src/components/IconComponent/IconComponent.tsx b/src/components/IconComponent/IconComponent.tsx
@@ -53,7 +53,7 @@ const iconComponent = (props: InterfaceIconComponent): JSX.Element => {
           data-testid="Icon-Component-SettingsIcon"
         />
       );
-    case 'All Organizations':
+    case 'My Organizations':
       return (
         <OrganizationsIcon
           stroke={props.fill}

diff --git 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
@@ -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' },
 ];