@@ -2,8 +2,6 @@ import { FormInput, messageInstance, PasswordInput } from "lowcoder-design";
22import {
33AuthBottomView ,
44ConfirmButton ,
5- FormWrapperMobile ,
6- LoginCardTitle ,
75StyledRouteLink ,
86} from "pages/userAuth/authComponents" ;
97import React , { useContext , useEffect , useState } from "react" ;
@@ -15,7 +13,7 @@ import { UserConnectionSource } from "@lowcoder-ee/constants/userConstants";
1513import { trans } from "i18n" ;
1614import { AuthContext , useAuthSubmit } from "pages/userAuth/authUtils" ;
1715import { ThirdPartyAuth } from "pages/userAuth/thirdParty/thirdPartyAuth" ;
18- import { AUTH_FORGOT_PASSWORD_URL , AUTH_REGISTER_URL , ORG_AUTH_FORGOT_PASSWORD_URL , ORG_AUTH_REGISTER_URL } from "constants/routesURL" ;
16+ import { AUTH_FORGOT_PASSWORD_URL , AUTH_REGISTER_URL } from "constants/routesURL" ;
1917import { Link , useLocation , useParams } from "react-router-dom" ;
2018import { Divider } from "antd" ;
2119import Flex from "antd/es/flex" ;
@@ -27,7 +25,6 @@ import LeftOutlined from "@ant-design/icons/LeftOutlined";
2725import { fetchConfigAction } from "@lowcoder-ee/redux/reduxActions/configActions" ;
2826import { useDispatch , useSelector } from "react-redux" ;
2927import history from "util/history" ;
30- import ApplicationApi from "@lowcoder-ee/api/applicationApi" ;
3128import { getServerSettings } from "@lowcoder-ee/redux/selectors/applicationSelector" ;
3229import { fetchOrgPaginationByEmail } from "@lowcoder-ee/util/pagination/axios" ;
3330import PaginationComp from "@lowcoder-ee/util/pagination/Pagination" ;
@@ -120,9 +117,10 @@ export default function FormLoginSteps(props: FormLoginProps) {
120117const serverSettings = useSelector ( getServerSettings ) ;
121118const [ elements , setElements ] = useState < ElementsState > ( { elements :[ ] , total :0 } ) ;
122119const [ currentPage , setCurrentPage ] = useState ( 1 ) ;
123- const [ pageSize , setPageSize ] = useState ( 2 ) ;
120+ const [ pageSize , setPageSize ] = useState ( 10 ) ;
124121
125122useEffect ( ( ) => {
123+ if ( account )
126124fetchOrgPaginationByEmail ( {
127125email :account ,
128126pageNum :currentPage ,
@@ -169,20 +167,26 @@ export default function FormLoginSteps(props: FormLoginProps) {
169167}
170168
171169setOrgLoading ( true ) ;
172- OrgApi . fetchOrgsByEmail ( account )
170+ fetchOrgPaginationByEmail ( {
171+ email :account ,
172+ pageNum :currentPage ,
173+ pageSize :pageSize
174+ } )
173175. then ( ( resp ) => {
174- if ( validateResponse ( resp ) ) {
175- setOrgList ( resp . data . data ) ;
176- if ( ! resp . data . data . length ) {
176+ if ( resp . success ) {
177+ setElements ( { elements :resp . data || [ ] , total :resp . total || 1 } )
178+ console . log ( resp . data ) ;
179+ setOrgList ( resp . data ) ;
180+ if ( ! resp . data . length ) {
177181history . push (
178182AUTH_REGISTER_URL ,
179183{ ...location . state || { } , email :account } ,
180184)
181185return ;
182186}
183- if ( resp . data . data . length === 1 ) {
184- setOrganizationId ( resp . data . data [ 0 ] . orgId ) ;
185- dispatch ( fetchConfigAction ( resp . data . data [ 0 ] . orgId ) ) ;
187+ if ( resp . data . length === 1 ) {
188+ setOrganizationId ( resp . data [ 0 ] . orgId ) ;
189+ dispatch ( fetchConfigAction ( resp . data [ 0 ] . orgId ) ) ;
186190setCurrentStep ( CurrentStepEnum . AUTH_PROVIDERS ) ;
187191return ;
188192}