Feat : User can leave the org by clicking on button #2298
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -83,6 +83,7 @@ | |
| "updatedSuccessfully": "{{item}} 更新成功", | ||
| "removedSuccessfully": "{{item}} 删除成功", | ||
| "successfullyUpdated": "更新成功", | ||
| "confirm": "确认", | ||
| "sessionWarning": "由于不活动，您的会话即将过期。请与页面互动以延长您的会话。", | ||
| "sessionLogOut": "由于不活动，您的会话已过期。请重新登录以继续。" | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -233,7 +233,8 @@ | |
| "orgJoined": "已加入组织", | ||
| "MembershipRequestSent": "会员请求已发送", | ||
| "AlreadyJoined": "已加入", | ||
| "errorOccured": "发生错误", | ||
| "leave": "离开" | ||
AnshulKahar2729 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| }, | ||
| "communityProfile": { | ||
| "title": "社区简介", | ||
|
|
@@ -407,7 +408,7 @@ | |
| "assignmentDate": "分配日期", | ||
| "active": "积极的", | ||
| "clearFilters": "清除过滤器", | ||
| "completed": "已完成", | ||
| "completionDate": "完成日期", | ||
| "createActionItem": "创建操作项", | ||
| "deleteActionItem": "删除操作项", | ||
|
|
@@ -982,7 +983,8 @@ | |
| "logout": "登出", | ||
| "settings": "设置", | ||
| "chat": "聊天", | ||
| "menu": "菜单", | ||
| "leave": "离开" | ||
| }, | ||
| "organizationSidebar": { | ||
| "viewAll": "查看全部", | ||
|
|
@@ -1205,7 +1207,8 @@ | |
| "deleteCategory": "删除类别", | ||
| "deleteCategoryMsg": "您确定要删除此操作项目类别吗？", | ||
| "createButton": "创建按钮", | ||
| "editButton": "编辑按钮", | ||
| "categoryDetails": "类别详情" | ||
| }, | ||
| "organizationVenues": { | ||
| "title": "场地", | ||
|
|
@@ -1319,5 +1322,12 @@ | |
| }, | ||
| "userPledges": { | ||
| "title": "我的承诺" | ||
| }, | ||
| "orgLeave": { | ||
AnshulKahar2729 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| "confirmation": "您确定要离开该组织吗？", | ||
| "heading": "离开组织？", | ||
| "description": "您确定要离开该组织吗？此操作无法撤销。如果该组织需要批准，您将无法在没有批准的情况下重新加入。任何相关的数据或权限可能也会丢失。", | ||
| "errorOccured": "发生错误。请稍后再试。", | ||
| "orgLeft": "您已离开该组织。" | ||
AnshulKahar2729 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -283,6 +283,14 @@ export const JOIN_PUBLIC_ORGANIZATION = gql` | |
| } | ||
| `; | ||
|
|
||
| export const LEAVE_ORGANIZATION = gql` | ||
| mutation ($organizationId: ID!) { | ||
| leaveOrganization(organizationId: $organizationId) { | ||
| _id | ||
| } | ||
| } | ||
| `; | ||
|
|
||
| export const CANCEL_MEMBERSHIP_REQUEST = gql` | ||
| mutation ($membershipRequestId: ID!) { | ||
| cancelMembershipRequest(membershipRequestId: $membershipRequestId) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -728,6 +728,7 @@ export { | |
| CREATE_DIRECT_CHAT, | ||
| CREATE_SAMPLE_ORGANIZATION_MUTATION, | ||
| JOIN_PUBLIC_ORGANIZATION, | ||
| LEAVE_ORGANIZATION, | ||
|
There was a problem hiding this comment. Missing implementation for The Please add the implementation for the export const LEAVE_ORGANIZATION = gql`
mutation LeaveOrganization($orgId: ID!) {
leaveOrganization(organizationId: $orgId) {
_id
}
}
`;Ensure that the mutation name and parameters match the backend GraphQL schema. |
||
| PLUGIN_SUBSCRIPTION, | ||
| REMOVE_CUSTOM_FIELD, | ||
| REMOVE_SAMPLE_ORGANIZATION_MUTATION, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -58,6 +58,13 @@ | |
| width: 8rem; | ||
| } | ||
|
|
||
| .leaveBtn { | ||
| display: flex; | ||
| justify-content: space-around; | ||
| width: 8rem; /* You can adjust the width based on your needs */ | ||
| margin-right: 9rem; | ||
| } | ||
|
|
||
| .orgName { | ||
| text-overflow: ellipsis; | ||
| white-space: nowrap; | ||
|
|
@@ -139,9 +146,17 @@ | |
| margin-left: auto; | ||
| display: block; | ||
| } | ||
|
|
||
| .orgCard .btnContainer { | ||
| display: flex; | ||
| flex-direction: column; | ||
| gap: 0.5rem; | ||
| } | ||
|
|
||
| .joinBtn, | ||
| .joinedBtn, | ||
| .withdrawBtn, | ||
| .leaveBtn { | ||
| display: flex; | ||
| justify-content: space-around; | ||
| width: 100%; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -204,6 +204,52 @@ describe('Testing OrganizationCard Component [User Portal]', () => { | |
| await wait(); | ||
| }); | ||
|
|
||
| test('should navigate to organization page and open leave confirmation modal', async () => { | ||
| const cardProps = { | ||
| ...props, | ||
| membershipRequestStatus: 'accepted', // Set status to accepted | ||
| }; | ||
|
|
||
| render( | ||
| <MockedProvider addTypename={false} link={link}> | ||
| <BrowserRouter> | ||
| <Provider store={store}> | ||
| <I18nextProvider i18n={i18nForTest}> | ||
| <OrganizationCard {...cardProps} /> | ||
| </I18nextProvider> | ||
| </Provider> | ||
| </BrowserRouter> | ||
| </MockedProvider>, | ||
| ); | ||
|
|
||
| await wait(); | ||
|
|
||
| // Assert that "Visit" and "Leave" buttons are present | ||
| expect(screen.getByTestId('manageBtn')).toBeInTheDocument(); | ||
| expect(screen.getByTestId('leaveBtn')).toBeInTheDocument(); | ||
|
|
||
| // Click the "Visit" button and assert the navigate function is called | ||
| fireEvent.click(screen.getByTestId('manageBtn')); | ||
| expect(window.location.pathname).toBe(`/user/organization/${cardProps.id}`); // Simulate navigation | ||
|
|
||
| // Click the "Leave" button and assert that the modal opens | ||
| fireEvent.click(screen.getByTestId('leaveBtn')); | ||
| await wait(); | ||
|
|
||
| // Modal should be shown | ||
| expect(screen.getByText('Leaving organization ?')).toBeInTheDocument(); // Adjust this as per your modal content | ||
|
|
||
| const closeButton = screen.getByText('Cancel'); // Assuming the modal has a "Close" button, adjust as per your modal content | ||
| fireEvent.click(closeButton); | ||
|
|
||
| await wait(); | ||
|
|
||
| // Assert that the modal is no longer in the document | ||
| expect( | ||
| screen.queryByText('Leaving organization ?'), | ||
| ).not.toBeInTheDocument(); | ||
| }); | ||
|
|
||
| test('Component should be rendered properly if organization Image is not undefined', async () => { | ||
| props = { | ||
| ...props, | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Update placeholder values for new keys.
The addition of "editButton" and "categoryDetails" is appropriate. However, they have placeholder values that need to be replaced with proper translations.
Please update the following keys with appropriate translations:
📝 Committable suggestion