Merge remote-tracking branch 'origin/release' into fix/CVE-2025-58754

Author: subrata71

app/client/src/pages/AppViewer/Navigation/components/BackToAppsButton.tsx

@@ -14,6 +14,8 @@ import { getCurrentUser } from "selectors/usersSelectors";
 import type { User } from "constants/userConstants";
 import { ANONYMOUS_USERNAME } from "constants/userConstants";
 import { Icon, Tooltip } from "@appsmith/ads";
+import { getCurrentWorkspaceId } from "ee/selectors/selectedWorkspaceSelectors";
+import { APPLICATIONS_URL } from "constants/routes";
 
 interface BackToAppsButtonProps {
   currentApplicationDetails?: ApplicationPayload;
@@ -44,11 +46,20 @@ const BackToAppsButton = (props: BackToAppsButtonProps) => {
   );
   const history = useHistory();
   const currentUser: User | undefined = useSelector(getCurrentUser);
+  const currentWorkspaceId = useSelector(getCurrentWorkspaceId);
 
   if (currentUser?.username === ANONYMOUS_USERNAME) {
     return null;
   }
 
+  const handleNavigation = () => {
+    const applicationsUrl = currentWorkspaceId
+      ? `${APPLICATIONS_URL}?workspaceId=${currentWorkspaceId}`
+      : APPLICATIONS_URL;
+
+    history.push(applicationsUrl);
+  };
+
   return (
     <Tooltip
       content={createMessage(ALL_APPS)}
@@ -69,9 +80,7 @@ const BackToAppsButton = (props: BackToAppsButtonProps) => {
         insideSidebar={insideSidebar}
         isMinimal={isMinimal}
         navColorStyle={navColorStyle}
-        onClick={() => {
-          history.push("/applications");
-        }}
+        onClick={handleNavigation}
         primaryColor={primaryColor}
         text={insideSidebar && !isMinimal && createMessage(ALL_APPS)}
       />

app/client/src/pages/Editor/AppsmithLink.tsx

@@ -7,6 +7,7 @@ import AppsmithLogo from "assets/images/appsmith_logo_square.png";
 import history from "utils/history";
 import { useSelector } from "react-redux";
 import { getOrganizationConfig } from "ee/selectors/organizationSelectors";
+import { getCurrentWorkspaceId } from "ee/selectors/selectedWorkspaceSelectors";
 
 export const StyledLink = styled((props) => {
   // we are removing non input related props before passing them in the components
@@ -27,18 +28,23 @@ export const StyledLink = styled((props) => {
 
 export const AppsmithLink = () => {
   const organizationConfig = useSelector(getOrganizationConfig);
+  const currentWorkspaceId = useSelector(getCurrentWorkspaceId);
 
   const handleOnClick = useCallback(
     (e: React.MouseEvent<HTMLAnchorElement>) => {
       e.stopPropagation();
 
+      const applicationsUrl = currentWorkspaceId
+        ? `${APPLICATIONS_URL}?workspaceId=${currentWorkspaceId}`
+        : APPLICATIONS_URL;
+
       if (e.ctrlKey || e.metaKey) {
-        window.open(APPLICATIONS_URL, "_blank");
+        window.open(applicationsUrl, "_blank");
       } else {
-        history.push(APPLICATIONS_URL);
+        history.push(applicationsUrl);
       }
     },
-    [],
+    [currentWorkspaceId],
   );
 
   return (

app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ConfigController.java

@@ -1,8 +1,6 @@
 package com.appsmith.server.services.ce;
 
-import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.domains.Config;
-import com.appsmith.server.domains.User;
 import reactor.core.publisher.Mono;
 
 import java.util.Map;
@@ -11,8 +9,6 @@ public interface ConfigServiceCE {
 
     Mono<Config> getByName(String name);
 
-    Mono<Config> updateByName(Config config);
-
     Mono<Config> save(Config config);
 
     Mono<Config> save(String name, Map<String, Object> config);
@@ -21,10 +17,6 @@ public interface ConfigServiceCE {
 
     Mono<Void> delete(String name);
 
-    Mono<Config> getByName(String name, AclPermission permission);
-
-    Mono<Config> getByNameAsUser(String name, User user, AclPermission permission);
-
     /**
      * Get the instance variables from the instance config
      * @return Map containing the instance variables

app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/ConfigControllerCE.java

@@ -1,9 +1,7 @@
 package com.appsmith.server.services.ce;
 
-import com.appsmith.server.acl.AclPermission;
 import com.appsmith.server.constants.FieldName;
 import com.appsmith.server.domains.Config;
-import com.appsmith.server.domains.User;
 import com.appsmith.server.exceptions.AppsmithError;
 import com.appsmith.server.exceptions.AppsmithException;
 import com.appsmith.server.repositories.ConfigRepository;
@@ -34,20 +32,6 @@ public Mono<Config> getByName(String name) {
                         Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.CONFIG, name)));
     }
 
-    @Override
-    public Mono<Config> updateByName(Config config) {
-        final String name = config.getName();
-        return repository
-                .findByName(name)
-                .switchIfEmpty(
-                        Mono.error(new AppsmithException(AppsmithError.NO_RESOURCE_FOUND, FieldName.CONFIG, name)))
-                .flatMap(dbConfig -> {
-                    log.debug("Found config with name: {} and id: {}", name, dbConfig.getId());
-                    dbConfig.setConfig(config.getConfig());
-                    return repository.save(dbConfig);
-                });
-    }
-
     @Override
     public Mono<Config> save(Config config) {
         return repository
@@ -85,16 +69,6 @@ public Mono<Void> delete(String name) {
                 .flatMap(repository::delete);
     }
 
-    @Override
-    public Mono<Config> getByName(String name, AclPermission permission) {
-        return repository.findByName(name, permission);
-    }
-
-    @Override
-    public Mono<Config> getByNameAsUser(String name, User user, AclPermission permission) {
-        return repository.findByNameAsUser(name, user, permission);
-    }
-
     @Override
     public Mono<Map<String, Object>> getInstanceVariables() {
         return getByName(FieldName.INSTANCE_CONFIG).map(config -> {