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

Merge pull request 'Implemented Pushover to display permission descriptions when editing or creating application role' (#104) from Kartik_permission_description into Issue_May_3W

Browse Source 
Reviewed-on: #104
This commit is contained in:
Gitea Admin 2025-05-14 08:04:12 +00:00
commit 197abedfe2
2 changed files with 303 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
import React, { useEffect, useState } from "react"; import React, { useEffect, useState, useRef } from "react";
import { useFeatures } from "../../hooks/useMasterRole"; import { useFeatures } from "../../hooks/useMasterRole";
import { useForm } from 'react-hook-form'; import { useForm } from 'react-hook-form';
@ -16,7 +16,7 @@ import showToast from "../../services/toastService";
const schema = z.object({ const schema = 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" })
.max(255, { message: "Description cannot exceed 255 characters" }), .max(255, { message: "Description cannot exceed 255 characters" }),
selectedPermissions: z selectedPermissions: z
.array(z.string()) .array(z.string())
@ -24,78 +24,91 @@ const schema = z.object({
}); });
const CreateRole = ({modalType,onClose}) => {
const[isLoading,setIsLoading] = useState(false)
const {masterFeatures} = useFeatures()
const { const CreateRole = ({ modalType, onClose }) => {
register,
handleSubmit, const [isLoading, setIsLoading] = useState(false)
formState: { errors },
const popoverRefs = useRef([]);
} = useForm({ const { masterFeatures } = useFeatures()
resolver: zodResolver(schema),
defaultValues: { const {
role: "", register,
description: "", handleSubmit,
selectedPermissions: [], formState: { errors },
},
}); } = useForm({
resolver: zodResolver(schema),
defaultValues: {
role: "",
description: "",
selectedPermissions: [],
},
});
const onSubmit = (values) => {
setIsLoading(true)
const result = {
role: values.role,
description: values.description,
featuresPermission: values.selectedPermissions.map((id) => ({
id,
isEnabled: true,
})),
};
MasterRespository.createRole(result).then((resp) => {
setIsLoading(false)
const cachedData = getCachedData("Application Role");
const updatedData = [...cachedData, resp.data];
cacheData("Application Role", updatedData);
showToast("Application Role Added successfully.", "success");
onClose()
}).catch((err) => {
showToast(err?.response?.data?.message, "error");
setIsLoading(false)
onClose()
})
const onSubmit = (values) => {
setIsLoading(true)
const result = {
role: values.role,
description: values.description,
featuresPermission: values.selectedPermissions.map((id) => ({
id,
isEnabled: true,
})),
}; };
const [descriptionLength, setDescriptionLength] = useState(0);
const maxDescriptionLength = 255;
useEffect(() => {
setDescriptionLength(0);
}, []);
useEffect(() => {
popoverRefs.current.forEach((el) => {
if (el) {
new bootstrap.Popover(el, {
trigger: "focus",
placement: "right",
html: true,
content: el.getAttribute("data-bs-content"), // use inline content from attribute
});
}
});
}, [masterFeatures]);
MasterRespository.createRole(result).then((resp)=>{
setIsLoading(false)
const cachedData = getCachedData( "Application Role" );
const updatedData = [...cachedData, resp.data];
cacheData("Application Role", updatedData);
showToast( "Application Role Added successfully.", "success" );
onClose()
} ).catch( ( err ) =>
{
showToast(err?.response?.data?.message, "error");
setIsLoading( false )
onClose()
})
};
const [descriptionLength, setDescriptionLength] = useState(0);
const maxDescriptionLength = 255;
useEffect(() => {
setDescriptionLength(0);
}, []);
return ( return (
<form className="row g-2" onSubmit={handleSubmit(onSubmit)}>
<div className="col-12 col-md-12">
<label className="form-label">Role</label>
<input type="text"
{...register("role")}
className={`form-control ${errors.role ? 'is-invalids' : ''}`}
/>
{errors.role && <p className="text-danger">{errors.role.message}</p>}
</div>
<form className="row g-2" onSubmit={handleSubmit(onSubmit)}>
<div className="col-12 col-md-12">
<label className="form-label" htmlFor="description">Description</label> <div className="col-12 col-md-12">
<label className="form-label">Role</label>
<input type="text"
{...register("role")}
className={`form-control ${errors.role ? 'is-invalids' : ''}`}
/>
{errors.role && <p className="text-danger">{errors.role.message}</p>}
</div>
<div className="col-12 col-md-12">
<label className="form-label" htmlFor="description">Description</label>
<textarea <textarea
rows="3" rows="3"
{...register("description")} {...register("description")}
@ -110,75 +123,106 @@ useEffect(() => {
{maxDescriptionLength - descriptionLength} characters left {maxDescriptionLength - descriptionLength} characters left
</div> </div>
{errors.description && ( {errors.description && (
<p className="text-danger">{errors.description.message}</p> <p className="text-danger">{errors.description.message}</p>
)} )}
</div>
<div className="col-12 col-md-12 border">
{masterFeatures.map((feature) => (
<React.Fragment key={feature.id}>
<div className="row my-1" key={feature.id} style={{ marginLeft: "0px" }}>
<div className="col-12 col-md-3 d-flex text-start align-items-start" style={{ wordWrap: 'break-word' }}>
<span className="fs">{feature.name}</span>
</div> </div>
<div className="col-12 col-md-1"></div>
<div className="col-12 col-md-8 d-flex justify-content-start align-items-center flex-wrap"> <div className="col-12 col-md-12 border">
{feature.featurePermissions.map((perm) => (
<div className="d-flex me-3 mb-2" key={perm.id}>
<label className="form-check-label" htmlFor={perm.id}> {masterFeatures.map((feature, featureIndex) => (
<input
type="checkbox" <React.Fragment key={feature.id}>
className="form-check-input mx-2" <div className="row my-1" key={feature.id} style={{ marginLeft: "0px" }}>
id={perm.id}
value={perm.id}
{...register("selectedPermissions")} <div className="col-12 col-md-3 d-flex text-start align-items-start" style={{ wordWrap: 'break-word' }}>
/> <span className="fs">{feature.name}</span>
{perm.name} </div>
</label>
</div> <div className="col-12 col-md-1"></div>
<div className="col-12 col-md-8 d-flex justify-content-start align-items-center flex-wrap">
{feature.featurePermissions.map((perm, permIndex) => {
const refIndex = (featureIndex * 10) + permIndex;
return (
<div className="d-flex me-3 mb-2" key={perm.id}>
<label className="form-check-label" htmlFor={perm.id}>
<input
type="checkbox"
className="form-check-input mx-2"
id={perm.id}
value={perm.id}
{...register("selectedPermissions")}
/>
{perm.name}
</label>
<div style={{ display: 'flex', alignItems: 'center' }}>
<div
key={refIndex}
ref={(el) =>
(popoverRefs.current[refIndex] = el)
}
tabIndex="0"
className="d-flex align-items-center avatar-group justify-content-center"
data-bs-toggle="popover" refIndex
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>
`}
>
&nbsp;
<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="hr my-1 py-1" />
</React.Fragment>
))} ))}
{errors.selectedPermissions && (
<p className="text-danger">{errors.selectedPermissions.message}</p>
)}
{!masterFeatures && <p>Loading...</p>}
</div> </div>
</div>
<hr className="hr my-1 py-1" />
</React.Fragment>
))}
{errors.selectedPermissions && (
<p className="text-danger">{errors.selectedPermissions.message}</p>
)}
{!masterFeatures && <p>Loading...</p>}
</div>
{
masterFeatures && (
<div className="col-12 text-center"> {
<button type="submit" className="btn btn-sm btn-primary me-3"> masterFeatures && (
{isLoading? "Please Wait...":"Submit"}
</button> <div className="col-12 text-center">
<button <button type="submit" className="btn btn-sm btn-primary me-3">
type="reset" {isLoading ? "Please Wait..." : "Submit"}
className="btn btn-sm btn-label-secondary" </button>
data-bs-dismiss="modal" <button
aria-label="Close" type="reset"
> className="btn btn-sm btn-label-secondary"
Cancel data-bs-dismiss="modal"
</button> aria-label="Close"
</div> >
) Cancel
} </button>
</div>
)
}
</form> </form>
); );
}; };

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

@ -1,9 +1,9 @@
import React, { useEffect, useState } from "react"; import React, { useEffect, useState, useRef } from "react";
import { useForm ,Controller} from 'react-hook-form'; import { useForm, Controller } from 'react-hook-form';
import { z } from 'zod'; import { z } from 'zod';
import { zodResolver } from '@hookform/resolvers/zod'; import { zodResolver } from '@hookform/resolvers/zod';
import { useFeatures} from "../../hooks/useMasterRole"; import { useFeatures } from "../../hooks/useMasterRole";
import { MasterRespository } from "../../repositories/MastersRepository"; import { MasterRespository } from "../../repositories/MastersRepository";
import { cacheData, getCachedData } from "../../slices/apiDataManager"; import { cacheData, getCachedData } from "../../slices/apiDataManager";
import showToast from "../../services/toastService"; import showToast from "../../services/toastService";
@ -18,17 +18,18 @@ import showToast from "../../services/toastService";
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" })
.max(255, { message: "Description cannot exceed 255 characters" }), .max(255, { message: "Description cannot exceed 255 characters" }),
permissions: z.record(z.boolean()).refine((permission) => Object.values(permission).includes(true), { permissions: z.record(z.boolean()).refine((permission) => Object.values(permission).includes(true), {
message: "At least one permission must be selected", message: "At least one permission must be selected",
}), }),
}); });
const EditMaster=({master,onClose})=> { const EditMaster = ({ master, onClose }) => {
const [isLoading,setIsLoading] = useState(false) const [isLoading, setIsLoading] = useState(false)
const {masterFeatures} = useFeatures() const { masterFeatures } = useFeatures()
const popoverRefs = useRef([]);
const buildDefaultPermissions = () => { const buildDefaultPermissions = () => {
const defaults = {}; const defaults = {};
@ -41,20 +42,16 @@ const EditMaster=({master,onClose})=> {
}); });
}); });
return defaults; return defaults;
}; };
const initialPermissions = buildDefaultPermissions(); const initialPermissions = buildDefaultPermissions();
const { const {
register, register,
handleSubmit, handleSubmit,
formState: { errors, dirtyFields }, formState: { errors, dirtyFields },
setError,reset setError, reset
} = useForm({ } = useForm({
resolver: zodResolver(updateSchema), resolver: zodResolver(updateSchema),
defaultValues: { defaultValues: {
@ -65,16 +62,16 @@ const EditMaster=({master,onClose})=> {
}); });
const onSubmit = (data) => { const onSubmit = (data) => {
setIsLoading(true) setIsLoading(true)
const existingIds = new Set( const existingIds = new Set(
master?.item?.featurePermission?.map((p) => p.id) master?.item?.featurePermission?.map((p) => p.id)
); );
const updatedPermissions = Object.entries(data.permissions) const updatedPermissions = Object.entries(data.permissions)
.filter(([id, value]) => { .filter(([id, value]) => {
if (existingIds.has(id)) return true; if (existingIds.has(id)) return true;
return ( return (
value === true || value === true ||
(dirtyFields.permissions && dirtyFields.permissions[id]) (dirtyFields.permissions && dirtyFields.permissions[id])
@ -82,7 +79,7 @@ const EditMaster=({master,onClose})=> {
}) })
.map(([id, value]) => ({ id, isEnabled: value })); .map(([id, value]) => ({ id, isEnabled: value }));
if (updatedPermissions.length === 0) { if (updatedPermissions.length === 0) {
setError("permissions", { setError("permissions", {
type: "manual", type: "manual",
@ -92,30 +89,30 @@ const EditMaster=({master,onClose})=> {
} }
const updatedRole = { const updatedRole = {
id:master?.item?.id, id: master?.item?.id,
role: data.role, role: data.role,
description: data.description, description: data.description,
featuresPermission: updatedPermissions, featuresPermission: updatedPermissions,
}; };
MasterRespository.updateRoles(master?.item?.id, updatedRole).then((resp)=>{ MasterRespository.updateRoles(master?.item?.id, updatedRole).then((resp) => {
setIsLoading( false ) setIsLoading(false)
const cachedData = getCachedData("Application Role"); const cachedData = getCachedData("Application Role");
if (cachedData) { if (cachedData) {
const updatedData = cachedData.map((role) => const updatedData = cachedData.map((role) =>
role.id === resp.data?.id ? { ...role, ...resp.data } : role role.id === resp.data?.id ? { ...role, ...resp.data } : role
); );
cacheData("Application Role", updatedData); cacheData("Application Role", updatedData);
} }
showToast( "Application Role Updated successfully.", "success" ); showToast("Application Role Updated successfully.", "success");
setIsLoading(false) setIsLoading(false)
onClose() onClose()
}).catch((Err)=>{ }).catch((Err) => {
showToast( Err.message, "error" ); showToast(Err.message, "error");
setIsLoading(false) setIsLoading(false)
}) })
@ -129,26 +126,38 @@ const EditMaster=({master,onClose})=> {
}); });
setDescriptionLength(master?.item?.description?.length || 0); setDescriptionLength(master?.item?.description?.length || 0);
}, [master, reset]); }, [master, reset]);
const [descriptionLength, setDescriptionLength] = useState(master?.item?.description?.length || 0); const [descriptionLength, setDescriptionLength] = useState(master?.item?.description?.length || 0);
const maxDescriptionLength = 255; const maxDescriptionLength = 255;
useEffect(() => {
popoverRefs.current.forEach((el) => {
if (el) {
new bootstrap.Popover(el, {
trigger: "focus",
placement: "right",
html: true,
content: el.getAttribute("data-bs-content"), // use inline content from attribute
});
}
});
}, [masterFeatures]);
return ( return (
<form className="row g-2 " onSubmit={handleSubmit(onSubmit)}> <form className="row g-2 " onSubmit={handleSubmit(onSubmit)}>
<div className="col-12 col-md-12"> <div className="col-12 col-md-12">
<label className="form-label">Role</label> <label className="form-label">Role</label>
<input type="text" <input type="text"
{...register("role")} {...register("role")}
className={`form-control ${errors.role ? 'is-invalid' : ''}`} className={`form-control ${errors.role ? 'is-invalid' : ''}`}
/> />
{errors.role && <p className="text-danger">{errors.role.message}</p>} {errors.role && <p className="text-danger">{errors.role.message}</p>}
</div> </div>
<div className="col-12 col-md-12"> <div className="col-12 col-md-12">
<label className="form-label" htmlFor="description">Description</label> <label className="form-label" htmlFor="description">Description</label>
<textarea <textarea
rows="3" rows="3"
{...register("description")} {...register("description")}
@ -164,47 +173,81 @@ const EditMaster=({master,onClose})=> {
{errors.description && ( {errors.description && (
<p className="text-danger">{errors.description.message}</p> <p className="text-danger">{errors.description.message}</p>
)} )}
</div> </div>
<div className="col-12 col-md-12 mx-2s " >
{masterFeatures.map((feature, featureIndex) => (
<div className="row my-3" key={feature.id} style={{ marginLeft: "0px" }}>
<div className="col-12 col-md-12 mx-2s " >
{masterFeatures.map((feature) => (
<div className="row my-3" key={feature.id} style={{marginLeft:"0px"}}>
<div className="col-12 col-md-3 d-flex text-start align-items-center" style={{ wordWrap: 'break-word' }}> <div className="col-12 col-md-3 d-flex text-start align-items-center" style={{ wordWrap: 'break-word' }}>
<span className="fs">{feature.name}</span> <span className="fs">{feature.name}</span>
</div> </div>
<div className="col-12 col-md-1"> <div className="col-12 col-md-1">
</div> </div>
<div className="col-12 col-md-8 d-flex justify-content-start align-items-center flex-wrap"> <div className="col-12 col-md-8 d-flex justify-content-start align-items-center flex-wrap">
{feature.featurePermissions.map((perm) => ( {feature.featurePermissions.map((perm, permIndex) => {
const refIndex = (featureIndex * 10) + permIndex;
return (
<div className="d-flex me-3 mb-2" key={perm.id}> <div className="d-flex me-3 mb-2" key={perm.id}>
<label className="form-check-label" htmlFor={perm.id}>
<input <label className="form-check-label" htmlFor={perm.id}>
type="checkbox" <input
className="form-check-input mx-2" type="checkbox"
id={perm.id} className="form-check-input mx-2"
{...register(`permissions.${perm.id}`, { id={perm.id}
value: initialPermissions[perm.id] || false {...register(`permissions.${perm.id}`, {
})} value: initialPermissions[perm.id] || false
/> })}
/>
{perm.name} {perm.name}
</label> </label>
</div>
))}
</div>
</div>
))}
{errors.permissions && (
<p className="text-danger">{errors.permissions.message}</p>
)}
</div>
<div className="col-12 text-center">
<div style={{ display: 'flex', alignItems: 'center' }}>
<div
key={refIndex}
ref={(el) =>
(popoverRefs.current[refIndex] = el)
}
tabIndex="0"
className="d-flex align-items-center avatar-group justify-content-center"
data-bs-toggle="popover" refIndex
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>
`}
>
&nbsp;
<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>
))}
{errors.permissions && (
<p className="text-danger">{errors.permissions.message}</p>
)}
</div>
<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
type="reset" type="reset"
className="btn btn-sm btn-label-secondary" className="btn btn-sm btn-label-secondary"
data-bs-dismiss="modal" data-bs-dismiss="modal"
@ -213,9 +256,9 @@ const EditMaster=({master,onClose})=> {
Cancel Cancel
</button> </button>
</div> </div>
</form> </form>
); );
} }