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

iamfaran · iamfaran · commit 704a160969bb · 2025-04-30T19:04:50.000+05:00
diff --git a/client/packages/lowcoder/src/comps/comps/tableComp/column/columnTypeComps/columnSwitchComp.tsx b/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>
diff --git a/client/packages/lowcoder/src/comps/hooks/localStorageComp.ts 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"));
     },
   },
 ]);
diff --git a/client/packages/lowcoder/src/pages/userAuth/register.tsx b/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]);
 
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/usermanagement/OrganizationController.java
@@ -68,17 +68,7 @@ public Mono<PageResponseView<?>> getOrganizationByUser(@PathVariable String emai
                     .map(OrgView::new)
                     .cache();
         } else {
-            // 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();
+            flux = organizationService.getOrganizationInEnterpriseMode().flux().map(OrgView::new).cache();
         }
         var newflux = flux.sort((OrgView o1, OrgView o2) -> {
             if (o1.getOrgName() == null || o2.getOrgName() == null) {
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/authentication/GenericAuthenticateTest.java b/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() {
diff --git a/server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/common/TestRedisConfiguration.java b/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);

Original file line number	Diff line number	Diff line change
`@@ -182,7 +182,7 @@ public void testGoogleLoginSuccess(WireMockRuntimeInfo wmRuntimeInfo) {`
`182`	`182`	`})`
`183`	`183`	`.verifyComplete();`
`184`	`184`
`185`		`- Mockito.framework().clearInlineMocks();`
	`185`	`+ // Mockito.framework().clearInlineMocks();`
`186`	`186`	`}`
`187`	`187`
`188`	`188`	`private String getEmailAuthConfigId() {`