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

Yashwanth individual permission change show #2868

Merged
merged 8 commits into from
Dec 29, 2024
Merged

Yashwanth individual permission change show #2868

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ce7ecd8
Yashwanth Permission Log Table
yashwanth170 Nov 9, 2024
3379eb7
fix:Changing Column name
yashwanth170 Nov 9, 2024
9940a72
Merge branch 'development' of https://github.com/OneCommunityGlobal/H…
yashwanth170 Nov 20, 2024
10869e5
Merge branch 'development' of https://github.com/OneCommunityGlobal/H…
yashwanth170 Nov 21, 2024
3df8692
fix:Moved logic to backend
yashwanth170 Nov 21, 2024
664d5be
Merge branch 'development' of https://github.com/OneCommunityGlobal/H…
yashwanth170 Dec 18, 2024
13f689f
Merge branch 'development' of https://github.com/OneCommunityGlobal/H…
yashwanth170 Dec 21, 2024
6ca3e6b
fix:Highlighting the Individual Name
yashwanth170 Dec 21, 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
6 changes: 2 additions & 4 deletions src/components/PermissionsManagement/PermissionChangeLogTable.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ function PermissionChangeLogTable({ changeLogs, darkMode }) {
<th className={`permission-change-log-table--header${addDark}`}>
Log Date and Time (PST)
</th>
<th className={`permission-change-log-table--header${addDark}`}>Role Name</th>
<th className={`permission-change-log-table--header${addDark}`}>Name</th>
<th className={`permission-change-log-table--header${addDark}`}>Permissions</th>
<th className={`permission-change-log-table--header${addDark}`}>Permissions Added</th>
<th className={`permission-change-log-table--header${addDark}`}>
Expand All @@ -111,9 +111,7 @@ function PermissionChangeLogTable({ changeLogs, darkMode }) {
<td className={`permission-change-log-table--cell ${bgYinmnBlue}`}>{`${formatDate(
log.logDateTime,
)} ${formattedAmPmTime(log.logDateTime)}`}</td>
<td className={`permission-change-log-table--cell ${bgYinmnBlue}`}>
{log.roleName}
</td>
<td className={`permission-change-log-table--cell ${bgYinmnBlue}`}>{log.name}</td>
<td className={`permission-change-log-table--cell permissions ${bgYinmnBlue}`}>
{renderPermissions(log.permissions, log._id)}
</td>
Expand Down
7 changes: 4 additions & 3 deletions src/components/PermissionsManagement/PermissionsManagement.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,11 @@ function PermissionsManagement({ roles, auth, getUserRole, userProfile, darkMode

getInfoCollections();
getUserRole(auth?.user.userid);

const getChangeLogs = async () => {
try {
const response = await axios.get(ENDPOINTS.PERMISSION_CHANGE_LOGS(auth?.user.userid));
const response = await axios.get(
ENDPOINTS.GET_USER_PERMISSION_CHANGE_LOGS(auth?.user.userid),
nathanah marked this conversation as resolved.
Show resolved Hide resolved
);
setChangeLogs(response.data);
setLoading(false);
} catch (error) {
Expand Down Expand Up @@ -243,7 +244,7 @@ function PermissionsManagement({ roles, auth, getUserRole, userProfile, darkMode
</div>
{loading && <p className="loading-message">Loading...</p>}
{changeLogs?.length > 0 && (
<PermissionChangeLogTable changeLogs={changeLogs.slice().reverse()} darkMode={darkMode} />
<PermissionChangeLogTable changeLogs={changeLogs} darkMode={darkMode} />
nathanah marked this conversation as resolved.
Show resolved Hide resolved
)}
<br />
<br />
Expand Down
42 changes: 42 additions & 0 deletions src/components/PermissionsManagement/UserPermissionsPopUp.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,16 @@ function UserPermissionsPopUp({
}
}, [actualUserProfile]);

const logPermissionChanges = async (logPermissionChangesUrl, permissionChangeLog) => {
try {
await axios.post(logPermissionChangesUrl, permissionChangeLog);
} catch (error) {
toast.error('Error logging permissions:', {
autoClose: 10000,
});
}
};

nathanah marked this conversation as resolved.
Show resolved Hide resolved
const updateProfileOnSubmit = async e => {
e.preventDefault();
const shouldPreventEdit = cantUpdateDevAdminDetails(actualUserProfile?.email, authUser.email);
Expand All @@ -80,9 +90,40 @@ function UserPermissionsPopUp({
const userId = actualUserProfile?._id;

const url = ENDPOINTS.USER_PROFILE(userId);
const logPermissionChangesUrl = ENDPOINTS.POST_USER_PERMISSION_CHANGE_LOGS;
nathanah marked this conversation as resolved.
Show resolved Hide resolved
const allUserInfo = await axios.get(url).then(res => res.data);
const newUserInfo = { ...allUserInfo, permissions: { frontPermissions: userPermissions } };

let existingPermissions = allUserInfo.permissions?.frontPermissions || [];
const existingPermissionsSet = new Set(existingPermissions || []);
const newPermissionsSet = new Set(userPermissions || []);
const addedPermissions = (userPermissions || []).filter(
permission => !existingPermissionsSet.has(permission),
);
const removedPermissions = (existingPermissions || []).filter(
permission => !newPermissionsSet.has(permission),
);

existingPermissions = [
...existingPermissions.filter(permission => !removedPermissions.includes(permission)),
...addedPermissions,
];

const permissionChangeLog = {
actualUserProfile: {
firstName: actualUserProfile.firstName,
lastName: actualUserProfile.lastName,
},
authUser: {
email: authUser.email,
role: authUser.role,
},
userId,
existingPermissions, // Existing permissions before change
addedPermissions, // New permissions added
removedPermissions, // Permissions removed
};

nathanah marked this conversation as resolved.
Show resolved Hide resolved
await axios
.put(url, newUserInfo)
.then(() => {
Expand All @@ -94,6 +135,7 @@ function UserPermissionsPopUp({
autoClose: 10000,
});
setToastShown(true);
logPermissionChanges(logPermissionChangesUrl, permissionChangeLog);
nathanah marked this conversation as resolved.
Show resolved Hide resolved
}
toggle();
})
Expand Down
2 changes: 2 additions & 0 deletions src/utils/URL.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ const APIEndpoint =
export const ENDPOINTS = {
APIEndpoint: () => APIEndpoint,
USER_PROFILE: userId => `${APIEndpoint}/userprofile/${userId}`,
POST_USER_PERMISSION_CHANGE_LOGS: `${APIEndpoint}/logPermissionChanges`,
nathanah marked this conversation as resolved.
Show resolved Hide resolved
GET_USER_PERMISSION_CHANGE_LOGS: userId => `${APIEndpoint}/logPermissionChanges/${userId}`,
USER_PROFILE_PROPERTY: userId => `${APIEndpoint}/userprofile/${userId}/property`,
USER_PROFILES: `${APIEndpoint}/userprofile/`,
UPDATE_REHIREABLE_STATUS: userId => `${APIEndpoint}/userprofile/${userId}/rehireable`,
Expand Down
Loading