@kaspernj/api-maker 1.0.351 → 1.0.352

package/package.json

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

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

@@ -1,4 +1,4 @@
-import ConfigReader from "./config-reader"
+import ConfigReader from "./config-reader.jsx"
 import {digg} from "diggerize"
 import * as inflection from "inflection"
 import {Pressable, Text, TextInput, View} from "react-native"

package/src/super-admin/has-edit-config.js

@@ -0,0 +1,15 @@
+import ConfigReader from "./config-reader.jsx"
+
+const hasEditConfig = (modelClass) => {
+  const configReader = ConfigReader.forModel(modelClass)
+  const extraContent = configReader.modelConfig?.edit?.extraContentconst
+  const attributes = configReader.modelConfig?.edit?.attributes
+
+  if (attributes || extraContent) {
+    return true
+  }
+
+  return false
+}
+
+export default hasEditConfig

package/src/super-admin/index.jsx

@@ -1,4 +1,5 @@
 import EditPage from "./edit-page"
+import hasEditConfig from "./has-edit-config.js"
 import IndexPage from "./index-page"
 import Layout from "./layout"
 import Link from "../link"
@@ -9,9 +10,11 @@ import ShowPage from "./show-page"
 import ShowReflectionActions from "./show-reflection-actions"
 import ShowReflectionPage from "./show-reflection-page"
 import useCanCan from "../use-can-can"
+import useCurrentUser from "../use-current-user.mjs"
 import useQueryParams from "on-location-changed/src/use-query-params"
 
 const ApiMakerSuperAdmin = () => {
+  const currentUser = useCurrentUser()
   const queryParams = useQueryParams()
   let modelClass, pageToShow
 
@@ -20,13 +23,16 @@ const ApiMakerSuperAdmin = () => {
   const modelId = queryParams.model_id
   const modelName = modelClass?.modelClassData()?.name
   const [model, setModel] = useState()
-  const canCan = useCanCan(() => {
-    const abilities = []
+  const canCan = useCanCan(
+    () => {
+      const abilities = []
 
-    if (modelClass) abilities.push([modelClass, ["new"]])
+      if (modelClass) abilities.push([modelClass, ["new"]])
 
-    return abilities
-  })
+      return abilities
+    },
+    [currentUser?.id(), modelClass]
+  )
 
   const loadModel = useCallback(async () => {
     if (modelId && modelClass) {
@@ -82,7 +88,7 @@ const ApiMakerSuperAdmin = () => {
     () => <>
       {modelClass && pageToShow == "index" &&
         <>
-          {canCan?.can("new", modelClass) &&
+          {canCan?.can("new", modelClass) && hasEditConfig(modelClass) &&
             <Link className="create-new-model-link" to={Params.withParams({model: modelName, mode: "new"})}>
               Create new
             </Link>
@@ -91,7 +97,7 @@ const ApiMakerSuperAdmin = () => {
       }
       {model && pageToShow == "show" &&
         <>
-          {model.can("edit") &&
+          {model.can("edit") && hasEditConfig(modelClass) &&
             <Link className="edit-model-link" to={Params.withParams({model: modelName, model_id: modelId, mode: "edit"})}>
               Edit
             </Link>

package/src/super-admin/model-class-table.jsx

@@ -1,5 +1,6 @@
-import ConfigReader from "./config-reader"
+import ConfigReader from "./config-reader.jsx"
 import {digg} from "diggerize"
+import hasEditConfig from "./has-edit-config.js"
 import * as inflection from "inflection"
 import Params from "../params"
 import PropTypes from "prop-types"
@@ -45,7 +46,7 @@ const ApiMakerSuperAdminModelClassTable = (props) => {
     <Table
       columns={columns}
       currentUser={currentUser}
-      editModelPath={editModelPath}
+      editModelPath={hasEditConfig(modelClass) ? editModelPath : undefined}
       modelClass={modelClass}
       viewModelPath={viewModelPath}
       {...tableProps}

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

@@ -1,6 +1,6 @@
 import AttributeRow from "../../bootstrap/attribute-row"
 import BelongsToAttributeRow from "./belongs-to-attribute-row"
-import ConfigReader from "../config-reader"
+import ConfigReader from "../config-reader.jsx"
 import {digg} from "diggerize"
 import * as inflection from "inflection"
 import PropTypes from "prop-types"

package/src/use-can-can.mjs

@@ -27,6 +27,7 @@ const useCanCan = (abilitiesCallback, dependencies) => {
   }, [])
 
   useEffect(() => {
+    setCanCan(undefined)
     loadAbilities()
   }, dependencies)