Skip to content

Commit

Permalink
data-testid added in navbar and admin (#130)
Browse files Browse the repository at this point in the history 
* data-testid added in navbar and admin

* data-testid updated
  • Loading branch information
@Ajay-aot
Ajay-aot authored Jan 11, 2024
1 parent 65401f9 commit fe1b236
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 13 deletions.
9 changes: 7 additions & 2 deletions forms-flow-admin/src/components/dashboard/dashboard.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ export const InsightDashboard = React.memo((props: any) => {
);
};
const noData = () => (
<div>
<div data-testid="dashboard-no-data-msg">
<h3 className="text-center">
<Translation>{(t) => t(props.error || "No data Found")}</Translation>
</h3>
Expand All @@ -186,12 +186,15 @@ export const InsightDashboard = React.memo((props: any) => {
return (
<div className="d-flex flex-wrap col-12">
{cell?.map((label, i) => (
<div key={i} className="d-flex align-items-center justify-content-between rounded-pill px-3 py-2 small m-2" style={{background:"#EAEFFF"}}>
<div key={i} className="d-flex align-items-center justify-content-between rounded-pill px-3 py-2 small m-2"
style={{background:"#EAEFFF"}}
data-testid={`dashboard-access-group-${i}`}>
<span className="">
{label}
<i
className="fa-solid fa-xmark chip-close ms-2"
onClick={() => removeDashboardAuth(rowData, label)}
data-testid={`dashboard-remove-auth-btn-${i}`}
></i>
</span>
</div>
Expand Down Expand Up @@ -222,6 +225,7 @@ export const InsightDashboard = React.memo((props: any) => {
className="role"
key={key}
onClick={() => addDashboardAuth(item)}
data-testid={`dashboard-remaining-group-${key}`}
>
{item.path}
</div>
Expand Down Expand Up @@ -314,6 +318,7 @@ export const InsightDashboard = React.memo((props: any) => {
fontWeight: 600,
}}
noDataIndication={noData}
data-testid="admin-dashboard-table"
/>
) : (
<Loading />
Expand Down
16 changes: 10 additions & 6 deletions forms-flow-admin/src/components/roles/roles.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ const Roles = React.memo((props: any) => {
// Delete confirmation

const confirmDelete = () => (
<div>
<div data-testid="roles-confirm-delete-modal">
<Modal show={showConfirmDelete} onHide={handleCloseDeleteModal}>
<Modal.Header closeButton>
<Modal.Title>{t("Confirm Delete")}</Modal.Title>
Expand All @@ -258,14 +258,17 @@ const Roles = React.memo((props: any) => {
{`${t("Are you sure deleting the role")} ${deleteCandidate.name}`}
</Modal.Body>
<Modal.Footer>
<button type="button"
className="btn btn-link text-dark" onClick={handleCloseDeleteModal}>
<button
type="button"
className="btn btn-link text-dark" onClick={handleCloseDeleteModal}
data-testid="roles-cancel-delete-btn">
{t("Cancel")}
</button>
<Button
variant="danger"
disabled={disabled}
onClick={() => deleteRole(deleteCandidate)}
data-testid="roles-confirm-delete-btn"
>
{t("Delete")}
</Button>
Expand All @@ -275,7 +278,7 @@ const Roles = React.memo((props: any) => {
);

const showCreateModal = () => (
<div>
<div data-testid="create-role-modal">
<Modal show={showRoleModal} onHide={handleCloseRoleModal}>
<Form>
<Modal.Header closeButton>
Expand Down Expand Up @@ -324,7 +327,7 @@ const Roles = React.memo((props: any) => {
</div>
);
const showEditModal = () => (
<div>
<div data-testid="edit-role-modal">
<Modal show={showEditRoleModal} onHide={handleCloseEditRoleModal}>
<Form>
<Modal.Header closeButton>
Expand Down Expand Up @@ -373,7 +376,7 @@ const Roles = React.memo((props: any) => {
);

const noData = () => (
<div>
<div data-testid="roles-no-data-msg">
<h3 className="text-center">
<Translation>{(t) => t(props.error || "No data Found")}</Translation>
</h3>
Expand Down Expand Up @@ -566,6 +569,7 @@ const Roles = React.memo((props: any) => {
fontWeight: 600,
}}
noDataIndication={noData}
data-testid="admin-roles-table"
/>
) : (
<Loading />
Expand Down
5 changes: 4 additions & 1 deletion forms-flow-admin/src/components/users/users.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ const Users = React.memo((props: any) => {
setSizePerPage(sizePerPage);
};
const customTotal = (from, to, size) => (
<span className="ms-2" role="main">
<span className="ms-2" role="main" data-testid="admin-users-custom-total">
<Translation>{(t) => t("Showing")}</Translation> {from}{" "}
<Translation>{(t) => t("to")}</Translation> {to}{" "}
<Translation>{(t) => t("of")}</Translation> {size}{" "}
Expand All @@ -106,12 +106,14 @@ const Users = React.memo((props: any) => {
variant="secondary"
title={currSizePerPage}
style={{ display: "inline" }}
data-testid="admin-users-custom-drop-up"
>
{options.map((option) => (
<Dropdown.Item
key={option.text}
type="button"
onClick={() => onSizePerPageChange(option.page)}
data-testid={`admin-users-drop-up-option-${option.text}`}
>
{option.text}
</Dropdown.Item>
Expand Down Expand Up @@ -380,6 +382,7 @@ const Users = React.memo((props: any) => {
}}
noDataIndication={noData}
onTableChange={handleTableChange}
data-testid="admin-users-table"
/>
) : (
<Loading />
Expand Down
17 changes: 13 additions & 4 deletions forms-flow-nav/src/Navbar.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ const NavBar = React.memo(({ props }) => {
<Nav
id="main-menu-nav"
className="align-items-lg-center justify-content-start w-100"
data-testid="main-menu-nav"
>
{ENABLE_FORMS_MODULE && (
<Nav.Link
Expand All @@ -199,6 +200,7 @@ const NavBar = React.memo(({ props }) => {
? "active"
: ""
}`}
data-testid="forms-nav-link"
>
<i className="fa-solid fa-file-lines me-2" />
{t("Forms")}
Expand All @@ -215,6 +217,7 @@ const NavBar = React.memo(({ props }) => {
? "active"
: ""
}`}
data-testid="admin-nav-link"
>
<i className="fa-solid fa-user-check me-2" />
{t("Admin")}
Expand All @@ -233,6 +236,7 @@ const NavBar = React.memo(({ props }) => {
? "active"
: ""
}`}
data-testid="processes-nav-link"
>
<i className="fa fa-cogs fa-fw me-2" />
{t("Processes")}
Expand All @@ -258,6 +262,7 @@ const NavBar = React.memo(({ props }) => {
? "active"
: ""
}`}
data-testid="applications-nav-link"
>
<i className="fa-solid fa-rectangle-list me-2" />
{t("Submissions")}
Expand All @@ -277,6 +282,7 @@ const NavBar = React.memo(({ props }) => {
? "active"
: ""
}`}
data-testid="tasks-nav-link"
>
<i className="fa-solid fa-list-check me-2" />
{t("Tasks")}
Expand All @@ -289,7 +295,7 @@ const NavBar = React.memo(({ props }) => {
<Nav.Link
as={Link}
to={`${baseUrl}metrics`}
data-testid="Dashboards"
data-testid="dashboards-nav-link"
className={`nav-menu-item py-md-3 px-0 mx-2 ${
pathname.match(
createURLPathMatchExp("metrics", baseUrl)
Expand All @@ -309,7 +315,7 @@ const NavBar = React.memo(({ props }) => {
: null}
</Nav>

<Nav className="nav-user">
<Nav className="nav-user" data-testid="nav-user">
{selectLanguages.length === 1 ? (
selectLanguages.map((e, i) => {
return (
Expand All @@ -330,13 +336,15 @@ const NavBar = React.memo(({ props }) => {
}
className="me-2"
id="basic-nav-dropdown"
data-testid="language-dropdown"
>
{selectLanguages.map((e, index) => (
<NavDropdown.Item
key={index}
onClick={() => {
handleOnclick(e.name);
}}
data-testid={`language-option-${index}`}
>
{e.value}
</NavDropdown.Item>
Expand All @@ -352,16 +360,17 @@ const NavBar = React.memo(({ props }) => {
""}
</>
}
data-testid="user-dropdown"
>
<NavDropdown.Item>
<NavDropdown.Item data-testid="user-info">

{userDetail?.name || userDetail?.preferred_username}
<br />
<i className="fa fa-users fa-fw" />
<b>{getUserRoleName(userRoles)}</b>
</NavDropdown.Item>
<NavDropdown.Divider />
<NavDropdown.Item onClick={logout}>
<NavDropdown.Item onClick={logout} data-testid="logout-item">
<i className="fa fa-sign-out fa-fw" /> {t("Logout")}
</NavDropdown.Item>
</NavDropdown>
Expand Down

0 comments on commit fe1b236

Please sign in to comment.