@abgov/nx-adsp 5.9.0-beta.2 → 5.9.0-beta.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/package.json +1 -1
  2. package/src/generators/react-form/files/__fileName__/__fileName__.slice.ts__tmpl__ +2 -2
  3. package/src/generators/react-form/files/__fileName__/__fileName__.tsx__tmpl__ +18 -97
  4. package/src/generators/react-form/includes/input-template.ejs +146 -0
  5. package/src/generators/react-form/react-form.js +1 -1
  6. package/src/generators/react-form/react-form.js.map +1 -1
  7. package/src/generators/react-form/react-forms.spec.ts +1 -0
  8. package/src/generators/react-form/schema.d.ts +1 -0
  9. package/src/generators/react-form/schema.json +3 -3
  10. package/src/utils/form.d.ts +1 -0
  11. package/src/utils/form.js.map +1 -1
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@abgov/nx-adsp",
3
- "version": "5.9.0-beta.2",
3
+ "version": "5.9.0-beta.4",
4
4
  "license": "Apache-2.0",
5
5
  "main": "src/index.js",
6
6
  "description": "Government of Alberta - Nx plugin for ADSP apps.",
package/src/generators/react-form/files/__fileName__/__fileName__.slice.ts__tmpl__ CHANGED
@@ -11,7 +11,7 @@ import { UserState } from 'redux-oidc';
11
11
  import { CONFIG_FEATURE_KEY, ConfigState } from '../config.slice';
12
12
 
13
13
  export const <%= constantName %>_FEATURE_KEY = '<%= fileName %>';
14
- const FORM_DEFINITION_ID = '<%= fileName %>';
14
+ const FORM_DEFINITION_ID = '<%= id %>';
15
15
  const FORM_SERVICE_ID = 'urn:ads:platform:form-service';
16
16
 
17
17
  /*
@@ -23,7 +23,7 @@ const rules: Record<string, Record<string, RegExp>> = {
23
23
  <%_ sections.forEach(function([sectionKey, section]) { _%>
24
24
  <%= sectionKey %>: {
25
25
  <%_ Object.entries(section.properties).filter(([_, { pattern }]) => !!pattern).forEach(function([key, value]) { _%>
26
- <%= key %>: new RegExp('<%- value.pattern %>')
26
+ <%= key %>: new RegExp('<%- value.pattern %>'),
27
27
  <%_ }); _%>
28
28
  },
29
29
  <%_ }); _%>
package/src/generators/react-form/files/__fileName__/__fileName__.tsx__tmpl__ CHANGED
@@ -3,6 +3,7 @@ import {
3
3
  GoAButtonGroup,
4
4
  GoACallout,
5
5
  GoACheckbox,
6
+ GoADivider,
6
7
  GoADropdown,
7
8
  GoADropdownItem,
8
9
  GoAFormItem,
@@ -14,6 +15,7 @@ import {
14
15
  GoAInputTime,
15
16
  GoANotification,
16
17
  GoASpinner,
18
+ GoATextArea,
17
19
  } from '@abgov/react-components';
18
20
  import { FunctionComponent, useEffect } from 'react';
19
21
  import { useDispatch, useSelector } from 'react-redux';
@@ -34,6 +36,20 @@ import {
34
36
  } from './<%= fileName %>.slice';
35
37
  import styles from './<%= fileName %>.module.css';
36
38
 
39
+ // Function that supports raising change events for updates to properties on array items.
40
+ // Note that this is not needed if the form does not include an array field.
41
+ function onArrayItemChange(
42
+ onChange: (value: Record<string, unknown>) => void,
43
+ value: Record<string, unknown>,
44
+ arrayProperty: string,
45
+ index: number,
46
+ updatedItem: object
47
+ ) {
48
+ const updatedArray = [...(value[arrayProperty] as object[])];
49
+ updatedArray[index] = updatedItem;
50
+ onChange({ ...value, [arrayProperty]: updatedArray });
51
+ }
52
+
37
53
  interface FieldSetProps {
38
54
  className?: string;
39
55
  inReview: boolean;
@@ -61,103 +77,8 @@ const <%= section.className %>FieldSet: FunctionComponent<FieldSetProps> = ({
61
77
  <p><%= section.description %></p>
62
78
  {!isReadOnly && inReview && <GoAButton type="tertiary" onClick={onEdit}>Edit</GoAButton>}
63
79
  </div>
64
- <%_ Object.entries(section.properties).forEach(function([key, value]) { _%>
65
- <%_ if (!value.type) { _%>
66
- <%_ if (value.constant) { _%>
67
- <p><%= value.constant %></p>
68
- <%_ } _%>
69
- <%_ } else { _%>
70
- <GoAFormItem mb="m" label="<%= value.title || key %>" helpText="<%= value.description %>">
71
- <%_ switch(value.type) {
72
- case 'string': _%>
73
- <%_ if (value.enum) { _%>
74
- <GoADropdown
75
- name="<%= key %>"
76
- disabled={isReadOnly || inReview}
77
- onChange={(name, updated) => onChange({ ...value, [name]: updated })}
78
- value={`${value.<%= key %> || ''}`}
79
- >
80
- <%_ value.enum.forEach((enumValue) => { _%>
81
- <GoADropdownItem value="<%= enumValue %>" label="<%= enumValue %>" />
82
- <%_ }); _%>
83
- </GoADropdown>
84
- <%_ } else { _%>
85
- <%_ switch(value.format) {
86
- case 'date-time': _%>
87
- <GoAInputDateTime
88
- name="<%= key %>"
89
- disabled={isReadOnly || inReview}
90
- value={value.<%= key %> ? new Date(value.<%= key %> as string) : null}
91
- onChange={(name, updated) => onChange({ ...value, [name]: (updated as Date)?.toISOString() })}
92
- />
93
- <%_ break;
94
- case 'date': _%>
95
- <GoAInputDate
96
- name="<%= key %>"
97
- disabled={isReadOnly || inReview}
98
- value={value.<%= key %> ? new Date(value.<%= key %> as string) : null}
99
- onChange={(name, updated) => onChange({ ...value, [name]: (updated as Date)?.toISOString() })}
100
- />
101
- <%_ break;
102
- case 'time': _%>
103
- <GoAInputTime
104
- name="<%= key %>"
105
- step={1}
106
- disabled={isReadOnly || inReview}
107
- value={value.<%= key %> ? new Date(value.<%= key %> as string) : null}
108
- onChange={(name, updated) => onChange({ ...value, [name]: (updated as Date)?.toISOString() })}
109
- />
110
- <%_ break;
111
- default: _%>
112
- <GoAInput
113
- type="text"
114
- disabled={isReadOnly || inReview}
115
- error={errors['<%= key %>']}
116
- placeholder="<%= value?.examples?.join(', ') || '' %>"
117
- onChange={(name, updated) => onChange({ ...value, [name]: updated })}
118
- value={`${value.<%= key %> || ''}`}
119
- name="<%= key %>"
120
- />
121
- <%_ break;
122
- } _%>
123
- <%_ } _%>
124
- <%_ break;
125
- case 'integer':
126
- case 'number': _%>
127
- <GoAInput
128
- type="number"
129
- disabled={isReadOnly || inReview}
130
- error={errors['<%= key %>']}
131
- placeholder="<%= value?.examples || []%>"
132
- onChange={(name, updated) => onChange({ ...value, [name]: parseFloat(updated) })}
133
- value={`${value.<%= key %> || ''}`}
134
- name="<%= key %>"
135
- <%_ if (value?.maximum !== undefined) { _%>
136
- max={<%= value.maximum %>}
137
- <%_ } _%>
138
- <%_ if (value?.minimum !== undefined) { _%>
139
- min={<%= value.minimum %>}
140
- <%_ } _%>
141
- <%_ if (value?.multipleOf !== undefined) { _%>
142
- step={<%= value.multipleOf %>}
143
- <%_ } _%>
144
- />
145
- <%_ break;
146
- case 'boolean': _%>
147
- <GoACheckbox
148
- disabled={isReadOnly || inReview}
149
- checked={value.<%= key %> as any || false}
150
- onChange={(name, updated) => onChange({ ...value, [name]: updated })}
151
- name="<%= key %>"
152
- />
153
- <%_ break;
154
- case 'array': _%>
155
- <%_ break;
156
- default:
157
- break; _%>
158
- <%_ } _%>
159
- </GoAFormItem>
160
- <%_ } _%>
80
+ <%_ Object.entries(section.properties).forEach(function([key, property]) { _%>
81
+ <%- include(`${includesPath}/input-template.ejs`, {key, property, path: key, inArray: false, includesPath}); %>
161
82
  <%_ }); _%>
162
83
  </fieldset>
163
84
  );
package/src/generators/react-form/includes/input-template.ejs ADDED
@@ -0,0 +1,146 @@
1
+ <%_ const valueVar = inArray ? 'item' : 'value'; %>
2
+ <%_ if (!property.type) { _%>
3
+ <%_ if (property.constant) { _%>
4
+ <p><%= property.constant %></p>
5
+ <%_ } _%>
6
+ <%_ } else { _%>
7
+ <GoAFormItem mb="m" label="<%= property.title || key %>" helpText="<%= property.description %>">
8
+ <%_ switch(property.type) {
9
+ case 'string': _%>
10
+ <%_ if (property.enum) { _%>
11
+ <GoADropdown
12
+ name="<%= key %>"
13
+ disabled={isReadOnly || inReview}
14
+ onChange={(name,updated) => <%- inArray ? `onArrayItemChange(onChange, value, '${parent}', idx, ` : 'onChange(' %>{ ...<%= valueVar %>, [name]: updated })}
15
+ value={`${<%= valueVar %>.<%= key %> || ''}`}
16
+ >
17
+ <%_ property.enum.forEach((enumValue) => { _%>
18
+ <GoADropdownItem value="<%= enumValue %>" label="<%= enumValue %>" />
19
+ <%_ }); _%>
20
+ </GoADropdown>
21
+ <%_ } else { _%>
22
+ <%_ switch(property.format) {
23
+ case 'date-time': _%>
24
+ <GoAInputDateTime
25
+ name="<%= key %>"
26
+ disabled={isReadOnly || inReview}
27
+ value={<%= valueVar %>.<%= key %> ? new Date(<%= valueVar %>.<%= key %> as string) : null}
28
+ onChange={(name, updated) => <%- inArray ? `onArrayItemChange(onChange, value, '${parent}', idx, ` : 'onChange(' %>{ ...<%= valueVar %>, [name]: (updated as Date)?.toISOString() })}
29
+ />
30
+ <%_ break;
31
+ case 'date': _%>
32
+ <GoAInputDate
33
+ name="<%= key %>"
34
+ disabled={isReadOnly || inReview}
35
+ value={<%= valueVar %>.<%= key %> ? new Date(<%= valueVar %>.<%= key %> as string) : null}
36
+ onChange={(name, updated) => <%- inArray ? `onArrayItemChange(onChange, value, '${parent}', idx, ` : 'onChange(' %>{ ...<%= valueVar %>, [name]: (updated as Date)?.toISOString() })}
37
+ />
38
+ <%_ break;
39
+ case 'time': _%>
40
+ <GoAInputTime
41
+ name="<%= key %>"
42
+ step={1}
43
+ disabled={isReadOnly || inReview}
44
+ value={<%= valueVar %>.<%= key %> ? new Date(<%= valueVar %>.<%= key %> as string) : null}
45
+ onChange={(name, updated) => <%- inArray ? `onArrayItemChange(onChange, value, '${parent}', idx, ` : 'onChange(' %>{ ...<%= valueVar %>, [name]: (updated as Date)?.toISOString() })}
46
+ />
47
+ <%_ break;
48
+ default: _%>
49
+ <% if (property.maxLength > 100) { %>
50
+ <GoATextArea
51
+ disabled={isReadOnly || inReview}
52
+ error={errors[`<%= path %>`]}
53
+ placeholder="<%= property?.examples?.join(', ') || '' %>"
54
+ onChange={(name, updated) => <%- inArray ? `onArrayItemChange(onChange, value, '${parent}', idx, ` : 'onChange(' %>{ ...<%= valueVar %>, [name]: updated })}
55
+ value={`${<%= valueVar %>.<%= key %> || ''}`}
56
+ name="<%= key %>"
57
+ />
58
+ <% } else { %>
59
+ <GoAInput
60
+ type="text"
61
+ disabled={isReadOnly || inReview}
62
+ error={errors[`<%= path %>`]}
63
+ placeholder="<%= property?.examples?.join(', ') || '' %>"
64
+ onChange={(name, updated) => <%- inArray ? `onArrayItemChange(onChange, value, '${parent}', idx, ` : 'onChange(' %>{ ...<%= valueVar %>, [name]: updated })}
65
+ value={`${<%= valueVar %>.<%= key %> || ''}`}
66
+ name="<%= key %>"
67
+ />
68
+ <% } %>
69
+ <%_ break;
70
+ } _%>
71
+ <%_ } _%>
72
+ <%_ break;
73
+ case 'integer':
74
+ case 'number': _%>
75
+ <GoAInput
76
+ type="number"
77
+ disabled={isReadOnly || inReview}
78
+ error={errors[`<%= path %>`]}
79
+ placeholder="<%= property?.examples || []%>"
80
+ onChange={(name, updated) => <%- inArray ? `onArrayItemChange(onChange, value, '${parent}', idx, ` : 'onChange(' %>{ ...<%= valueVar %>, [name]: parseFloat(updated) })}
81
+ value={`${<%= valueVar %>.<%= key %> || ''}`}
82
+ name="<%= key %>"
83
+ <%_ if (property?.maximum !== undefined) { _%>
84
+ max={<%= property.maximum %>}
85
+ <%_ } _%>
86
+ <%_ if (property?.minimum !== undefined) { _%>
87
+ min={<%= property.minimum %>}
88
+ <%_ } _%>
89
+ <%_ if (property?.multipleOf !== undefined) { _%>
90
+ step={<%= property.multipleOf %>}
91
+ <%_ } _%>
92
+ />
93
+ <%_ break;
94
+ case 'boolean': _%>
95
+ <GoACheckbox
96
+ disabled={isReadOnly || inReview}
97
+ checked={<%= valueVar %>.<%= key %> as any || false}
98
+ onChange={(name, updated) => <%- inArray ? `onArrayItemChange(onChange, value, '${parent}', idx, ` : 'onChange(' %>{ ...<%= valueVar %>, [name]: updated })}
99
+ name="<%= key %>"
100
+ />
101
+ <%_ break;
102
+ case 'array': _%>
103
+ <% if (!inArray && property.items?.type === 'object') { %>
104
+ <fieldset>
105
+ <legend><%= property.items.title || key %></legend>
106
+ <p><%= property.items.description %></p>
107
+ {(<%= valueVar %>.<%= key %> as Record<string, unknown>[])?.map((item, idx) => (
108
+ <div key={idx}>
109
+ <% Object.entries(property.items.properties || {}).map(([key, property]) => { %>
110
+ <%- include(`${includesPath}/input-template.ejs`, {key, property, parent: path, path: path + ".[${idx}]." + key, inArray: true, includesPath}); %>
111
+ <% }); %>
112
+ {!inReview && <GoAButtonGroup alignment="end">
113
+ <GoAButton
114
+ disabled={isReadOnly}
115
+ type="tertiary"
116
+ onClick={() => {
117
+ const update = [...(<%= valueVar %>.<%= key %> as [] || [])];
118
+ update.splice(idx, 1);
119
+ <%- inArray ? `onArrayItemChange(onChange, value, '${parent}', idx, ` : 'onChange(' %>{ ...<%= valueVar %>, <%= key %>: update })
120
+ }}
121
+ >
122
+ Remove
123
+ </GoAButton>
124
+ </GoAButtonGroup>}
125
+ <GoADivider mb="l" />
126
+ </div>
127
+ ))}
128
+ {!inReview && <GoAButtonGroup alignment="end">
129
+ <GoAButton
130
+ disabled={isReadOnly}
131
+ type="tertiary"
132
+ onClick={() =>
133
+ <%- inArray ? `onArrayItemChange(onChange, value, '${parent}', idx, ` : 'onChange(' %>{ ...<%= valueVar %>, <%= key %>: [...(<%= valueVar %>.<%= key %> as [] || []), {}] })
134
+ }
135
+ >
136
+ Add
137
+ </GoAButton>
138
+ </GoAButtonGroup>}
139
+ </fieldset>
140
+ <% } %>
141
+ <%_ break;
142
+ default:
143
+ break; _%>
144
+ <%_ } _%>
145
+ </GoAFormItem>
146
+ <%_ } _%>
package/src/generators/react-form/react-form.js CHANGED
@@ -80,7 +80,7 @@ function addFiles(host, options) {
80
80
  return tslib_1.__awaiter(this, void 0, void 0, function* () {
81
81
  const formNames = (0, devkit_1.names)(options.formDefinition.name);
82
82
  const interfaceDefinition = yield (0, form_1.generateFormInterface)(options.formDefinition);
83
- const templateOptions = Object.assign(Object.assign(Object.assign(Object.assign({}, options), options.formDefinition), formNames), { interfaceDefinition, tmpl: '' });
83
+ const templateOptions = Object.assign(Object.assign(Object.assign(Object.assign({}, options), options.formDefinition), formNames), { interfaceDefinition, includesPath: path.join(__dirname, 'includes'), tmpl: '' });
84
84
  (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files'), `${options.projectRoot}/src/app`, templateOptions);
85
85
  });
86
86
  }
package/src/generators/react-form/react-form.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"react-form.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-form/react-form.ts"],"names":[],"mappings":";;;AAAA,wCAKsB;AACtB,yCAMsB;AACtB,iCAA0B;AAC1B,uCAAkC;AAClC,6BAA6B;AAE7B,2CAAyE;AAEzE,SAAe,iBAAiB,CAC9B,uBAA+B,EAC/B,KAAa;;QAEb,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,eAAK,CAAC,GAAG,CAC9B,IAAI,GAAG,CACL,6DAA6D,EAC7D,uBAAuB,CACxB,CAAC,IAAI,EACN;YACE,OAAO,EAAE,EAAE,aAAa,EAAE,UAAU,KAAK,EAAE,EAAE;SAC9C,CACF,CAAC;QAEF,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACxC,MAAM,OAAO,GAAG,WAAW;aACxB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC;aAC7B,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;aAClB,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAEtC,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;YACtB,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;SAChE;QAED,MAAM,MAAM,GAAG,MAAM,IAAA,iBAAM,EAAyB;YAClD,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,gEAAgE;YACzE,OAAO;SACR,CAAC,CAAC;QAEH,MAAM,cAAc,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,UAAU,CAAC,CAAC;QAE7E,MAAM,OAAO,GAAG;YACd,IAAI,EAAE,QAAQ;YACd,SAAS,EAAE,SAAS;YACpB,UAAU,EAAE,EAAE;SACf,CAAC;QACF,IAAI,UAAU,GAAG,KAAK,CAAC;QACvB,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,OAAO,CAChE,CAAC,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,EAAE;YACpB,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;gBAC3B,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,KAAK,CAAC;gBACrC,OAAO,cAAc,CAAC,UAAU,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;gBACtD,UAAU,GAAG,IAAI,CAAC;aACnB;iBAAM;gBACL,KAAK,CAAC,SAAS,GAAG,IAAA,cAAK,EAAC,QAAQ,CAAC,CAAC,SAAS,CAAC;aAC7C;QACH,CAAC,CACF,CAAC;QAEF,IAAI,UAAU,EAAE;YACd,cAAc,CAAC,UAAU,CAAC,UAAU,mBAClC,OAAO,IACH,cAAc,CAAC,UAAU,CAAC,UAAqB,CACpD,CAAC;SACH;QAED,OAAO,cAAc,CAAC;IACxB,CAAC;CAAA;AAED,SAAe,gBAAgB,CAC7B,IAAU,EACV,OAAe;;;QAEf,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;QAErC,MAAM,WAAW,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC;QACpD,MAAM,WAAW,GAAG,GAAG,IAAA,2BAAkB,EAAC,IAAI,CAAC,CAAC,OAAO,IAAI,WAAW,EAAE,CAAC;QAEzE,MAAM,WAAW,GAAG,oBAAY,CAAC,GAAG,IAAI,MAAM,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG,MAAM,IAAA,sBAAc,EAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC;QACnE,MAAM,gBAAgB,GAAG,IAAI,CAAC,oCAAoC,CAAC,CAAC;QACpE,MAAM,uBAAuB,GAC3B,IAAI,CAAC,wCAAwC,CAAC,CAAC;QAEjD,IAAI,WAAW,GAAG,WAAW,CAAC;QAC9B,IAAI,CAAC,WAAW,EAAE;YAChB,MAAM,eAAe,GAAG,GAAG,WAAW,kCAAkC,CAAC;YAEzE,MAAM,MAAM,GAAG,MAAA,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,0CAAE,QAAQ,EAAE,CAAC;YACtD,IAAI,KAAK,GAAG,MAAA,8BAA8B,CAAC,IAAI,CAAC,MAAM,CAAC,0CAAG,CAAC,CAAC,CAAC;YAC7D,IAAI,CAAC,KAAK,EAAE;gBACV,MAAM,KAAK,GAAG,MAAM,IAAA,kBAAU,EAAC,WAAW,CAAC,gBAAgB,EAAE,MAAM,CAAC,CAAC;gBACrE,MAAM,MAAM,GAAG,MAAM,IAAA,oBAAY,EAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;gBAC3D,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC;aACtB;YAED,WAAW,GAAG,MAAM,IAAA,kBAAU,EAAC,WAAW,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAC;SACrE;QAED,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAC5C,uBAAuB,EACvB,WAAW,CACZ,CAAC;QAEF,uCACK,OAAO,KACV,WAAW;YACX,cAAc,IACd;;CACH;AAED,SAAe,QAAQ,CAAC,IAAU,EAAE,OAAyB;;QAC3D,MAAM,SAAS,GAAG,IAAA,cAAK,EAAC,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;QACrD,MAAM,mBAAmB,GAAG,MAAM,IAAA,4BAAqB,EACrD,OAAO,CAAC,cAAc,CACvB,CAAC;QAEF,MAAM,eAAe,+DAChB,OAAO,GACP,OAAO,CAAC,cAAc,GACtB,SAAS,KACZ,mBAAmB,EACnB,IAAI,EAAE,EAAE,GACT,CAAC;QACF,IAAA,sBAAa,EACX,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,EAC7B,GAAG,OAAO,CAAC,WAAW,UAAU,EAChC,eAAe,CAChB,CAAC;IACJ,CAAC;CAAA;AAED,mBAA+B,IAAU,EAAE,OAAe;;QACxD,MAAM,iBAAiB,GAAG,MAAM,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAChE,MAAM,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;QACxC,MAAM,IAAA,oBAAW,EAAC,IAAI,CAAC,CAAC;QAExB,OAAO;IACT,CAAC;CAAA;AAND,4BAMC"}
1
+ {"version":3,"file":"react-form.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-form/react-form.ts"],"names":[],"mappings":"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"}
package/src/generators/react-form/react-forms.spec.ts CHANGED
@@ -9,6 +9,7 @@ import { Schema } from './schema';
9
9
  import generator from './react-form';
10
10
 
11
11
  const formDefinition: FormDefinition = {
12
+ id: 'some-intake',
12
13
  name: 'Some Intake',
13
14
  dataSchema: {
14
15
  type: 'object',
package/src/generators/react-form/schema.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import { EnvironmentName } from '@abgov/nx-oc';
2
+ import { FormDefinition } from '../../utils/form';
2
3
 
3
4
  export interface Schema {
4
5
  project: string;
package/src/generators/react-form/schema.json CHANGED
@@ -23,12 +23,12 @@
23
23
  },
24
24
  "alias": "e",
25
25
  "x-prompt": {
26
- "message": "Which ADSP environment do you want to target?",
26
+ "message": "Which ADSP environment do you want to target? (Typically test for ADSP tenants.)",
27
27
  "type": "list",
28
28
  "items": [
29
- "dev",
30
29
  "test",
31
- "prod"
30
+ "prod",
31
+ "dev"
32
32
  ]
33
33
  }
34
34
  },
package/src/utils/form.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  export interface FormDefinition {
2
+ id: string;
2
3
  name: string;
3
4
  dataSchema: Record<string, unknown>;
4
5
  }
package/src/utils/form.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"form.js","sourceRoot":"","sources":["../../../../../packages/nx-adsp/src/utils/form.ts"],"names":[],"mappings":";;;;AAAA,yEAAoD;AAOpD,SAAsB,qBAAqB,CAAC,EAC1C,IAAI,EACJ,UAAU,GACK;;QACf,MAAM,KAAK,GAAG,MAAM,IAAA,mCAAO,EAAC,UAAU,EAAE,IAAI,EAAE;YAC5C,oBAAoB,EAAE,KAAK;YAC3B,aAAa,EAAE,EAAE;YACjB,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC;IACf,CAAC;CAAA;AAXD,sDAWC"}
1
+ {"version":3,"file":"form.js","sourceRoot":"","sources":["../../../../../packages/nx-adsp/src/utils/form.ts"],"names":[],"mappings":";;;;AAAA,yEAAoD;AAQpD,SAAsB,qBAAqB,CAAC,EAC1C,IAAI,EACJ,UAAU,GACK;;QACf,MAAM,KAAK,GAAG,MAAM,IAAA,mCAAO,EAAC,UAAU,EAAE,IAAI,EAAE;YAC5C,oBAAoB,EAAE,KAAK;YAC3B,aAAa,EAAE,EAAE;YACjB,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC;IACf,CAAC;CAAA;AAXD,sDAWC"}