From a31bf155da55e493698b10558d2e45d778a2c4f2 Mon Sep 17 00:00:00 2001 From: ilkinguluzada Date: Wed, 3 May 2023 13:39:10 +0400 Subject: [PATCH] DASG-602: select account profiles default --- .../AdminPartnersListPage/AdminPartnersListPage.tsx | 12 +++++++++++- .../updatePartner/PartnerFormComponent.tsx | 4 ++-- client/src/types.d.ts | 4 ++-- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/client/src/pages/AdminPartnersListPage/AdminPartnersListPage.tsx b/client/src/pages/AdminPartnersListPage/AdminPartnersListPage.tsx index 1b6b5e689..72a511851 100644 --- a/client/src/pages/AdminPartnersListPage/AdminPartnersListPage.tsx +++ b/client/src/pages/AdminPartnersListPage/AdminPartnersListPage.tsx @@ -10,6 +10,7 @@ import { REF_PROFILE_TYPE, REF_PROFILE_TYPES_FILTER_OPTIONS, } from '../../constants/common'; +import { FIO_ACCOUNT_TYPES } from '../../constants/fio'; import { DEFAULT_LIMIT } from '../../hooks/usePagination'; import useEffectOnce from '../../hooks/general'; @@ -32,6 +33,7 @@ const AdminPartnersListPage: React.FC = props => { getFioAccountsProfilesList, getPartnersList, } = props; + const [filters, setFilters] = useState>({ type: '' }); const [showPartnerModal, setShowPartnerModal] = useState(false); const [selectedPartner, setSelectedPartner] = useState>( @@ -73,9 +75,17 @@ const AdminPartnersListPage: React.FC = props => { img: '', link: '', }, + freeFioAccountProfileId: fioAccountsProfilesList.find( + fioAccountsProfile => + fioAccountsProfile.accountType === FIO_ACCOUNT_TYPES.FREE, + )?.id, + paidFioAccountProfileId: fioAccountsProfilesList.find( + fioAccountsProfile => + fioAccountsProfile.accountType === FIO_ACCOUNT_TYPES.PAID, + )?.id, }); setShowPartnerModal(true); - }, []); + }, [fioAccountsProfilesList]); const onEditPartner = useCallback((partner: RefProfile) => { setSelectedPartner(partner); setShowPartnerModal(true); diff --git a/client/src/pages/AdminPartnersListPage/components/updatePartner/PartnerFormComponent.tsx b/client/src/pages/AdminPartnersListPage/components/updatePartner/PartnerFormComponent.tsx index 2926aeb38..7cff1220f 100644 --- a/client/src/pages/AdminPartnersListPage/components/updatePartner/PartnerFormComponent.tsx +++ b/client/src/pages/AdminPartnersListPage/components/updatePartner/PartnerFormComponent.tsx @@ -237,7 +237,7 @@ export const PartnerFormComponent: React.FC & { uiType={INPUT_UI_STYLES.BLACK_WHITE} errorColor={COLOR_TYPE.WARN} label="FIO Account Profile for Free Registrations *" - placeholder="FIO Account Profie FREE" + placeholder="Select..." loading={validating} disabled={submitting || loading} /> @@ -249,7 +249,7 @@ export const PartnerFormComponent: React.FC & { uiType={INPUT_UI_STYLES.BLACK_WHITE} errorColor={COLOR_TYPE.WARN} label="FIO Account Profile for Paid Registrations *" - placeholder="FIO Account Profie PAID" + placeholder="Select..." loading={validating} disabled={submitting || loading} /> diff --git a/client/src/types.d.ts b/client/src/types.d.ts index 1a6477849..6364475c9 100644 --- a/client/src/types.d.ts +++ b/client/src/types.d.ts @@ -398,8 +398,8 @@ export type RefProfile = { link?: string; }; tpid: string; - freeFioAccountProfileId: number; - paidFioAccountProfileId: number; + freeFioAccountProfileId: string; + paidFioAccountProfileId: string; createdAt?: string; };