From d96fcae0d8a5d57e6f7524d2a013527c4e1a0b8b Mon Sep 17 00:00:00 2001 From: Abhijeet <41686026+abhvsn@users.noreply.github.com> Date: Wed, 19 Mar 2025 10:45:47 +0530 Subject: [PATCH] chore: Remove hostname param from controller (#39768) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## Description > [!TIP] > _Add a TL;DR when the description is longer than 500 words or extremely technical (helps the content, marketing, and DevRel team)._ > > _Please also include relevant motivation and context. List any dependencies that are required for this change. Add links to Notion, Figma or any other documents that might be relevant to the PR._ Fixes #`Issue Number` _or_ Fixes `Issue URL` > [!WARNING] > _If no issue exists, please create an issue first, and check with the maintainers if the issue is valid._ /test Sanity ### :mag: Cypress test results > [!TIP] > 🟢 🟢 🟢 All cypress tests have passed! 🎉 🎉 🎉 > Workflow run: > Commit: 4999b394e04e884b724fa65d4b345c0edcbe3c39 > Cypress dashboard. > Tags: `@tag.Sanity` > Spec: >
Tue, 18 Mar 2025 11:38:43 UTC ## Communication Should the DevRel and Marketing teams inform users about this change? - [ ] Yes - [ ] No ## Summary by CodeRabbit - **Refactor** - Streamlined workspace retrieval by removing an unnecessary hostname input. Users will continue to see their workspaces displayed as before. - **Tests** - Updated test cases to match the revised workflow for fetching workspaces, ensuring consistent behavior with the changes. --- .../server/controllers/ce/WorkspaceControllerCE.java | 5 ++--- .../appsmith/server/services/ce/UserWorkspaceServiceCE.java | 2 +- .../server/services/ce/UserWorkspaceServiceCEImpl.java | 2 +- .../server/services/UserWorkspaceServiceUnitTest.java | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/WorkspaceControllerCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/WorkspaceControllerCE.java index a2a3688a80..a7ad0f6967 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/WorkspaceControllerCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/controllers/ce/WorkspaceControllerCE.java @@ -105,10 +105,9 @@ public class WorkspaceControllerCE { @JsonView(Views.Public.class) @GetMapping("/home") - public Mono>> workspacesForHome( - @RequestHeader(name = "Host", required = false) String hostname) { + public Mono>> workspacesForHome() { return userWorkspaceService - .getUserWorkspacesByRecentlyUsedOrder(hostname) + .getUserWorkspacesByRecentlyUsedOrder() .map(workspaces -> new ResponseDTO<>(HttpStatus.OK, workspaces)); } } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCE.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCE.java index e3e44ea8e4..f336b8d285 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCE.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCE.java @@ -24,5 +24,5 @@ public interface UserWorkspaceServiceCE { Mono isLastAdminRoleEntity(PermissionGroup permissionGroup); - Mono> getUserWorkspacesByRecentlyUsedOrder(String hostname); + Mono> getUserWorkspacesByRecentlyUsedOrder(); } diff --git a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCEImpl.java b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCEImpl.java index a26bc14352..973b2ae250 100644 --- a/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCEImpl.java +++ b/app/server/appsmith-server/src/main/java/com/appsmith/server/services/ce/UserWorkspaceServiceCEImpl.java @@ -398,7 +398,7 @@ public class UserWorkspaceServiceCEImpl implements UserWorkspaceServiceCE { * @return Mono of list of workspaces */ @Override - public Mono> getUserWorkspacesByRecentlyUsedOrder(String hostname) { + public Mono> getUserWorkspacesByRecentlyUsedOrder() { Mono> workspaceIdsMono = userDataService .getForCurrentUser() diff --git a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceUnitTest.java b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceUnitTest.java index 90367c0fd3..2b03505764 100644 --- a/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceUnitTest.java +++ b/app/server/appsmith-server/src/test/java/com/appsmith/server/services/UserWorkspaceServiceUnitTest.java @@ -248,7 +248,7 @@ public class UserWorkspaceServiceUnitTest { cleanup(); createDummyWorkspaces().blockLast(); - StepVerifier.create(userWorkspaceService.getUserWorkspacesByRecentlyUsedOrder(null)) + StepVerifier.create(userWorkspaceService.getUserWorkspacesByRecentlyUsedOrder()) .assertNext(workspaces -> { assertThat(workspaces).hasSize(4); workspaces.forEach(workspace -> { @@ -275,7 +275,7 @@ public class UserWorkspaceServiceUnitTest { userData.setRecentlyUsedEntityIds(recentlyUsedEntityDTOs); doReturn(Mono.just(userData)).when(userDataService).getForCurrentUser(); - StepVerifier.create(userWorkspaceService.getUserWorkspacesByRecentlyUsedOrder(null)) + StepVerifier.create(userWorkspaceService.getUserWorkspacesByRecentlyUsedOrder()) .assertNext(workspaces -> { assertThat(workspaces).hasSize(4); List fetchedWorkspaceIds = new ArrayList<>();