Move search result member into its own object

2020-01-14 00:52:15 +00:00
parent f52ee5532d
commit 579966e7aa
6 changed files with 105 additions and 58 deletions
--- a/webclient/src/Account.js
+++ b/webclient/src/Account.js
@@ -17,7 +17,7 @@ function ChangePasswordForm(props) {

 	const handleSubmit = (e) => {
 		setLoading(true);
-		requester('/rest-auth/password/change/', 'POST', props.token, input)
+		requester('/password/change/', 'POST', props.token, input)
 		.then(res => {
 			setError({});
 			history.push('/');
@@ -32,7 +32,7 @@ function ChangePasswordForm(props) {
 	const makeProps = (name) => ({
 		name: name,
 		onChange: handleChange,
-		value: input[name],
+		value: input[name] || '',
 		error: error[name],
 	});

@@ -43,16 +43,19 @@ function ChangePasswordForm(props) {
 			<Form.Input
 				label='Old Password'
 				type='password'
+				required
 				{...makeProps('old_password')}
 			/>
 			<Form.Input
 				label='New Password'
 				type='password'
+				required
 				{...makeProps('new_password1')}
 			/>
 			<Form.Input
 				label='Confirm Password'
 				type='password'
+				required
 				{...makeProps('new_password2')}
 			/>

@@ -139,6 +142,11 @@ export function AccountForm(props) {
 				required
 				{...makeProps('city')}
 			/>
+			<Form.Input
+				label='Postal Code'
+				required
+				{...makeProps('postal_code')}
+			/>

 			<Form.Field>
 				<label>Are you under 18 years old?</label>
--- a/webclient/src/Admin.js
+++ b/webclient/src/Admin.js
@@ -5,7 +5,7 @@ import { Container, Checkbox, Divider, Dropdown, Form, Grid, Header, Icon, Image
 import { BasicTable, staticUrl, requester } from './utils.js';

 export function AdminMemberForm(props) {
-	const [input, setInput] = useState(false);
+	const [input, setInput] = useState(props.result.member);
 	const [error, setError] = useState(false);
 	const [loading, setLoading] = useState(false);
 	const [success, setSuccess] = useState(false);
@@ -16,17 +16,6 @@ export function AdminMemberForm(props) {
 	const handleChange = (e) => handleValues(e, e.currentTarget);
 	const handleCheck = (e, v) => setInput({ ...input, [v.name]: v.checked });

-	useEffect(() => {
-		requester('/members/'+id+'/', 'GET', props.token)
-		.then(res => {
-			setInput(res);
-		})
-		.catch(err => {
-			console.log(err);
-			setError(true);
-		});
-	}, []);
-
 	const handleSubmit = (e) => {
 		setLoading(true);
 		setSuccess(false);
@@ -35,6 +24,7 @@ export function AdminMemberForm(props) {
 			setLoading(false);
 			setSuccess(true);
 			setError(false);
+			props.setResult({ ...props.result, member: res });
 		})
 		.catch(err => {
 			setLoading(false);
@@ -57,6 +47,11 @@ export function AdminMemberForm(props) {
 					<Form onSubmit={handleSubmit}>
 						<Header size='medium'>Edit Member Details</Header>

+						<Form.Input
+							label='Email'
+							{...makeProps('email')}
+						/>
+
 						<Form.Input
 							label='Application Date'
 							{...makeProps('application_date')}
@@ -117,21 +112,10 @@ export function AdminMemberForm(props) {
 };

 export function AdminMemberInfo(props) {
-	const [member, setMember] = useState(false);
+	const member = props.result.member;
 	const [error, setError] = useState(false);
 	const { id } = useParams();

-	useEffect(() => {
-		requester('/members/'+id+'/', 'GET', props.token)
-		.then(res => {
-			setMember(res);
-		})
-		.catch(err => {
-			console.log(err);
-			setError(true);
-		});
-	}, []);
-
 	return (
 		<div>
 			{!error ?
--- a/webclient/src/Members.js
+++ b/webclient/src/Members.js
@@ -8,7 +8,7 @@ import { NotFound, PleaseLogin } from './Misc.js';
 import { AdminMemberInfo, AdminMemberForm } from './Admin.js';

 export function Members(props) {
-	const [members, setMembers] = useState(false);
+	const [response, setResponse] = useState(false);
 	const searchDefault = {seq: 0, q: ''};
 	const [search, setSearch] = useState(searchDefault);
 	const { token } = props;
@@ -16,8 +16,8 @@ export function Members(props) {
 	useEffect(() => {
 		requester('/search/', 'POST', token, search)
 		.then(res => {
-			if (!search.seq || res.seq > members.seq) {
-				setMembers(res);
+			if (!search.seq || res.seq > response.seq) {
+				setResponse(res);
 			}
 		})
 		.catch(err => {
@@ -48,16 +48,16 @@ export function Members(props) {
 				{search.q.length ? 'Search Results' : 'Newest Vetted Members'}
 			</Header>

-			{members ?
+			{response ?
 				<Item.Group divided>
-					{members.results.length ?
-						members.results.map((x, i) =>
-							<Item key={i} as={Link} to={'/members/'+x.id}>
-								<Item.Image size='tiny' src={x.photo_small ? staticUrl + '/' + x.photo_small : '/nophoto.png'} />
+					{response.results.length ?
+						response.results.map((x, i) =>
+							<Item key={i} as={Link} to={'/members/'+x.member.id}>
+								<Item.Image size='tiny' src={x.member.photo_small ? staticUrl + '/' + x.member.photo_small : '/nophoto.png'} />
 								<Item.Content verticalAlign='top'>
-									<Item.Header>{x.preferred_name} {x.last_name}</Item.Header>
-									<Item.Description>Status: {x.status || 'Unknown'}</Item.Description>
-									<Item.Description>Joined: {x.current_start_date || 'Unknown'}</Item.Description>
+									<Item.Header>{x.member.preferred_name} {x.member.last_name}</Item.Header>
+									<Item.Description>Status: {x.member.status || 'Unknown'}</Item.Description>
+									<Item.Description>Joined: {x.member.current_start_date || 'Unknown'}</Item.Description>
 								</Item.Content>
 							</Item>
 						)
@@ -74,7 +74,7 @@ export function Members(props) {
 };

 export function MemberDetail(props) {
-	const [member, setMember] = useState(false);
+	const [result, setResult] = useState(false);
 	const [error, setError] = useState(false);
 	const { token, user } = props;
 	const { id } = useParams();
@@ -82,7 +82,7 @@ export function MemberDetail(props) {
 	useEffect(() => {
 		requester('/search/'+id+'/', 'GET', token)
 		.then(res => {
-			setMember(res);
+			setResult(res);
 		})
 		.catch(err => {
 			console.log(err);
@@ -90,6 +90,8 @@ export function MemberDetail(props) {
 		});
 	}, []);

+	const member = result.member || false;
+
 	return (
 		<Container>
 			{!error ?
@@ -104,7 +106,7 @@ export function MemberDetail(props) {
 								</p>

 								{isAdmin(user) ?
-									<AdminMemberInfo {...props} />
+									<AdminMemberInfo result={result} setResult={setResult} {...props} />
 								:
 									<BasicTable>
 										<Table.Body>
@@ -122,7 +124,9 @@ export function MemberDetail(props) {
 							</Grid.Column>

 							<Grid.Column>
-								{isAdmin(user) && <Segment padded><AdminMemberForm {...props} /></Segment>}
+								{isAdmin(user) && <Segment padded>
+									<AdminMemberForm result={result} setResult={setResult} {...props} />
+								</Segment>}
 							</Grid.Column>
 						</Grid>

--- a/webclient/src/utils.js
+++ b/webclient/src/utils.js
@@ -51,7 +51,7 @@ export const requester = (route, method, token, data) => {
 		return response.json();
 	})
 	.catch(error => {
-		const code = error.data.status;
+		const code = error.data ? error.data.status : null;
 		if (code == 413) {
 			throw customError({non_field_errors: ['File too big']});
 		} else if (code >= 400 && code < 500) {