diff --git a/frontend/src/HomePage/Folders.jsx b/frontend/src/HomePage/Folders.jsx index 8818e65be6..e62bc1c919 100644 --- a/frontend/src/HomePage/Folders.jsx +++ b/frontend/src/HomePage/Folders.jsx @@ -25,7 +25,6 @@ export const Folders = function Folders({ canDeleteFolder, canCreateApp, darkMode, - searchedAppCount, }) { const [isLoading, setLoadingStatus] = useState(foldersLoading); const [showInput, setShowInput] = useState(false); @@ -41,14 +40,10 @@ export const Folders = function Folders({ const [activeFolder, setActiveFolder] = useState(currentFolder || {}); const [filteredData, setFilteredData] = useState(folders); const [errorText, setErrorText] = useState(''); - const [activeFolderAppCount, setActiveFolderAppCount] = useState(activeFolder.count); const navigate = useNavigate(); const { t } = useTranslation(); const { updateSidebarNAV } = useContext(BreadCrumbContext); - useEffect(() => { - setActiveFolderAppCount(searchedAppCount); - }, [searchedAppCount]); useEffect(() => { setLoadingStatus(foldersLoading); // eslint-disable-next-line react-hooks/exhaustive-deps @@ -111,7 +106,6 @@ export const Folders = function Folders({ updateSidebarNAV(folder?.name ?? 'All apps'); //update the url query parameter with folder name updateFolderQuery(folder?.name); - setActiveFolderAppCount(folder.count); } function updateFolderQuery(name) { @@ -316,11 +310,7 @@ export const Folders = function Folders({ className="flex-grow-1 tj-folder-list tj-text-xsm" data-cy={`${folder.name.toLowerCase().replace(/\s+/g, '-')}-name`} > - {folder.id === activeFolder.id ? ( - {`${folder.name}${folder.count > 0 ? ` (${activeFolderAppCount})` : ''}`} - ) : ( - {`${folder.name}${folder.count > 0 ? ` (${folder.count})` : ''}`} - )} + {`${folder.name}${folder.count > 0 ? ` (${folder.count})` : ''}`} {(canDeleteFolder || canUpdateFolder) && ( diff --git a/frontend/src/HomePage/HomePage.jsx b/frontend/src/HomePage/HomePage.jsx index 15219269e0..9f93dfdf8c 100644 --- a/frontend/src/HomePage/HomePage.jsx +++ b/frontend/src/HomePage/HomePage.jsx @@ -843,7 +843,6 @@ class HomePageComponent extends React.Component { canUpdateFolder={this.canUpdateFolder()} darkMode={this.props.darkMode} canCreateApp={this.canCreateApp()} - searchedAppCount={this.state.searchedAppCount} /> diff --git a/frontend/src/ManageGranularAccess/AddEditResourceModal/AddEditResourcePermissionsModal.jsx b/frontend/src/ManageGranularAccess/AddEditResourceModal/AddEditResourcePermissionsModal.jsx index e70441a58e..783b008051 100644 --- a/frontend/src/ManageGranularAccess/AddEditResourceModal/AddEditResourcePermissionsModal.jsx +++ b/frontend/src/ManageGranularAccess/AddEditResourceModal/AddEditResourcePermissionsModal.jsx @@ -171,14 +171,16 @@ function AddEditResourcePermissionsModal({ - + {isCustom && ( + + )}