Skip to content

Commit

Permalink
[#1123] Changes position and text of "All Organizations" button (#1124)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
adi790uu and adi790u authored Dec 10, 2023
1 parent f71bc11 commit 1fd4105
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/GraphQl/Queries/Queries.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import gql from 'graphql-tag';

//Query List
// Query List

// Check Auth

Expand Down
8 changes: 4 additions & 4 deletions src/components/IconComponent/IconComponent.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion src/components/IconComponent/IconComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
12 changes: 6 additions & 6 deletions src/state/reducers/routesReducer.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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' },
Expand All @@ -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',
Expand Down Expand Up @@ -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' },
],
});
Expand All @@ -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' },
Expand All @@ -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',
Expand Down Expand Up @@ -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' },
],
});
Expand All @@ -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' },
Expand All @@ -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,
Expand All @@ -183,6 +183,7 @@ describe('Testing Routes reducer', () => {
],
configUrl: 'undefined',
components: [
{ name: 'My Organizations', comp_id: 'orglist', component: 'OrgList' },
{
name: 'Dashboard',
comp_id: 'orgdash',
Expand Down Expand Up @@ -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' },
],
});
Expand Down
2 changes: 1 addition & 1 deletion src/state/reducers/routesReducer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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' },
Expand All @@ -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' },
];

Expand Down

0 comments on commit 1fd4105

Please sign in to comment.