Merge pull request #11047 from ToolJet/bugfix/copywriting-change

Static Folder counts on app search + minor fixes

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 ? (
-                  <span>{`${folder.name}${folder.count > 0 ? ` (${activeFolderAppCount})` : ''}`}</span>
-                ) : (
-                  <span>{`${folder.name}${folder.count > 0 ? ` (${folder.count})` : ''}`}</span>
-                )}
+                {`${folder.name}${folder.count > 0 ? ` (${folder.count})` : ''}`}
               </div>
             </ToolTip>
             {(canDeleteFolder || canUpdateFolder) && (

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}
               />
               <OrganizationList />
             </div>

frontend/src/ManageGranularAccess/AddEditResourceModal/AddEditResourcePermissionsModal.jsx

@@ -171,14 +171,16 @@ function AddEditResourcePermissionsModal({
               </div>
             </label>
           </OverlayTrigger>
-          <AppsSelect
-            disabled={!isCustom}
-            allowSelectAll={true}
-            value={selectedApps}
-            onChange={setSelectedApps}
-            options={addableApps}
-            data-value="test"
-          />
+          {isCustom && (
+            <AppsSelect
+              disabled={!isCustom}
+              allowSelectAll={true}
+              value={selectedApps}
+              onChange={setSelectedApps}
+              options={addableApps}
+              data-value="test"
+            />
+          )}
         </div>
       </div>
     </ModalBase>