guard against trailing non-widget fields in EditFoo.svelte template, …

…take 2
holochain · Nov 10, 2023 · 9a7286d · 9a7286d
1 parent fce5add
commit 9a7286d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/src/scaffold/entry_type.rs b/src/scaffold/entry_type.rs
@@ -101,15 +101,6 @@ pub fn scaffold_entry_type(
  }
  };
 
- let widget_fields = fields
- .iter()
- .map(|f| f.clone())
- .filter(|f| match f.widget {
- Some(_) => true,
- None => false
- })
- .collect();
-
  let reference_entry_hash = match maybe_reference_entry_hash {
  Some(r) => r.clone(),
  None => {
@@ -156,7 +147,6 @@ pub fn scaffold_entry_type(
  let entry_def = EntryDefinition {
  name: name.clone(),
  fields,
- widget_fields,
  reference_entry_hash,
  };
 

diff --git a/src/scaffold/entry_type/definitions.rs b/src/scaffold/entry_type/definitions.rs
@@ -298,7 +298,6 @@ impl Referenceable {
 pub struct EntryDefinition {
  pub name: String,
  pub fields: Vec<FieldDefinition>,
- pub widget_fields: Vec<FieldDefinition>,
  pub reference_entry_hash: bool,
 }
 

diff --git a/..._manifest.name}}/{{#if crud.update}}Edit{{pascal_case entry_type.name}}.svelte{{¡if}}.hbs b/..._manifest.name}}/{{#if crud.update}}Edit{{pascal_case entry_type.name}}.svelte{{¡if}}.hbs
@@ -39,7 +39,7 @@ let {{camel_case field_name}}: Array<{{> (concat field_type.type "/type")}} | un
 
 let errorSnackbar: Snackbar;
 
-$: {{#each entry_type.widget_fields}}{{camel_case field_name}}{{#unless @last}}, {{/unless}}{{/each}};
+$: {{#each (filter entry_type.fields "widget")}}{{camel_case field_name}}{{#unless @last}}, {{/unless}}{{/each}};
 $: is{{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}};
 
 onMount(() => {