@kaspernj/api-maker 1.0.392 → 1.0.393

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaspernj/api-maker",
-  "version": "1.0.392",
+  "version": "1.0.393",
   "type": "module",
   "description": "",
   "main": "index.js",

package/src/form.jsx

@@ -25,6 +25,8 @@ class FormInputs {
   }
 
   setValue(name, value) {
+    if (!name) throw new Error("'name' is required")
+
     console.log("Form", {name, value})
 
     this.inputs[name] = value

package/src/inputs/input.jsx

@@ -5,7 +5,7 @@ import EventUpdated from "../event-updated"
 import inputWrapper from "./input-wrapper"
 import Money from "./money"
 import PropTypes from "prop-types"
-import {memo, useRef} from "react"
+import {memo, useMemo, useRef} from "react"
 import replaceall from "replaceall"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
 import strftime from "strftime"

package/src/super-admin/edit-page/edit-attribute-content.jsx

@@ -4,15 +4,9 @@ import {shapeComponent} from "set-state-compare/src/shape-component.js"
 
 export default memo(shapeComponent(class EditAttributeContent extends BaseComponent {
   setup() {
-    const {inputs, name} = this.p
-
     this.useStates({
       value: () => this.defaultValue()
     })
-
-    useMemo(() => {
-      inputs[name] = this.s.value
-    }, [])
   }
 
   render() {
@@ -38,10 +32,6 @@ export default memo(shapeComponent(class EditAttributeContent extends BaseCompon
   defaultValue = () => this.p.model[this.p.attribute.attribute]() || ""
 
   onChangeValue = (newValue) => {
-    const {inputs, name} = this.p
-
-    inputs[name] = newValue
-
     this.setState({value: newValue})
   }
 }))

package/src/super-admin/edit-page/edit-attribute-input.jsx

@@ -1,19 +1,18 @@
+import {memo, useMemo} from "react"
+import {Text, TextInput, View} from "react-native"
 import BaseComponent from "../../base-component"
-import {useForm} from "../../form"
 import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
-import {Text, TextInput, View} from "react-native"
-import {memo, useMemo} from "react"
+import {useForm} from "../../form"
 
 export default memo(shapeComponent(class EditAttributeInput extends BaseComponent {
   static propTypes = propTypesExact({
-    inputs: PropTypes.object.isRequired,
     name: PropTypes.string.isRequired
   })
 
   setup() {
-    const {inputs, name} = this.p
+    const {name} = this.p
 
     this.form = useForm()
     this.useStates({
@@ -21,8 +20,6 @@ export default memo(shapeComponent(class EditAttributeInput extends BaseComponen
     })
 
     useMemo(() => {
-      inputs[name] = this.s.value
-
       if (this.form) {
         this.form.setValue(name, this.s.value)
       }
@@ -59,12 +56,8 @@ export default memo(shapeComponent(class EditAttributeInput extends BaseComponen
   }
 
   onChangeText = (newValue) => {
-    const {inputs, name} = this.p
-
-    inputs[name] = newValue
-
     if (this.form) {
-      this.form.setValue(name, newValue)
+      this.form.setValue(this.p.name, newValue)
     }
 
     this.setState({value: newValue})

package/src/super-admin/edit-page/edit-attribute.jsx

@@ -5,11 +5,19 @@ import EditAttributeInput from "./edit-attribute-input"
 import * as inflection from "inflection"
 import Locales from "shared/locales"
 import {memo} from "react"
+import PropTypes from "prop-types"
+import propTypesExact from "prop-types-exact"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
 
 export default memo(shapeComponent(class EditAttribute extends BaseComponent {
+  static propTypes = propTypesExact({
+    attribute: PropTypes.string,
+    model: PropTypes.object,
+    modelClass: PropTypes.func
+  })
+
   render() {
-    const {attribute, inputs, model, modelClass} = this.props
+    const {attribute, model, modelClass} = this.props
     const availableLocales = Locales.availableLocales()
     const camelizedLower = digg(modelClass.modelClassData(), "camelizedLower")
 
@@ -19,7 +27,6 @@ export default memo(shapeComponent(class EditAttribute extends BaseComponent {
           <EditAttributeContent
             attribute={attribute}
             id={`${inflection.underscore(camelizedLower)}_${inflection.underscore(attribute.attribute)}`}
-            inputs={inputs}
             model={model}
             name={inflection.underscore(attribute.attribute)}
           />
@@ -28,7 +35,6 @@ export default memo(shapeComponent(class EditAttribute extends BaseComponent {
           <EditAttributeInput
             attributeName={`${attribute.attribute}${inflection.camelize(locale)}`}
             id={`${inflection.underscore(camelizedLower)}_${inflection.underscore(attribute.attribute)}_${locale}`}
-            inputs={inputs}
             label={`${modelClass.humanAttributeName(attribute.attribute)} (${locale})`}
             model={model}
             name={`${inflection.underscore(attribute.attribute)}_${locale}`}
@@ -39,7 +45,6 @@ export default memo(shapeComponent(class EditAttribute extends BaseComponent {
           <EditAttributeInput
             attributeName={attribute.attribute}
             id={`${inflection.underscore(camelizedLower)}_${inflection.underscore(attribute.attribute)}`}
-            inputs={inputs}
             label={modelClass.humanAttributeName(attribute.attribute)}
             model={model}
             name={inflection.underscore(attribute.attribute)}

package/src/super-admin/edit-page.jsx

@@ -19,8 +19,6 @@ export default memo(shapeComponent(class ApiMakerSuperAdminEditPage extends Base
     modelClass: PropTypes.func.isRequired
   })
 
-  inputs = {}
-
   setup() {
     const {modelClass} = this.p
     const modelClassName = modelClass.modelClassData().name
@@ -75,7 +73,7 @@ export default memo(shapeComponent(class ApiMakerSuperAdminEditPage extends Base
       <View dataSet={{class: "super-admin--edit-page"}}>
         <Form setForm={this.setStates.form}>
           {model && attributes?.map((attribute) =>
-            <EditAttribute attribute={attribute} inputs={this.inputs} key={attribute.attribute} model={model} modelClass={modelClass} />
+            <EditAttribute attribute={attribute} key={attribute.attribute} model={model} modelClass={modelClass} />
           )}
           {extraContent && extraContent(modelArgs)}
           <Pressable
@@ -102,16 +100,13 @@ export default memo(shapeComponent(class ApiMakerSuperAdminEditPage extends Base
 
   onSubmit = async () => {
     try {
-      const {inputs, model} = this.tt
-      const {form} = this.s
-
-      const formObject = form.asObject()
-      const allInputs = Object.assign({}, inputs, formObject)
+      const {model} = this.tt
+      const formObject = this.s.form.asObject()
 
-      console.log({allInputs})
+      console.log({formObject})
 
-      model.assignAttributes(allInputs)
-      await model.save(this.inputs)
+      model.assignAttributes(formObject)
+      await model.save()
       Params.changeParams({mode: undefined, model_id: model.id()})
     } catch (error) {
       FlashMessage.errorResponse(error)