Merge branch 'dev' of github.com:lowcoder-org/lowcoder into fix/1634-step-control

Author: iamfaran

client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnSwitchComp.tsx

@@ -69,10 +69,13 @@ const childrenMap = {
 
 const getBaseValue: ColumnTypeViewFn<typeof childrenMap, boolean, boolean> = (props) => props.switchState;
 
+let onEvent: (eventName: string) => Promise<unknown[]>;
+
 export const SwitchComp = (function () {
   return new ColumnTypeCompBuilder(
     childrenMap,
     (props, dispatch) => {
+      onEvent = props.onEvent;
       const value = props.changeValue ?? getBaseValue(props, dispatch);
       const CheckBoxComp = () => {
         return (
@@ -106,6 +109,8 @@ export const SwitchComp = (function () {
             disabled={false}
             onChange={(checked, e) => {
               props.onChange(checked);
+              onEvent?.("change");
+              onEvent?.(checked ? "true" : "false");
             }}
           />
         </Wrapper>

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>

client/packages/lowcoder/src/comps/hooks/localStorageComp.ts

@@ -13,21 +13,28 @@ const APP_STORE_NAMESPACE = "lowcoder_app_local_storage";
 const LocalStorageCompBase = withViewFn(
   simpleMultiComp({ values: stateComp<JSONObject>({}) }),
   (comp) => {
-    const originStore = localStorage.getItem(APP_STORE_NAMESPACE) || "{}";
-    let parseStore = {};
-    try {
-      parseStore = JSON.parse(originStore);
-    } catch (e) {
-      log.error("application local storage invalid");
-    }
-
+    // add custom event listener to update values reactively
     useEffect(() => {
-      const value = comp.children.values.value;
-      if (!isEqual(value, parseStore)) {
-        log.info(value, parseStore);
-        comp.children.values.dispatchChangeValueAction(parseStore);
-      }
-    }, [parseStore]);
+      const handler = () => {
+        try {
+          const raw = localStorage.getItem(APP_STORE_NAMESPACE) || "{}";
+          const parsed = JSON.parse(raw);
+          comp.children.values.dispatchChangeValueAction(parsed);
+        } catch (e) {
+          log.error("Failed to parse localStorage:", e);
+        }
+      };
+
+      // Add listener on mount
+      window.addEventListener("lowcoder-localstorage-updated", handler);
+
+      // Run once on mount to initialize
+      handler();
+
+      return () => {
+        window.removeEventListener("lowcoder-localstorage-updated", handler);
+      };
+    }, []);
 
     return null;
   }
@@ -62,6 +69,8 @@ LocalStorageComp = withMethodExposing(LocalStorageComp, [
           parseStore[key] = value;
           localStorage.setItem(APP_STORE_NAMESPACE, JSON.stringify(parseStore));
           comp.children.values.dispatchChangeValueAction(parseStore);
+
+          window.dispatchEvent(new CustomEvent("lowcoder-localstorage-updated"));
         } catch (e) {
           localStorage.setItem(APP_STORE_NAMESPACE, "{}");
         }
@@ -83,6 +92,9 @@ LocalStorageComp = withMethodExposing(LocalStorageComp, [
           delete parseStore[key];
           localStorage.setItem(APP_STORE_NAMESPACE, JSON.stringify(parseStore));
           comp.children.values.dispatchChangeValueAction(parseStore);
+
+          //  Trigger update
+          window.dispatchEvent(new CustomEvent("lowcoder-localstorage-updated"));
         } catch (e) {
           localStorage.setItem(APP_STORE_NAMESPACE, "{}");
         }
@@ -98,6 +110,9 @@ LocalStorageComp = withMethodExposing(LocalStorageComp, [
     execute: (comp) => {
       localStorage.removeItem(APP_STORE_NAMESPACE);
       comp.children.values.dispatchChangeValueAction({});
+
+      // Trigger update
+      window.dispatchEvent(new CustomEvent("lowcoder-localstorage-updated"));
     },
   },
 ]);

client/packages/lowcoder/src/pages/userAuth/register.tsx

@@ -95,25 +95,28 @@ function UserRegister() {
     setSigninEnabled(LOWCODER_EMAIL_AUTH_ENABLED === 'true');
   }, [serverSettings]);
 
+  const fetchOrgsByEmail = () => {
+    fetchOrgPaginationByEmail({
+      email: ' ',
+      pageNum: 1,
+      pageSize: 10,
+    })
+    .then((resp) => {
+      if (resp.success) {
+        const orgList = resp.data || [];
+        if (orgList.length) {
+          // in Enterprise mode, we will get org data in different format
+          const selectedOrgId = orgList[0]?.id || orgList[0]?.orgId;
+          setDefaultOrgId(selectedOrgId);
+          dispatch(fetchConfigAction(selectedOrgId));
+        }
+      }
+    })
+  }
+
   useEffect(() => {
     if (isEnterpriseMode) {
-      // dispatch(fetchConfigAction());
-      fetchOrgPaginationByEmail({
-          email: ' ',
-          pageNum: 1,
-          pageSize: 10,
-        })
-        .then((resp) => {
-          if (resp.success) {
-            const orgList = resp.data || [];
-            if (orgList.length) {
-              // in Enterprise mode, we will get org data in different format
-              const selectedOrgId = orgList[0]?.id || orgList[0]?.orgId;
-              setDefaultOrgId(selectedOrgId);
-              dispatch(fetchConfigAction(selectedOrgId));
-            }
-          }
-        })
+      fetchOrgsByEmail();
     }
   }, [isEnterpriseMode]);
 

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,9 +62,11 @@ 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();
         }

server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/GenericAuthenticateTest.java

@@ -182,7 +182,7 @@ public void testGoogleLoginSuccess(WireMockRuntimeInfo wmRuntimeInfo) {
                 })
                 .verifyComplete();
 
-        Mockito.framework().clearInlineMocks();
+        // Mockito.framework().clearInlineMocks();
     }
 
     private String getEmailAuthConfigId() {

server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/TestRedisConfiguration.java

@@ -10,7 +10,7 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 @SuppressWarnings("UnstableApiUsage")
-//@TestConfiguration
+@TestConfiguration
 public class TestRedisConfiguration {
 
     private static final AtomicInteger STATE = new AtomicInteger(0);