Merge branch 'dev' of github.com:lowcoder-org/lowcoder into dev

Author: iamfaran

client/packages/lowcoder/src/comps/comps/timelineComp/timelineComp.tsx

@@ -142,9 +142,15 @@ const TimelineComp = (
             dispatch(changeChildAction("clickedIndex", index, false));
             onEvent("click");
           }}
+          // for responsiveness
           style={{
             cursor: "pointer",
             color: value?.titleColor || style?.titleColor,
+            whiteSpace: "normal",
+            wordWrap: "break-word",
+            textAlign: "left",
+            height: "auto",
+            padding: "0"
           }}
         >
           <b>{value?.title}</b>

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java

@@ -245,7 +245,7 @@ public Mono<Void> onUserRegister(User user, boolean isSuperAdmin) {
         return organizationService.createDefault(user, isSuperAdmin).then();
     }
 
-    protected Mono<Void> onUserLogin(String orgId, User user, String source, String groupId) {
+    protected Mono<Void> onUserLogin(String orgId, User user, String source, String groupIdToJoin) {
         Mono<String> orgMono;
         if(commonConfig.getWorkspace().getMode() == WorkspaceMode.ENTERPRISE) {
             orgMono = organizationService.getOrganizationInEnterpriseMode().map(HasIdAndAuditing::getId);
@@ -255,12 +255,12 @@ protected Mono<Void> onUserLogin(String orgId, User user, String source, String
             }
             orgMono = Mono.just(orgId);
         }
-        Mono<GroupMember> groupMember = groupMemberService.getGroupMember(groupId, user.getId()).switchIfEmpty(Mono.defer(() -> {
+        Mono<GroupMember> groupMember = groupIdToJoin == null ? Mono.empty() : groupMemberService.getGroupMember(groupIdToJoin, user.getId()).switchIfEmpty(Mono.defer(() -> {
             GroupMember groupMember1 = GroupMember.builder()
-                    .groupId(groupId)
+                    .groupId(groupIdToJoin)
                     .userId(user.getId())
                     .build();
-            return groupMemberService.addMember(orgId, groupId, user.getId(), MemberRole.MEMBER).thenReturn(groupMember1);
+            return groupMemberService.addMember(orgId, groupIdToJoin, user.getId(), MemberRole.MEMBER).thenReturn(groupMember1);
         }));
         return orgMono.flatMap(orgId2 -> orgApiService.tryAddUserToOrgAndSwitchOrg(orgId2, user.getId())).then(groupMember).then();
     }

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java

@@ -62,11 +62,23 @@ public Mono<PageResponseView<?>> getOrganizationByUser(@PathVariable String emai
                                                            @RequestParam(required = false, defaultValue = "0") Integer pageSize) {
         Flux<OrgView> flux;
         if (commonConfig.getWorkspace().getMode() == WorkspaceMode.SAAS) {
-            flux = userService.findByEmailDeep(email).flux().flatMap(user -> orgMemberService.getAllActiveOrgs(user.getId()))
+            flux = userService.findByEmailDeep(email).flux()
+                    .flatMap(user -> orgMemberService.getAllActiveOrgs(user.getId()))
                     .flatMap(orgMember -> organizationService.getById(orgMember.getOrgId()))
-                    .map(OrgView::new).cache();
+                    .map(OrgView::new)
+                    .cache();
         } else {
-            flux = organizationService.getOrganizationInEnterpriseMode().flux().map(OrgView::new).cache();
+            // Not SAAS: check if user exists and is a member of the org
+            flux = userService.findByEmailDeep(email)
+                    .flatMapMany(user -> 
+                        organizationService.getOrganizationInEnterpriseMode().flux()
+                            .flatMap(org -> 
+                                orgMemberService.getOrgMember(org.getId(), user.getId())
+                                    .filter(orgMember -> !orgMember.isInvalid())
+                                    .map(__ -> new OrgView(org))
+                            )
+                    )
+                    .cache();
         }
         var newflux = flux.sort((OrgView o1, OrgView o2) -> {
             if (o1.getOrgName() == null || o2.getOrgName() == null) {