Skip to content

Commit

Permalink
Adjust the details component to be a little more polymorphic.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jonesy committed Jan 31, 2020
1 parent 3c7c38a commit e3b7535
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 8 deletions.
42 changes: 42 additions & 0 deletions frontend/src/modules/requests/components/request/details-row.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
import * as React from 'react';
import PropTypes from 'prop-types';
import get from 'lodash/get';

import { RequestSchema } from '../../types';
import * as styles from './styles.css';

function getText(data, request) {
const value = get(request, data.key);

switch (data.inputType) {
case 'checkbox':
return <div>{value ? 'Yes' : 'No'}</div>;

case 'radio':
return data.values.find(d => d.value === value).label;

default:
return value || '-';
}
}

function DetailsRow({ data, request }) {
const { key, label } = data;
const text = getText(data, request);
return (
<div id={`request-${key}-field`} className={styles.fieldRow}>
<h6>{label}</h6>
<p id={`request-${key}-text`}>{text}</p>
</div>
);
}

DetailsRow.propTypes = {
data: PropTypes.shape({
label: PropTypes.string,
key: PropTypes.string,
}).isRequired,
request: RequestSchema.isRequired,
};

export default DetailsRow;
10 changes: 2 additions & 8 deletions frontend/src/modules/requests/components/request/details.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { Prompt } from 'react-router-dom';
import { uid } from 'react-uid';
import { _e } from '@src/utils';

import DetailsRow from './details-row';
import { RequestSchema } from '../../types';
import * as styles from './styles.css';

Expand Down Expand Up @@ -78,14 +79,7 @@ function RequestDetails({
{fields
.filter(d => d.key !== 'name')
.map(d => (
<div
key={uid(d)}
id={`request-${d.key}-field`}
className={styles.fieldRow}
>
<h6>{d.label}</h6>
<p id={`request-${d.key}-text`}>{data[d.key] || '-'}</p>
</div>
<DetailsRow key={uid(d)} data={d} request={data} />
))}
</div>
)}
Expand Down

0 comments on commit e3b7535

Please sign in to comment.