From e0579abac68f149258c8a4a325bf1dd2d7b77282 Mon Sep 17 00:00:00 2001
From: Georgi Parlakov <gparlakov@gmail.com>
Date: Sat, 16 Nov 2024 17:24:26 +0200
Subject: [PATCH] fix: campaign application

- fix order of fields (make the goal the last field on the 3-rd step)
- remove "Membership" from the list of campaign types (it's a system type)
---
 .../steps/CampaignApplicationBasic.tsx         |  2 +-
 .../steps/CampaignApplicationDetails.tsx       | 18 +++++++++---------
 .../client/campaigns/CampaignTypeSelect.tsx    | 16 ++++++++++------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/src/components/client/campaign-application/steps/CampaignApplicationBasic.tsx b/src/components/client/campaign-application/steps/CampaignApplicationBasic.tsx
index 864dcd8f9..807e746b2 100644
--- a/src/components/client/campaign-application/steps/CampaignApplicationBasic.tsx
+++ b/src/components/client/campaign-application/steps/CampaignApplicationBasic.tsx
@@ -58,7 +58,7 @@ export default function CampaignApplicationBasic() {
           />
         </Grid>
         <Grid item xs={12}>
-          <CampaignTypeSelect name="applicationBasic.campaignType" />
+          <CampaignTypeSelect name="applicationBasic.campaignType" hideSystemTypes={true} />
         </Grid>
         <Grid item xs={12}>
           <StyledFormTextField
diff --git a/src/components/client/campaign-application/steps/CampaignApplicationDetails.tsx b/src/components/client/campaign-application/steps/CampaignApplicationDetails.tsx
index 6fa0945f6..30d8dffa6 100644
--- a/src/components/client/campaign-application/steps/CampaignApplicationDetails.tsx
+++ b/src/components/client/campaign-application/steps/CampaignApplicationDetails.tsx
@@ -22,15 +22,6 @@ export default function CampaignApplicationDetails({ files, setFiles }: Props) {
         <StyledStepHeading variant="h4">{t('steps.details.title')}</StyledStepHeading>
       </Grid>
       <Grid item container spacing={6} justifyContent="space-between" direction="row">
-        <Grid item xs={12}>
-          <FormTextField
-            type="text"
-            name="applicationDetails.cause"
-            label={t('steps.details.cause')}
-            multiline
-            rows={3}
-          />
-        </Grid>
         <Grid item xs={12}>
           <FormTextField
             type="text"
@@ -50,6 +41,15 @@ export default function CampaignApplicationDetails({ files, setFiles }: Props) {
             rows={5}
           />
         </Grid>
+        <Grid item xs={12}>
+          <FormTextField
+            type="text"
+            name="applicationDetails.cause"
+            label={t('steps.details.cause')}
+            multiline
+            rows={3}
+          />
+        </Grid>
         <Grid item xs={12}>
           <FileUpload
             buttonLabel={t('steps.details.documents')}
diff --git a/src/components/client/campaigns/CampaignTypeSelect.tsx b/src/components/client/campaigns/CampaignTypeSelect.tsx
index 6d1fa2fb7..2da5b52ae 100644
--- a/src/components/client/campaigns/CampaignTypeSelect.tsx
+++ b/src/components/client/campaigns/CampaignTypeSelect.tsx
@@ -4,7 +4,9 @@ import { useCampaignTypesList } from 'common/hooks/campaigns'
 import { useField } from 'formik'
 import { useTranslation } from 'next-i18next'
 
-export default function CampaignTypeSelect({ name = 'campaignTypeId' }) {
+const systemTypes = ['Membership']
+
+export default function CampaignTypeSelect({ name = 'campaignTypeId', hideSystemTypes = false }) {
   const { t } = useTranslation()
   const { data } = useCampaignTypesList()
   const [field, meta] = useField(name)
@@ -21,11 +23,13 @@ export default function CampaignTypeSelect({ name = 'campaignTypeId' }) {
         <MenuItem value="" disabled>
           {t('campaigns:campaign.type')}
         </MenuItem>
-        {data?.map((campaignType, index) => (
-          <MenuItem key={index} value={campaignType.id}>
-            {campaignType.name}
-          </MenuItem>
-        ))}
+        {data
+          ?.filter((campaignType) => !hideSystemTypes || !systemTypes.includes(campaignType?.name))
+          ?.map((campaignType, index) => (
+            <MenuItem key={index} value={campaignType.id}>
+              {campaignType.name}
+            </MenuItem>
+          ))}
       </Select>
       {helperText && <FormHelperText error>{helperText}</FormHelperText>}
     </FormControl>