@kaspernj/api-maker 1.0.374 → 1.0.375

package/package.json

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

package/src/base-model/attribute.mjs

@@ -1,3 +1,4 @@
+import Column from "./column.mjs"
 import {digg} from "diggerize"
 
 export default class ApiMakerBaseModelAttribute {
@@ -5,10 +6,20 @@ export default class ApiMakerBaseModelAttribute {
     this.attributeData = attributeData
   }
 
-  isColumn() {
-    return Boolean(digg(this, "attributeData", "column"))
+  getColumn() {
+    if (!this.column) {
+      const columnData = digg(this, "attributeData", "column")
+
+      if (columnData) {
+        this.column = new Column(columnData)
+      }
+    }
+
+    return this.column
   }
 
+  isColumn = () => Boolean(digg(this, "attributeData", "column"))
+
   isSelectedByDefault() {
     const isSelectedByDefault = digg(this, "attributeData", "selected_by_default")
 
@@ -17,7 +28,5 @@ export default class ApiMakerBaseModelAttribute {
     return false
   }
 
-  name() {
-    return digg(this, "attributeData", "name")
-  }
+  name = () => digg(this, "attributeData", "name")
 }

package/src/base-model/column.mjs

@@ -0,0 +1,13 @@
+import {digg} from "diggerize"
+
+export default class ApiMakerBaseModelColumn {
+  constructor(columnData) {
+    if (!columnData) {
+      throw new Error("No column data was given")
+    }
+
+    this.columnData = columnData
+  }
+
+  getType = () => digg(this, "columnData", "type")
+}

package/src/bootstrap/attribute-row/index.jsx

@@ -1,11 +1,13 @@
 import classNames from "classnames"
 import {digg} from "diggerize"
+import * as inflection from "inflection"
 import MoneyFormatter from "../../money-formatter"
 import PropTypes from "prop-types"
-import React from "react"
+import {memo, useMemo} from "react"
+import {shapeComponent, ShapeComponent} from "set-state-compare/src/shape-component.js"
 import strftime from "strftime"
 
-export default class ApiMakerBootstrapAttributeRow extends React.PureComponent {
+export default memo(shapeComponent(class ApiMakerBootstrapAttributeRow extends ShapeComponent {
   static defaultProps = {
     checkIfAttributeLoaded: false
   }
@@ -20,6 +22,13 @@ export default class ApiMakerBootstrapAttributeRow extends React.PureComponent {
     value: PropTypes.node
   }
 
+  setup() {
+    this.attribute = useMemo(
+      () => this.props.model?.constructor?.attributes()?.find((attribute) => attribute.name() == inflection.underscore(this.props.attribute)),
+      [this.props.attribute, this.props.model]
+    )
+  }
+
   render () {
     const {attribute, checkIfAttributeLoaded, children, className, identifier, label, model, value, ...restProps} = this.props
 
@@ -68,7 +77,11 @@ export default class ApiMakerBootstrapAttributeRow extends React.PureComponent {
   }
 
   valueContent(value) {
-    if (value instanceof Date) {
+    const columnType = this.attribute?.getColumn()?.getType()
+
+    if (columnType == "date") {
+      return I18n.l("date.formats.default", value)
+    } else if (value instanceof Date) {
       return strftime("%Y-%m-%d %H:%M", value)
     } else if (typeof value === "boolean") {
       if (value) return I18n.t("js.shared.yes", {defaultValue: "Yes"})
@@ -80,4 +93,4 @@ export default class ApiMakerBootstrapAttributeRow extends React.PureComponent {
       return value
     }
   }
-}
+}))

package/src/table/model-row.jsx

@@ -105,8 +105,8 @@ export default memo(shapeComponent(class ApiMakerBootStrapLiveTableModelRow exte
   }
 
   columnsContentFromAttributeAndPath (column, model) {
-    const {attribute} = digs(column, "attribute")
-    const currentModelClass = this.props.modelClass
+    const {attribute: attributeName} = digs(column, "attribute")
+    const attributeNameUnderscore = inflection.underscore(attributeName)
     const path = column.path || []
     let value
     let currentModel = model
@@ -118,8 +118,18 @@ export default memo(shapeComponent(class ApiMakerBootStrapLiveTableModelRow exte
       }
     }
 
-    if (!(attribute in currentModel)) throw new Error(`${currentModelClass.modelName().name} doesn't respond to ${attribute}`)
-    if (currentModel.isAttributeLoaded(attribute)) value = currentModel[attribute]()
+    if (!(attributeName in currentModel)) {
+      throw new Error(`${currentModel.constructor.modelName().human()} doesn't respond to ${attributeName}`)
+    }
+
+    if (currentModel.isAttributeLoaded(attributeName)) value = currentModel[attributeName]()
+
+    const attribute = currentModel.constructor.attributes().find((attribute) => attribute.name() == attributeNameUnderscore)
+    const modelColumn = attribute?.getColumn()
+
+    if (modelColumn?.getType() == "date") {
+      return this.presentDateTime({apiMakerType: "date", value})
+    }
 
     return this.presentColumnValue(value)
   }
@@ -155,9 +165,9 @@ export default memo(shapeComponent(class ApiMakerBootStrapLiveTableModelRow exte
     }
   }
 
-  presentColumnValue (value) {
+  presentColumnValue(value) {
     if (value instanceof Date) {
-      return this.presentDateTime(value)
+      return this.presentDateTime({value})
     } else if (MoneyFormatter.isMoney(value)) {
       return MoneyFormatter.format(value)
     } else if (typeof value == "boolean") {
@@ -174,15 +184,13 @@ export default memo(shapeComponent(class ApiMakerBootStrapLiveTableModelRow exte
     return value
   }
 
-  presentDateTime(value) {
-    const apiMakerType = value.apiMakerType || "time"
-
-    if (apiMakerType == "time") {
+  presentDateTime({apiMakerType, value}) {
+    if (!apiMakerType || apiMakerType == "time") {
       const dateTimeFormatName = this.props.liveTable.props.defaultDateTimeFormatName || "time.formats.default"
 
       return I18n.l(dateTimeFormatName, value)
     } else if (apiMakerType == "date") {
-      const dateFormatName = this.props.liveTable.props.defaultDateTimeFormatName || "date.formats.default"
+      const dateFormatName = this.props.liveTable.props.defaultDateFormatName || "date.formats.default"
 
       return I18n.l(dateFormatName, value)
     } else {