@kaspernj/api-maker 1.0.304 → 1.0.306

package/src/super-admin/show-reflection-page.jsx

@@ -1,51 +1,40 @@
-import {digg, digs} from "diggerize"
+import {digg} from "diggerize"
 import PropTypes from "prop-types"
-import React from "react"
+import React, {memo} from "react"
 import ModelClassTable from "./model-class-table"
 import ShowNav from "./show-nav"
+import useQueryParams from "on-location-changed/src/use-query-params"
 import withModel from "../with-model"
 
-class ApiMakerSuperAdminShowReflectionPage extends React.PureComponent {
-  static propTypes = {
-    currentUser: PropTypes.object,
-    modelClass: PropTypes.func.isRequired,
-    queryParams: PropTypes.object.isRequired
-  }
-
-  render() {
-    const {currentUser, modelClass, queryParams} = digs(this.props, "currentUser", "modelClass", "queryParams")
-    const model = this.model()
-    const reflections = modelClass.reflections()
-    const reflection = reflections.find((reflectionI) => reflectionI.name() == queryParams.model_reflection)
-    const reflectionModelClass = reflection.modelClass()
-    let collection
-
-    if (model) collection = model[reflection.name()]()
-
-    return (
-      <div className="super-admin--show-page">
-        {model &&
-          <ShowNav model={model} modelClass={modelClass} queryParams={queryParams} />
-        }
-        {collection &&
-          <ModelClassTable
-            collection={collection}
-            currentUser={currentUser}
-            key={reflectionModelClass.modelName().human()}
-            modelClass={reflectionModelClass}
-            queryParams={queryParams}
-          />
-        }
-      </div>
-    )
-  }
-
-  model() {
-    const {modelClass} = digs(this.props, "modelClass")
-    const camelizedLower = digg(modelClass.modelClassData(), "camelizedLower")
+const ApiMakerSuperAdminShowReflectionPage = ({modelClass, restProps}) => {
+  const queryParams = useQueryParams()
+  const camelizedLower = digg(modelClass.modelClassData(), "camelizedLower")
+  const model = digg(restProps, camelizedLower)
+  const reflections = modelClass.reflections()
+  const reflection = reflections.find((reflectionI) => reflectionI.name() == queryParams.model_reflection)
+  const reflectionModelClass = reflection.modelClass()
+  let collection
+
+  if (model) collection = model[reflection.name()]()
+
+  return (
+    <div className="super-admin--show-page">
+      {model &&
+        <ShowNav model={model} modelClass={modelClass} />
+      }
+      {collection &&
+        <ModelClassTable
+          collection={collection}
+          key={reflectionModelClass.modelName().human()}
+          modelClass={reflectionModelClass}
+        />
+      }
+    </div>
+  )
+}
 
-    return digg(this, "props", camelizedLower)
-  }
+ApiMakerSuperAdminShowReflectionPage.propTypes = {
+  modelClass: PropTypes.func.isRequired
 }
 
 const modelClassResolver = {callback: ({queryParams}) => {
@@ -56,7 +45,7 @@ const modelClassResolver = {callback: ({queryParams}) => {
 }}
 
 export default withModel(
-  ApiMakerSuperAdminShowReflectionPage,
+  memo(ApiMakerSuperAdminShowReflectionPage),
   modelClassResolver,
   {
     loadByQueryParam: ({props}) => props.queryParams.model_id

package/src/use-current-user.mjs

@@ -1,4 +1,4 @@
-import {useCallback, useEffect} from "react"
+import {useCallback, useEffect, useState} from "react"
 import Devise from "./devise.mjs"
 
 const useCurrentUser = () => {

package/src/use-model.mjs

@@ -1,7 +1,9 @@
+import * as inflection from "inflection"
 import ModelEvents from "./model-events.mjs"
 import useQueryParams from "on-location-changed/src/use-query-params.js"
+import {useEffect, useState} from "react"
 
-const useModel = (match, modelClassArg, argsArg = {}) => {
+const useModel = (modelClassArg, argsArg = {}) => {
   const queryParams = useQueryParams()
   let args, modelClass
 
@@ -24,7 +26,9 @@ const useModel = (match, modelClassArg, argsArg = {}) => {
       return args.loadByQueryParam({queryParams})
     }
 
-    return match.params[paramsVariableName] || match.params.id
+    if (!args.match) throw new Error("Both 'loadByQueryParam' and 'match' wasn't given")
+
+    return args.match.params[paramsVariableName] || args.match.params.id
   }
 
   const modelId = getModelId()
@@ -53,17 +57,17 @@ const useModel = (match, modelClassArg, argsArg = {}) => {
 
   const loadNewModel = async () => {
     const params = Params.parse()
-    const ModelClass = digg(this, "modelClass")
+    const ModelClass = modelClass
     const paramKey = ModelClass.modelName().paramKey()
     const modelDataFromParams = params[paramKey] || {}
 
     let defaults = {}
 
-    if (this.args.newIfNoId?.defaults) {
-      defaults = await this.args.newIfNoId.defaults()
+    if (args.newIfNoId?.defaults) {
+      defaults = await args.newIfNoId.defaults()
     }
 
-    const modelData = Object.assign(defaults, this.args.newAttributes, modelDataFromParams)
+    const modelData = Object.assign(defaults, args.newAttributes, modelDataFromParams)
     const model = new ModelClass({
       isNewRecord: true,
       data: {a: modelData}