diff --git a/components/Organization/UpdateOrganization.tsx b/components/Organization/UpdateOrganization.tsx index c276dfe8d..ad6470db1 100644 --- a/components/Organization/UpdateOrganization.tsx +++ b/components/Organization/UpdateOrganization.tsx @@ -8,30 +8,38 @@ interface IProps { setError: Function setOrg: Function setOrgEdit: Function + editType: 'name' | 'address' + loading: boolean + setLoading: Function } interface UpdateOrganizationForm { - name: string + name?: string + address?: string } -const UpdateOrganization = ({ user, setError, setOrg, setOrgEdit }: IProps): JSX.Element => { +const UpdateOrganization = ({ user, setError, setOrg, setOrgEdit, editType, loading, setLoading }: IProps): JSX.Element => { const { register, handleSubmit, reset } = useForm({}) - const onSubmit = async (params: any): Promise => { + const onSubmit = async (params: UpdateOrganizationForm): Promise => { + setLoading(true) const res = await fetch('/api/organization', { method: 'PUT', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ - name: params.name, - userId: user.userProfile.id + userId: user.userProfile.id, + ...(editType === 'name' ? { name: params.name } : {}), + ...(editType === 'address' ? { address: params.address } : {}) }) }) + if (res.status === 200) { const data = await res.json() setOrg(data.organization) reset() + setLoading(false) setOrgEdit('') } else { const json = await res.json() @@ -46,22 +54,24 @@ const UpdateOrganization = ({ user, setError, setOrg, setOrgEdit }: IProps): JSX }} method="post" > - +
- -
) diff --git a/components/Organization/ViewOrganization.tsx b/components/Organization/ViewOrganization.tsx index 4fe902b28..a3fe6bc1f 100644 --- a/components/Organization/ViewOrganization.tsx +++ b/components/Organization/ViewOrganization.tsx @@ -46,6 +46,13 @@ const ViewOrganization = ({ user, orgMembers, setOrgMembers, organization }: IPr + + {org.address?.trim() !== '' && ( +
+
Address
+
{org.address}
+
+ )}
Manage
{orgEdit === '' ? ( @@ -59,6 +66,15 @@ const ViewOrganization = ({ user, orgMembers, setOrgMembers, organization }: IPr Edit Name +
+
Organization Address
+ +
Delete Organization