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

FWF-3922: [Bugfix] Replaced search, fixed pagination updates #352

Merged
merged 2 commits into from
Nov 27, 2024
Merged

FWF-3922: [Bugfix] Replaced search, fixed pagination updates #352

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ead7547
FWF-3922: [Bugfix] Replaced search, fixed pagination updates
Bonymol-aot Nov 25, 2024
8ac41c2
FWF-3922: [Bugfix] Search fix
Bonymol-aot Nov 25, 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
39 changes: 15 additions & 24 deletions forms-flow-admin/src/components/roles/roles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
import { DEFAULT_ROLES } from "../../constants";

import {removingTenantId} from "../../utils/utils.js";
import { TableFooter } from "@formsflow/components";
import { TableFooter, CustomSearch } from "@formsflow/components";
const Roles = React.memo((props: any) => {
const { t } = useTranslation();
const { tenantId } = useParams();
Expand Down Expand Up @@ -117,8 +117,11 @@ const Roles = React.memo((props: any) => {
}, []);

const handlFilter = (e) => {
setSerach(e.target.value);
setRoles(filterList(e.target.value, props.roles));
if (e && e.key === 'Enter') {
setSerach(e.target.value);
setRoles(filterList(e.target.value, props.roles));

}
};

const deleteRole = (rowData) => {
Expand Down Expand Up @@ -356,9 +359,7 @@ const Roles = React.memo((props: any) => {
}
};



const clearSearch = () => {
const handleClearSearch = () => {
setSerach("");
let updatedRoleName = removingTenantId(props.roles,tenantId);
setRoles(updatedRoleName);
Expand Down Expand Up @@ -729,25 +730,15 @@ const Roles = React.memo((props: any) => {
<div className="container-admin">
<div className="d-flex align-items-center justify-content-between">
<div className="search-role col-xl-4 col-lg-4 col-md-6 col-sm-5 px-0">
<Form.Control
type="text"
placeholder={t("Search by role name")}
className="search-role-input"
onChange={handlFilter}
value={search}
title={t("Search...")}
data-testid="search-role-input"
<CustomSearch
handleClearSearch={handleClearSearch}
search={search}
setSearch={setSerach}
handleSearch={handlFilter}
placeholder="Search by role name"
title="Search"
dataTestId="search-role-input"
/>

{search.length > 0 && (
<Button
variant="outline-secondary btn-small clear"
onClick={clearSearch}
data-testid="clear-role-search-button"
>
{t("Clear")}
</Button>
)}
</div>
<Button
variant="primary"
Expand Down
91 changes: 30 additions & 61 deletions forms-flow-admin/src/components/users/users.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import "./users.scss";
import { KEYCLOAK_ENABLE_CLIENT_AUTH,MULTITENANCY_ENABLED } from "../../constants";
import Select from "react-select";
import { CreateUser } from "../../services/users";
import { TableFooter } from "@formsflow/components";
import { TableFooter, CustomSearch } from "@formsflow/components";

const Users = React.memo((props: any) => {
const [selectedRow, setSelectedRow] = React.useState(null);
Expand All @@ -32,7 +32,7 @@ const Users = React.memo((props: any) => {
const [showInviteModal, setShowInviteModal] = React.useState(false); // Add state for managing invite modal
const { t } = useTranslation();
const [selectedRolesModal, setSelectedRolesModal] = React.useState([]);
const [formData, setFormData] = React.useState({ user: ""});
const [formData, setFormData] = React.useState({ user: "" });
const [showSuccessModal, setShowSuccessModal] = React.useState(false);
const [validationError, setValidationError] = React.useState('');

Expand Down Expand Up @@ -82,9 +82,13 @@ const Users = React.memo((props: any) => {
setSelectedRolesModal(selectedOptions);
};
const handleSearch = (e) => {
setSearchKey(e.target.value);
if (e && e.key === 'Enter') {
setSearchKey(e.target.value);
}
};
const handleClearSearch = () => {
setSearchKey("");
};

const removePermission = (rowData, item) => {
const user_id = rowData.id;
const group_id = item.id;
Expand Down Expand Up @@ -113,36 +117,10 @@ const Users = React.memo((props: any) => {
setSizePerPage(sizePerPage);
};

const customTotal = (from, to, size) => (
<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}{" "}
<Translation>{(t) => t("results")}</Translation>
</span>
);

const customDropUp = ({ options, currSizePerPage, onSizePerPageChange }) => {
return (
<DropdownButton
drop="up"
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>
))}
</DropdownButton>
);
const handlePageChange = (page) => {
setActivePage(page);
props.page.setPageNo(page);
props.setInvalidated(true);
};

const getpageList = () => {
Expand Down Expand Up @@ -415,26 +393,17 @@ const Users = React.memo((props: any) => {
<div className="container-admin">
<div className="d-flex align-items-center justify-content-between flex-wrap">
<div className="search-role col-lg-4 col-xl-4 col-md-4 col-sm-6 col-12 px-0">
<Form.Control
type="text"
placeholder={t("Search by name, username or email")}
className="search-role-input"
onChange={handleSearch}
value={searchKey}

<CustomSearch
search={searchKey}
setSearch={setSearchKey}
handleSearch={handleSearch}
handleClearSearch={handleClearSearch}
searchLoading={loading}
placeholder={t("Search by name, username, or email")}
title={t("Search...")}
data-testid="search-users-input"
dataTestId="search-users-input"
/>
{searchKey && (
<Button
variant="outline-secondary btn-small clear"
onClick={() => {
setSearchKey("");
}}
data-testid="clear-users-search-button"
>
{t("Clear")}
</Button>
)}
</div>

<div className="user-filter-container col-lg-4 col-xl-4 col-md-4 col-sm-6 col-12 d-flex justify-content-end gap-2">
Expand Down Expand Up @@ -548,15 +517,15 @@ const Users = React.memo((props: any) => {
<table className="table">
<tfoot>
<TableFooter
limit={sizePerPage}
activePage={activePage}
totalCount={roles.length}
handlePageChange={setActivePage}
onLimitChange={handleLimitChange}
pageOptions={getpageList()}
/>
</tfoot>
</table>
limit={sizePerPage}
activePage={activePage}
totalCount={props.total}
handlePageChange={handlePageChange}
onLimitChange={handleLimitChange}
/>

</tfoot>
</table>
</div>
) : (
<Loading />
Expand Down
2 changes: 1 addition & 1 deletion forms-flow-admin/src/declarations.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,5 +43,5 @@ declare module "@formsflow/service" {
}

declare module "@formsflow/components"{
export const {TableFooter}: any;
export const {TableFooter, CustomSearch}: any;
}
9 changes: 6 additions & 3 deletions forms-flow-components/src/components/CustomComponents/TableFooter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export const TableFooter: React.FC<TableFooterProps> = ({
{totalCount > 5 ? (
<>
<td colSpan={3}>
<div className="d-flex align-items-center justify-content-around">
<div className="d-flex align-items-center">
<Pagination
activePage={activePage}
itemsCountPerPage={limit}
Expand All @@ -54,8 +54,9 @@ export const TableFooter: React.FC<TableFooterProps> = ({
/>
</div>
</td>
<td colSpan={3}>
<div className="d-flex align-items-center justify-content-end">
{pageOptions && (
<td colSpan={3}>
<div className="d-flex align-items-center">
<span className="pagination-text">{t("Rows per page")}</span>
<div className="pagination-dropdown">
<Dropdown data-testid="page-limit-dropdown">
Expand Down Expand Up @@ -83,6 +84,8 @@ export const TableFooter: React.FC<TableFooterProps> = ({
</div>
</div>
</td>
)}

</>
) : null}
</tr>
Expand Down
Loading