@kaspernj/api-maker 1.0.305 → 1.0.307

package/package.json

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

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

@@ -19,7 +19,7 @@ const EditPage = ({modelClass}) => {
   const modelVarName = inflection.camelize(modelClass.modelClassData().name, true)
   const extraContent = configReader.modelConfig?.edit?.extraContentconst
   const attributes = configReader.modelConfig?.edit?.attributes
-  const selectedModelAttributes = []
+  const selectedModelAttributes = ["id"]
   const selectedAttributes = {}
 
   selectedAttributes[modelClassName] = selectedModelAttributes
@@ -37,7 +37,8 @@ const EditPage = ({modelClass}) => {
   const useModelResult = useModel(modelClass, {
     cacheArgs: [currentUser?.id()],
     loadByQueryParam: (props) => props.queryParams.model_id,
-    newIfNoId: true
+    newIfNoId: true,
+    select: selectedAttributes
   })
 
   const model = digg(useModelResult, modelVarName)
@@ -68,7 +69,7 @@ const EditPage = ({modelClass}) => {
             {attribute.translated && availableLocales.map((locale) =>
               <div key={locale}>
                 <Input
-                  attribute={attribute.attribute}
+                  attribute={`${attribute.attribute}${inflection.camelize(locale)}`}
                   id={`${camelizedLower}_${inflection.underscore(attribute.attribute)}_${locale}`}
                   label={`${modelClass.humanAttributeName(attribute.attribute)} (${locale})`}
                   model={model}

package/src/super-admin/index.jsx

@@ -1,10 +1,10 @@
-import {digg} from "diggerize"
 import EditPage from "./edit-page"
 import IndexPage from "./index-page"
 import Layout from "./layout"
 import Link from "../link"
 import {memo, useMemo} from "react"
 import * as modelsModule from "@kaspernj/api-maker/src/models.mjs.erb"
+import {useCallback} from "react"
 import ShowPage from "./show-page"
 import ShowReflectionPage from "./show-reflection-page"
 import useQueryParams from "on-location-changed/src/use-query-params"
@@ -15,8 +15,13 @@ const ApiMakerSuperAdmin = () => {
 
   if (queryParams.model) modelClass = modelsModule[queryParams.model]
 
+  const modelId = queryParams.model_id
+  const modelName = modelClass?.modelClassData()?.name
+
   if (queryParams.model && queryParams.model_id && queryParams.model_reflection) {
     pageToShow = "show_reflection"
+  } else if (queryParams.model && queryParams.model_id && queryParams.mode == "edit") {
+    pageToShow = "edit"
   } else if (queryParams.model && queryParams.model_id) {
     pageToShow = "show"
   } else if (queryParams.model && queryParams.mode == "new") {
@@ -27,13 +32,39 @@ const ApiMakerSuperAdmin = () => {
     pageToShow = "welcome"
   }
 
+  const onDestroyClicked = useCallback(async (e) => {
+    e.preventDefault()
+
+    if (!confirm("Are you sure?")) {
+      return
+    }
+
+    try {
+      const model = await modelClass.find(modelId)
+
+      await model.destroy()
+    } catch (error) {
+      FlashMessage.errorResponse(error)
+    }
+  }, [modelName, modelId])
+
   const actions = useMemo(
     () => <>
       {modelClass && pageToShow == "index" &&
-        <Link className="create-new-model-link" to={Params.withParams({model: modelClass.modelClassData().name, mode: "new"})}>
+        <Link className="create-new-model-link" to={Params.withParams({model: modelName, mode: "new"})}>
           Create new
         </Link>
       }
+      {modelClass && pageToShow == "show" &&
+        <>
+          <Link to={Params.withParams({model: modelName, model_id: modelId, mode: "edit"})}>
+            Edit
+          </Link>
+          <a href="#" onClick={onDestroyClicked}>
+            Delete
+          </a>
+        </>
+      }
     </>,
     [modelClass, pageToShow]
   )
@@ -42,27 +73,27 @@ const ApiMakerSuperAdmin = () => {
     <Layout actions={actions} active={queryParams.model} headerTitle={modelClass?.modelName()?.human({count: 2})}>
       {pageToShow == "index" &&
         <IndexPage
-          key={`index-page-${digg(modelClass.modelClassData(), "name")}`}
+          key={`index-page-${modelName}`}
           modelClass={modelClass}
         />
       }
       {pageToShow == "show" &&
         <ShowPage
-          key={`show-page-${digg(modelClass.modelClassData(), "name")}-${queryParams.modelId}`}
+          key={`show-page-${modelName}-${modelId}`}
           modelClass={modelClass}
-          modelId={queryParams.modelId}
+          modelId={modelId}
         />
       }
       {pageToShow == "show_reflection" &&
         <ShowReflectionPage
-          key={`show-reflection-page-${digg(modelClass.modelClassData(), "name")}-${queryParams.modelId}`}
+          key={`show-reflection-page-${modelName}-${modelId}`}
           modelClass={modelClass}
-          modelId={queryParams.modelId}
+          modelId={modelId}
         />
       }
       {pageToShow == "edit" &&
         <EditPage
-          key={`edit-page-${digg(modelClass.modelClassData(), "name")}-${queryParams.modelId}`}
+          key={`edit-page-${modelName}-${modelId}`}
           modelClass={modelClass}
         />
       }

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

@@ -16,6 +16,17 @@ const ApiMakerSuperAdminModelClassTable = ({modelClass, ...restProps}) => {
     return configReader.tableColumns()
   }, [modelClass])
 
+  const editModelPath = useCallback((args) => {
+    const argName = inflection.camelize(digg(modelClass.modelClassData(), "name"), true)
+    const model = digg(args, argName)
+
+    return Params.withParams({
+      model: modelClass.modelClassData().name,
+      model_id: model.primaryKey(),
+      mode: "edit"
+    })
+  })
+
   const viewModelPath = useCallback((args) => {
     const argName = inflection.camelize(digg(modelClass.modelClassData(), "name"), true)
     const model = digg(args, argName)
@@ -30,6 +41,7 @@ const ApiMakerSuperAdminModelClassTable = ({modelClass, ...restProps}) => {
     <Table
       columns={columns}
       currentUser={currentUser}
+      editModelPath={editModelPath}
       modelClass={modelClass}
       viewModelPath={viewModelPath}
       {...restProps}

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

@@ -3,6 +3,7 @@ import BelongsToAttributeRow from "./belongs-to-attribute-row"
 import ConfigReader from "../config-reader"
 import {digg} from "diggerize"
 import * as inflection from "inflection"
+import Link from "../../link"
 import PropTypes from "prop-types"
 import {memo} from "react"
 import ShowNav from "../show-nav"