Merge pull request lowcoder-org#282 from lvhuichao/develop

neon-balcony · web-flow · commit c4f4e58e61eb · 2023-02-24T14:31:19.000+08:00
fix: responder select query bug; fix no login way on first deployment and enterprise mode
diff --git a/client/packages/openblocks-design/src/components/query.tsx b/client/packages/openblocks-design/src/components/query.tsx
@@ -110,6 +110,9 @@ export const QueryConfigItemWrapper = styled.div<{ direction?: "row" | "column"
 type TutorialStyle = "dropdownRight" | "begin";
 
 const TutorialButtonWrapper = styled.div<{ styleName: TutorialStyle }>`
+  height: 100%;
+  display: flex;
+  align-items: center;
   ${(props) => {
     if (props.styleName === "dropdownRight") {
       return css`
diff --git a/client/packages/openblocks/src/comps/comps/dataChangeResponderComp.tsx b/client/packages/openblocks/src/comps/comps/dataChangeResponderComp.tsx
@@ -53,6 +53,7 @@ const DataResponderItemCompBase = new MultiCompBuilder(
                     label: trans("dataResponder.data"),
                     tooltip: trans("dataResponder.dataTooltip"),
                     placement: "bottom",
+                    placeholder: "{{anyDependencies}}",
                     extraChildren: QueryTutorials.dataResponder && (
                       <DocLink style={{ marginTop: 8 }} href={QueryTutorials.dataResponder}>
                         {trans("dataResponder.docLink")}
@@ -133,6 +134,6 @@ export const DataChangeResponderListComp = bottomResListComp(
   DataChangeResponderItemComp,
   DataResponderCompType,
   {
-    data: JSON.stringify({}),
+    data: "",
   }
 );
diff --git a/client/packages/openblocks/src/comps/controls/actionSelector/executeQueryAction.tsx b/client/packages/openblocks/src/comps/controls/actionSelector/executeQueryAction.tsx
@@ -56,11 +56,15 @@ export class ExecuteQueryAction extends ExecuteQueryTmpAction {
           }))
           .filter(
             // Filter out the current query under query
-            (option) =>
-              placement !== "query" ||
-              (placement === "query" &&
-                editorState.selectedBottomResType === BottomResTypeEnum.Query &&
-                option.value !== editorState.selectedBottomResName)
+            (option) => {
+              if (
+                placement === "query" &&
+                editorState.selectedBottomResType === BottomResTypeEnum.Query
+              ) {
+                return option.value !== editorState.selectedBottomResName;
+              }
+              return true;
+            }
           ) || [];
 
       // input queries
diff --git a/client/packages/openblocks/src/comps/editorState.tsx b/client/packages/openblocks/src/comps/editorState.tsx
@@ -139,7 +139,22 @@ export class EditorState {
     const queryComInfoList = this.queryCompInfoList();
     const stateComInfoList = this.getTempStateCompInfoList();
     const transformerComInfoList = this.getTransformerCompInfoList();
-    return [...queryComInfoList, ...stateComInfoList, ...transformerComInfoList];
+    const dataResponderInfoList = this.getDataResponderInfoList();
+    return [
+      ...queryComInfoList,
+      ...stateComInfoList,
+      ...transformerComInfoList,
+      ...dataResponderInfoList,
+    ];
+  }
+
+  getDataResponderInfoList(): Array<CompInfo> {
+    const listComp = this.getDataRespondersComp();
+    const exposingInfo = listComp.nameAndExposingInfo();
+    return listComp.getView().map((item) => {
+      const name = item.children.name.getView();
+      return this.getCompInfo(exposingInfo, name, BottomResTypeEnum.DateResponder);
+    });
   }
 
   getTempStateCompInfoList(): Array<CompInfo> {
diff --git a/client/packages/openblocks/src/i18n/locales/en.ts b/client/packages/openblocks/src/i18n/locales/en.ts
@@ -1496,8 +1496,7 @@ export const en = {
   dataResponder: {
     data: "Data",
     dataDesc: "Data of current data responder",
-    dataTooltip:
-      "The dependent data that it's change will trigger the actions of current responder",
+    dataTooltip: "When this data is changed, it will trigger subsequent actions.",
     docLink: "About the Data responder",
     deleteMessage: "The data responder is deleted successfully. You can use {undoKey} to undo.",
   },
diff --git a/client/packages/openblocks/src/pages/setting/settingHome.tsx b/client/packages/openblocks/src/pages/setting/settingHome.tsx
@@ -42,6 +42,14 @@ export function SettingHome() {
       key: SettingPageEnum.Organization,
       label: trans("settings.organization"),
     },
+    ...(isEE() && currentOrgAdmin(user) && (isSelfDomain(config) || isEnterpriseMode(config))
+      ? [
+          {
+            key: SettingPageEnum.IdSource,
+            label: trans("settings.idSource"),
+          },
+        ]
+      : []),
     ...(showAuditLog(config) && currentOrgAdmin(user)
       ? [
           {
@@ -70,14 +78,6 @@ export function SettingHome() {
       key: SettingPageEnum.Advanced,
       label: trans("settings.advanced"),
     },
-    ...(isEE() && currentOrgAdmin(user) && (isSelfDomain(config) || isEnterpriseMode(config))
-      ? [
-          {
-            key: SettingPageEnum.IdSource,
-            label: trans("settings.idSource"),
-          },
-        ]
-      : []),
   ];
 
   return (
diff --git a/client/packages/openblocks/src/util/envUtils.ts b/client/packages/openblocks/src/util/envUtils.ts
@@ -30,7 +30,7 @@ export function isSelfDomain(config?: SystemConfig) {
 }
 
 export function showAuditLog(config?: SystemConfig) {
-  return config?.featureFlag.enableAuditLog;
+  return config?.featureFlag?.enableAuditLog;
 }
 
 export function useCloudHosting() {
diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/AuthenticationService.java b/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/AuthenticationService.java
@@ -3,8 +3,13 @@
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
+import com.openblocks.sdk.auth.EmailAuthConfig;
+import com.openblocks.sdk.constants.AuthSourceConstants;
+
 public interface AuthenticationService {
 
+    EmailAuthConfig DEFAULT_AUTH_CONFIG = new EmailAuthConfig(AuthSourceConstants.EMAIL, true, true);
+
     Mono<FindAuthConfig> findAuthConfigByAuthId(String authId);
 
     Mono<FindAuthConfig> findAuthConfigBySource(String source);
diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/AuthenticationServiceImpl.java b/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/authentication/AuthenticationServiceImpl.java
@@ -59,7 +59,8 @@ public Flux<FindAuthConfig> findAllAuthConfigs(boolean enableOnly) {
                         return findAuthConfig.authConfig().isEnable();
                     }
                     return true;
-                });
+                })
+                .defaultIfEmpty(new FindAuthConfig(DEFAULT_AUTH_CONFIG, null));
     }
 
     private Flux<FindAuthConfig> findAllAuthConfigsByDomain() {
diff --git a/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrganizationServiceImpl.java b/server/api-service/openblocks-domain/src/main/java/com/openblocks/domain/organization/service/OrganizationServiceImpl.java
@@ -1,5 +1,6 @@
 package com.openblocks.domain.organization.service;
 
+import static com.openblocks.domain.authentication.AuthenticationService.DEFAULT_AUTH_CONFIG;
 import static com.openblocks.domain.organization.model.OrganizationState.ACTIVE;
 import static com.openblocks.domain.organization.model.OrganizationState.DELETED;
 import static com.openblocks.domain.util.QueryDslUtils.fieldName;
@@ -10,6 +11,7 @@
 import static com.openblocks.sdk.util.LocaleUtils.getMessage;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Locale;
 
 import javax.annotation.Nonnull;
@@ -29,6 +31,7 @@
 import com.openblocks.domain.organization.model.MemberRole;
 import com.openblocks.domain.organization.model.Organization;
 import com.openblocks.domain.organization.model.Organization.OrganizationCommonSettings;
+import com.openblocks.domain.organization.model.OrganizationDomain;
 import com.openblocks.domain.organization.model.OrganizationState;
 import com.openblocks.domain.organization.model.QOrganization;
 import com.openblocks.domain.organization.repository.OrganizationRepository;
@@ -102,6 +105,9 @@ public Mono<Organization> createDefault(User user) {
                         if (Boolean.TRUE.equals(join)) {
                             return Mono.empty();
                         }
+                        OrganizationDomain organizationDomain = new OrganizationDomain();
+                        organizationDomain.setAuthConfigs(List.of(DEFAULT_AUTH_CONFIG));
+                        organization.setOrganizationDomain(organizationDomain);
                         return create(organization, user.getId());
                     });
         });
diff --git a/server/api-service/openblocks-server/src/test/resources/application.yml b/server/api-service/openblocks-server/src/test/resources/application.yml
@@ -17,12 +17,4 @@ demo:
       port: 3306
       timeout: 100
       username: 123
-      host: localhost
-
-common:
-  cloud: false
-  cookie-name: UT-TACO-TOKEN
-
-auth:
-  email:
-    enable: true
+      host: localhost

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ export function isSelfDomain(config?: SystemConfig) {`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`export function showAuditLog(config?: SystemConfig) {`
`33`		`- return config?.featureFlag.enableAuditLog;`
	`33`	`+ return config?.featureFlag?.enableAuditLog;`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`export function useCloudHosting() {`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,8 @@ public Flux<FindAuthConfig> findAllAuthConfigs(boolean enableOnly) {`
`59`	`59`	`return findAuthConfig.authConfig().isEnable();`
`60`	`60`	`}`
`61`	`61`	`return true;`
`62`		`- });`
	`62`	`+ })`
	`63`	`+ .defaultIfEmpty(new FindAuthConfig(DEFAULT_AUTH_CONFIG, null));`
`63`	`64`	`}`
`64`	`65`
`65`	`66`	`private Flux<FindAuthConfig> findAllAuthConfigsByDomain() {`