Skip to content

Commit f3323b3

Browse files
astleyzastleyz
committed
Move texts to json
1 parent af01990 commit f3323b3

File tree

9 files changed

+86
-668
lines changed

9 files changed

+86
-668
lines changed

‎client/src/assets/text.json‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,22 @@
2121
"triggerForm": {
2222
"formTitle": "Fill in details",
2323
"formName": "Participant Information",
24-
"fields": {
25-
"instanceName": "Instance Name",
26-
"signerName": "Signer Name",
27-
"signerEmail": "Signer Email",
28-
"ccName": "CC Name",
29-
"ccEmail": "CC Email"
24+
"fieldsI9": {
25+
"field1": "Preparer Name",
26+
"field2": "Preparer Email",
27+
"field3": "Employee Name",
28+
"field4": "Employee Email",
29+
"field5": "HR Approver Name",
30+
"field6": "HR Approver Email"
31+
},
32+
"fieldsOffer": {
33+
"field1": "HR Manager Name",
34+
"field2": "HR Manager Email",
35+
"field3": "Company"
36+
},
37+
"fieldsNda": {
38+
"field1": "HR Manager Name",
39+
"field2": "HR Manager Email"
3040
}
3141
},
3242
"home": {
@@ -119,7 +129,8 @@
119129
"updateWorkflow": "Update workflow status",
120130
"cancelWorkflow": "Cancel workflow",
121131
"getStarted": "Get Started",
122-
"moreInfo": "More Info"
132+
"moreInfo": "More Info",
133+
"backHome": "← Back to home"
123134
},
124135
"links": {
125136
"github": "https://github.com/docusign/sample-app-mymaestro-node",

‎client/src/components/Popups/CreateWorkflowMoreInfo/CreateWorkflowMoreInfo.jsx‎

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,28 +3,32 @@ import withPopup from '../../../hocs/withPopup/withPopup.jsx';
33
import textContent from '../../../assets/text.json';
44

55
const CreateWorkflowMoreinfo = () => {
6-
return (
7-
<div className={styles.popupContainer}>
8-
<h2>{textContent.buttons.behindTheScenes}</h2>
9-
<div className={styles.behindTheScenes}>
10-
<h4>{textContent.behindTheScenes.titles.main}</h4>
11-
<p>{textContent.behindTheScenes.createWorkflow.mainDescription}</p>
12-
<h4>{textContent.behindTheScenes.titles.code}</h4>
13-
<div style={{ display: 'flex', flexDirection: 'row', marginBottom: '-0.5rem' }}>
14-
<p>{textContent.behindTheScenes.descriptions.codeDescription}</p> <a target="_blank" rel="noreferrer"
15-
href={'https://github.com/docusign/sample-app-mymaestro-node/blob/main/server/controllers/workflowsController.js'}>Controller</a>
16-
</div>
17-
<h4>{textContent.behindTheScenes.titles.step1}</h4>
18-
<p>{textContent.behindTheScenes.createWorkflow.step1Description}</p>
19-
<h4>{textContent.behindTheScenes.titles.step2}</h4>
20-
<p>{textContent.behindTheScenes.createWorkflow.step2Description}</p>
21-
<h4>{textContent.behindTheScenes.titles.step3}</h4>
22-
<p>{textContent.behindTheScenes.createWorkflow.step3Description}</p>
6+
return (
7+
<div className={styles.popupContainer}>
8+
<h2>{textContent.buttons.behindTheScenes}</h2>
9+
<div className={styles.behindTheScenes}>
10+
<h4>{textContent.behindTheScenes.titles.main}</h4>
11+
<p>{textContent.behindTheScenes.createWorkflow.mainDescription}</p>
12+
<h4>{textContent.behindTheScenes.titles.code}</h4>
13+
<div style={{ display: 'flex', flexDirection: 'row', marginBottom: '-0.5rem' }}>
14+
<p>{textContent.behindTheScenes.descriptions.codeDescription}</p>{' '}
15+
<a
16+
target="_blank"
17+
rel="noreferrer"
18+
href={`${textContent.links.github}/blob/main/server/controllers/workflowsController.js`}
19+
>
20+
Controller
21+
</a>
2322
</div>
23+
<h4>{textContent.behindTheScenes.titles.step1}</h4>
24+
<p>{textContent.behindTheScenes.createWorkflow.step1Description}</p>
25+
<h4>{textContent.behindTheScenes.titles.step2}</h4>
26+
<p>{textContent.behindTheScenes.createWorkflow.step2Description}</p>
27+
<h4>{textContent.behindTheScenes.titles.step3}</h4>
28+
<p>{textContent.behindTheScenes.createWorkflow.step3Description}</p>
2429
</div>
25-
);
26-
}
27-
;
28-
30+
</div>
31+
);
32+
};
2933
const CreateWorkflowMoreinfoPopup = withPopup(CreateWorkflowMoreinfo);
3034
export default CreateWorkflowMoreinfoPopup;

‎client/src/components/TriggerForm/TriggerForm.jsx‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,42 +16,42 @@ const TriggerForm = ({ workflowId, templateType }) => {
1616
const [isDataSending, setDataSending] = useState(false);
1717
const [workflowInstanceUrl, setWorkflowInstanceUrl] = useState('');
1818
const [i9Form, setI9Form] = useState([
19-
{ fieldHeader: 'Preparer Name', fieldName: 'preparerName', value: '' },
20-
{ fieldHeader: 'Preparer Email', fieldName: 'preparerEmail', value: '' },
21-
{ fieldHeader: 'Employee Name', fieldName: 'employeeName', value: '' },
22-
{ fieldHeader: 'Employee Email', fieldName: 'employeeEmail', value: '' },
23-
{ fieldHeader: 'HR Approver Name', fieldName: 'hrApproverName', value: '' },
24-
{ fieldHeader: 'HR Approver Email', fieldName: 'hrApproverEmail', value: '' },
19+
{ fieldHeader: triggerForm.fieldsI9.field1, fieldName: 'preparerName', value: '' },
20+
{ fieldHeader: triggerForm.fieldsI9.field2, fieldName: 'preparerEmail', value: '' },
21+
{ fieldHeader: triggerForm.fieldsI9.field3, fieldName: 'employeeName', value: '' },
22+
{ fieldHeader: triggerForm.fieldsI9.field4, fieldName: 'employeeEmail', value: '' },
23+
{ fieldHeader: triggerForm.fieldsI9.field5, fieldName: 'hrApproverName', value: '' },
24+
{ fieldHeader: triggerForm.fieldsI9.field6, fieldName: 'hrApproverEmail', value: '' },
2525
]);
2626
const [offerLetterForm, setOfferLetterForm] = useState([
27-
{ fieldHeader: 'HR Manager Name', fieldName: 'hrManagerName', value: '' },
28-
{ fieldHeader: 'HR Manager Email', fieldName: 'hrManagerEmail', value: '' },
29-
{ fieldHeader: 'Company', fieldName: 'Company', value: '' },
27+
{ fieldHeader: triggerForm.fieldsOffer.field1, fieldName: 'hrManagerName', value: '' },
28+
{ fieldHeader: triggerForm.fieldsOffer.field2, fieldName: 'hrManagerEmail', value: '' },
29+
{ fieldHeader: triggerForm.fieldsOffer.field3, fieldName: 'Company', value: '' },
3030
]);
3131
const [ndaForm, setNdaForm] = useState([
32-
{ fieldHeader: 'HR Manager Name', fieldName: 'hrManagerName', value: '' },
33-
{ fieldHeader: 'HR Manager Email', fieldName: 'hrManagerEmail', value: '' },
32+
{ fieldHeader: triggerForm.fieldsNda.field1, fieldName: 'hrManagerName', value: '' },
33+
{ fieldHeader: triggerForm.fieldsNda.field2, fieldName: 'hrManagerEmail', value: '' },
3434
]);
3535

36-
let relevantForm = [];
36+
let relevantFormFields = [];
3737
let relevantSetter = null;
3838
switch (templateType) {
3939
case TemplateType.I9.type:
40-
relevantForm = i9Form;
40+
relevantFormFields = i9Form;
4141
relevantSetter = setI9Form;
4242
break;
4343
case TemplateType.OFFER.type:
44-
relevantForm = offerLetterForm;
44+
relevantFormFields = offerLetterForm;
4545
relevantSetter = setOfferLetterForm;
4646
break;
4747
case TemplateType.NDA.type:
48-
relevantForm = ndaForm;
48+
relevantFormFields = ndaForm;
4949
relevantSetter = setNdaForm;
5050
break;
5151
}
5252

5353
const handleChange = (idx, event) => {
54-
const newRelevantForm = [...relevantForm];
54+
const newRelevantForm = [...relevantFormFields];
5555
newRelevantForm[idx].value = event.target.value;
5656
relevantSetter(newRelevantForm);
5757
};
@@ -64,7 +64,7 @@ const TriggerForm = ({ workflowId, templateType }) => {
6464
const handleSubmit = async event => {
6565
event.preventDefault();
6666

67-
const body = relevantForm.reduce((acc, current) => {
67+
const body = relevantFormFields.reduce((acc, current) => {
6868
acc[current.fieldName] = current.value;
6969
return acc;
7070
}, {});
@@ -101,7 +101,7 @@ const TriggerForm = ({ workflowId, templateType }) => {
101101
<form className={styles.triggerForm} onSubmit={handleSubmit}>
102102
<h3>{triggerForm.formName}</h3>
103103

104-
{relevantForm.map((formItem, idx) => (
104+
{relevantFormFields.map((formItem, idx) => (
105105
<div key={formItem.fieldHeader}>
106106
<label>{formItem.fieldHeader}</label>
107107
<input type="text" value={formItem.value} onChange={e => handleChange(idx, e)} required={true} />

‎client/src/components/WorkflowDescription/BehindTheScenes/ManageBehindTheScenes.jsx‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,15 @@ const ManageBehindTheScenes = () => {
88
<p>{textContent.behindTheScenes.manageWorkflow.mainDescription}</p>
99
<h4>{textContent.behindTheScenes.titles.code}</h4>
1010
<div style={{ display: 'flex', flexDirection: 'row', marginBottom: '-0.5rem' }}>
11-
<p>{textContent.behindTheScenes.descriptions.codeDescription}</p> <a target="_blank" rel="noreferrer"
12-
style={{ fontSize: '14px' }}
13-
href={'https://github.com/docusign/sample-app-mymaestro-node/blob/main/server/controllers/workflowsController.js'}>Controller</a>
11+
<p>{textContent.behindTheScenes.descriptions.codeDescription}</p>{' '}
12+
<a
13+
target="_blank"
14+
rel="noreferrer"
15+
style={{ fontSize: '14px' }}
16+
href={`${textContent.links.github}/blob/main/server/controllers/workflowsController.js`}
17+
>
18+
Controller
19+
</a>
1420
</div>
1521
<h4>{textContent.behindTheScenes.titles.step1}</h4>
1622
<p>{textContent.behindTheScenes.manageWorkflow.step1Description}</p>
@@ -22,4 +28,4 @@ const ManageBehindTheScenes = () => {
2228
);
2329
};
2430

25-
export default ManageBehindTheScenes;
31+
export default ManageBehindTheScenes;

‎client/src/components/WorkflowDescription/BehindTheScenes/TriggerBehindTheScenes.jsx‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,15 @@ const TriggerBehindTheScenes = () => {
88
<p>{textContent.behindTheScenes.triggerWorkflow.mainDescription}</p>
99
<h4>{textContent.behindTheScenes.titles.code}</h4>
1010
<div style={{ display: 'flex', flexDirection: 'row', marginBottom: '-0.5rem' }}>
11-
<p>{textContent.behindTheScenes.descriptions.codeDescription}</p> <a target="_blank" rel="noreferrer"
12-
style={{ fontSize: '14px' }}
13-
href={'https://github.com/docusign/sample-app-mymaestro-node/blob/main/server/controllers/workflowsController.js'}>Controller</a>
11+
<p>{textContent.behindTheScenes.descriptions.codeDescription}</p>{' '}
12+
<a
13+
target="_blank"
14+
rel="noreferrer"
15+
style={{ fontSize: '14px' }}
16+
href={`${textContent.links.github}/blob/main/server/controllers/workflowsController.js`}
17+
>
18+
Controller
19+
</a>
1420
</div>
1521
<h4>{textContent.behindTheScenes.titles.step1}</h4>
1622
<p>{textContent.behindTheScenes.triggerWorkflow.step1Description}</p>
@@ -20,4 +26,4 @@ const TriggerBehindTheScenes = () => {
2026
);
2127
};
2228

23-
export default TriggerBehindTheScenes;
29+
export default TriggerBehindTheScenes;

‎client/src/components/WorkflowDescription/WorkflowDescription.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ const WorkflowDescription = ({ title, behindTheScenesComponent, backRoute }) =>
66
return (
77
<div className={styles.descriptionContainer}>
88
<Link to={backRoute}>
9-
<button className={styles.backButton}>← Back to home</button>
9+
<button className={styles.backButton}>{textContent.buttons.backHome}</button>
1010
</Link>
1111
<h2>{title}</h2>
1212
<div className={`dropdown ${styles.dropDown}`}>

‎client/src/pages/TriggerWorkflow/TriggerWorkflow.jsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@ const TriggerWorkflow = () => {
3737

3838
return {
3939
id: definition.id,
40-
name: `WF ${TemplateType[foundKey]?.name || 'ExampleName'}`,
41-
type: TemplateType[foundKey]?.type || 'ExampleType',
40+
name: `WF ${TemplateType[foundKey]?.name}`,
41+
type: TemplateType[foundKey]?.type,
4242
};
4343
})
44-
.filter(w => !!w);
44+
.filter(definition => !!definition);
4545

4646
const workflowsWithState = await Promise.all(
4747
workflowDefinitions.map(async definition => {

‎server/controllers/workflowsController.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ const config = require('../config');
1616
const WorkflowsService = require('../services/workflowsService');
1717
const createPrefixedLogger = require('../utils/logger');
1818
const { getParameterValueFromUrl } = require('../utils/utils');
19-
const { TEMPLATE_TYPE, FORM_FIELDS } = require('../constants');
19+
const { TEMPLATE_TYPE } = require('../constants');
2020

2121
const oAuth = docusign.ApiClient.OAuth;
2222
const restApi = docusign.ApiClient.RestApi;

0 commit comments

Comments
 (0)