Update form_props dependency

thoughtbot · Dec 1, 2024 · 8b437c2 · 8b437c2
1 parent 8020ccc
commit 8b437c2
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/superglue_rails/lib/generators/superglue/view_collection/templates/js/edit.js b/superglue_rails/lib/generators/superglue/view_collection/templates/js/edit.js
@@ -11,17 +11,17 @@ import { usePage } from '@thoughtbot/superglue'
 
 export default function <%= js_plural_table_name(:upper) %>Edit() {
   const {
-    form,
+    <%= js_singular_table_name %>Form,
     <%= js_singular_table_name %>Path,
     <%= js_plural_table_name %>Path,
   } = usePage().data
 
-  const { inputs, props, extras } = form
+  const { inputs, form, extras } = <%= js_singular_table_name %>Form
   const validationErrors = useSelector((state) => state.flash["<%= js_singular_table_name%>FormErrors"])
 
   return (
     <Layout>
-      <Form {...props} extras={extras} validationErrors={validationErrors} data-sg-visit>
+      <Form {...form} extras={extras} validationErrors={validationErrors} data-sg-visit>
         <%- attributes.each do |attr| -%>
         <<%= js_component(attr)%> {...inputs.<%= attr.column_name.camelize(:lower)%>} label="<%= attr.column_name.humanize %>" errorKey="<%= attr.column_name %>" />
         <%- end -%>

diff --git a/superglue_rails/lib/generators/superglue/view_collection/templates/js/index.js b/superglue_rails/lib/generators/superglue/view_collection/templates/js/index.js
@@ -9,7 +9,7 @@ export default function <%= js_plural_table_name(:upper) %>Index() {
   } = usePage().data
   const <%= js_singular_table_name %>Items = <%= js_plural_table_name %>.map((<%= js_singular_table_name %>, key) => {
     const { deleteForm } = <%=js_singular_table_name%>;
-    const { inputs, props, extras } = deleteForm;
+    const { inputs, form, extras } = deleteForm;
 
     return (
       <tr key={<%= js_singular_table_name %>.id}>
@@ -19,7 +19,7 @@ export default function <%= js_plural_table_name(:upper) %>Index() {
         <td><a href={ <%=js_singular_table_name%>.<%=js_singular_table_name%>Path } data-sg-visit>Show</a></td>
         <td><a href={ <%=js_singular_table_name%>.edit<%=js_singular_table_name(:upper)%>Path } data-sg-visit>Edit</a></td>
         <td>
-          <Form {...props} extras={extras} data-sg-visit>
+          <Form {...form} extras={extras} data-sg-visit>
             <button type="submit">Delete</button>
           </Form>
         </td>

diff --git a/superglue_rails/lib/generators/superglue/view_collection/templates/js/new.js b/superglue_rails/lib/generators/superglue/view_collection/templates/js/new.js
@@ -11,20 +11,20 @@ import { usePage } from '@thoughtbot/superglue'
 
 export default function <%= js_plural_table_name(:upper) %>New() {
   const {
-    form,
+    <%= js_singular_table_name %>Form,
     <%= js_plural_table_name %>Path
   } = usePage().data
 
-  const { inputs, props, extras } = form
+  const { inputs, form, extras } = <%= js_singular_table_name %>Form
   const validationErrors = useSelector((state) => state.flash["<%= js_singular_table_name%>FormErrors"])
 
   return (
     <Layout>
-      <Form {...props} extras={extras} validationErrors={validationErrors} data-sg-visit>
+      <Form {...form} extras={extras} validationErrors={validationErrors} data-sg-visit>
         <%- attributes.each do |attr| -%>
         <<%= js_component(attr)%> {...inputs.<%= attr.column_name.camelize(:lower)%>} label="<%= attr.column_name.humanize %>" errorKey="<%= attr.column_name %>" />
         <%- end -%>
-        <button {...form.inputs.submit} type="submit"> {...form.inputs.submit.text} </button>
+        <button {...inputs.submit} type="submit"> {...inputs.submit.text} </button>
       </Form>
 
       <a href={<%= js_plural_table_name %>Path} data-sg-visit>Back</a>

diff --git a/superglue_rails/lib/generators/superglue/view_collection/templates/props/edit.json.props b/superglue_rails/lib/generators/superglue/view_collection/templates/props/edit.json.props
@@ -2,7 +2,7 @@ if @<%= singular_table_name %>.errors.any?
   flash.now["<%= js_singular_table_name%>Errors"] = @<%= singular_table_name %>.errors.to_h
 end
 
-json.form(partial: 'form') do
+json.<%= js_singular_table_name %>Form(partial: 'form') do
 end
 
 json.<%= js_singular_table_name%>Path <%= singular_table_name%>_path(@<%=singular_table_name%>)

diff --git a/superglue_rails/lib/generators/superglue/view_collection/templates/props/new.json.props b/superglue_rails/lib/generators/superglue/view_collection/templates/props/new.json.props
@@ -2,7 +2,7 @@ if @<%= singular_table_name %>.errors.any?
   flash.now["<%= js_singular_table_name%>Errors"] = @<%= singular_table_name %>.errors.to_h
 end
 
-json.form(partial: 'form') do
+json.<%= js_singular_table_name %>Form(partial: 'form') do
 end
 
 json.<%= js_plural_table_name %>Path <%= plural_table_name %>_path

diff --git a/superglue_rails/superglue.gemspec b/superglue_rails/superglue.gemspec
@@ -13,5 +13,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency "actionpack", ">= 7.0.0"
   s.add_dependency "props_template", ">= 0.32.0"
-  s.add_dependency "form_props", ">= 0.0.5"
+  s.add_dependency "form_props", ">= 0.1.0"
 end