inertia_rails 3.12.1 → 3.14.0

data/lib/generators/inertia_templates/scaffold/templates/vue/form.ts.vue.tt

@@ -0,0 +1,102 @@
+<template>
+  <Form
+    :transform="data => ({ <%= singular_table_name %>: data })"
+    v-slot="{ processing, errors }"
+    v-bind="$attrs"
+  >
+<% attributes.each do |attribute| -%>
+<% if attribute.password_digest? -%>
+    <div>
+      <label class="label" for="password">Password</label>
+      <input
+        type="password"
+        name="password"
+        id="password"
+      />
+      <div v-if="errors.password" class="error">
+        {{ errors.password.join(', ') }}
+      </div>
+    </div>
+
+    <div>
+      <label class="label" for="password_confirmation">
+        Password confirmation
+      </label>
+      <input
+        type="password"
+        name="password_confirmation"
+        id="password_confirmation"
+      />
+      <div v-if="errors.password_confirmation" class="error">
+        {{ errors.password_confirmation.join(', ') }}
+      </div>
+    </div>
+<% else -%>
+    <div>
+      <label class="label" for="<%= attribute.singular_name %>"><%= attribute.human_name %></label>
+<% if input_type(attribute) == "text_area" -%>
+      <textarea
+        name="<%= attribute.singular_name %>"
+        id="<%= attribute.singular_name %>"
+        :value="<%= singular_table_name %>.<%= attribute.column_name %>"
+      />
+<% elsif attribute.attachment? -%>
+      <input
+        type="file"
+        name="<%= attribute.singular_name %>"
+        id="<%= attribute.singular_name %>"
+      />
+<% elsif attribute.attachments? -%>
+      <input
+        type="file"
+        multiple
+        name="<%= attribute.singular_name %>[]"
+        id="<%= attribute.singular_name %>"
+      />
+<% elsif input_type(attribute) == "checkbox" -%>
+      <input
+        type="<%= input_type(attribute) %>"
+        name="<%= attribute.singular_name %>"
+        id="<%= attribute.singular_name %>"
+        :checked="<%= singular_table_name %>.<%= attribute.column_name %>"
+      />
+<% else -%>
+      <input
+        type="<%= input_type(attribute) %>"
+        name="<%= attribute.singular_name %>"
+        id="<%= attribute.singular_name %>"
+        :value="<%= singular_table_name %>.<%= attribute.column_name %>"
+      />
+<% end -%>
+      <div v-if="errors.<%= attribute.column_name %>" class="error">
+        {{ errors.<%= attribute.column_name %>.join(', ') }}
+      </div>
+    </div>
+<% end -%>
+<% end -%>
+    <div>
+      <button type="submit" :disabled="processing">
+        {{ submitText }}
+      </button>
+    </div>
+  </Form>
+</template>
+
+<script setup lang="ts">
+import { Form } from '@inertiajs/vue3'
+import { <%= inertia_model_type %> } from './types'
+
+const { <%= singular_table_name %>, submitText } = defineProps<{
+  <%= singular_table_name %>: <%= inertia_model_type %>
+  submitText: string
+}>()
+</script>
+
+<style scoped>
+.label {
+  display: block;
+}
+.error {
+  color: red;
+}
+</style>

data/lib/generators/inertia_templates/scaffold/templates/vue/form.vue.tt

@@ -0,0 +1,98 @@
+<template>
+  <Form
+    :transform="data => ({ <%= singular_table_name %>: data })"
+    v-slot="{ processing, errors }"
+    v-bind="$attrs"
+  >
+<% attributes.each do |attribute| -%>
+<% if attribute.password_digest? -%>
+    <div>
+      <label class="label" for="password">Password</label>
+      <input
+        type="password"
+        name="password"
+        id="password"
+      />
+      <div v-if="errors.password" class="error">
+        {{ errors.password.join(', ') }}
+      </div>
+    </div>
+
+    <div>
+      <label class="label" for="password_confirmation">
+        Password confirmation
+      </label>
+      <input
+        type="password"
+        name="password_confirmation"
+        id="password_confirmation"
+      />
+      <div v-if="errors.password_confirmation" class="error">
+        {{ errors.password_confirmation.join(', ') }}
+      </div>
+    </div>
+<% else -%>
+    <div>
+      <label class="label" for="<%= attribute.singular_name %>"><%= attribute.human_name %></label>
+<% if input_type(attribute) == "text_area" -%>
+      <textarea
+        name="<%= attribute.singular_name %>"
+        id="<%= attribute.singular_name %>"
+        :value="<%= singular_table_name %>.<%= attribute.column_name %>"
+      />
+<% elsif attribute.attachment? -%>
+      <input
+        type="file"
+        name="<%= attribute.singular_name %>"
+        id="<%= attribute.singular_name %>"
+      />
+<% elsif attribute.attachments? -%>
+      <input
+        type="file"
+        multiple
+        name="<%= attribute.singular_name %>[]"
+        id="<%= attribute.singular_name %>"
+      />
+<% elsif input_type(attribute) == "checkbox" -%>
+      <input
+        type="<%= input_type(attribute) %>"
+        name="<%= attribute.singular_name %>"
+        id="<%= attribute.singular_name %>"
+        :checked="<%= singular_table_name %>.<%= attribute.column_name %>"
+      />
+<% else -%>
+      <input
+        type="<%= input_type(attribute) %>"
+        name="<%= attribute.singular_name %>"
+        id="<%= attribute.singular_name %>"
+        :value="<%= singular_table_name %>.<%= attribute.column_name %>"
+      />
+<% end -%>
+      <div v-if="errors.<%= attribute.column_name %>" class="error">
+        {{ errors.<%= attribute.column_name %>.join(', ') }}
+      </div>
+    </div>
+<% end -%>
+<% end -%>
+    <div>
+      <button type="submit" :disabled="processing">
+        {{ submitText }}
+      </button>
+    </div>
+  </Form>
+</template>
+
+<script setup>
+import { Form } from '@inertiajs/vue3'
+
+const { <%= singular_table_name %>, submitText } = defineProps(['<%= singular_table_name %>', 'submitText'])
+</script>
+
+<style scoped>
+.label {
+  display: block;
+}
+.error {
+  color: red;
+}
+</style>

data/lib/generators/inertia_templates/scaffold/templates/vue/{Index.ts.vue.tt → index.ts.vue.tt}

@@ -19,7 +19,7 @@
 
 <script setup lang="ts">
 import { Head, Link } from '@inertiajs/vue3'
-import <%= inertia_component_name %> from './<%= inertia_component_name %>.vue'
+import <%= inertia_component_name %> from './<%= singular_name %>.vue'
 import { <%= inertia_model_type %> } from './types'
 
 const { <%= plural_table_name %>, flash } = defineProps<{

data/lib/generators/inertia_templates/scaffold/templates/vue/{Index.vue.tt → index.vue.tt}

@@ -19,7 +19,7 @@
 
 <script setup>
 import { Head, Link } from '@inertiajs/vue3'
-import <%= inertia_component_name %> from './<%= inertia_component_name %>.vue'
+import <%= inertia_component_name %> from './<%= singular_name %>.vue'
 
 const { <%= plural_table_name %>, flash } = defineProps(['<%= plural_table_name %>', 'flash'])
 </script>

data/lib/generators/inertia_templates/scaffold/templates/vue/{New.ts.vue.tt → new.ts.vue.tt}

@@ -6,7 +6,8 @@
   <Form
     :<%= singular_table_name %>="<%= singular_table_name %>"
     submitText="Create <%= human_name %>"
-    @onSubmit="handleSubmit"
+    action="<%= js_resources_path %>"
+    method="post"
   />
 
   <br />
@@ -17,14 +18,10 @@
 </template>
 
 <script setup lang="ts">
-import { Head, InertiaForm, Link } from '@inertiajs/vue3'
-import Form from './Form.vue'
-import { <%= inertia_model_form_type %>, <%= inertia_model_type %> } from './types'
+import { Head, Link } from '@inertiajs/vue3'
 
-const { <%= singular_table_name %> } = defineProps<{ <%= singular_table_name %>: <%= inertia_model_type %> }>()
+import Form from './form.vue'
+import type { <%= inertia_model_type %> } from './types'
 
-const handleSubmit = (form: InertiaForm<<%= inertia_model_form_type %>>) => {
-  form.transform((data) => ({ <%= singular_table_name %>: data }))
-  form.post('<%= js_resources_path %>')
-}
+const { <%= singular_table_name %> } = defineProps<{ <%= singular_table_name %>: <%= inertia_model_type %> }>()
 </script>

data/lib/generators/inertia_templates/scaffold/templates/vue/{New.vue.tt → new.vue.tt}

@@ -6,7 +6,8 @@
   <Form
     :<%= singular_table_name %>="<%= singular_table_name %>"
     submitText="Create <%= human_name %>"
-    @onSubmit="handleSubmit"
+    action="<%= js_resources_path %>"
+    method="post"
   />
 
   <br />
@@ -18,12 +19,8 @@
 
 <script setup>
 import { Head, Link } from '@inertiajs/vue3'
-import Form from './Form.vue'
 
-const { <%= singular_table_name %> } = defineProps(['<%= singular_table_name %>'])
+import Form from './form.vue'
 
-const handleSubmit = (form) => {
-  form.transform((data) => ({ <%= singular_table_name %>: data }))
-  form.post('<%= js_resources_path %>')
-}
+const { <%= singular_table_name %> } = defineProps(['<%= singular_table_name %>'])
 </script>

data/lib/generators/inertia_templates/scaffold/templates/vue/{Show.ts.vue.tt → show.ts.vue.tt}

@@ -25,7 +25,7 @@
 
 <script setup lang="ts">
 import { Head, Link } from '@inertiajs/vue3'
-import <%= inertia_component_name %> from './<%= inertia_component_name %>.vue'
+import <%= inertia_component_name %> from './<%= singular_name %>.vue'
 import { <%= inertia_model_type %> } from './types'
 
 const { <%= singular_table_name %>, flash } = defineProps<{

data/lib/generators/inertia_templates/scaffold/templates/vue/{Show.vue.tt → show.vue.tt}

@@ -25,7 +25,7 @@
 
 <script setup>
 import { Head, Link } from '@inertiajs/vue3'
-import <%= inertia_component_name %> from './<%= inertia_component_name %>.vue'
+import <%= inertia_component_name %> from './<%= singular_name %>.vue'
 
 const { <%= singular_table_name %>, flash } = defineProps(['<%= singular_table_name %>', 'flash'])
 </script>

data/lib/generators/inertia_tw_templates/scaffold/templates/react/{Edit.jsx.tt → edit.jsx.tt}

@@ -1,5 +1,5 @@
 import { Head, Link } from '@inertiajs/react'
-import Form from './Form'
+import Form from './form'
 
 export default function Edit({ <%= singular_table_name %> }) {
   return (
@@ -11,16 +11,13 @@ export default function Edit({ <%= singular_table_name %> }) {
 
         <Form
           <%= singular_table_name %>={<%= singular_table_name %>}
-          onSubmit={(form) => {
-            form.transform((data) => ({ <%= singular_table_name %>: data }))
+            action={`<%= js_resource_path %>`}
 <% if attributes.any?(&:attachments?) -%>
-            form.post(`<%= js_resource_path %>`, {
-              headers: { 'X-HTTP-METHOD-OVERRIDE': 'put' },
-            })
+            method="post"
+            headers={{ 'X-HTTP-METHOD-OVERRIDE': 'patch' }}
 <% else -%>
-            form.patch(`<%= js_resource_path %>`)
+            method="patch"
 <% end -%>
-          }}
           submitText="Update <%= human_name %>"
         />
 

data/lib/generators/inertia_tw_templates/scaffold/templates/react/{Edit.tsx.tt → edit.tsx.tt}

@@ -1,6 +1,6 @@
 import { Head, Link } from '@inertiajs/react'
-import Form from './Form'
-import { <%= inertia_model_type %> } from './types'
+import Form from './form'
+import type { <%= inertia_model_type %> } from './types'
 
 interface EditProps {
   <%= singular_table_name %>: <%= inertia_model_type %>
@@ -16,16 +16,13 @@ export default function Edit({ <%= singular_table_name %> }: EditProps) {
 
         <Form
           <%= singular_table_name %>={<%= singular_table_name %>}
-          onSubmit={(form) => {
-            form.transform((data) => ({ <%= singular_table_name %>: data }))
+            action={`<%= js_resource_path %>`}
 <% if attributes.any?(&:attachments?) -%>
-            form.post(`<%= js_resource_path %>`, {
-              headers: { 'X-HTTP-METHOD-OVERRIDE': 'put' },
-            })
+            method="post"
+            headers={{ 'X-HTTP-METHOD-OVERRIDE': 'patch' }}
 <% else -%>
-            form.patch(`<%= js_resource_path %>`)
+            method="patch"
 <% end -%>
-          }}
           submitText="Update <%= human_name %>"
         />
 

data/lib/generators/inertia_tw_templates/scaffold/templates/react/form.jsx.tt

@@ -0,0 +1,106 @@
+import { Form as InertiaForm } from '@inertiajs/react'
+
+export default function Form({ <%= singular_table_name %>, submitText, ...formProps }) {
+  return (
+    <InertiaForm
+      transform={data => ({ <%= singular_table_name %>: data })}
+      className="contents"
+      {...formProps}
+    >
+      {({ errors, processing }) => (
+        <>
+<% attributes.each do |attribute| -%>
+          <div className="my-5">
+<% if attribute.password_digest? -%>
+            <label htmlFor="password">Password</label>
+            <input
+              type="password"
+              name="password"
+              id="password"
+              className="block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full"
+            />
+            {errors.password && (
+              <div className="text-red-500 px-3 py-2 font-medium">
+                {errors.password.join(', ')}
+              </div>
+            )}
+          </div>
+
+          <div className="my-5">
+            <label htmlFor="password_confirmation">Password confirmation</label>
+            <input
+              type="password"
+              name="password_confirmation"
+              id="password_confirmation"
+              className="block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full"
+            />
+            {errors.password_confirmation && (
+              <div className="text-red-500 px-3 py-2 font-medium">
+                {errors.password_confirmation.join(', ')}
+              </div>
+            )}
+<% else -%>
+            <label htmlFor="<%= attribute.singular_name %>"><%= attribute.human_name %></label>
+<% if input_type(attribute) == "text_area" -%>
+            <textarea
+              name="<%= attribute.singular_name %>"
+              id="<%= attribute.singular_name %>"
+              defaultValue={<%= singular_table_name %>.<%= attribute.column_name %>}
+              rows="4"
+              className="block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full"
+            />
+<% elsif attribute.attachment? -%>
+            <input
+              type="file"
+              name="<%= attribute.singular_name %>"
+              id="<%= attribute.singular_name %>"
+              className="block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full"
+            />
+<% elsif attribute.attachments? -%>
+            <input
+              type="file"
+              multiple
+              name="<%= attribute.singular_name %>[]"
+              id="<%= attribute.singular_name %>"
+              className="block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full"
+            />
+<% elsif input_type(attribute) == "checkbox" -%>
+            <input
+              type="<%= input_type(attribute) %>"
+              name="<%= attribute.singular_name %>"
+              id="<%= attribute.singular_name %>"
+              defaultChecked={<%= singular_table_name %>.<%= attribute.column_name %>}
+              className="block mt-2 h-5 w-5"
+            />
+<% else -%>
+            <input
+              type="<%= input_type(attribute) %>"
+              name="<%= attribute.singular_name %>"
+              id="<%= attribute.singular_name %>"
+              defaultValue={<%= singular_table_name %>.<%= attribute.column_name %>}
+              className="block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full"
+            />
+<% end -%>
+            {errors.<%= attribute.column_name %> && (
+              <div className="text-red-500 px-3 py-2 font-medium">
+                {errors.<%= attribute.column_name %>.join(', ')}
+              </div>
+            )}
+<% end -%>
+          </div>
+
+<% end -%>
+          <div className="inline">
+            <button
+              type="submit"
+              disabled={processing}
+              className="rounded-lg py-3 px-5 bg-blue-600 text-white inline-block font-medium cursor-pointer"
+            >
+              {submitText}
+            </button>
+          </div>
+        </>
+      )}
+    </InertiaForm>
+  )
+}

data/lib/generators/inertia_tw_templates/scaffold/templates/react/form.tsx.tt

@@ -0,0 +1,122 @@
+import { Form as InertiaForm } from '@inertiajs/react'
+import { type ComponentProps } from 'react'
+
+import { <%= inertia_model_type %> } from './types'
+
+type FormProps = Omit<ComponentProps<typeof InertiaForm>, 'children'> & {
+  <%= singular_table_name %>: <%= inertia_model_type %>
+  submitText: string
+}
+
+export default function Form({ <%= singular_table_name %>, submitText, ...formProps }: FormProps) {
+  return (
+    <InertiaForm
+      transform={data => ({ <%= singular_table_name %>: data })}
+      className="contents"
+      {...formProps}
+    >
+      {({ errors, processing }) => (
+        <>
+<% attributes.each do |attribute| -%>
+          <div className="my-5">
+<% if attribute.password_digest? -%>
+            <label htmlFor="password">Password</label>
+            <input
+              type="password"
+              name="password"
+              id="password"
+              className="block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full"
+            />
+            {errors.password && (
+              <div className="text-red-500 px-3 py-2 font-medium">
+                {errors.password.join(', ')}
+              </div>
+            )}
+          </div>
+
+          <div className="my-5">
+            <label htmlFor="password_confirmation">Password confirmation</label>
+            <input
+              type="password"
+              name="password_confirmation"
+              id="password_confirmation"
+              className="block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full"
+            />
+            {errors.password_confirmation && (
+              <div className="text-red-500 px-3 py-2 font-medium">
+                {errors.password_confirmation.join(', ')}
+              </div>
+            )}
+<% else -%>
+            <label htmlFor="<%= attribute.singular_name %>"><%= attribute.human_name %></label>
+<% if input_type(attribute) == "text_area" -%>
+            <textarea
+              name="<%= attribute.singular_name %>"
+              id="<%= attribute.singular_name %>"
+              defaultValue={<%= singular_table_name %>.<%= attribute.column_name %>}
+              rows={4}
+              className="block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full"
+            />
+<% elsif attribute.attachment? -%>
+            <input
+              type="file"
+              name="<%= attribute.singular_name %>"
+              id="<%= attribute.singular_name %>"
+              className="block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full"
+            />
+<% elsif attribute.attachments? -%>
+            <input
+              type="file"
+              multiple
+              name="<%= attribute.singular_name %>[]"
+              id="<%= attribute.singular_name %>"
+              className="block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full"
+            />
+<% elsif input_type(attribute) == "checkbox" -%>
+            <input
+              type="<%= input_type(attribute) %>"
+              name="<%= attribute.singular_name %>"
+              id="<%= attribute.singular_name %>"
+              defaultChecked={<%= singular_table_name %>.<%= attribute.column_name %>}
+              className="block mt-2 h-5 w-5"
+            />
+<% elsif input_type(attribute) == "number" -%>
+            <input
+              type="<%= input_type(attribute) %>"
+              name="<%= attribute.singular_name %>"
+              id="<%= attribute.singular_name %>"
+              defaultValue={<%= singular_table_name %>.<%= attribute.column_name %>}
+              className="block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full"
+            />
+<% else -%>
+            <input
+              type="<%= input_type(attribute) %>"
+              name="<%= attribute.singular_name %>"
+              id="<%= attribute.singular_name %>"
+              defaultValue={<%= singular_table_name %>.<%= attribute.column_name %>}
+              className="block shadow rounded-md border border-gray-400 outline-none px-3 py-2 mt-2 w-full"
+            />
+<% end -%>
+            {errors.<%= attribute.column_name %> && (
+              <div className="text-red-500 px-3 py-2 font-medium">
+                {errors.<%= attribute.column_name %>.join(', ')}
+              </div>
+            )}
+<% end -%>
+          </div>
+
+<% end -%>
+          <div className="inline">
+            <button
+              type="submit"
+              disabled={processing}
+              className="rounded-lg py-3 px-5 bg-blue-600 text-white inline-block font-medium cursor-pointer"
+            >
+              {submitText}
+            </button>
+          </div>
+        </>
+      )}
+    </InertiaForm>
+  )
+}

data/lib/generators/inertia_tw_templates/scaffold/templates/react/{Index.jsx.tt → index.jsx.tt}

@@ -1,6 +1,6 @@
 import { Head, Link } from '@inertiajs/react'
 import { Fragment } from 'react'
-import <%= inertia_component_name %> from './<%= inertia_component_name %>'
+import <%= inertia_component_name %> from './<%= singular_name %>'
 
 export default function Index({ <%= plural_table_name %>, flash }) {
   return (

data/lib/generators/inertia_tw_templates/scaffold/templates/react/{Index.tsx.tt → index.tsx.tt}

@@ -1,6 +1,6 @@
 import { Head, Link } from '@inertiajs/react'
 import { Fragment } from 'react'
-import <%= inertia_component_name %> from './<%= inertia_component_name %>'
+import <%= inertia_component_name %> from './<%= singular_name %>'
 import { <%= inertia_model_type %> } from './types'
 
 interface IndexProps {

data/lib/generators/inertia_tw_templates/scaffold/templates/react/{New.jsx.tt → new.jsx.tt}

@@ -1,5 +1,5 @@
 import { Head, Link } from '@inertiajs/react'
-import Form from './Form'
+import Form from './form'
 
 export default function New({ <%= singular_table_name %> }) {
   return (
@@ -11,10 +11,8 @@ export default function New({ <%= singular_table_name %> }) {
 
         <Form
           <%= singular_table_name %>={<%= singular_table_name %>}
-          onSubmit={(form) => {
-            form.transform((data) => ({ <%= singular_table_name %>: data }))
-            form.post('<%= js_resources_path %>')
-          }}
+          method="post"
+          action="<%= js_resources_path %>"
           submitText="Create <%= human_name %>"
         />
 

data/lib/generators/inertia_tw_templates/scaffold/templates/react/{New.tsx.tt → new.tsx.tt}

@@ -1,6 +1,6 @@
 import { Head, Link } from '@inertiajs/react'
-import Form from './Form'
-import { <%= inertia_model_type %> } from './types'
+import Form from './form'
+import type { <%= inertia_model_type %> } from './types'
 
 interface NewProps {
   <%= singular_table_name %>: <%= inertia_model_type %>
@@ -16,10 +16,8 @@ export default function New({ <%= singular_table_name %> }: NewProps) {
 
         <Form
           <%= singular_table_name %>={<%= singular_table_name %>}
-          onSubmit={(form) => {
-            form.transform((data) => ({ <%= singular_table_name %>: data }))
-            form.post('<%= js_resources_path %>')
-          }}
+          method="post"
+          action="<%= js_resources_path %>"
           submitText="Create <%= human_name %>"
         />
 

data/lib/generators/inertia_tw_templates/scaffold/templates/react/{Show.jsx.tt → show.jsx.tt}

@@ -1,5 +1,5 @@
 import { Head, Link } from '@inertiajs/react'
-import <%= inertia_component_name %> from './<%= inertia_component_name %>'
+import <%= inertia_component_name %> from './<%= singular_name %>'
 
 export default function Show({ <%= singular_table_name %>, flash }) {
   return (

data/lib/generators/inertia_tw_templates/scaffold/templates/react/{Show.tsx.tt → show.tsx.tt}

@@ -1,5 +1,5 @@
 import { Head, Link } from '@inertiajs/react'
-import <%= inertia_component_name %> from './<%= inertia_component_name %>'
+import <%= inertia_component_name %> from './<%= singular_name %>'
 import { <%= inertia_model_type %> } from './types'
 
 interface ShowProps {