@kaspernj/api-maker 1.0.125 → 1.0.128

package/src/updated-attribute.jsx

@@ -1,37 +1,37 @@
 const {digg} = require("diggerize")
 const ModelEvents = require("./model-events.cjs")
 const PropTypes = require("prop-types")
-const PropTypesExact = require("prop-types-exact")
+const propTypesExact = require("prop-types-exact")
 const React = require("react")
 
 export default class ApiMakerUpdatedAttribute extends React.PureComponent {
-  static propTypes = PropTypesExact({
+  static propTypes = propTypesExact({
     attribute: PropTypes.string,
     model: PropTypes.object.isRequired,
     onValue: PropTypes.func
   })
 
-  constructor(props) {
+  constructor (props) {
     super(props)
     this.state = {
       model: this.props.model
     }
   }
 
-  componentDidMount() {
+  componentDidMount () {
     this.setAttribute()
     this.connect()
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     // Apparently 'componentWillUnmount' can be called without 'componentDidMount' was called. Several bug reports on this.
     if (this.connectUpdated) {
       this.connectUpdated.unsubscribe()
     }
   }
 
-  connect() {
-    this.connectUpdated = ModelEvents.connectUpdated(this.props.model, args => {
+  connect () {
+    this.connectUpdated = ModelEvents.connectUpdated(this.props.model, (args) => {
       if (!this.props.attribute || args.model.isAttributeLoaded(this.props.attribute)) {
         this.setState(
           {model: args.model},
@@ -44,7 +44,7 @@ export default class ApiMakerUpdatedAttribute extends React.PureComponent {
   }
 
   // This loads the model from the backend with the primary key and the attribute and calls setAttribute
-  async loadModelWithAttribute() {
+  async loadModelWithAttribute () {
     const id = this.props.model.primaryKey()
     const modelClass = this.props.model.modelClass()
     const modelName = digg(modelClass.modelClassData(), "name")
@@ -56,7 +56,10 @@ export default class ApiMakerUpdatedAttribute extends React.PureComponent {
     const select = {}
     select[modelName] = [primaryKey, this.props.attribute]
 
-    const model = await modelClass.ransack(args).select(select).first()
+    const model = await modelClass
+      .ransack(args)
+      .select(select)
+      .first()
 
     this.setState(
       {model},
@@ -64,14 +67,15 @@ export default class ApiMakerUpdatedAttribute extends React.PureComponent {
     )
   }
 
-  setAttribute() {
+  setAttribute () {
     let newValue
 
     if (this.props.onValue) {
       newValue = this.props.onValue.apply(null, [{model: this.state.model}])
     } else {
-      if (!this.state.model[this.props.attribute])
+      if (!this.state.model[this.props.attribute]) {
         throw new Error(`No such method: ${digg(this.state.model.modelClassData(), "name")}#${this.props.attribute}()`)
+      }
 
       newValue = this.state.model[this.props.attribute].apply(this.state.model)
     }
@@ -81,9 +85,8 @@ export default class ApiMakerUpdatedAttribute extends React.PureComponent {
     })
   }
 
-  render() {
-    if (this.state.value === undefined)
-      return null
+  render () {
+    if (this.state.value === undefined) return null
 
     return this.state.value
   }

package/src/validation-error.cjs

@@ -1,25 +1,22 @@
 const CustomError = require("./custom-error.cjs")
-const {digg} = require("diggerize")
 const inflection = require("inflection")
 
 module.exports = class ValidationError extends CustomError {
-  constructor(validationErrors, args) {
+  constructor (validationErrors, args) {
     super(validationErrors.getUnhandledErrorMessage() || validationErrors.getErrorMessage(), args)
     this.validationErrors = validationErrors
   }
 
-  hasUnhandledErrors() {
-    const unhandledError = this.validationErrors.getValidationErrors().find(validationError => !validationError.getHandled())
+  hasUnhandledErrors () {
+    const unhandledError = this.validationErrors.getValidationErrors().find((validationError) => !validationError.getHandled())
     return Boolean(unhandledError)
   }
 
-  hasValidationErrorForAttribute(attributeName) {
+  hasValidationErrorForAttribute (attributeName) {
     const underscoredAttributeName = inflection.underscore(attributeName)
     const foundAttribute = this.validationErrors.getValidationErrors().find((validationError) => validationError.getAttributeName() == underscoredAttributeName)
 
-    if (foundAttribute) {
-      return true
-    }
+    if (foundAttribute) return true
 
     return false
   }

package/src/validation-errors.cjs

@@ -2,7 +2,7 @@ const {digg, digs} = require("diggerize")
 const inflection = require("inflection")
 
 class ValidationError {
-  constructor(args) {
+  constructor (args) {
     this.attributeName = digg(args, "attribute_name")
     this.attributeType = digg(args, "attribute_type")
     this.errorMessages = digg(args, "error_messages")
@@ -12,7 +12,7 @@ class ValidationError {
     this.modelName = digg(args, "model_name")
   }
 
-  matchesAttributeAndInputName(attributeName, inputName) {
+  matchesAttributeAndInputName (attributeName, inputName) {
     if (this.getInputName() == inputName) return true
     if (!attributeName) return false
 
@@ -29,15 +29,15 @@ class ValidationError {
     return false
   }
 
-  getAttributeName() {
+  getAttributeName () {
     return digg(this, "attributeName")
   }
 
-  getErrorMessages() {
+  getErrorMessages () {
     return digg(this, "errorMessages")
   }
 
-  getFullErrorMessages() {
+  getFullErrorMessages () {
     const {attributeType} = digs(this, "attributeType")
 
     if (attributeType == "base") {
@@ -54,32 +54,32 @@ class ValidationError {
     }
   }
 
-  getHandled() {
+  getHandled () {
     return digg(this, "handled")
   }
 
-  getInputName() {
+  getInputName () {
     return digg(this, "inputName")
   }
 
-  getModelClass() {
+  getModelClass () {
     const modelName = inflection.classify(digg(this, "modelName"))
 
     return digg(require("@kaspernj/api-maker/src/models"), modelName)
   }
 
-  setHandled() {
+  setHandled () {
     this.handled = true
   }
 }
 
 class ValidationErrors {
-  constructor(args) {
+  constructor (args) {
     this.rootModel = digg(args, "model")
-    this.validationErrors = digg(args, "validationErrors").map(validationError => new ValidationError(validationError))
+    this.validationErrors = digg(args, "validationErrors").map((validationError) => new ValidationError(validationError))
   }
 
-  getErrorMessage() {
+  getErrorMessage () {
     const fullErrorMessages = []
 
     for (const validationError of this.validationErrors) {
@@ -91,11 +91,11 @@ class ValidationErrors {
     return fullErrorMessages.join(". ")
   }
 
-  getValidationErrors() {
+  getValidationErrors () {
     return this.validationErrors
   }
 
-  getValidationErrorsForInput(args) {
+  getValidationErrorsForInput (args) {
     const {attribute, inputName, onMatchValidationError} = args
     const validationErrors = this.validationErrors.filter((validationError) => {
       if (onMatchValidationError) {
@@ -110,8 +110,8 @@ class ValidationErrors {
     return validationErrors
   }
 
-  getUnhandledErrorMessage() {
-    const unhandledValidationErrors = this.validationErrors.filter(validationError => !validationError.getHandled())
+  getUnhandledErrorMessage () {
+    const unhandledValidationErrors = this.validationErrors.filter((validationError) => !validationError.getHandled())
 
     if (unhandledValidationErrors.length > 0) {
       const unhandledValidationErrorMessages = []

package/src/event-location-changed.jsx

@@ -1,21 +0,0 @@
-import PropTypes from "prop-types"
-import React from "react"
-
-export default class EventLocationChanged extends React.PureComponent {
-  static propTypes = {
-    history: PropTypes.object.isRequired,
-    onChanged: PropTypes.func.isRequired
-  }
-
-  componentDidMount() {
-    this.appHistoryUnlisten = this.props.history.listen(this.props.onChanged)
-  }
-
-  componentWillUnmount() {
-    this.appHistoryUnlisten()
-  }
-
-  render() {
-    return null
-  }
-}

package/src/history-listener.jsx

@@ -1,20 +0,0 @@
-const PropTypes = require("prop-types")
-const PropTypesExact = require("prop-types-exact")
-
-export default class ApiMakerHistoryListener extends React.PureComponent {
-  static propTypes = PropTypesExact({
-    onChanged: PropTypes.func.isRequired
-  })
-
-  componentDidMount() {
-    this.unlisten = AppHistory.listen((location, action) => this.props.onChanged({location, action}))
-  }
-
-  componentWillUnmount() {
-    this.unlisten()
-  }
-
-  render() {
-    return null
-  }
-}