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

Fixes #1380 by simplifying the modal closure mechanism in the 'Manage Features' modal. #1393

Merged
merged 6 commits into from
Jan 22, 2024
Merged

Fixes #1380 by simplifying the modal closure mechanism in the 'Manage Features' modal. #1393

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
974504f
Fix:
harshpreet14 Jan 6, 2024
6de4d4e
reverted changes made to package-lock.json file
harshpreet14 Jan 7, 2024
1f5cdba
Merge branch 'develop' into bugfix/redundant-close
harshpreet14 Jan 7, 2024
8d39fd4
Fix:Replacing Modal Buttons with Bootstrap buttons.
harshpreet14 Jan 7, 2024
315b915
fixed redundant test id- modalOrganisationHeader
harshpreet14 Jan 21, 2024
9b7b3c2
Update OrgList.test.tsx
harshpreet14 Jan 21, 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
65 changes: 19 additions & 46 deletions src/screens/OrgList/OrgList.module.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,25 @@
border: None;
}

.enableEverythingBtn {
width: 100%;
border: None;
}

.pluginStoreBtn {
width: 100%;
background-color: white;
color: #31bb6b;
border: 0.5px solid #31bb6b;
}

.pluginStoreBtn:hover,
.pluginStoreBtn:focus {
background-color: #dfe1e2 !important;
color: #31bb6b !important;
border-color: #31bb6b !important;
}

.line::before {
content: '';
display: inline-block;
Expand Down Expand Up @@ -241,13 +260,6 @@ form > input {
margin-bottom: 0.8rem;
}

.cancel > i {
margin-top: 5px;
transform: scale(1.2);
cursor: pointer;
color: #707070;
}

.modalbody {
width: 50px;
}
Expand All @@ -257,51 +269,12 @@ form > input {
gap: 1rem;
}

.greenregbtn {
margin: 1rem 0 0;
margin-top: 10px;
border: 1px solid #e8e5e5;
box-shadow: 0 2px 2px #e8e5e5;
padding: 10px 10px;
border-radius: 5px;
background-color: #31bb6b;
width: 100%;
font-size: 16px;
color: white;
outline: none;
font-weight: 600;
cursor: pointer;
transition: transform 0.2s, box-shadow 0.2s;
width: 100%;
}

.itemCard .loadingWrapper .innerContainer .content h6[title='Location'] {
display: block;
width: 45%;
height: 18px;
}

.secondbtn {
display: flex;
align-items: center;
justify-content: center;
margin: 1rem 0 0;
margin-top: 10px;
border: 1px solid #d0cfcf;
box-shadow: 0 2px 2px #d0cfcf;
padding: 10px 10px;
border-radius: 5px;
background-color: white;
width: 100%;
font-size: 16px;
color: #31bb6b;
outline: none;
font-weight: 600;
cursor: pointer;
transition: transform 0.2s, box-shadow 0.2s;
width: 100%;
}

.itemCard .loadingWrapper .innerContainer .content h6 {
display: block;
width: 30%;
Expand Down
2 changes: 1 addition & 1 deletion src/screens/OrgList/OrgList.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,6 @@ describe('Organisations Page testing as SuperAdmin', () => {
screen.queryByText(/Congratulation the Organization is created/i)
).toBeInTheDocument()
);
userEvent.click(screen.getByTestId(/closeOrganizationModal/i));
});

test('Plugin Notification model should work properly', async () => {
Expand Down Expand Up @@ -276,6 +275,7 @@ describe('Organisations Page testing as SuperAdmin', () => {
).toBeInTheDocument()
);
userEvent.click(screen.getByTestId(/enableEverythingForm/i));
userEvent.click(screen.getByTestId(/goToStore/i));
});

test('Testing create sample organization working properly', async () => {
Expand Down
39 changes: 13 additions & 26 deletions src/screens/OrgList/OrgList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,53 +643,40 @@ function orgList(): JSX.Element {
</Modal>{' '}
{/* Plugin Notification Modal after Org is Created */}
<Modal show={dialogModalisOpen} onHide={toggleDialogModal}>
<Modal.Header
className="bg-primary"
closeButton
data-testid="modalOrganizationHeader"
harshpreet14 marked this conversation as resolved.
Show resolved Hide resolved
>
<Modal.Title className="text-white">
{t('manageFeatures')}
</Modal.Title>
</Modal.Header>
<Modal.Body>
<section id={styles.grid_wrapper}>
<div>
<div className={styles.flexdir}>
<p className={styles.titlemodal}>{t('manageFeatures')}</p>
<a
onClick={toggleDialogModal}
className={styles.cancel}
data-testid="closeOrganizationModal"
>
<i
className="fa fa-times"
style={{
cursor: 'pointer',
}}
></i>
</a>
<Button
variant="secondary"
onClick={toggleModal}
data-testid="cancelOrganizationModal"
>
{t('cancel')}
</Button>
</div>
<h4 className={styles.titlemodaldialog}>
{t('manageFeaturesInfo')}
</h4>

<div className={styles.pluginStoreBtnContainer}>
<Link
className={styles.secondbtn}
className={`btn btn-primary ${styles.pluginStoreBtn}`}
data-testid="goToStore"
to={`orgstore/id=${dialogRedirectOrgId}`}
>
{t('goToStore')}
</Link>
{/* </button> */}
<button
<Button
type="submit"
className={styles.greenregbtn}
className={styles.enableEverythingBtn}
onClick={closeDialogModal}
value="invite"
data-testid="enableEverythingForm"
>
{t('enableEverything')}
</button>
</Button>
</div>
</div>
</section>
Expand Down
Loading