Refactor_Expenses #321
@ -141,7 +141,7 @@ const CreateRole = ({ modalType, onClose }) => {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="col-12 border px-3"
|
<div className="border rounded px-3"
|
||||||
style={{
|
style={{
|
||||||
maxHeight: "350px", // Adjust this as needed
|
maxHeight: "350px", // Adjust this as needed
|
||||||
overflowY: "auto",
|
overflowY: "auto",
|
||||||
|
|||||||
@ -199,89 +199,91 @@ const EditMaster = ({ master, onClose }) => {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div className="col-12 text-start">
|
<div className="col-12 text-start">
|
||||||
{/* Scrollable Container */}
|
{/* Scrollable Container with Border */}
|
||||||
|
<div
|
||||||
|
className="border rounded p-3" // ✅ border applied here
|
||||||
|
style={{
|
||||||
|
maxHeight: "350px",
|
||||||
|
overflowY: "auto",
|
||||||
|
paddingRight: "10px", // spacing for scrollbar
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{masterFeatures.map((feature, featureIndex) => (
|
||||||
|
<div key={feature.id} className="mb-3">
|
||||||
|
{/* Feature Group Title */}
|
||||||
|
<div className="fw-semibold mb-2">{feature.name}</div>
|
||||||
|
|
||||||
|
{/* Permissions Grid */}
|
||||||
<div
|
<div
|
||||||
|
className="permissions-grid"
|
||||||
style={{
|
style={{
|
||||||
maxHeight: "350px", // adjust as needed
|
display: "grid",
|
||||||
overflowY: "auto",
|
gridTemplateColumns: "repeat(3, minmax(0, 1fr))",
|
||||||
paddingRight: "10px", // for better scrollbar spacing
|
gap: "0.75rem 2rem",
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
{masterFeatures.map((feature, featureIndex) => (
|
{feature.featurePermissions.map((perm, permIndex) => {
|
||||||
<div key={feature.id} className="mb-3">
|
const refIndex = featureIndex * 10 + permIndex;
|
||||||
{/* Feature Group Title */}
|
return (
|
||||||
<div className="fw-semibold mb-2">{feature.name}</div>
|
<div key={perm.id} className="d-flex align-items-start">
|
||||||
|
<label
|
||||||
|
className="form-check-label d-flex align-items-center"
|
||||||
|
htmlFor={perm.id}
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
className="form-check-input me-2"
|
||||||
|
id={perm.id}
|
||||||
|
{...register(`permissions.${perm.id}`, {
|
||||||
|
value: initialPermissions[perm.id] || false,
|
||||||
|
})}
|
||||||
|
/>
|
||||||
|
{perm.name}
|
||||||
|
</label>
|
||||||
|
|
||||||
{/* Permissions Grid */}
|
{/* Info Icon */}
|
||||||
<div
|
<div style={{ display: "flex", alignItems: "center" }}>
|
||||||
className="permissions-grid"
|
<div
|
||||||
style={{
|
ref={(el) => (popoverRefs.current[refIndex] = el)}
|
||||||
display: "grid",
|
tabIndex="0"
|
||||||
gridTemplateColumns: "repeat(3, minmax(0, 1fr))",
|
className="d-flex align-items-center justify-content-center"
|
||||||
gap: "0.75rem 2rem",
|
data-bs-toggle="popover"
|
||||||
}}
|
data-bs-trigger="focus"
|
||||||
>
|
data-bs-placement="right"
|
||||||
{feature.featurePermissions.map((perm, permIndex) => {
|
data-bs-html="true"
|
||||||
const refIndex = featureIndex * 10 + permIndex;
|
data-bs-content={`<div class="border border-secondary rounded custom-popover p-2 px-3">${perm.description}</div>`}
|
||||||
return (
|
>
|
||||||
<div key={perm.id} className="d-flex align-items-start">
|
|
||||||
<label
|
<svg
|
||||||
className="form-check-label d-flex align-items-center"
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
htmlFor={perm.id}
|
width="13"
|
||||||
>
|
height="13"
|
||||||
<input
|
fill="currentColor"
|
||||||
type="checkbox"
|
className="bi bi-info-circle"
|
||||||
className="form-check-input me-2"
|
viewBox="0 0 16 16"
|
||||||
id={perm.id}
|
>
|
||||||
{...register(`permissions.${perm.id}`, {
|
<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" />
|
||||||
value: initialPermissions[perm.id] || false,
|
<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>
|
||||||
/>
|
</div>
|
||||||
{perm.name}
|
</div>
|
||||||
</label>
|
|
||||||
|
|
||||||
{/* Info Icon */}
|
|
||||||
<div style={{ display: "flex", alignItems: "center" }}>
|
|
||||||
<div
|
|
||||||
ref={(el) => (popoverRefs.current[refIndex] = el)}
|
|
||||||
tabIndex="0"
|
|
||||||
className="d-flex align-items-center justify-content-center"
|
|
||||||
data-bs-toggle="popover"
|
|
||||||
data-bs-trigger="focus"
|
|
||||||
data-bs-placement="right"
|
|
||||||
data-bs-html="true"
|
|
||||||
data-bs-content={`<div class="border border-secondary rounded custom-popover p-2 px-3">${perm.description}</div>`}
|
|
||||||
>
|
|
||||||
|
|
||||||
<svg
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
width="13"
|
|
||||||
height="13"
|
|
||||||
fill="currentColor"
|
|
||||||
className="bi bi-info-circle"
|
|
||||||
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.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>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
);
|
|
||||||
})}
|
|
||||||
</div>
|
</div>
|
||||||
|
);
|
||||||
<hr className="my-2" />
|
})}
|
||||||
</div>
|
|
||||||
))}
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{/* Error Display */}
|
<hr className="my-2" />
|
||||||
{errors.permissions && (
|
|
||||||
<p className="text-danger">{errors.permissions.message}</p>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{/* Error Display */}
|
||||||
|
{errors.permissions && (
|
||||||
|
<p className="text-danger">{errors.permissions.message}</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div className="col-12 text-center">
|
<div className="col-12 text-center">
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user