Merge from git

This commit is contained in:
2021-11-01 11:21:39 +00:00
parent adcff32d73
commit d94b3b3e5a
210 changed files with 69742 additions and 3359 deletions
+108 -64
View File
@@ -1,10 +1,15 @@
import useSWR from "swr";
import { Field, reduxForm } from "redux-form";
import router from "next/router";
import DatePicker from "react-datepicker";
import { useRouter } from "next/router";
import DatePicker, { registerLocale, setDefaultLocale } from "react-datepicker";
import cy from "date-fns/locale/cy";
import React, { useState } from "react";
import "react-datepicker/dist/react-datepicker.css";
import moment from "moment";
import jsonpath from "jsonpath";
import fieldLookup from "../../data/crmfieldlookuptranslations.json";
import pickListLookup from "../../data/picklistLookups.json";
import useTranslation from "next-translate/useTranslation";
const RenderTextfield = ({
id,
@@ -28,7 +33,7 @@ const RenderTextfield = ({
}
>
<label className="govuk-label " htmlFor={id} id={id + "_label"}>
{label}
{FieldsTranslations(label)}
</label>
{touched && error && (
<span id={id + "-error"} className="govuk-error-message">
@@ -43,21 +48,39 @@ const RenderTextfield = ({
};
export function Textfield(props) {
const { name, label, validate } = props;
const { name, label, validate, ticketnumber } = props;
const required = (value) => (value ? undefined : "Required");
return (
<Field
name={props.name}
id={props.name}
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
//validate={[required]}
label={props.label}
errorMsg="Is required"
/>
);
if (name == "pinswg_name") {
return (
<div className="govuk-form-group">
<label className="govuk-label " htmlFor={props.name}>
{label}
</label>
<input
type="text"
name={name}
id={props.name}
component={RenderCaseID}
value={ticketnumber}
className="govuk-input govuk-input--width-20"
disabled
/>
</div>
);
} else {
return (
<Field
name={props.name}
id={props.name}
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
//validate={[required]}
label={props.label}
errorMsg="Is required"
/>
);
}
}
const RenderMultiline = ({
@@ -84,7 +107,7 @@ export function MultiLinefield(props) {
<div className="govuk-form-group">
<h1 className="govuk-label-wrapper">
<label className="govuk-label" htmlFor={props.name}>
{props.label}
{FieldsTranslations(props.label)}
</label>
</h1>
<div
@@ -118,6 +141,8 @@ const RenderDatePicker = ({
meta: { touched, error },
...custom
}) => {
const router = useRouter();
registerLocale("cy", cy);
return (
<>
<div
@@ -137,7 +162,7 @@ const RenderDatePicker = ({
className="govuk-fieldset__heading"
id={id + "_label"}
>
{label}
{FieldsTranslations(label)}
</label>
</legend>
{touched && error && (
@@ -153,6 +178,7 @@ const RenderDatePicker = ({
)}
<DatePicker
{...custom}
locale={router.locale}
autoOk={true}
dateFormat="dd/MM/yyyy"
onChange={onChange}
@@ -190,14 +216,14 @@ export function DateField(props) {
<fieldset
className="govuk-fieldset"
role="group"
aria-describedby="dob-hint"
aria-describedby={name + "-hint"}
>
<legend className="govuk-fieldset__legend govuk-fieldset__legend--s govuk-!-font-weight-regular">
<label className="govuk-fieldset__heading">
{props.label}
{FieldsTranslations(props.label)}
</label>
</legend>
<div className="govuk-date-input" id="dob">
<div className="govuk-date-input" id={name}>
<div className="govuk-date-input__item">
<div className="govuk-form-group">
<label
@@ -290,7 +316,7 @@ const RenderYesNo = ({
className="govuk-fieldset__heading govuk-body-m"
id={id + "_label"}
>
{label}
{FieldsTranslations(label)}
</label>
</legend>
{touched && error && (
@@ -335,8 +361,10 @@ const RenderYesNo = ({
};
export function YesNofield(props) {
const router = useRouter();
const { name, label } = props;
const yesNo = ["Yes", "No"];
const yesNo = router.locale == "cy" ? ["Ydw", "Na"] : ["Yes", "No"];
const required = (value) => (value ? undefined : "Required");
return (
@@ -348,7 +376,7 @@ export function YesNofield(props) {
id={props.name}
className="govuk-radios__input"
//validate={[required]}
errorMsg="Select and option"
errorMsg="Select an option"
component={RenderYesNo}
/>
);
@@ -356,49 +384,29 @@ export function YesNofield(props) {
const RenderPickList = ({
datafieldname,
picklistData,
name,
label,
input,
meta: { touched, errorStr },
}) => {
const fetcher = (url) => fetch(url).then((res) => res.json());
const { data, error } = useSWR("/api/lookups/" + datafieldname, fetcher);
if (error)
return (
<div className="govuk-form-group">
<label className="govuk-label govuk-body-m" htmlFor={name}>
{label}
</label>
<select className="govuk-select" id={name} name={name}>
<option value="">empty</option>
</select>
</div>
);
if (!data)
return (
<div>
<div className="govuk-form-group">{label} loading...</div>
</div>
);
//console.log(JSON.stringify(data.GlobalOptionSet.Options));
const dropdownObj = data.GlobalOptionSet.Options;
let { t } = useTranslation();
var dropdownObj = jsonpath.query(
picklistData,
"$..value[?(@.LogicalName=='" + datafieldname + "')]..Options"
);
dropdownObj = dropdownObj[0];
return (
<div>
<select {...input} className="govuk-select " id={name} name={name}>
<option>Select...</option>
<option>{t("newappeal:select-default")}</option>
{Object.keys(dropdownObj).map((key, index) => {
return (
<option
key={key}
value={
dropdownObj[key].Label.LocalizedLabels[0].value
}
// value={dropdownObj[key].Label.LocalizedLabels[0].MetadataId}
>
{dropdownObj[key].Label.LocalizedLabels[0].Label}
<option key={key} value={dropdownObj[key].Value}>
{PickListTranslations(
dropdownObj[key].Label.LocalizedLabels[0].Label
)}
</option>
);
})}
@@ -415,12 +423,13 @@ export function PickList(props) {
return (
<div className="govuk-form-group">
<label className="govuk-label govuk-body-m" htmlFor={props.name}>
{props.label}
{FieldsTranslations(label)}
</label>
<Field
name={props.name}
component={RenderPickList}
datafieldname={datafieldname}
picklistData={props.picklistData}
/>
</div>
);
@@ -432,18 +441,19 @@ export function NumericField(props) {
return (
<div className="govuk-form-group">
<label className="govuk-label" htmlFor={props.name}>
{props.label}
{FieldsTranslations(props.label)}
</label>
<Field
name={props.name}
id={props.name}
component="input"
type="text"
type="number"
className="govuk-input govuk-input--width-20"
spellCheck="false"
//aria-describedby="account-number-hint"
pattern="[0-9]*"
inputMode="numeric"
parse={Number}
/>
</div>
);
@@ -455,18 +465,19 @@ export function DecimalField(props) {
return (
<div className="govuk-form-group">
<label className="govuk-label" htmlFor={props.name}>
{props.label}
{FieldsTranslations(props.label)}
</label>
<Field
name={props.name}
id={props.name}
component="input"
type="text"
className="govuk-input govuk-input--width-10"
type="number"
className="govuk-input govuk-input--width-10"
spellCheck="false"
//aria-describedby="account-number-hint"
pattern="[0-9]*"
inputMode="numeric"
parse={Number}
/>
</div>
);
@@ -480,7 +491,7 @@ export function ReadOnlyfield(props) {
return (
<div className="govuk-form-group">
<label className="govuk-label " htmlFor={props.name}>
{props.label}
{FieldsTranslations(props.label)}
</label>
<input
type="text"
@@ -494,3 +505,36 @@ export function ReadOnlyfield(props) {
</div>
);
}
const FieldsTranslations = (label) => {
const router = useRouter();
const { locale } = router;
const { appealtypes } = router.query;
let formObj = jsonpath.query(fieldLookup, "$['" + appealtypes + "']");
let labelTrans =
router.locale == "cy"
? jsonpath.query(
formObj,
"$..[?(@.value=='" + label + "')].value_cy"
)
: label;
return labelTrans;
};
const PickListTranslations = (optionValue) => {
const router = useRouter();
const { locale } = router;
const { appealtypes } = router.query;
//console.log(optionValue);
let optionTrans =
router.locale == "cy"
? jsonpath.query(
pickListLookup,
'$..[?(@.value=="' + optionValue + '")].value_cy'
)
: optionValue;
//console.log(optionTrans, optionValue);
return optionTrans;
};