Merge branch 'dev' into subscription-handling

Author: FalkWolsky

.github/workflows/docker-images.yml

@@ -11,6 +11,7 @@ on:
         options:
         - latest
         - test
+        - 2.4.6
       build_allinone:
         type: boolean
         description: 'Build the All-In-One image'

client/VERSION

@@ -1 +1 @@
-2.4.9
+2.4.12

client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lowcoder-frontend",
-  "version": "2.4.9",
+  "version": "2.4.12",
   "type": "module",
   "private": true,
   "workspaces": [

client/packages/lowcoder/src/components/ThemeSettingsSelector.tsx

@@ -98,7 +98,7 @@ export default function ThemeSettingsSelector(props: ColorConfigProps) {
     gridBgImagePosition: defaultGridBgImagePosition,
     gridBgImageOrigin: defaultGridBgImageOrigin,
   } = props;
-  
+
   const configChangeWithDebounce = _.debounce(configChange, 0);
   const [color, setColor] = useState(defaultColor);
   const [radius, setRadius] = useState(defaultRadius);
@@ -239,20 +239,20 @@ export default function ThemeSettingsSelector(props: ColorConfigProps) {
     configChange({ themeSettingKey, gridColumns: result });
   };
 
-  const gridRowCountInputBlur = (value: number) => {  
+  const gridRowCountInputBlur = (value: string) => {  
     let result = Infinity;
-    if (value > 0) {
-      result = value;
+    if (value !== '') {
+      result = Number(value);
     }
 
     setGridRowCount(result);  
     configChange({ themeSettingKey, gridRowCount: result });
   };
 
-  const gridPaddingInputBlur = (padding: number) => {  
+  const gridPaddingInputBlur = (padding: string) => { 
     let result = 20;  
-    if (padding > 0) {  
-      result = padding;  
+    if (padding !== '') {  
+      result = Number(padding);  
     }
 
     if (themeSettingKey === 'gridPaddingX') {
@@ -346,6 +346,14 @@ export default function ThemeSettingsSelector(props: ColorConfigProps) {
     setDataLoaders(defaultShowDataLoaders);
   }, [defaultShowDataLoaders]);
 
+  useEffect(() => {
+    setGridPaddingX(defaultGridPaddingX);
+  }, [defaultGridPaddingX]);
+
+  useEffect(() => {
+    setGridPaddingY(defaultGridPaddingY);
+  }, [defaultGridPaddingY]);
+
   return (
     <ConfigItem className={props.className}>
       {themeSettingKey !== "showDataLoadingIndicators"
@@ -587,11 +595,16 @@ export default function ThemeSettingsSelector(props: ColorConfigProps) {
             type="number"
             min={0}
             value={gridRowCount}
-            onChange={(e) => setGridRowCount(Number(e.target.value))}
-            onBlur={(e) => gridRowCountInputBlur(Number(e.target.value))}
+            onChange={(e) => {
+              if (e.target.value === '') {
+                return setGridRowCount(Infinity);  
+              }
+              setGridRowCount(Number(e.target.value))
+            }}
+            onBlur={(e) => gridRowCountInputBlur(e.target.value)}
             onKeyUp={(e) =>
               e.nativeEvent.key === "Enter" &&
-              gridRowCountInputBlur(Number(e.currentTarget.value))
+              gridRowCountInputBlur(e.currentTarget.value)
             }
           />
         </div>
@@ -606,11 +619,16 @@ export default function ThemeSettingsSelector(props: ColorConfigProps) {
             type="number"
             min={0}
             value={gridPaddingX}
-            onChange={(e) => setGridPaddingX(Number(e.target.value))}
-            onBlur={(e) => gridPaddingInputBlur(Number(e.target.value))}
+            onChange={(e) => {
+              if (e.target.value === '') {
+                return setGridPaddingX(undefined);  
+              }
+              setGridPaddingX(Number(e.target.value))
+            }}
+            onBlur={(e) => gridPaddingInputBlur(e.target.value)}
             onKeyUp={(e) =>
               e.nativeEvent.key === "Enter" &&
-              gridPaddingInputBlur(Number(e.currentTarget.value))
+              gridPaddingInputBlur(e.currentTarget.value)
             }
           />
         </div>
@@ -625,11 +643,16 @@ export default function ThemeSettingsSelector(props: ColorConfigProps) {
             type="number"
             min={0}
             value={gridPaddingY}
-            onChange={(e) => setGridPaddingY(Number(e.target.value))}
-            onBlur={(e) => gridPaddingInputBlur(Number(e.target.value))}
+            onChange={(e) => {
+              if (e.target.value === '') {
+                return setGridPaddingY(undefined); 
+              }
+              setGridPaddingY(Number(e.target.value))
+            }}
+            onBlur={(e) => gridPaddingInputBlur(e.target.value)}
             onKeyUp={(e) =>
               e.nativeEvent.key === "Enter" &&
-              gridPaddingInputBlur(Number(e.currentTarget.value))
+              gridPaddingInputBlur(e.currentTarget.value)
             }
           />
         </div>

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

@@ -136,7 +136,7 @@ const ButtonTmpComp = (function () {
   };
   return new UICompBuilder(childrenMap, (props) => {
     return(
-      <ButtonCompWrapper disabled={props.disabled}>
+      <ButtonCompWrapper $disabled={props.disabled}>
         <EditorContext.Consumer>
           {(editorState) => (
             <Button100

client/packages/lowcoder/src/comps/comps/buttonComp/buttonCompConstants.tsx

@@ -68,10 +68,12 @@ export const Button100 = styled(Button)<{ $buttonStyle?: ButtonStyleType }>`
   line-height:${(props) => props.$buttonStyle?.lineHeight}; 
 `;
 
-export const ButtonCompWrapper = styled.div<{ disabled: boolean }>`
+export const ButtonCompWrapper = styled.div<{ $disabled: boolean }>`
+  display: flex;
+
   // The button component is disabled but can respond to drag & select events
   ${(props) =>
-    props.disabled &&
+    props.$disabled &&
     `
     cursor: not-allowed;
     button:disabled {

client/packages/lowcoder/src/comps/comps/buttonComp/dropdownComp.tsx

@@ -116,7 +116,7 @@ const DropdownTmpComp = (function () {
     );
 
     return (
-      <ButtonCompWrapper disabled={props.disabled}>
+      <ButtonCompWrapper $disabled={props.disabled}>
         {props.onlyMenu ? (
           <Dropdown
             disabled={props.disabled}

client/packages/lowcoder/src/comps/comps/buttonComp/linkComp.tsx

@@ -95,7 +95,7 @@ const LinkTmpComp = (function () {
     // chrome86 bug: button children should not contain only empty span
     const hasChildren = hasIcon(props.prefixIcon) || !!props.text || hasIcon(props.suffixIcon);
     return (
-      <ButtonCompWrapper disabled={props.disabled}>
+      <ButtonCompWrapper $disabled={props.disabled}>
         <Link
           $animationStyle={props.animationStyle}
           ref={props.viewRef}

client/packages/lowcoder/src/comps/comps/buttonComp/scannerComp.tsx

@@ -134,7 +134,7 @@ const ScannerTmpComp = (function () {
     };
 
     return (
-      <ButtonCompWrapper disabled={props.disabled}>
+      <ButtonCompWrapper $disabled={props.disabled}>
         <Button100
           ref={props.viewRef}
           $buttonStyle={props.style}

client/packages/lowcoder/src/comps/comps/buttonComp/toggleButtonComp.tsx

@@ -72,7 +72,7 @@ const ToggleTmpComp = (function () {
 
     return (
       <ButtonCompWrapperStyled
-        disabled={props.disabled}
+        $disabled={props.disabled}
         $align={props.alignment}
         $showBorder={props.showBorder}
         $animationStyle={props.animationStyle}

client/packages/lowcoder/src/comps/comps/gridLayoutComp/canvasView.tsx

@@ -26,6 +26,7 @@ import { getBackgroundStyle } from "@lowcoder-ee/util/styleUtils";
 
 const UICompContainer = styled.div<{
   $maxWidth?: number;
+  $rowCount?: number;
   readOnly?: boolean;
   $bgColor: string;
   $bgImage?: string;
@@ -35,6 +36,7 @@ const UICompContainer = styled.div<{
   $bgImagePosition?: string;
 }>`
   height: auto;
+  min-height: ${props => props.$rowCount === Infinity ? '100%' : 'auto'};
   margin: 0 auto;
   max-width: ${(props) => props.$maxWidth || 1600}px;
   
@@ -246,6 +248,7 @@ export const CanvasView = React.memo((props: ContainerBaseProps) => {
     return (
       <UICompContainer
         $maxWidth={maxWidth}
+        $rowCount={defaultRowCount}
         readOnly={true}
         className={CNRootContainer}
         $bgColor={bgColor}
@@ -278,6 +281,7 @@ export const CanvasView = React.memo((props: ContainerBaseProps) => {
       <EditorContainer ref={scrollContainerRef}>
         <UICompContainer
           $maxWidth={maxWidth}
+          $rowCount={defaultRowCount}
           className={CNRootContainer}
           $bgColor={bgColor}
           $bgImage={bgImage}

client/packages/lowcoder/src/layout/gridLayout.tsx

@@ -213,15 +213,15 @@ class GridLayout extends React.Component<GridLayoutProps, GridLayoutState> {
    * @return {String} Container height in pixels.
    */
   containerHeight(): string {
-    const { margin, rowHeight, fixedRowCount } = this.props as Required<GridLayoutProps>;
+    const { margin, rowHeight, fixedRowCount, isCanvas } = this.props as Required<GridLayoutProps>;
     const { extraHeight, emptyRows } = this.props;
     const positionParams = genPositionParams(this.props);
-
     const { containerPadding } = positionParams;
     const layout = this.getUILayout(undefined, true);
+
     let nbRow = bottom(layout);
-    if (!_.isNil(emptyRows) && (_.size(layout) === 0 || fixedRowCount)) {
-      nbRow = emptyRows;// === Infinity ? 0 : emptyRows;
+    if (!_.isNil(emptyRows) && (_.size(layout) === 0 || (fixedRowCount && isCanvas))) {
+      nbRow = emptyRows;
     }
     const containerHeight = Math.max(
       nbRow * rowHeight + (nbRow - 1) * margin[1] + containerPadding[1] * 2

client/packages/lowcoder/src/pages/setting/theme/detail/index.tsx

@@ -768,7 +768,6 @@ class ThemeDetailPage extends React.Component<ThemeDetailPageProps, ThemeDetailP
                                   name={layoutSettingsItem.name}
                                   showComponentLoadingIndicators={layoutSettingsItem.value as boolean}
                                   configChange={(params) => {
-                                    console.log('configChange', params);
                                     this.configChange(params);
                                   }}
                                 />

client/packages/lowcoder/src/util/styleUtils.tsx

@@ -5,7 +5,7 @@ const getBackgroundStyle = (style: Record<string, string | undefined>) => {
   return css`
     ${isValidColor(style.background) && `background-color: ${style.background}`};
     ${isValidGradient(style.background) && !Boolean(style.backgroundImage) && `background-image: ${style.background}`};
-    ${!isValidGradient(style.background) && Boolean(style.backgroundImage) && `background-image: ${style.backgroundImage}`};
+    ${!isValidGradient(style.background) && Boolean(style.backgroundImage) && `background-image: url(${style.backgroundImage})`};
     ${isValidGradient(style.background) && Boolean(style.backgroundImage) && `background-image: url(${style.backgroundImage}), ${style.background}`};
 
     ${style.backgroundImageRepeat && `background-repeat: ${style.backgroundImageRepeat};`}; 

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

@@ -53,15 +53,15 @@ private Mono<FindAuthConfig> findAuthConfig(String orgId, Function<AbstractAuthC
     public Flux<FindAuthConfig> findAllAuthConfigs(String orgId, boolean enableOnly) {
 
         Mono<FindAuthConfig> emailAuthConfigMono = orgMemberService.doesAtleastOneAdminExist()
-                .map(doesAtleastOneAdminExist -> {
+                .flatMap(doesAtleastOneAdminExist -> {
                     boolean shouldEnableRegister;
                     if(doesAtleastOneAdminExist) {
                         shouldEnableRegister = authProperties.getEmail().getEnableRegister();
                     } else {
                         shouldEnableRegister = Boolean.TRUE;
                     }
-                    return new FindAuthConfig
-                            (new EmailAuthConfig(AuthSourceConstants.EMAIL, authProperties.getEmail().isEnable(), shouldEnableRegister), null);
+                    if(orgId == null) return Mono.just(new FindAuthConfig(new EmailAuthConfig(AuthSourceConstants.EMAIL, authProperties.getEmail().isEnable(), shouldEnableRegister), null));
+                    else return organizationService.getById(orgId).map(organization -> new FindAuthConfig(new EmailAuthConfig(AuthSourceConstants.EMAIL, !organization.getIsEmailDisabled(), shouldEnableRegister), null));
                 });
 
 

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/organization/model/Organization.java

@@ -51,6 +51,13 @@ public class Organization extends HasIdAndAuditing implements BeforeMongodbWrite
 
     private String contactPhoneNumber;
 
+    private Boolean isEmailDisabled;
+
+    public Boolean getIsEmailDisabled() {
+        if(isEmailDisabled == null) return false;
+        else return isEmailDisabled;
+    }
+
     @JsonIgnore
     private String logoAssetId;
 

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserService.java

@@ -43,6 +43,8 @@ public interface UserService {
 
     Mono<User> addNewConnectionAndReturnUser(String userId, AuthUser authUser);
 
+    Mono<User> saveUser(User user);
+
     Mono<Void> deleteProfilePhoto(User visitor);
 
     Mono<Boolean> updatePassword(String userId, String oldPassword, String newPassword);

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/user/service/UserServiceImpl.java

@@ -225,6 +225,11 @@ public Mono<User> addNewConnectionAndReturnUser(String userId, AuthUser authUser
                 .flatMap(repository::save);
     }
 
+    @Override
+    public Mono<User> saveUser(User user) {
+        return repository.save(user);
+    }
+
     @Override
     public Mono<Void> deleteProfilePhoto(User visitor) {
         String userAvatar = visitor.getAvatar();