@kaspernj/api-maker 1.0.317 → 1.0.318

package/package.json

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

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

@@ -8,7 +8,7 @@ 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}`)
   }
@@ -42,9 +42,9 @@ const EditAttributeInput = ({attributeName, id, inputs, label, model, name}) =>
       </View>
     </View>
   )
-}
+})
 
-const EditAttributeContent = ({attribute, id, inputs, model, name}) => {
+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}`)
   }
@@ -70,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")
 
@@ -81,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)}
@@ -90,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}
@@ -101,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}
@@ -110,7 +110,7 @@ const EditAttribute = ({attribute, inputs, model, modelClass}) => {
       }
     </>
   )
-}
+})
 
 const EditPage = ({modelClass}) => {
   const availableLocales = Locales.availableLocales()
@@ -128,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

@@ -8,6 +8,7 @@ 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 = () => {
@@ -19,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) {
@@ -73,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" &&
         <>
@@ -95,7 +101,7 @@ const ApiMakerSuperAdmin = () => {
         <ShowReflectionActions model={model} modelClass={modelClass} reflectionName={queryParams.model_reflection} />
       }
     </>,
-    [model, modelClass, pageToShow]
+    [canCan, model, modelClass, pageToShow]
   )
 
   return (

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

@@ -6,6 +6,7 @@ const SuperAdminShowReflectionActions = ({model, modelClass, 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()
 
@@ -17,9 +18,13 @@ const SuperAdminShowReflectionActions = ({model, modelClass, reflectionName}) =>
   linkParams[dataParamName] = modelData
 
   return (
-    <Link className="create-new-model-link" to={Params.withParams(linkParams)}>
-      Create new
-    </Link>
+    <>
+      {canCan?.can("new", reflection.modelClass()) &&
+        <Link className="create-new-model-link" to={Params.withParams(linkParams)}>
+          Create new
+        </Link>
+      }
+    </>
   )
 }