Skip to content

Commit d4f068e

Browse files
fix: add fixes after yarn build
1 parent 6ca804a commit d4f068e

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

src/generators/NextGenerator.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
import chalk from "chalk";
2+
import handlebars from "handlebars";
3+
import hbh_comparison from "handlebars-helpers/lib/comparison";
24
import BaseGenerator from "./BaseGenerator";
35

46
export default class NextGenerator extends BaseGenerator {
@@ -28,6 +30,8 @@ export default class NextGenerator extends BaseGenerator {
2830
"utils/dataAccess.ts",
2931
"utils/mercure.ts",
3032
]);
33+
34+
handlebars.registerHelper("compare", hbh_comparison.compare);
3135
}
3236

3337
help(resource) {

templates/next/components/foo/Form.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,13 +74,18 @@ export const Form: FunctionComponent<Props> = ({ {{{lc}}} }) => {
7474
<input
7575
name="{{name}}"
7676
id="{{lc}}_{{name}}"
77-
value={ values.{{name}} ?? "" }
77+
{{#compare type "==" "dateTime" }}
78+
value={values.{{name}}?.toLocaleString() ?? ""}
79+
{{/compare}}
80+
{{#compare type "!=" "dateTime" }}
81+
value={values.{{name}} ?? ""}
82+
{{/compare}}
7883
type="{{type}}"
7984
{{#if step}}step="{{{step}}}"{{/if}}
8085
placeholder="{{{description}}}"
8186
{{#if required}}required={true}{{/if}}
8287
className={`form-control${errors.{{name}} && touched.{{name}} ? ' is-invalid' : ''}`}
83-
aria-invalid={errors.{{name}} && touched.{{name~}} }
88+
aria-invalid={errors.{{name}} && touched.{{name~}} ? 'true' : null}
8489
onChange={handleChange}
8590
onBlur={handleBlur}
8691
/>

templates/next/utils/dataAccess.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ export const normalize = (data: unknown) => {
6969
}
7070

7171
// Flatten nested documents
72-
return mapValues(data, (value) =>
72+
return mapValues(data as Object, (value) =>
7373
Array.isArray(value)
7474
? value.map((v) => get(v, "@id", v))
7575
: get(value, "@id", value)

templates/next/utils/mercure.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,18 @@ export const useMercure = (deps: unknown | PagedCollection<unknown>, hubURL: str
2020
}, [deps]);
2121

2222
useEffect(() => {
23-
if (!hubURL || !data) {
24-
return;
25-
}
26-
2723
if (!has(data, "{{{hydraPrefix}}}member") && !has(data, "@id")) {
2824
console.error("Object sent is not in JSON-LD format.");
2925

30-
return;
3126
}
3227

33-
if (has(data, "{{{hydraPrefix}}}member") && Array.isArray(data["{{{hydraPrefix}}}member"]) && data["{{{hydraPrefix}}}member"].length !== 0) {
28+
if (hubURL && has(data, "{{{hydraPrefix}}}member") && Array.isArray(data["{{{hydraPrefix}}}member"]) && data["{{{hydraPrefix}}}member"].length !== 0) {
3429
// It's a PagedCollection
3530
data["{{{hydraPrefix}}}member"].forEach((obj, pos) => mercureSubscribe(hubURL, obj, (datum) => {
3631
data["{{{hydraPrefix}}}member"][pos] = datum;
3732
setData(data);
3833
}));
3934

40-
return () => data;
4135
}
4236

4337
// It's a single object
@@ -46,7 +40,6 @@ export const useMercure = (deps: unknown | PagedCollection<unknown>, hubURL: str
4640
return () => {
4741
eventSource.removeEventListener("message", (event) => setData(normalize(JSON.parse(event.data))));
4842

49-
return data;
5043
};
5144
}, [data]);
5245

0 commit comments

Comments
 (0)