redirect to signup page if no workspace found on login

Author: raheeliftikhar5

client/packages/lowcoder/src/pages/userAuth/formLoginSteps.tsx

@@ -6,7 +6,7 @@ import {
   LoginCardTitle,
   StyledRouteLink,
 } from "pages/userAuth/authComponents";
-import React, { useContext, useMemo, useState } from "react";
+import React, { useContext, useState } from "react";
 import styled from "styled-components";
 import UserApi from "api/userApi";
 import { useRedirectUrl } from "util/hooks";
@@ -27,6 +27,7 @@ import { default as Button } from "antd/es/button";
 import LeftOutlined from "@ant-design/icons/LeftOutlined";
 import { fetchConfigAction } from "@lowcoder-ee/redux/reduxActions/configActions";
 import { useDispatch } from "react-redux";
+import history from "util/history";
 
 const StyledCard = styled.div<{$selected: boolean}>`
   display: flex;
@@ -86,13 +87,16 @@ const StepBackButton = (props : {
 )
 export default function FormLoginSteps() {
   const dispatch = useDispatch();
-  const [account, setAccount] = useState("");
+  const location = useLocation(); 
+  const [account, setAccount] = useState(() => {
+    const { email } = (location.state || {}) as any;
+    return email ?? '';
+  });
   const [password, setPassword] = useState("");
   const redirectUrl = useRedirectUrl();
   const { systemConfig, inviteInfo, fetchUserAfterAuthSuccess } = useContext(AuthContext);
   const invitationId = inviteInfo?.invitationId;
   const authId = systemConfig?.form.id;
-  const location = useLocation(); 
   const [orgLoading, setOrgLoading] = useState(false);
   const [orgList, setOrgList] = useState<OrgItem[]>([]);
   const [currentStep, setCurrentStep] = useState<CurrentStepEnum>(CurrentStepEnum.EMAIL);
@@ -121,9 +125,13 @@ export default function FormLoginSteps() {
         if (validateResponse(resp)) {
           setOrgList(resp.data.data);
           if (!resp.data.data.length) {
-            throw new Error('Error: no workspaces found');
+            history.push(
+              AUTH_REGISTER_URL,
+              {...location.state || {}, email: account},
+            )
+            return;
           }
-          else if (resp.data.data.length === 1) {
+          if (resp.data.data.length === 1) {
             setOrganizationId(resp.data.data[0].orgId);
             setCurrentStep(CurrentStepEnum.AUTH_PROVIDERS);
             return;

client/packages/lowcoder/src/pages/userAuth/register.tsx

@@ -1,4 +1,4 @@
-import React, { useContext, useState, useMemo } from "react";
+import React, { useContext, useState, useMemo, useEffect } from "react";
 import {
   AuthContainer,
   ConfirmButton,
@@ -37,11 +37,14 @@ const RegisterContent = styled(FormWrapperMobile)`
 `;
 
 function UserRegister() {
+  const location = useLocation();
   const [submitBtnDisable, setSubmitBtnDisable] = useState(false);
-  const [account, setAccount] = useState("");
+  const [account, setAccount] = useState(() => {
+    const { email } = (location.state || {}) as any;
+    return email ?? '';
+  });
   const [password, setPassword] = useState("");
   const redirectUrl = useRedirectUrl();
-  const location = useLocation();
   const { systemConfig, inviteInfo, fetchUserAfterAuthSuccess } = useContext(AuthContext);
   const invitationId = inviteInfo?.invitationId;
 
@@ -81,10 +84,10 @@ function UserRegister() {
       type="large"
     >
       <RegisterContent>
-        {/* <LoginCardTitle>{trans("userAuth.registerByEmail")}</LoginCardTitle> */}
         <StyledFormInput
           className="form-input"
           label={trans("userAuth.email")}
+          defaultValue={account}
           onChange={(value, valid) => setAccount(valid ? value : "")}
           placeholder={trans("userAuth.inputEmail")}
           checkRule={{

client/packages/lowcoder/src/pages/userAuth/thirdParty/thirdPartyAuth.tsx

@@ -7,7 +7,7 @@ import { WhiteLoading } from "lowcoder-design";
 import history from "util/history";
 import { LoginLogoStyle, LoginLabelStyle, StyledLoginButton } from "pages/userAuth/authComponents";
 import { useSelector } from "react-redux";
-import { selectSystemConfig } from "redux/selectors/configSelectors";
+import { getSystemConfigFetching, selectSystemConfig } from "redux/selectors/configSelectors";
 import React from "react";
 import { messageInstance } from "lowcoder-design/src/components/GlobalInstances";
 import styled from "styled-components";
@@ -17,6 +17,8 @@ import { default as Divider } from "antd/es/divider";
 import { default as Typography } from "antd/es/typography";
 import { useRedirectUrl } from "util/hooks";
 import { MultiIconDisplay } from "../../../comps/comps/multiIconDisplay";
+import Spin from "antd/es/spin";
+import { LoadingOutlined } from "@ant-design/icons";
 
 const { Text } = Typography;
 
@@ -107,7 +109,13 @@ export function ThirdPartyAuth(props: {
   authGoal: ThirdPartyAuthGoal;
   labelFormatter?: (name: string) => string;
 }) {
+  const systemConfigFetching = useSelector(getSystemConfigFetching);
   const systemConfig = useSelector(selectSystemConfig);
+  
+  if (systemConfigFetching) {
+    return <Spin indicator={<LoadingOutlined style={{ fontSize: 15, marginTop: '16px' }} spin />} />;
+  }
+
   if (!systemConfig) {
     return null;
   }