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 e64efd8992..f8ae8565e8 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 @@ -108,9 +108,10 @@ public class WorkspaceControllerCE { @JsonView(Views.Public.class) @GetMapping("/home") - public Mono>> workspacesForHome() { + public Mono>> workspacesForHome( + @RequestHeader(name = "Host", required = false) String hostname) { return userWorkspaceService - .getUserWorkspacesByRecentlyUsedOrder() + .getUserWorkspacesByRecentlyUsedOrder(hostname) .map(workspaces -> new ResponseDTO<>(HttpStatus.OK.value(), workspaces, null)); } } 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 ee1082921e..ad976da77e 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 { Boolean isLastAdminRoleEntity(PermissionGroup permissionGroup); - Mono> getUserWorkspacesByRecentlyUsedOrder(); + Mono> getUserWorkspacesByRecentlyUsedOrder(String hostname); } 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 d86b285248..3430bb83b9 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 @@ -393,7 +393,7 @@ public class UserWorkspaceServiceCEImpl implements UserWorkspaceServiceCE { * @return Mono of list of workspaces */ @Override - public Mono> getUserWorkspacesByRecentlyUsedOrder() { + public Mono> getUserWorkspacesByRecentlyUsedOrder(String hostname) { 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 6bdc1323fb..22b53e0cce 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 @@ -247,7 +247,7 @@ public class UserWorkspaceServiceUnitTest { cleanup(); createDummyWorkspaces().blockLast(); - StepVerifier.create(userWorkspaceService.getUserWorkspacesByRecentlyUsedOrder()) + StepVerifier.create(userWorkspaceService.getUserWorkspacesByRecentlyUsedOrder(null)) .assertNext(workspaces -> { assertThat(workspaces).hasSize(4); workspaces.forEach(workspace -> { @@ -274,7 +274,7 @@ public class UserWorkspaceServiceUnitTest { userData.setRecentlyUsedEntityIds(recentlyUsedEntityDTOs); doReturn(Mono.just(userData)).when(userDataService).getForCurrentUser(); - StepVerifier.create(userWorkspaceService.getUserWorkspacesByRecentlyUsedOrder()) + StepVerifier.create(userWorkspaceService.getUserWorkspacesByRecentlyUsedOrder(null)) .assertNext(workspaces -> { assertThat(workspaces).hasSize(4); List fetchedWorkspaceIds = new ArrayList<>();