@kaspernj/api-maker 1.0.427 → 1.0.429

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaspernj/api-maker",
-  "version": "1.0.427",
+  "version": "1.0.429",
   "type": "module",
   "description": "",
   "main": "index.js",

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

@@ -83,7 +83,15 @@ export default memo(shapeComponent(class ApiMakerSuperAdminShowPage extends Base
         if (nameAttribute && !select[reflectionModelClassName].includes("name")) select[reflectionModelClassName].push("name")
 
         // The foreign key is needed to look up any belongs-to-relationships
-        if (!modelClassSelect.includes(reflection.foreignKey())) modelClassSelect.push(reflection.foreignKey())
+        if (!modelClassSelect.includes(reflection.foreignKey())) {
+          const foreignKeyAttribute = reflectionModelClassAttributes.find((attribute) => attribute.name() == reflection.foreignKey())
+
+          if (!foreignKeyAttribute) {
+            throw new Error(`${reflection.foreignKey()} wasn't defined as an attribute on ${modelClassName}`)
+          }
+
+          modelClassSelect.push(reflection.foreignKey())
+        }
       } else if (reflection.macro() == "has_one") {
         const reflectionModelClass = reflection.modelClass()
         const reflectionModelClassName = reflectionModelClass.modelClassData().name

package/src/table/filters/save-search-modal.jsx

@@ -4,10 +4,13 @@ import Checkbox from "../../bootstrap/checkbox"
 import {digg} from "diggerize"
 import {Form} from "../../form"
 import Input from "../../bootstrap/input"
+import modelClassRequire from "../../model-class-require.mjs"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
 import {memo} from "react"
 import useI18n from "i18n-on-steroids/src/use-i18n.mjs"
 
+const TableSearch = modelClassRequire("TableSearch")
+
 export default memo(shapeComponent(class ApiMakerTableFiltersSaveSearchModal extends BaseComponent {
   setup() {
     const {t} = useI18n({namespace: "js.api_maker.table.filters.save_search_modal"})
@@ -46,16 +49,21 @@ export default memo(shapeComponent(class ApiMakerTableFiltersSaveSearchModal ext
   onSaveSearchSubmit = async () => {
     const formData = this.s.form.asObject()
     const {currentFilters, currentUser, onRequestClose, search} = this.p
+    const hasUserTypeColumn = Boolean(TableSearch.attributes().find((attribute) => attribute.name() == "user_type"))
 
     if (search.isNewRecord()) {
       formData.table_search.query_params = JSON.stringify(currentFilters())
     }
 
-    formData.table_search.user_type = digg(currentUser.modelClassData(), "className")
+    if (hasUserTypeColumn) {
+      formData.table_search.user_type = digg(currentUser.modelClassData(), "className")
+    }
+
     formData.table_search.user_id = currentUser.id()
 
     try {
       await search.saveRaw(formData)
+      FlashMessage.success(this.t(".", {defaultValue: "The search was saved."}))
       onRequestClose()
     } catch (error) {
       FlashMessage.errorResponse(error)