diff --git a/apps/OpenSign/package.json b/apps/OpenSign/package.json index 5b72d6240..dd97ed9b7 100644 --- a/apps/OpenSign/package.json +++ b/apps/OpenSign/package.json @@ -36,13 +36,13 @@ "react-dom": "^18.3.1", "react-gtm-module": "^2.0.11", "react-helmet": "^6.1.0", - "react-i18next": "^15.7.3", + "react-i18next": "^15.7.4", "react-konva": "^18.2.12", "react-pdf": "^9.2.1", "react-quill-new": "^3.6.0", "react-redux": "^9.2.0", "react-rnd": "^10.5.2", - "react-router": "^7.9.1", + "react-router": "^7.9.3", "react-scrollbars-custom": "^4.1.1", "react-select": "^5.10.2", "react-signature-canvas": "^1.1.0-alpha.2", diff --git a/apps/OpenSign/src/pages/UserList.jsx b/apps/OpenSign/src/pages/UserList.jsx index aab50554e..63dc24d84 100644 --- a/apps/OpenSign/src/pages/UserList.jsx +++ b/apps/OpenSign/src/pages/UserList.jsx @@ -253,7 +253,11 @@ const UserList = () => { }; const handleBtnVisibility = (act, item) => { if (act.restrictAdmin) { - return item?.objectId !== extClass?.[0]?.objectId; + if (item?.UserRole === "contracts_Admin") { + return false; + } else { + return item?.objectId !== extClass?.[0]?.objectId; + } } else if ( act.restrictBtn === true && item?.objectId === extClass?.[0]?.objectId @@ -263,6 +267,13 @@ const UserList = () => { return true; } }; + const handleActiveToggleVisibility = (item) => { + if (item?.UserRole === "contracts_Admin") { + return false; + } else { + return item?.objectId !== extClass?.[0]?.objectId; + } + }; return (
{isLoader && ( @@ -340,7 +351,7 @@ const UserList = () => { {formatRow(item.TeamIds)} - {item.UserRole !== "contracts_Admin" ? ( + {handleActiveToggleVisibility(item) ? (