Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature Added: An option for users to leave the Organization (Fixes #1873) #2629

Open
wants to merge 15 commits into
base: develop-postgres
Choose a base branch
from
Open

Feature Added: An option for users to leave the Organization (Fixes #1873) #2629

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
eae5b1a
Fixed: issue-#1873
raggettii Dec 9, 2024
c971387
Fixed: issue-#1873
raggettii Dec 9, 2024
f28688d
Fixed: issue-#1873
raggettii Dec 9, 2024
0af5351
Fixed: issue-#1873
raggettii Dec 9, 2024
43ec4b2
Not title changed to title
raggettii Dec 9, 2024
da0b9c0
Ensure case-insensitive email verification for leaving organization
raggettii Dec 9, 2024
ef9bef6
Null check for organization data added
raggettii Dec 9, 2024
1228beb
Refetching of orgs added after leaving org
raggettii Dec 10, 2024
b806e2d
GraphQL error scenarios to test cases Added
raggettii Dec 10, 2024
31a9950
GraphQL error scenarios to test cases Added 1
raggettii Dec 10, 2024
c8ac9d8
Downgrade vitest to 2.1.5 to resolve peer dependency conflict
raggettii Dec 10, 2024
e2ea39a
fixed parsing error 1
raggettii Dec 10, 2024
6baab67
TSDoc comment added in LeaveOrganization.tsx 5
raggettii Dec 10, 2024
d7c1c93
LeaveOrganization.test.tsx file updated 1
raggettii Dec 11, 2024
8bb7424
suggested changes are made
raggettii Dec 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 67 additions & 47 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
"sass": "^1.80.7",
"tsx": "^4.19.1",
"vite-plugin-svgr": "^4.2.0",
"vitest": "^2.1.5",
"vitest": "^2.1.8",
"whatwg-fetch": "^3.6.20"
},
"resolutions": {
Expand Down
3 changes: 3 additions & 0 deletions public/locales/en/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,6 +1405,9 @@
"userPledges": {
"title": "My Pledges"
},
"leaveOrganization": {
"title": "Leave Organization"
},
"eventVolunteers": {
"volunteers": "Volunteers",
"volunteer": "Volunteer",
Expand Down
3 changes: 3 additions & 0 deletions public/locales/fr/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,6 +1405,9 @@
"userPledges": {
"title": "Mes Promesses"
},
"leaveOrganization": {
"title": "Quitter l'organisation"
},
"eventVolunteers": {
"volunteers": "Bénévoles",
"volunteer": "Bénévole",
Expand Down
3 changes: 3 additions & 0 deletions public/locales/hi/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,6 +1405,9 @@
"userPledges": {
"title": "मेरी प्रतिज्ञाएँ"
},
"leaveOrganization": {
"title": "संगठन छोड़ें"
},
"eventVolunteers": {
"volunteers": "स्वयंसेवक",
"volunteer": "स्वयंसेवक",
Expand Down
3 changes: 3 additions & 0 deletions public/locales/sp/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1407,6 +1407,9 @@
"userPledges": {
"title": "Mis Promesas"
},
"leaveOrganization": {
"title": "Dejar la organización"
},
"eventVolunteers": {
"volunteers": "Voluntarios",
"volunteer": "Voluntario",
Expand Down
3 changes: 3 additions & 0 deletions public/locales/zh/translation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,6 +1405,9 @@
"userPledges": {
"title": "我的承诺"
},
"leaveOrganization": {
"title": "离开组织"
},
"eventVolunteers": {
"volunteers": "志愿者",
"volunteer": "志愿者",
Expand Down
5 changes: 5 additions & 0 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ import EventDashboardScreen from 'components/EventDashboardScreen/EventDashboard
import Campaigns from 'screens/UserPortal/Campaigns/Campaigns';
import Pledges from 'screens/UserPortal/Pledges/Pledges';
import VolunteerManagement from 'screens/UserPortal/Volunteer/VolunteerManagement';
import LeaveOrganization from 'screens/UserPortal/LeaveOrganization/LeaveOrganization';

const { setItem } = useLocalStorage();

Expand Down Expand Up @@ -198,6 +199,10 @@ function app(): JSX.Element {
<Route path="/user/events/:orgId" element={<Events />} />
<Route path="/user/campaigns/:orgId" element={<Campaigns />} />
<Route path="/user/pledges/:orgId" element={<Pledges />} />
<Route
path="/user/leaveOrg/:orgId"
element={<LeaveOrganization />}
/>
<Route
path="/user/volunteer/:orgId"
element={<VolunteerManagement />}
Expand Down
1 change: 1 addition & 0 deletions src/assets/svgs/leave.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/EventDashboardScreen/EventDashboardScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const EventDashboardScreen = (): JSX.Element => {
className={`d-flex flex-row justify-content-between flex-wrap ${styles.gap}`}
>
<div style={{ flex: 1 }}>
<h1>{t('title')}</h1>
<h1>{t('Not title ')}</h1>
Copy link

@coderabbitai coderabbitai bot Dec 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Fix incorrect title translation key

The title translation key appears to be incorrectly changed to 'Not title ' which seems unintentional and inconsistent with other title renderings in the file.

-                <h1>{t('Not title ')}</h1>
+                <h1>{t('title')}</h1>
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
<h1>{t('Not title ')}</h1>
<h1>{t('title')}</h1>

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes have been made

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@raggettii, thank you for making the changes!

If you found this review helpful, would you consider giving us a shout-out on X?
Thank you for using CodeRabbit!

</div>
<Outlet />
</div>
Expand Down
Loading
Loading