add missing imports, strip out eslint

holochain · May 29, 2024 · 3141d62 · 3141d62
1 parent fd5e160
commit 3141d62
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 42 deletions.
diff --git a/...e_name}}/{{coordinator_zome_manifest.name}}/Create{{pascal_case entry_type.name}}.tsx.hbs b/...e_name}}/{{coordinator_zome_manifest.name}}/Create{{pascal_case entry_type.name}}.tsx.hbs
@@ -1,3 +1,4 @@
+import type { AppClient, Record, EntryHash, AgentPubKey, ActionHash, DnaHash } from '@holochain/client';
 import { FC, useState, useContext, useEffect } from 'react';
 import type { {{pascal_case entry_type.name}}{{#each entry_type.fields}}{{#if (eq field_type.type "Enum")}}, {{field_type.label}}{{/if}}{{/each}} } from './types';
 import { HolochainContext } from '../../contexts/HolochainContext';
@@ -10,7 +11,7 @@ import { HolochainContext } from '../../contexts/HolochainContext';
   {{/each}}
 {{/uniq_lines}}
 
-const Create{{pascal_case entry_type.name}}: FC<Create{{pascal_case entry_type.name}}Props> = ({ on{{pascal_case entry_type.name}}Created }) => {
+const Create{{pascal_case entry_type.name}}: FC<Create{{pascal_case entry_type.name}}Props> = ({ on{{pascal_case entry_type.name}}Created{{#each entry_type.fields}}{{#if (not widget) }}{{#if (eq cardinality "vector")}}, {{camel_case field_name}}{{else}}, {{camel_case field_name}}{{/if}}{{/if}}{{/each}} }) => {
   const {client} = useContext(HolochainContext);
 {{#each entry_type.fields}}
   {{#if widget }}
@@ -45,7 +46,7 @@ const Create{{pascal_case entry_type.name}}: FC<Create{{pascal_case entry_type.n
 
 	useEffect(() => {
     setIs{{pascal_case entry_type.name}}Valid(true{{#each entry_type.fields}}{{#if widget}}{{#if (eq cardinality "single")}} && {{> (concat field_type.type "/" widget "/is-valid") variable_to_validate=(camel_case field_name) }}{{/if}}{{#if (eq cardinality "vector")}} && {{camel_case field_name}}.every(e => {{> (concat field_type.type "/" widget "/is-valid") variable_to_validate="e" }}){{/if}}{{/if}}{{/each}});
-  }, [{{#each entry_type.fields}}{{#if widget}}{{camel_case field_name}}{{/if}}{{#unless @last}}, {{/unless}}{{/each}}]);
+  }, [{{#each entry_type.fields}}{{#if widget}}{{camel_case field_name}}{{#unless @last}}, {{/unless}}{{/if}}{{/each}}]);
 
   return (
     <div>
@@ -71,7 +72,16 @@ const Create{{pascal_case entry_type.name}}: FC<Create{{pascal_case entry_type.n
 };
 
 interface Create{{pascal_case entry_type.name}}Props {
-	on{{pascal_case entry_type.name}}Created?: (hash?: Uint8Array) => void
+	on{{pascal_case entry_type.name}}Created?: (hash?: Uint8Array) => void,
+{{#each entry_type.fields}}
+  {{#if (not widget) }}
+    {{#if (eq cardinality "vector")}}
+  {{camel_case field_name}}: {{> (concat field_type.type "/type") }}[],
+    {{else}}
+  {{camel_case field_name}}{{#if (eq cardinality "single")}}{{/if}}: {{> (concat field_type.type "/type") }}{{#if (eq cardinality "option")}} | undefined{{/if}},
+    {{/if}}
+  {{/if}}
+{{/each}}
 }
 
 export default Create{{pascal_case entry_type.name}};
diff --git a/...ome_manifest.name}}/{{#if crud.update}}Edit{{pascal_case entry_type.name}}.tsx{{¡if}}.hbs b/...ome_manifest.name}}/{{#if crud.update}}Edit{{pascal_case entry_type.name}}.tsx{{¡if}}.hbs
@@ -35,19 +35,20 @@ const Edit{{pascal_case entry_type.name}}: FC<Edit{{pascal_case entry_type.name}
   const [is{{pascal_case entry_type.name}}Valid, setIs{{pascal_case entry_type.name}}Valid] = useState(false);
 
   const update{{pascal_case entry_type.name}} = useCallback(async () => {
-		const {{camel_case entry_type.name}}: {{pascal_case entry_type.name}} = {
+		const {{camel_case entry_type.name}}: Partial<{{pascal_case entry_type.name}}> = {
 {{#each entry_type.fields}}
 	{{#if widget}}
 		{{#if (eq cardinality "single") }}
-				{{snake_case field_name}}: {{camel_case field_name}}!,
+				{{snake_case field_name}}: {{camel_case field_name}},
 			{{else}}
 				{{snake_case field_name}}: {{camel_case field_name}}{{#if (eq cardinality "vector") }} as {{> (concat field_type.type "/type") }}[]{{/if}},
 		{{/if}}
+	{{else}}
 	{{/if}}
 {{/each}}
 {{#each entry_type.fields}}
 	{{#if (not widget)}}
-				{{snake_case field_name}}: current{{pascal_case ../entry_type.name}}!.{{snake_case field_name}},
+				{{snake_case field_name}}: current{{pascal_case ../entry_type.name}}?.{{snake_case field_name}},
 	{{/if}}
 {{/each}}
 		};
@@ -79,7 +80,7 @@ const Edit{{pascal_case entry_type.name}}: FC<Edit{{pascal_case entry_type.name}
 	{{/if}}
 {{#each entry_type.fields}}
   {{#if (not widget)}}
-		current{{pascal_case ../entry_type.name}}!.{{snake_case field_name}},
+		current{{pascal_case ../entry_type.name}}?.{{snake_case field_name}},
 	{{else}}
     {{camel_case field_name}},
 	{{/if}}
@@ -99,7 +100,7 @@ const Edit{{pascal_case entry_type.name}}: FC<Edit{{pascal_case entry_type.name}
 
   useEffect(() => {
     setIs{{pascal_case entry_type.name}}Valid(true{{#each entry_type.fields}}{{#if widget}}{{#if (eq cardinality "single")}} && {{> (concat field_type.type "/" widget "/is-valid") variable_to_validate=(camel_case field_name) }}{{/if}}{{#if (eq cardinality "vector")}} && {{camel_case field_name}}.every(e => {{> (concat field_type.type "/" widget "/is-valid") variable_to_validate="e" }}){{/if}}{{/if}}{{/each}});
-  }, [{{#each entry_type.fields}}{{#if widget}}{{camel_case field_name}}{{/if}}{{#unless @last}}, {{/unless}}{{/each}}]);
+  }, [{{#each entry_type.fields}}{{#if widget}}{{camel_case field_name}}{{#unless @last}}, {{/unless}}{{/if}}{{/each}}]);
 
   return (
     <div>

diff --git a/templates/react/web-app/ui/.eslintrc.cjs.hbs b/templates/react/web-app/ui/.eslintrc.cjs.hbs
diff --git a/templates/react/web-app/ui/package.json.hbs b/templates/react/web-app/ui/package.json.hbs
@@ -1,32 +1,32 @@
 {
-  "name": "my-app",
-  "private": true,
+  "name": "ui",
   "version": "0.1.0",
-  "type": "module",
   "scripts": {
-    "dev": "vite",
-    "build": "tsc && vite build",
-    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
-    "preview": "vite preview",
-    "package": "npm run build && cd dist && bestzip ../dist.zip/*"
+    "start": "vite --clearScreen false --port $UI_PORT",
+    "build": "npm run check && vite build",
+{{#if holo_enabled}}
+    "build:holo": "VITE_APP_IS_HOLO=true vite build",
+    "package:holo": "npm run build:holo && cd dist && bestzip ../dist.zip *",
+{{/if}}
+    "check": "svelte-check --tsconfig ./tsconfig.json",
+    "package": "npm run build && cd dist && bestzip ../dist.zip *"
   },
   "dependencies": {
-    "@holochain/client": "^0.18.0-dev.0",
+    "@holochain/client": "{{holochain_client_version}}",
+{{#if holo_enabled}}
+    "@holo-host/web-sdk": "{{web_sdk_version}}",
+{{/if}}
     "@msgpack/msgpack": "^2.8.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
     "@types/react": "^18.2.66",
     "@types/react-dom": "^18.2.22",
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@typescript-eslint/parser": "^7.2.0",
     "@vitejs/plugin-react": "^4.2.1",
     "bestzip": "^2.2.1",
-    "eslint": "^8.57.0",
-    "eslint-plugin-react-hooks": "^4.6.0",
-    "eslint-plugin-react-refresh": "^0.4.6",
     "typescript": "^5.2.2",
     "vite": "^5.2.0"
-  }
+  },
+  "type": "module"
 }