4493

pending completion

Build # 4493

Build Type

Pull #665

travis-ci

Committed by

web-flow

Commit Message

<a href="https://github.com/openmrs/openmrs-ocl-client/commit/<a class=hub.com/openmrs/openmrs-ocl-client/commit/<a class="double-link" href="https://git"><a class=hub.com/openmrs/openmrs-ocl-client/commit/<a class="double-link" href="https://git"><a class=hub.com/openmrs/openmrs-ocl-client/commit/81286102801ff119417de92642ca410f3b933480">812861028<a href="https://github.com/openmrs/openmrs-ocl-client/commit/81286102801ff119417de92642ca410f3b933480">&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/openmrs/openmrs-ocl-client/commit/&lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/openmrs/openmrs-ocl-client/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/openmrs/openmrs-ocl-client/commit/81286102801ff119417de92642ca410f3b933480&quot;&gt;812861028&lt;/a&gt;&lt;a href=&quot;https://github.com/openmrs/openmrs-ocl-client/commit/81286102801ff119417de92642ca410f3b933480&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/openmrs/openmrs-ocl-client/commit/81286102801ff119417de92642ca410f&lt;/a&gt;3b933480&quot;>&quot;&gt;Merge &lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/openmrs/openmrs-ocl-client/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/openmrs/openmrs-ocl-client/commit/<a class="double-link" href="https://github.com/openmrs/openmrs-ocl-client/commit/0a901eb19e0d9eb309b343b891d5484b2a9d5d44">0a901eb19</a><a href="https://github.com/openmrs/openmrs-ocl-client/commit/81286102801ff119417de92642ca410f3b933480">&amp;quot;&amp;gt;0a901eb19&amp;lt;/a&amp;gt;&amp;quot;&amp;gt;0a901eb19&amp;lt;/a&amp;gt;&amp;lt;a href=&amp;quot;https://github.com/openmrs/openmrs-ocl-client/commit/81286102801ff119417de92642ca410f3b933&lt;/a&gt;480&quot;&gt; into &lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/openmrs/openmrs-ocl-client/commit/<a class="double-link" href="https://github.com/openmrs/openmrs-ocl-client/commit/c19bbf7b0">c19bbf7b0">c19bbf7b0</a>

Pull Request Pull Request #665: OCLOMRS-941:Create Copy of an existing dictionary and redirect to Cre…

Run Details

416 of 1308 branches covered (31.8%)

Branch coverage included in aggregate %.

20 of 20 new or added lines in 5 files covered. (100.0%)

1249 of 2378 relevant lines covered (52.52%)

26.29 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

69.84

/src/apps/dictionaries/components/DictionaryForm.tsx

import React, { useEffect, useRef } from "react";
import {
  Button,
  FormControl,
  InputLabel,
  makeStyles,
  MenuItem,
  Typography
} from "@material-ui/core";
import {
  getCustomErrorMessage,
  getPrettyError,
  PREFERRED_SOURCES,
  CONTEXT
} from "../../../utils";
import { ErrorMessage, Field, Form, Formik } from "formik";
import * as Yup from "yup";
import { Select, TextField } from "formik-material-ui";
import { snakeCase } from "lodash";
import { Dictionary, APIDictionary, dictionaryToCopyableDictionary } from "../types";
import { APIOrg, APIProfile } from "../../authentication";
import {
  showDefaultLocale,
  showOrganisationHeader,
  showUserName,
  showUserOrganisations,
  supportedLocalesLabel
} from "../../containers/components/FormUtils";

interface Props {
  onSubmit?: Function;
  loading: boolean;
  status?: string;
  profile?: APIProfile;
  usersOrgs: APIOrg[];
  errors?: {};
  savedValues?: Dictionary;
  copiedDictionary?: APIDictionary;
  context?: string;
}

const DictionarySchema = Yup.object().shape<Dictionary>({
  name: Yup.string().required("Dictionary name is required"),
  short_code: Yup.string()
    .required("Short code is required")
    .matches(/^[a-zA-Z0-9\-.]+$/, "Alphanumeric characters, - and . only"),
  description: Yup.string().min(0),
  preferred_source: Yup.string()
    .required("Select a preferred source")
    .oneOf(Object.keys(PREFERRED_SOURCES), "This source is not supported"),
  owner_url: Yup.string().required("Select this dictionary's owner"),
  public_access: Yup.string().required(
    "Select who will have access to this dictionary"
  ),
  default_locale: Yup.string().required("Select a preferred language"),
  supported_locales: Yup.array(Yup.string())
});

const initialValues: Dictionary = {
  name: "",
  short_code: "",
  description: "",
  preferred_source: "",
  owner_url: "",
  public_access: "",
  default_locale: "",
  supported_locales: []
};

const useStyles = makeStyles({
  dictionaryForm: {
    padding: "2vh 2vw"
  },
  submitButton: {
    textAlign: "center"
  }
});

const DictionaryForm: React.FC<Props> = ({
  onSubmit,
  loading,
  status, // todo start using this to show action progress
  profile,
  usersOrgs,
  errors,
  context = CONTEXT.view,
  savedValues,
  copiedDictionary
}) => {
  const classes = useStyles();

  const supported_locales: any = copiedDictionary?.supported_locales !== null ? copiedDictionary?.supported_locales : [];

  const copy = { ...initialValues, ...copiedDictionary ? dictionaryToCopyableDictionary(copiedDictionary): copiedDictionary, supported_locales } as APIDictionary;

  const viewing = context === CONTEXT.view;
  const editing = context === CONTEXT.edit;

  const formikRef: any = useRef(null);
  const statusCodesWeCareAbout = {
    403: `You don't have permission to ${context} a dictionary in this Organisation`
  };
  let error: string | undefined = getCustomErrorMessage(
    getPrettyError(errors),
    statusCodesWeCareAbout
  );

  useEffect(() => {
    const { current: currentRef } = formikRef;
    if (currentRef) {
      currentRef.setSubmitting(loading);
    }
  }, [loading]);

  useEffect(() => {
    const { current: currentRef } = formikRef;
    if (currentRef) {
      currentRef.setStatus(status);
    }
  }, [status]);

  useEffect(() => {
    const { current: currentRef } = formikRef;
    if (!currentRef) return;

    Object.keys(initialValues).forEach(key => {
      const error = getPrettyError(
        errors,
        snakeCase(key === "short_code" ? "id" : key) // id and short_code are the same value. error comes back in id
      );
      if (error) currentRef.setFieldError(key, error);
    });
  }, [errors]);

  return (
    <div id="dictionary-form" className={classes.dictionaryForm}>
      <Formik
        ref={formikRef}
        initialValues={savedValues || copy || initialValues }
        validationSchema={DictionarySchema}
        validateOnChange={false}
        onSubmit={(values: Dictionary) => {
          if (onSubmit) {
            onSubmit(values, copy.references)
          }
        }}
      >
        {({ isSubmitting, status, values }) => (
          <Form>
            <Field
              // required
              fullWidth
              autoComplete="off"
              id="name"
              name="name"
              label="Dictionary Name"
              margin="normal"
              multiline
              rowsMax={4}
              component={TextField}
            />
            <Field
              // required
              fullWidth
              disabled={editing || isSubmitting}
              autoComplete="off"
              id="short_code"
              name="short_code"
              label="Short Code"
              margin="normal"
              multiline
              rowsMax={4}
              component={TextField}
            />
            <Field
              fullWidth
              multiline
              rowsMax={4}
              id="description"
              name="description"
              label="Description"
              margin="normal"
              component={TextField}
            />
            <FormControl
              fullWidth
              // required
              margin="normal"
            >
              <InputLabel htmlFor="preferred_source">
                Preferred Source
              </InputLabel>
              <Field
                name="preferred_source"
                id="preferred_source"
                component={Select}
              >
                {Object.keys(PREFERRED_SOURCES).map(preferredSource => (
                  <MenuItem key={preferredSource} value={preferredSource}>
                    {preferredSource}
                  </MenuItem>
                ))}
              </Field>
              <Typography color="error" variant="caption" component="div">
                <ErrorMessage name="preferred_source" component="span" />
              </Typography>
            </FormControl>
            <FormControl
              fullWidth
              // required
              margin="normal"
            >
              <InputLabel htmlFor="owner_url">Owner</InputLabel>
              <Field
                value=""
                disabled={editing || isSubmitting}
                name="owner_url"
                id="owner_url"
                multiline
                rowsMax={4}
                component={Select}
              >
                {showUserName(profile)}
                {showOrganisationHeader(usersOrgs)}
                {showUserOrganisations(usersOrgs)}
              </Field>
              <Typography color="error" variant="caption" component="div">
                <ErrorMessage name="owner_url" component="span" />
              </Typography>
            </FormControl>
            <FormControl
              fullWidth
              // required
              margin="normal"
            >
              <InputLabel htmlFor="public_access">Visibility</InputLabel>
              <Field name="public_access" id="public_access" component={Select}>
                <MenuItem value="View">Public</MenuItem>
                <MenuItem value="None">Private</MenuItem>
              </Field>
              <Typography color="error" variant="caption" component="div">
                <ErrorMessage name="public_access" component="span" />
              </Typography>
            </FormControl>
            <FormControl
              fullWidth
              // required
              margin="normal"
            >
              <InputLabel htmlFor="default_locale">
                Preferred Language
              </InputLabel>
              <Field
                name="default_locale"
                id="default_locale"
                component={Select}
              >
                {showDefaultLocale()}
              </Field>
              <Typography color="error" variant="caption" component="div">
                <ErrorMessage name="default_locale" component="span" />
              </Typography>
            </FormControl>
            <FormControl
              fullWidth
              // required
              margin="normal"
            >
              <InputLabel htmlFor="supported_locales">
                Other Languages
              </InputLabel>
              <Field
                multiple
                fullWidth
                defaultValue={[]}
                name="supported_locales"
                id="supported_locales"
                component={Select}
                style={{whiteSpace: "inherit !important"}}
              >
                {supportedLocalesLabel(values)}
              </Field>
              <Typography color="error" variant="caption" component="div">
                <ErrorMessage name="supported_locales" component="span" />
              </Typography>
            </FormControl>
            {!viewing ? (
              ""
            ) : (
              <Field
                fullWidth
                multiline
                rowsMax={4}
                // defaultValue="None"
                id="linked_source"
                name="extras.source"
                label="Linked Source"
                helperText="Custom concepts created for this dictionary will be kept here."
                margin="normal"
                component={TextField}
              />
            )}
            <br />
            <br />
            {viewing ? (
              ""
            ) : (
              <div className={classes.submitButton}>
                {!status ? (
                  <br />
                ) : (
                  <Typography
                    color="textSecondary"
                    variant="caption"
                    component="span"
                  >
                    {status}
                  </Typography>
                )}
                {!error ? (
                  <br />
                ) : (
                  <Typography color="error" variant="caption" component="span">
                    {error}
                  </Typography>
                )}
                <br />
                <Button
                  variant="outlined"
                  color="primary"
                  size="medium"
                  type="submit"
                  disabled={isSubmitting}
                >
                  Submit
                </Button>
              </div>
            )}
          </Form>
        )}
      </Formik>
    </div>
  );
};

export default DictionaryForm;

1	import React, { useEffect, useRef } from "react";
2	import {
3	Button,
4	FormControl,
5	InputLabel,
6	makeStyles,
7	MenuItem,
8	Typography
9	} from "@material-ui/core";
10	import {
11	getCustomErrorMessage,
12	getPrettyError,
13	PREFERRED_SOURCES,
14	CONTEXT
15	} from "../../../utils";
16	import { ErrorMessage, Field, Form, Formik } from "formik";
17	import * as Yup from "yup";
18	import { Select, TextField } from "formik-material-ui";
19	import { snakeCase } from "lodash";
20	import { Dictionary, APIDictionary, dictionaryToCopyableDictionary } from "../types";
21	import { APIOrg, APIProfile } from "../../authentication";
22	import {
23	showDefaultLocale,
24	showOrganisationHeader,
25	showUserName,
26	showUserOrganisations,
27	supportedLocalesLabel
28	} from "../../containers/components/FormUtils";
29
30	interface Props {
31	onSubmit?: Function;
32	loading: boolean;
33	status?: string;
34	profile?: APIProfile;
35	usersOrgs: APIOrg[];
36	errors?: {};
37	savedValues?: Dictionary;
38	copiedDictionary?: APIDictionary;
39	context?: string;
40	}
41
42	const DictionarySchema = Yup.object().shape<Dictionary>({	28✔
43	name: Yup.string().required("Dictionary name is required"),
44	short_code: Yup.string()
45	.required("Short code is required")
46	.matches(/^[a-zA-Z0-9\-.]+$/, "Alphanumeric characters, - and . only"),
47	description: Yup.string().min(0),
48	preferred_source: Yup.string()
49	.required("Select a preferred source")
50	.oneOf(Object.keys(PREFERRED_SOURCES), "This source is not supported"),
51	owner_url: Yup.string().required("Select this dictionary's owner"),
52	public_access: Yup.string().required(
53	"Select who will have access to this dictionary"
54	),
55	default_locale: Yup.string().required("Select a preferred language"),
56	supported_locales: Yup.array(Yup.string())
57	});
58
59	const initialValues: Dictionary = {	28✔
60	name: "",
61	short_code: "",
62	description: "",
63	preferred_source: "",
64	owner_url: "",
65	public_access: "",
66	default_locale: "",
67	supported_locales: []
68	};
69
70	const useStyles = makeStyles({	28✔
71	dictionaryForm: {
72	padding: "2vh 2vw"
73	},
74	submitButton: {
75	textAlign: "center"
76	}
77	});
78
79	const DictionaryForm: React.FC<Props> = ({	28✔
80	onSubmit,
81	loading,
82	status, // todo start using this to show action progress
83	profile,
84	usersOrgs,
85	errors,
86	context = CONTEXT.view,	×
87	savedValues,
88	copiedDictionary
89	}) => {
90	const classes = useStyles();	1✔
91
92	const supported_locales: any = copiedDictionary?.supported_locales !== null ? copiedDictionary?.supported_locales : [];	1!
93
94	const copy = { ...initialValues, ...copiedDictionary ? dictionaryToCopyableDictionary(copiedDictionary): copiedDictionary, supported_locales } as APIDictionary;	1!
95
96	const viewing = context === CONTEXT.view;	1✔
97	const editing = context === CONTEXT.edit;	1✔
98
99	const formikRef: any = useRef(null);	1✔
100	const statusCodesWeCareAbout = {	1✔
101	403: `You don't have permission to ${context} a dictionary in this Organisation`
102	};
103	let error: string \| undefined = getCustomErrorMessage(	1✔
104	getPrettyError(errors),
105	statusCodesWeCareAbout
106	);
107
108	useEffect(() => {	1✔
109	const { current: currentRef } = formikRef;	1✔
110	if (currentRef) {	1!
111	currentRef.setSubmitting(loading);	1✔
112	}
113	}, [loading]);
114
115	useEffect(() => {	1✔
116	const { current: currentRef } = formikRef;	1✔
117	if (currentRef) {	1!
118	currentRef.setStatus(status);	1✔
119	}
120	}, [status]);
121
122	useEffect(() => {	1✔
123	const { current: currentRef } = formikRef;	1✔
124	if (!currentRef) return;	1!
125
126	Object.keys(initialValues).forEach(key => {	1✔
127	const error = getPrettyError(	8✔
128	errors,
129	snakeCase(key === "short_code" ? "id" : key) // id and short_code are the same value. error comes back in id	8✔
130	);
131	if (error) currentRef.setFieldError(key, error);	8!
132	});
133	}, [errors]);
134
135	return (	1✔
136	<div id="dictionary-form" className={classes.dictionaryForm}>
137	<Formik
138	ref={formikRef}
139	initialValues={savedValues \|\| copy \|\| initialValues }	1!
140	validationSchema={DictionarySchema}
141	validateOnChange={false}
142	onSubmit={(values: Dictionary) => {
143	if (onSubmit) {	×
144	onSubmit(values, copy.references)	×
145	}
146	}}
147	>
148	{({ isSubmitting, status, values }) => (
149	<Form>	2✔
150	<Field
151	// required
152	fullWidth
153	autoComplete="off"
154	id="name"
155	name="name"
156	label="Dictionary Name"
157	margin="normal"
158	multiline
159	rowsMax={4}
160	component={TextField}
161	/>
162	<Field
163	// required
164	fullWidth
165	disabled={editing \|\| isSubmitting}	4✔
166	autoComplete="off"
167	id="short_code"
168	name="short_code"
169	label="Short Code"
170	margin="normal"
171	multiline
172	rowsMax={4}
173	component={TextField}
174	/>
175	<Field
176	fullWidth
177	multiline
178	rowsMax={4}
179	id="description"
180	name="description"
181	label="Description"
182	margin="normal"
183	component={TextField}
184	/>
185	<FormControl
186	fullWidth
187	// required
188	margin="normal"
189	>
190	<InputLabel htmlFor="preferred_source">
191	Preferred Source
192	</InputLabel>
193	<Field
194	name="preferred_source"
195	id="preferred_source"
196	component={Select}
197	>
198	{Object.keys(PREFERRED_SOURCES).map(preferredSource => (
199	<MenuItem key={preferredSource} value={preferredSource}>	6✔
200	{preferredSource}
201	</MenuItem>
202	))}
203	</Field>
204	<Typography color="error" variant="caption" component="div">
205	<ErrorMessage name="preferred_source" component="span" />
206	</Typography>
207	</FormControl>
208	<FormControl
209	fullWidth
210	// required
211	margin="normal"
212	>
213	<InputLabel htmlFor="owner_url">Owner</InputLabel>
214	<Field
215	value=""
216	disabled={editing \|\| isSubmitting}	4✔
217	name="owner_url"
218	id="owner_url"
219	multiline
220	rowsMax={4}
221	component={Select}
222	>
223	{showUserName(profile)}
224	{showOrganisationHeader(usersOrgs)}
225	{showUserOrganisations(usersOrgs)}
226	</Field>
227	<Typography color="error" variant="caption" component="div">
228	<ErrorMessage name="owner_url" component="span" />
229	</Typography>
230	</FormControl>
231	<FormControl
232	fullWidth
233	// required
234	margin="normal"
235	>
236	<InputLabel htmlFor="public_access">Visibility</InputLabel>
237	<Field name="public_access" id="public_access" component={Select}>
238	<MenuItem value="View">Public</MenuItem>
239	<MenuItem value="None">Private</MenuItem>
240	</Field>
241	<Typography color="error" variant="caption" component="div">
242	<ErrorMessage name="public_access" component="span" />
243	</Typography>
244	</FormControl>
245	<FormControl
246	fullWidth
247	// required
248	margin="normal"
249	>
250	<InputLabel htmlFor="default_locale">
251	Preferred Language
252	</InputLabel>
253	<Field
254	name="default_locale"
255	id="default_locale"
256	component={Select}
257	>
258	{showDefaultLocale()}
259	</Field>
260	<Typography color="error" variant="caption" component="div">
261	<ErrorMessage name="default_locale" component="span" />
262	</Typography>
263	</FormControl>
264	<FormControl
265	fullWidth
266	// required
267	margin="normal"
268	>
269	<InputLabel htmlFor="supported_locales">
270	Other Languages
271	</InputLabel>
272	<Field
273	multiple
274	fullWidth
275	defaultValue={[]}
276	name="supported_locales"
277	id="supported_locales"
278	component={Select}
279	style={{whiteSpace: "inherit !important"}}
280	>
281	{supportedLocalesLabel(values)}
282	</Field>
283	<Typography color="error" variant="caption" component="div">
284	<ErrorMessage name="supported_locales" component="span" />
285	</Typography>
286	</FormControl>
287	{!viewing ? (	2!
288	""
289	) : (
290	<Field
291	fullWidth
292	multiline
293	rowsMax={4}
294	// defaultValue="None"
295	id="linked_source"
296	name="extras.source"
297	label="Linked Source"
298	helperText="Custom concepts created for this dictionary will be kept here."
299	margin="normal"
300	component={TextField}
301	/>
302	)}
303	<br />
304	<br />
305	{viewing ? (	2!
306	""
307	) : (
308	<div className={classes.submitButton}>
309	{!status ? (	×
310	<br />
311	) : (
312	<Typography
313	color="textSecondary"
314	variant="caption"
315	component="span"
316	>
317	{status}
318	</Typography>
319	)}
320	{!error ? (	×
321	<br />
322	) : (
323	<Typography color="error" variant="caption" component="span">
324	{error}
325	</Typography>
326	)}
327	<br />
328	<Button
329	variant="outlined"
330	color="primary"
331	size="medium"
332	type="submit"
333	disabled={isSubmitting}
334	>
335	Submit
336	</Button>
337	</div>
338	)}
339	</Form>
340	)}
341	</Formik>
342	</div>
343	);
344	};
345
346	export default DictionaryForm;

openmrs / openmrs-ocl-client / 4493

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous