admin/marco.pms.web
1
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Refactor_Expenses #321

Merged
pramod.mahajan merged 249 commits from Refactor_Expenses into hotfix/MasterActivity 2025-08-01 13:14:59 +00:00
Conversation 0 Commits 249 Files Changed 74 +68 -86
2 changed files with 68 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fa3ccd28fa - Show all commits

125
src/components/master/CreateRole.jsx
View File

@ -141,12 +141,14 @@ const CreateRole = ({ modalType, onClose }) => {
)} )}
</div> </div>
<div className="border rounded px-3" <div
className="border rounded px-3"
style={{ style={{
maxHeight: "350px", // Adjust this as needed maxHeight: "350px",
overflowY: "auto", overflowY: "auto",
overflowX: "hidden", overflowX: "hidden", // Prevent bottom scrollbar
}}> }}
>
{masterFeatures.map((feature, featureIndex) => ( {masterFeatures.map((feature, featureIndex) => (
<React.Fragment key={feature.id}> <React.Fragment key={feature.id}>
<div className="row my-1"> <div className="row my-1">
@ -156,70 +158,60 @@ const CreateRole = ({ modalType, onClose }) => {
</div> </div>
{/* Permissions Grid */} {/* Permissions Grid */}
<div className="col-12 ps-3"> <div className="col-12">
<div className="d-flex flex-column w-100"> <div className="row">
{Array.from({ {feature.featurePermissions.map((perm, permIndex) => {
length: Math.ceil(feature.featurePermissions.length / 3), const refIndex = featureIndex * 100 + permIndex;
}).map((_, rowIndex) => ( return (
<div <div
className="d-flex mb-2 align-items-start justify-content-start flex-wrap" className="col-12 col-sm-6 col-md-4 mb-3"
key={rowIndex} key={perm.id}
> >
{feature.featurePermissions <div className="d-flex align-items-start">
.slice(rowIndex * 3, rowIndex * 3 + 3) <label
.map((perm, permIndex) => { className="form-check-label d-flex align-items-center"
const refIndex = featureIndex * 10 + (rowIndex * 3 + permIndex); htmlFor={perm.id}
return ( >
<div <input
className="d-flex align-items-center me-4" type="checkbox"
key={perm.id} className="form-check-input me-2"
style={{ minWidth: "200px" }} id={perm.id}
> value={perm.id}
<label {...register("selectedPermissions")}
className="form-check-label d-flex align-items-center" />
htmlFor={perm.id} {perm.name}
> </label>
<input
type="checkbox"
className="form-check-input me-2"
id={perm.id}
value={perm.id}
{...register("selectedPermissions")}
/>
{perm.name}
</label>
{/* Info icon */} {/* Info icon */}
<div className="ms-1 d-flex align-items-center"> <div className="ms-1 d-flex align-items-center">
<div <div
ref={(el) => (popoverRefs.current[refIndex] = el)} ref={(el) => (popoverRefs.current[refIndex] = el)}
tabIndex="0" tabIndex="0"
className="d-flex align-items-center justify-content-center" className="d-flex align-items-center justify-content-center"
data-bs-toggle="popover" data-bs-toggle="popover"
data-bs-trigger="focus" data-bs-trigger="focus"
data-bs-placement="right" data-bs-placement="right"
data-bs-html="true" data-bs-html="true"
data-bs-content={`<div class="border border-secondary rounded custom-popover p-2 px-3">${perm.description}</div>`} data-bs-content={`<div class="border border-secondary rounded custom-popover p-2 px-3">${perm.description}</div>`}
> >
&nbsp; &nbsp;
<svg <svg
xmlns="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
width="13" width="13"
height="13" height="13"
fill="currentColor" fill="currentColor"
className="bi bi-info-circle" className="bi bi-info-circle"
viewBox="0 0 16 16" viewBox="0 0 16 16"
> >
<path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" /> <path d="M8 15A7 7 0 1 1 8 1a7 7 0 0 1 0 14zm0 1A8 8 0 1 0 8 0a8 8 0 0 0 0 16z" />
<path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.547 1.11l1.91-2.011c.241-.256.384-.592.287-.984-.172-.439-.58-.827-1.13-.967a.664.664 0 0 1-.58-.309l-.15-.241-.002-.002zM8 4c-.535 0-.943.372-.943.836 0 .464.408.836.943.836.535 0 .943-.372.943-.836 0-.464-.408-.836-.943-.836z" /> <path d="m8.93 6.588-2.29.287-.082.38.45.083c.294.07.352.176.288.469l-.738 3.468c-.194.897.105 1.319.547 1.11l1.91-2.011c.241-.256.384-.592.287-.984-.172-.439-.58-.827-1.13-.967a.664.664 0 0 1-.58-.309l-.15-.241-.002-.002zM8 4c-.535 0-.943.372-.943.836 0 .464.408.836.943.836.535 0 .943-.372.943-.836 0-.464-.408-.836-.943-.836z" />
</svg> </svg>
</div>
</div>
</div> </div>
); </div>
})} </div>
</div> </div>
))} );
})}
</div> </div>
</div> </div>
</div> </div>
@ -234,6 +226,7 @@ const CreateRole = ({ modalType, onClose }) => {
{!masterFeatures && <p>Loading...</p>} {!masterFeatures && <p>Loading...</p>}
</div> </div>
{masterFeatures && ( {masterFeatures && (
<div className="col-12 text-center"> <div className="col-12 text-center">
<button type="submit" className="btn btn-sm btn-primary me-3"> <button type="submit" className="btn btn-sm btn-primary me-3">

29
src/components/master/EditRole.jsx
View File

@ -9,13 +9,6 @@ import { cacheData, getCachedData } from "../../slices/apiDataManager";
import showToast from "../../services/toastService"; import showToast from "../../services/toastService";
import { useUpdateApplicationRole } from "../../hooks/masterHook/useMaster"; import { useUpdateApplicationRole } from "../../hooks/masterHook/useMaster";
const updateSchema = z.object({ const updateSchema = z.object({
role: z.string().min(1, { message: "Role is required" }), role: z.string().min(1, { message: "Role is required" }),
description: z.string().min(1, { message: "Description is required" }) description: z.string().min(1, { message: "Description is required" })
@ -25,8 +18,6 @@ const updateSchema = z.object({
}), }),
}); });
const EditMaster = ({ master, onClose }) => { const EditMaster = ({ master, onClose }) => {
const maxDescriptionLength = 255; const maxDescriptionLength = 255;
const popoverRefs = useRef([]); const popoverRefs = useRef([]);
@ -202,11 +193,12 @@ const EditMaster = ({ master, onClose }) => {
<div className="col-12 text-start"> <div className="col-12 text-start">
{/* Scrollable Container with Border */} {/* Scrollable Container with Border */}
<div <div
className="border rounded p-3" // ✅ border applied here className="border rounded p-3"
style={{ style={{
maxHeight: "350px", maxHeight: "350px",
overflowY: "auto", overflowY: "auto",
paddingRight: "10px", // spacing for scrollbar overflowX: "hidden", // Prevent horizontal scrollbar
paddingRight: "10px",
}} }}
> >
{masterFeatures.map((feature, featureIndex) => ( {masterFeatures.map((feature, featureIndex) => (
@ -215,18 +207,14 @@ const EditMaster = ({ master, onClose }) => {
<div className="fw-semibold mb-2">{feature.name}</div> <div className="fw-semibold mb-2">{feature.name}</div>
{/* Permissions Grid */} {/* Permissions Grid */}
<div <div className="row">
className="permissions-grid"
style={{
display: "grid",
gridTemplateColumns: "repeat(3, minmax(0, 1fr))",
gap: "0.75rem 2rem",
}}
>
{feature.featurePermissions.map((perm, permIndex) => { {feature.featurePermissions.map((perm, permIndex) => {
const refIndex = featureIndex * 10 + permIndex; const refIndex = featureIndex * 10 + permIndex;
return ( return (
<div key={perm.id} className="d-flex align-items-start"> <div
key={perm.id}
className="col-12 col-sm-6 col-md-4 mb-3 d-flex align-items-start"
>
<label <label
className="form-check-label d-flex align-items-center" className="form-check-label d-flex align-items-center"
htmlFor={perm.id} htmlFor={perm.id}
@ -286,6 +274,7 @@ const EditMaster = ({ master, onClose }) => {
<div className="col-12 text-center"> <div className="col-12 text-center">
<button type="submit" className="btn btn-sm btn-primary me-3"> {isLoading ? "Please Wait..." : "Submit"}</button> <button type="submit" className="btn btn-sm btn-primary me-3"> {isLoading ? "Please Wait..." : "Submit"}</button>
<button <button