@kaspernj/api-maker 1.0.221 → 1.0.222

package/package.json

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

package/src/base-model.mjs

@@ -94,6 +94,10 @@ class BaseModel {
     return new ModelName({modelClassData: this.modelClassData()})
   }
 
+  static primaryKey() {
+    return digg(this.modelClassData(), "primaryKey")
+  }
+
   static ransack (query = {}) {
     return new Collection({modelClass: this}, {ransack: query})
   }

package/src/super-admin/config-reader.jsx

@@ -0,0 +1,53 @@
+import {digg, digs} from "diggerize"
+import inflection from "inflection"
+
+export default class ApiMakerSuperAdminConfigReader {
+  static forModel(modelClass) {
+    const modelNameCamelized = digg(modelClass.modelClassData(), "nameDasherized")
+    let modelConfig
+
+    try {
+      modelConfig = require(`super-admin/model-configs/${modelNameCamelized}`).default
+    } catch (error) {
+      console.log(`No model-config for ${modelClass.modelClassData().name}`)
+    }
+
+    return new ApiMakerSuperAdminConfigReader(modelClass, modelConfig)
+  }
+
+  constructor(modelClass, modelConfig) {
+    this.modelClass = modelClass
+    this.modelConfig = modelConfig
+  }
+
+  tableColumns() {
+    const {modelConfig} = digs(this, "modelConfig")
+
+    if (modelConfig?.table?.columns) {
+      return modelConfig.table.columns()
+    }
+
+    return this.defaultTableColumns()
+  }
+
+  defaultTableColumns() {
+    const {modelClass} = digs(this, "modelClass")
+    const attributes = modelClass.attributes()
+    const columns = []
+
+    for (const attribute of attributes) {
+      if (!attribute.isSelectedByDefault()) continue
+
+      const camelizedName = inflection.camelize(attribute.name(), true)
+      const column = {
+        attribute: camelizedName
+      }
+
+      if (attribute.isColumn()) column.sortKey = camelizedName
+
+      columns.push(column)
+    }
+
+    return columns
+  }
+}

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

@@ -1,5 +1,5 @@
+import ConfigReader from "../config-reader"
 import {digg, digs} from "diggerize"
-import inflection from "inflection"
 import Params from "../../params"
 import PropTypes from "prop-types"
 import React from "react"
@@ -27,23 +27,9 @@ export default class ApiMakerSuperAdminIndexPage extends React.PureComponent {
 
   columns = () => {
     const {modelClass} = digs(this.props, "modelClass")
-    const attributes = modelClass.attributes()
-    const columns = []
+    const configReader = ConfigReader.forModel(modelClass)
 
-    for (const attribute of attributes) {
-      if (!attribute.isSelectedByDefault()) continue
-
-      const camelizedName = inflection.camelize(attribute.name(), true)
-      const column = {
-        attribute: camelizedName
-      }
-
-      if (attribute.isColumn()) column.sortKey = camelizedName
-
-      columns.push(column)
-    }
-
-    return columns
+    return configReader.tableColumns()
   }
 
   viewModelPath = (args) => {

package/src/super-admin/index.jsx

@@ -20,7 +20,7 @@ class ApiMakerSuperAdmin extends React.PureComponent {
     if (queryParams.model) modelClass = modelsModule[queryParams.model]
 
     return (
-      <Layout>
+      <Layout headerTitle={modelClass?.modelName()?.human({count: 2})}>
         {pageToShow == "index" &&
           <IndexPage
             currentUser={currentUser}

package/src/super-admin/layout/index.jsx

@@ -81,14 +81,14 @@ class ApiMakerSuperAdminLayout extends React.PureComponent {
               {currentUser &&
                 <>
                   <div className="mb-4">
-                    {I18n.t("js.api_maker.super_admin.layout.try_signing_out_and_in_with_a_different_user")}
+                    {I18n.t("js.api_maker.super_admin.layout.try_signing_out_and_in_with_a_different_user", {defaultValue: "Try signing in with a different user."})}
                   </div>
                 </>
               }
               {!currentUser &&
                 <>
                   <div className="mb-4">
-                    {I18n.t("js.api_maker.super_admin.layout.try_signing_in")}
+                    {I18n.t("js.api_maker.super_admin.layout.try_signing_in", {defaultValue: "Try signing in."})}
                   </div>
                 </>
               }

package/src/super-admin/layout/menu/menu-content.jsx

@@ -1,18 +1,10 @@
 import CanCanLoader from "@kaspernj/api-maker/src/can-can-loader"
 import {digg, digs} from "diggerize"
 import MenuItem from "./menu-item"
+import models from "../../models"
 import Params from "../../../params"
 import PropTypes from "prop-types"
 import PropTypesExact from "prop-types-exact"
-import * as modelsModule from "@kaspernj/api-maker/src/models.mjs.erb"
-
-const models = []
-
-for (const modelKey of Object.keys(modelsModule)) {
-  const model = modelsModule[modelKey]
-
-  models.push(model)
-}
 
 const abilities = []
 

package/src/super-admin/layout/no-access.jsx

@@ -7,7 +7,7 @@ class ComponentsAdminLayoutNoAccess extends React.PureComponent {
         className="components--admin--layout-no-access"
         data-user-roles={currentUser?.userRoles()?.loaded()?.map((userRole) => userRole.role()?.identifier()).join(", ")}
       >
-        {I18n.t("js.api_maker.super_admin.layout.no_access.you_dont_have_no_access_to_this_page")}
+        {I18n.t("js.api_maker.super_admin.layout.no_access.you_dont_have_no_access_to_this_page", {defaultValue: "You don't have access to this page."})}
       </div>
     )
   }

package/src/super-admin/models.js

@@ -0,0 +1,11 @@
+import * as modelsModule from "@kaspernj/api-maker/src/models.mjs.erb"
+
+const models = []
+
+for (const modelKey of Object.keys(modelsModule)) {
+  const model = modelsModule[modelKey]
+
+  models.push(model)
+}
+
+export default models

package/src/table/select-calculator.mjs

@@ -12,6 +12,16 @@ class SelectCalculator {
     const select = this.table.props.select || {}
     const {preparedColumns} = digs(this.table.shape, "preparedColumns")
 
+
+    // Ensure the primary key column is loader for the primary model class
+    const className = digg(modelClass.modelClassData(), "className")
+    const primaryKeyColumnName = modelClass.primaryKey()
+
+    if (!(className in select)) select[className] = []
+    if (!select[className].includes(primaryKeyColumnName)) select[className].push(primaryKeyColumnName)
+
+
+    // Ensure columns used for columns are loaded
     for (const preparedColumn of preparedColumns) {
       const {column} = digs(preparedColumn, "column")