@kaspernj/api-maker 1.0.316 → 1.0.318

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.316",
+  "version": "1.0.318",
   "type": "module",
   "description": "",
   "main": "index.js",

package/src/base-model/reflection.mjs

@@ -7,21 +7,8 @@ export default class ApiMakerBaseModelReflection {
     this.reflectionData = reflectionData
   }
 
-  foreignKey() {
-    return digg(this, "reflectionData", "foreignKey")
-  }
-
-  macro() {
-    return digg(this, "reflectionData", "macro")
-  }
-
-  modelClass() {
-    const modelClass = modelClassRequire(inflection.singularize(inflection.camelize(digg(this, "reflectionData", "resource_name"))))
-
-    return modelClass
-  }
-
-  name() {
-    return inflection.camelize(digg(this, "reflectionData", "name"), true)
-  }
+  foreignKey = () => digg(this, "reflectionData", "foreignKey")
+  macro = () => digg(this, "reflectionData", "macro")
+  modelClass = () => modelClassRequire(inflection.singularize(inflection.camelize(digg(this, "reflectionData", "resource_name"))))
+  name = () => inflection.camelize(digg(this, "reflectionData", "name"), true)
 }

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

@@ -8,7 +8,11 @@ import useCurrentUser from "../use-current-user"
 import useModel from "../use-model"
 import useQueryParams from "on-location-changed/src/use-query-params"
 
-const EditAttributeInput = ({attributeName, id, inputs, label, model, name}) => {
+const EditAttributeInput = memo(({attributeName, id, inputs, label, model, name}) => {
+  if (!(attributeName in model)) {
+    throw new Error(`${attributeName} isn't set on the resource ${model.modelClassData().name}`)
+  }
+
   const defaultValue = useCallback(() => model[attributeName]() || "")
   const [value, setValue] = useState(() => defaultValue())
 
@@ -38,9 +42,13 @@ const EditAttributeInput = ({attributeName, id, inputs, label, model, name}) =>
       </View>
     </View>
   )
-}
+})
+
+const EditAttributeContent = memo(({attribute, id, inputs, model, name}) => {
+  if (!(attribute.attribute in model)) {
+    throw new Error(`${attribute.attribute} isn't set on the resource ${model.modelClassData().name}`)
+  }
 
-const EditAttributeContent = ({attribute, id, inputs, model, name}) => {
   const defaultValue = useCallback(() => model[attribute.attribute]() || "")
   const [value, setValue] = useState(() => defaultValue())
   const onChangeValue = useCallback((newValue) => {
@@ -62,9 +70,9 @@ const EditAttributeContent = ({attribute, id, inputs, model, name}) => {
   })
 
   return attribute.content(contentArgs())
-}
+})
 
-const EditAttribute = ({attribute, inputs, model, modelClass}) => {
+const EditAttribute = memo(({attribute, inputs, model, modelClass}) => {
   const availableLocales = Locales.availableLocales()
   const camelizedLower = digg(modelClass.modelClassData(), "camelizedLower")
 
@@ -73,7 +81,7 @@ const EditAttribute = ({attribute, inputs, model, modelClass}) => {
       {attribute.content &&
         <EditAttributeContent
           attribute={attribute}
-          id={`${camelizedLower}_${inflection.underscore(attribute.attribute)}`}
+          id={`${inflection.underscore(camelizedLower)}_${inflection.underscore(attribute.attribute)}`}
           inputs={inputs}
           model={model}
           name={inflection.underscore(attribute.attribute)}
@@ -82,7 +90,7 @@ const EditAttribute = ({attribute, inputs, model, modelClass}) => {
       {!attribute.content && attribute.translated && availableLocales.map((locale) =>
         <EditAttributeInput
           attributeName={`${attribute.attribute}${inflection.camelize(locale)}`}
-          id={`${camelizedLower}_${inflection.underscore(attribute.attribute)}_${locale}`}
+          id={`${inflection.underscore(camelizedLower)}_${inflection.underscore(attribute.attribute)}_${locale}`}
           inputs={inputs}
           label={`${modelClass.humanAttributeName(attribute.attribute)} (${locale})`}
           model={model}
@@ -93,7 +101,7 @@ const EditAttribute = ({attribute, inputs, model, modelClass}) => {
       {!attribute.content && !attribute.translated &&
         <EditAttributeInput
           attributeName={attribute.attribute}
-          id={`${camelizedLower}_${inflection.underscore(attribute.attribute)}`}
+          id={`${inflection.underscore(camelizedLower)}_${inflection.underscore(attribute.attribute)}`}
           inputs={inputs}
           label={modelClass.humanAttributeName(attribute.attribute)}
           model={model}
@@ -102,7 +110,7 @@ const EditAttribute = ({attribute, inputs, model, modelClass}) => {
       }
     </>
   )
-}
+})
 
 const EditPage = ({modelClass}) => {
   const availableLocales = Locales.availableLocales()
@@ -120,6 +128,10 @@ const EditPage = ({modelClass}) => {
 
   selectedAttributes[modelClassName] = selectedModelAttributes
 
+  if (!attributes) {
+    throw new Error(`No 'attributes' given from edit config for ${modelClass.modelClassData().name}`)
+  }
+
   for (const attribute of attributes) {
     if (attribute.translated) {
       for (const locale of availableLocales) {

package/src/super-admin/index.jsx

@@ -6,7 +6,9 @@ import {memo, useMemo} from "react"
 import * as modelsModule from "@kaspernj/api-maker/src/models.mjs.erb"
 import {useCallback, useEffect, useState} from "react"
 import ShowPage from "./show-page"
+import ShowReflectionActions from "./show-reflection-actions"
 import ShowReflectionPage from "./show-reflection-page"
+import useCanCan from "../use-can-can"
 import useQueryParams from "on-location-changed/src/use-query-params"
 
 const ApiMakerSuperAdmin = () => {
@@ -18,6 +20,7 @@ const ApiMakerSuperAdmin = () => {
   const modelId = queryParams.model_id
   const modelName = modelClass?.modelClassData()?.name
   const [model, setModel] = useState()
+  const canCan = useCanCan(() => [[modelClass, ["new"]]])
 
   const loadModel = useCallback(async () => {
     if (modelId && modelClass) {
@@ -72,9 +75,13 @@ const ApiMakerSuperAdmin = () => {
   const actions = useMemo(
     () => <>
       {modelClass && pageToShow == "index" &&
-        <Link className="create-new-model-link" to={Params.withParams({model: modelName, mode: "new"})}>
-          Create new
-        </Link>
+        <>
+          {canCan?.can("new", modelClass) &&
+            <Link className="create-new-model-link" to={Params.withParams({model: modelName, mode: "new"})}>
+              Create new
+            </Link>
+          }
+        </>
       }
       {model && pageToShow == "show" &&
         <>
@@ -90,8 +97,11 @@ const ApiMakerSuperAdmin = () => {
           }
         </>
       }
+      {pageToShow == "show_reflection" &&
+        <ShowReflectionActions model={model} modelClass={modelClass} reflectionName={queryParams.model_reflection} />
+      }
     </>,
-    [model, pageToShow]
+    [canCan, model, modelClass, pageToShow]
   )
 
   return (

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

@@ -0,0 +1,31 @@
+import {digg} from "diggerize"
+import {memo} from "react"
+
+const SuperAdminShowReflectionActions = ({model, modelClass, reflectionName}) => {
+  const reflection = modelClass.reflections().find((reflection) => reflection.name() == reflectionName)
+  const modelClassName = digg(reflection, "reflectionData", "className")
+  const modelData = {}
+  const dataParamName = inflection.singularize(reflection.reflectionData.collectionName)
+  const canCan = useCanCan(() => [[reflection.modelClass(), ["new"]]])
+
+  modelData[reflection.foreignKey()] = model?.id()
+
+  const linkParams = {
+    model: modelClassName,
+    mode: "new"
+  }
+
+  linkParams[dataParamName] = modelData
+
+  return (
+    <>
+      {canCan?.can("new", reflection.modelClass()) &&
+        <Link className="create-new-model-link" to={Params.withParams(linkParams)}>
+          Create new
+        </Link>
+      }
+    </>
+  )
+}
+
+export default memo(SuperAdminShowReflectionActions)

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

@@ -9,7 +9,8 @@ import withModel from "../with-model"
 const ApiMakerSuperAdminShowReflectionPage = ({modelClass, restProps}) => {
   const queryParams = useQueryParams()
   const camelizedLower = digg(modelClass.modelClassData(), "camelizedLower")
-  const model = digg(restProps, camelizedLower)
+  const useModelResult = useModel(modelClass, {loadByQueryParam: ({queryParams}) => digg(queryParams, "model_id")})
+  const model = digg(useModelResult, camelizedLower)
   const reflections = modelClass.reflections()
   const reflection = reflections.find((reflectionI) => reflectionI.name() == queryParams.model_reflection)
   const reflectionModelClass = reflection.modelClass()
@@ -37,17 +38,4 @@ ApiMakerSuperAdminShowReflectionPage.propTypes = {
   modelClass: PropTypes.func.isRequired
 }
 
-const modelClassResolver = {callback: ({queryParams}) => {
-  const modelClassName = digg(queryParams, "model")
-  const modelClass = digg(require("../models.mjs.erb"), modelClassName)
-
-  return modelClass
-}}
-
-export default withModel(
-  memo(ApiMakerSuperAdminShowReflectionPage),
-  modelClassResolver,
-  {
-    loadByQueryParam: ({props}) => props.queryParams.model_id
-  }
-)
+export default memo(ApiMakerSuperAdminShowReflectionPage)