Merge branch 'dev' into charts

raheeliftikhar5 · web-flow · commit 9a373585911a · 2025-05-05T04:46:27.000-07:00
diff --git a/client/packages/lowcoder/src/comps/comps/selectInputComp/stepControl.tsx b/client/packages/lowcoder/src/comps/comps/selectInputComp/stepControl.tsx
@@ -151,6 +151,9 @@ let StepControlBasicComp = (function () {
     const onChange = (index: number) => {
       if (props.selectable == false) return;
       const newIndex = Math.max(0, index);
+      if (props.options[newIndex]?.disabled) {
+           return;
+      }
       setCurrent(newIndex);
       if (props.options[newIndex]?.value !== undefined) {
         props.value.onChange(newIndex + 1 + ""); // Convert back to 1-based index for display.
@@ -198,6 +201,7 @@ let StepControlBasicComp = (function () {
                   title={option.label}
                   subTitle={option.subTitle}
                   description={option.description}
+                  disabled={option.disabled}
                   status={option.status as "error" | "finish" | "wait" | "process" | undefined}
                   icon={props.showIcons && hasIcon(option.icon) && option.icon || undefined}
                 />
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/comps/tableComp/column/simpleColumnTypeComps.tsx b/client/packages/lowcoder/src/comps/comps/tableComp/column/simpleColumnTypeComps.tsx
@@ -7,6 +7,8 @@ import { trans } from "i18n";
 import { useStyle } from "comps/controls/styleControl";
 import { ButtonStyle } from "comps/controls/styleControlConstants";
 import { Button100 } from "comps/comps/buttonComp/buttonCompConstants";
+import { IconControl } from "comps/controls/iconControl";
+import { hasIcon } from "comps/utils";
 
 export const ColumnValueTooltip = trans("table.columnValueTooltip");
 
@@ -20,7 +22,7 @@ export const ButtonTypeOptions = [
     value: "default",
   },
   {
-    label: trans("text"),
+    label: trans("table.text"),
     value: "text",
   },
 ] as const;
@@ -32,23 +34,36 @@ export const ButtonComp = (function () {
     onClick: ActionSelectorControlInContext,
     loading: BoolCodeControl,
     disabled: BoolCodeControl,
+    prefixIcon: IconControl,
+    suffixIcon: IconControl,
   };
   return new ColumnTypeCompBuilder(
     childrenMap,
     (props) => {
       const ButtonStyled = () => {
         const style = useStyle(ButtonStyle);
+        const hasText = !!props.text;
+        const hasPrefixIcon = hasIcon(props.prefixIcon);
+        const hasSuffixIcon = hasIcon(props.suffixIcon);
+        const iconOnly = !hasText && (hasPrefixIcon || hasSuffixIcon);
+        
         return (
           <Button100
             type={props.buttonType}
             onClick={props.onClick}
             loading={props.loading}
             disabled={props.disabled}
             $buttonStyle={props.buttonType === "primary" ? style : undefined}
-            style={{margin: 0}}
+            style={{
+              margin: 0,
+              width: iconOnly ? 'auto' : undefined,
+              minWidth: iconOnly ? 'auto' : undefined,
+              padding: iconOnly ? '0 8px' : undefined
+            }}
+            icon={hasPrefixIcon ? props.prefixIcon : undefined}
           >
-            {/* prevent the button from disappearing */}
-            {!props.text ? " " : props.text}
+            {hasText ? props.text : (iconOnly ? null : " ")}
+            {hasSuffixIcon && !props.loading && <span style={{ marginLeft: hasText ? '8px' : 0 }}>{props.suffixIcon}</span>}
           </Button100>
         );
       };
@@ -62,6 +77,12 @@ export const ButtonComp = (function () {
           label: trans("table.columnValue"),
           tooltip: ColumnValueTooltip,
         })}
+        {children.prefixIcon.propertyView({
+          label: trans("button.prefixIcon"),
+        })}
+        {children.suffixIcon.propertyView({
+          label: trans("button.suffixIcon"),
+        })}
         {children.buttonType.propertyView({
           label: trans("table.type"),
           radioButton: true,
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/authentication/service/AuthenticationApiServiceImpl.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/authentication/service/AuthenticationApiServiceImpl.java
@@ -98,10 +98,23 @@ protected Mono<AuthUser> authenticate(String authId, @Deprecated String source,
                 })
                 .flatMap(findAuthConfig -> {
                     context.setAuthConfig(findAuthConfig.authConfig());
+                    // Check if email/password is superadmin before checking EMAIL provider enable
                     if (findAuthConfig.authConfig().getSource().equals("EMAIL")) {
-                        if(StringUtils.isBlank(context.getOrgId())) {
+                        if (StringUtils.isBlank(context.getOrgId())) {
                             context.setOrgId(Optional.ofNullable(findAuthConfig.organization()).map(Organization::getId).orElse(null));
                         }
+                        // --- Superadmin check start ---
+                        if (context instanceof FormAuthRequestContext formContext) {
+                            String email = formContext.getLoginId();
+                            String password = formContext.getPassword();
+                            String superAdminEmail = commonConfig.getSuperAdmin().getUserName();
+                            String superAdminPassword = commonConfig.getSuperAdmin().getPassword();
+                            if (StringUtils.equalsIgnoreCase(email, superAdminEmail) && StringUtils.equals(password, superAdminPassword)) {
+                                // Allow superadmin login even if EMAIL provider is disabled
+                                return Mono.just(findAuthConfig);
+                            }
+                        }
+                        // --- Superadmin check end ---
                         if(!findAuthConfig.authConfig().getEnable()) {
                             return Mono.error(new BizException(EMAIL_PROVIDER_DISABLED, "EMAIL_PROVIDER_DISABLED"));
                         }
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() {`