@postxl/generator 0.41.0 → 0.41.2

package/dist/generators/models/react.generator/modals.generator.js

@@ -38,6 +38,7 @@ function generateModelCreateModalComponent({ model, meta }) {
     const { fields } = model;
     const { react: { components: { modals }, }, trpc, } = meta;
     const selectorCollector = id_collector_1.SelectorCollector.from(meta.seed.constantName + '-createModal');
+    const dimensions = getModalComponentDimensions({ model });
     return `
 /* eslint-disable @typescript-eslint/no-unused-vars */
 ${getFormImports({ model, meta })}
@@ -46,10 +47,25 @@ type CreateInputData = {
   ${getCreateFormInputFields({ model })}
 }
 
+const INITIAL_VALUES = {
+  ${fields
+        .filter((f) => f.kind !== 'id' && !f.attributes.isReadonly)
+        .map((field) => `${getFormikFieldName(field.name)}: null,`)
+        .join('\n')}
+}
+
 /**
  * A modal component that lets the user create a new ${meta.userFriendlyName} instance.
  */
-export const ${modals.createComponentName} = ({ show, onHide }: { show: boolean; onHide: () => void }) => {
+export const ${modals.createComponentName} = ({ 
+  show, 
+  onHide, 
+  data 
+}: { 
+  show: boolean; 
+  onHide: () => void; 
+  data?: Partial<CreateInputData> 
+}) => {
   const Typed = React.useMemo(
     () => createTypedForm<CreateInputData>().with({ ${(() => {
         const components = new Set();
@@ -76,18 +92,14 @@ export const ${modals.createComponentName} = ({ show, onHide }: { show: boolean;
     })()} }), 
     []
   )
+
   const cache = trpc.useContext()
   const mutation = trpc.${trpc.create.reactQueryMethod}.useMutation()
 
   return (
-    <ModalWithNavigationContainer label="Create new ${meta.userFriendlyName}" show={show} onHide={onHide} fixed wide>
+    <ModalWithNavigationContainer label="Create new ${meta.userFriendlyName}" show={show} onHide={onHide} ${dimensions}>
       <Typed.Formik
-        initialValues={{
-					${fields
-        .filter((f) => f.kind !== 'id' && !f.attributes.isReadonly)
-        .map((field) => `${getFormikFieldName(field.name)}: null,`)
-        .join('\n')}
-				}}
+        initialValues={{ ...INITIAL_VALUES, ...data }}
         validate={(values) => {
           const errors: FormikErrors<CreateInputData> = {}
 
@@ -112,7 +124,13 @@ export const ${modals.createComponentName} = ({ show, onHide }: { show: boolean;
               {
                 loading: "Creating new ${meta.userFriendlyName}...",
                 success: "New ${meta.userFriendlyName} created!",
-                error: "Something went wrong...",
+                error: (error) => {
+                  if (error instanceof TRPCClientError) {
+                    return error.message
+                  }
+
+                  return 'Something went wrong...'
+                },
               },
             )
 
@@ -153,6 +171,7 @@ function generateEditModalModelComponent({ model, meta }) {
     const { fields } = model;
     const { react: { components }, trpc, } = meta;
     const selectorCollector = id_collector_1.SelectorCollector.from(meta.seed.constantName + '-editModal');
+    const dimensions = getModalComponentDimensions({ model });
     return `
 /* eslint-disable @typescript-eslint/no-unused-vars */
 ${getFormImports({ model, meta })}
@@ -198,7 +217,7 @@ export const ${components.modals.editComponentName} = ({
   const mutation = trpc.${trpc.update.reactQueryMethod}.useMutation()
 
   return (
-    <ModalWithNavigationContainer label="Edit ${meta.userFriendlyName}" show={show} onHide={onHide} fixed wide>
+    <ModalWithNavigationContainer label="Edit ${meta.userFriendlyName}" show={show} onHide={onHide} ${dimensions}>
       <Typed.Formik
         initialValues={{
 					${fields
@@ -243,7 +262,13 @@ export const ${components.modals.editComponentName} = ({
               {
                 loading: "Updating ${meta.userFriendlyName}...",
                 success: "${meta.userFriendlyName} updated!",
-                error: "Something went wrong...",
+                error: (error) => {
+                  if (error instanceof TRPCClientError) {
+                    return error.message
+                  }
+
+                  return 'Something went wrong...'
+                },
               },
             )
 
@@ -376,6 +401,7 @@ function getFormImports({ model, meta }) {
         });
     }
     return `
+    import { TRPCClientError } from '@trpc/client'
     import React from 'react'
     import { toast } from 'react-hot-toast'
     import { FormikErrors } from 'formik'
@@ -665,3 +691,14 @@ function getFormikValidationCases({ model }) {
 function getFormikFieldName(name) {
     return `formik${StringUtils.toPascalCase(name)}`;
 }
+/**
+ * Returns a string representing the "missing" dimension parameters for the modal component
+ * depending on the type of the modal.
+ */
+function getModalComponentDimensions({ model }) {
+    const _fields = model.fields.filter((f) => f.kind !== 'id' && !f.attributes.isReadonly);
+    if (_fields.length > 3) {
+        return 'fixed wide';
+    }
+    return '';
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@postxl/generator",
-  "version": "0.41.0",
+  "version": "0.41.2",
   "main": "./dist/generator.js",
   "typings": "./dist/generator.d.ts",
   "bin": {