Merge branch 'dev' into agora-integrationn

Author: FalkWolsky

.github/dependabot.yml

@@ -6,15 +6,19 @@ updates:
     directory: "/server/api-service"
     schedule:
       interval: "monthly"
+    target-branch: "dev"
   - package-ecosystem: "npm"
     directory: "/server/node-service"
     schedule:
       interval: "monthly"
+    target-branch: "dev"
   - package-ecosystem: "npm"
     directory: "/client"
     schedule:
       interval: "monthly"
+    target-branch: "dev"
   - package-ecosystem: "docker"
     directory: "/deploy/docker"
     schedule:
       interval: "monthly"
+    target-branch: "dev"

client/packages/lowcoder-cli/client.d.ts

@@ -34,6 +34,7 @@ declare var LOWCODER_NODE_SERVICE_URL: string;
 declare var LOWCODER_SHOW_BRAND: string;
 declare var LOWCODER_CUSTOM_LOGO: string;
 declare var LOWCODER_CUSTOM_LOGO_SQUARE: string;
+declare var LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string;
 declare var REACT_APP_ENV: string;
 declare var REACT_APP_BUILD_ID: string;
 declare var REACT_APP_LOG_LEVEL: string;

client/packages/lowcoder-dev-utils/buildVars.js

@@ -35,6 +35,10 @@ export const buildVars = [
     name: "LOWCODER_NODE_SERVICE_URL",
     defaultValue: "",
   },
+  {
+    name: "LOWCODER_CUSTOM_AUTH_WELCOME_TEXT",
+    defaultValue: "",
+  },
   {
     name: "REACT_APP_ENV",
     defaultValue: "production",

client/packages/lowcoder/src/api/configApi.ts

@@ -8,10 +8,14 @@ export interface ConfigResponse extends ApiResponse {
 }
 
 class ConfigApi extends Api {
-  static configURL = "/v1/configs";
+  static configURL = "/configs";
 
-  static fetchConfig(): AxiosPromise<ConfigResponse> {
-    return Api.get(ConfigApi.configURL);
+  static fetchConfig(orgId?: string): AxiosPromise<ConfigResponse> {
+    let authConfigURL = ConfigApi.configURL;
+    if(orgId?.length) {
+      authConfigURL += `?orgId?=${orgId}`;
+    }
+    return Api.get(authConfigURL);
   }
 }
 

client/packages/lowcoder/src/api/inviteApi.ts

@@ -14,10 +14,11 @@ export type InviteInfo = {
   inviteCode: string;
   createUserName: string;
   invitedOrganizationName: string;
+  invitedOrganizationId: string;
 };
 
 class InviteApi extends Api {
-  static getInviteURL = "/v1/invitation";
+  static getInviteURL = "/invitation";
   static acceptInviteURL = (invitationId: string) => `/v1/invitation/${invitationId}/invite`;
 
   // generate invitation

client/packages/lowcoder/src/api/userApi.ts

@@ -9,6 +9,7 @@ export interface CommonLoginParam {
   invitationId?: string;
   authId?: string;
   source?: string;
+  orgId?: string;
 }
 
 export interface CommonBindParam {
@@ -17,8 +18,8 @@ export interface CommonBindParam {
   source?: string;
 }
 
-interface ThirdPartyAuthRequest {
-  state: string;
+export interface ThirdPartyAuthRequest {
+  state?: string;
   code: string;
   redirectUrl: string;
 }

client/packages/lowcoder/src/app-env.d.ts

@@ -37,6 +37,7 @@ declare var LOWCODER_NODE_SERVICE_URL: string;
 declare var LOWCODER_SHOW_BRAND: string;
 declare var LOWCODER_CUSTOM_LOGO: string;
 declare var LOWCODER_CUSTOM_LOGO_SQUARE: string;
+declare var LOWCODER_CUSTOM_AUTH_WELCOME_TEXT: string;
 declare var REACT_APP_ENV: string;
 declare var REACT_APP_BUILD_ID: string;
 declare var REACT_APP_LOG_LEVEL: string;

client/packages/lowcoder/src/app.tsx

@@ -13,6 +13,8 @@ import {
   IMPORT_APP_FROM_TEMPLATE_URL,
   INVITE_LANDING_URL,
   isAuthUnRequired,
+  ORG_AUTH_LOGIN_URL,
+  ORG_AUTH_REGISTER_URL,
   QUERY_LIBRARY_URL,
   SETTING,
   TRASH_URL,
@@ -70,10 +72,11 @@ const Wrapper = (props: { children: React.ReactNode }) => (
 type AppIndexProps = {
   isFetchUserFinished: boolean;
   isFetchHomeFinished: boolean;
-  isFetchingConfig: boolean;
+  // isFetchingConfig: boolean;
+  currentOrgId?: string;
   orgDev: boolean;
   defaultHomePage: string | null | undefined;
-  fetchConfig: () => void;
+  fetchConfig: (orgId?: string) => void;
   getCurrentUser: () => void;
   fetchHome: () => void;
   favicon: string;
@@ -83,16 +86,22 @@ type AppIndexProps = {
 class AppIndex extends React.Component<AppIndexProps, any> {
   componentDidMount() {
     this.props.getCurrentUser();
-    this.props.fetchConfig();
-    if (history.location.pathname === BASE_URL) {
+    const { pathname } = history.location;
+
+    this.props.fetchConfig(this.props.currentOrgId);
+
+    if (pathname === BASE_URL) {
       this.props.fetchHome();
     }
   }
 
-  componentDidUpdate() {
+  componentDidUpdate(prevProps: AppIndexProps) {
     if (history.location.pathname === BASE_URL) {
       this.props.fetchHome();
     }
+    if(prevProps.currentOrgId !== this.props.currentOrgId) {
+      this.props.fetchConfig(this.props.currentOrgId);
+    }
   }
 
   render() {
@@ -101,7 +110,7 @@ class AppIndex extends React.Component<AppIndexProps, any> {
     // make sure all users in this app have checked login info
     if (
       !this.props.isFetchUserFinished ||
-      this.props.isFetchingConfig ||
+      // this.props.isFetchingConfig ||
       (pathname === BASE_URL && !this.props.isFetchHomeFinished)
     ) {
       const hideLoadingHeader = isTemplate || isAuthUnRequired(pathname);
@@ -151,6 +160,8 @@ class AppIndex extends React.Component<AppIndexProps, any> {
               component={ApplicationHome}
             />
             <LazyRoute path={USER_AUTH_URL} component={LazyUserAuthComp} />
+            <LazyRoute path={ORG_AUTH_LOGIN_URL} component={LazyUserAuthComp} />
+            <LazyRoute path={ORG_AUTH_REGISTER_URL} component={LazyUserAuthComp} />
             <LazyRoute path={INVITE_LANDING_URL} component={LazyInviteLanding} />
             <LazyRoute path={`${COMPONENT_DOC_URL}/:name`} component={LazyComponentDoc} />
             <LazyRoute path={`/playground/:name/:dsl`} component={LazyComponentPlayground} />
@@ -174,8 +185,9 @@ class AppIndex extends React.Component<AppIndexProps, any> {
 
 const mapStateToProps = (state: AppState) => ({
   isFetchUserFinished: isFetchUserFinished(state),
-  isFetchingConfig: getSystemConfigFetching(state),
+  // isFetchingConfig: getSystemConfigFetching(state),
   orgDev: state.ui.users.user.orgDev,
+  currentOrgId: state.ui.users.user.currentOrgId,
   defaultHomePage: state.ui.application.homeOrg?.commonSettings.defaultHomePage,
   isFetchHomeFinished: state.ui.application.loadingStatus.fetchHomeDataFinished,
   favicon: getBrandingConfig(state)?.favicon
@@ -188,7 +200,7 @@ const mapDispatchToProps = (dispatch: any) => ({
   getCurrentUser: () => {
     dispatch(fetchUserAction());
   },
-  fetchConfig: () => dispatch(fetchConfigAction()),
+  fetchConfig: (orgId?: string) => dispatch(fetchConfigAction(orgId)),
   fetchHome: () => dispatch(fetchHomeData({})),
 });
 

client/packages/lowcoder/src/appView/AppViewInstance.tsx

@@ -35,8 +35,8 @@ export class AppViewInstance<I = any, O = any> {
   private events = new Map<keyof EventHandlerMap, EventHandlerMap<O>[keyof EventHandlerMap]>();
   private dataPromise: Promise<{ appDsl: any; moduleDslMap: any }>;
   private options: AppViewInstanceOptions = {
-    baseUrl: "https://api.lowcoder.dev",
-    webUrl: "https://cloud.lowcoder.dev",
+    baseUrl: "https://api-service.lowcoder.cloud",
+    webUrl: "https://app.lowcoder.cloud",
   };
 
   constructor(private appId: string, private node: Element, options: AppViewInstanceOptions = {}) {

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

@@ -59,7 +59,8 @@ import {
 import { timelineDate, timelineNode, TimelineDataTooltip } from "./timelineConstants";
 import { convertTimeLineData } from "./timelineUtils";
 import { Timeline } from "antd";
-import { ANTDICON } from "./antIcon";
+
+import { ANTDICON } from "./antIcon"; // todo: select icons to not import all icons
 
 const EventOptions = [
   clickEvent,
@@ -129,14 +130,13 @@ const TimelineComp = (
     <div
       style={{
         margin: style.margin ?? '3px',
-        padding: style.padding ?? '3px',
+        padding: style.padding !== '3px' ? style.padding : '20px 10px 0px 10px',
         width: widthCalculator(style.margin ?? '3px'),
         height: heightCalculator(style.margin ?? '3px'),
         background: style.background,
         overflow: "auto",
         overflowX: "hidden",
         borderRadius: style.radius,
-        //height: '100%'
       }}
     >
       <Timeline