@kaspernj/api-maker 1.0.224 → 1.0.227

package/package.json

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

package/src/base-model.mjs

@@ -6,6 +6,7 @@ import CustomError from "./custom-error.mjs"
 import {digg} from "diggerize"
 import FormDataObjectizer from "form-data-objectizer"
 import inflection from "inflection"
+import modelClassRequire from "./model-class-require.mjs"
 import ModelName from "./model-name.mjs"
 import NotLoadedError from "./not-loaded-error.mjs"
 import objectToFormData from "object-to-formdata"
@@ -35,6 +36,26 @@ class ApiMakerAttribute {
   }
 }
 
+class ApiMakerReflection {
+  constructor(reflectionData) {
+    this.reflectionData = reflectionData
+  }
+
+  macro() {
+    return digg(this, "reflectionData", "macro")
+  }
+
+  modelClass() {
+    const modelClass = modelClassRequire(inflection.singularize(inflection.camelize(digg(this, "reflectionData", "name"))))
+
+    return modelClass
+  }
+
+  name() {
+    return inflection.camelize(digg(this, "reflectionData", "name"), true)
+  }
+}
+
 class BaseModel {
   static attributes() {
     const attributes = digg(this.modelClassData(), "attributes")
@@ -65,10 +86,10 @@ class BaseModel {
     }
   }
 
-  static async find (id) {
-    const primaryKeyName = this.modelClassData().primaryKey
+  static async find(id) {
     const query = {}
-    query[`${primaryKeyName}_eq`] = id
+
+    query[`${this.primaryKey()}_eq`] = id
 
     const model = await this.ransack(query).first()
 
@@ -79,7 +100,7 @@ class BaseModel {
     }
   }
 
-  static async findOrCreateBy (findOrCreateByArgs, args = {}) {
+  static async findOrCreateBy(findOrCreateByArgs, args = {}) {
     const result = await Services.current().sendRequest("Models::FindOrCreateBy", {
       additional_data: args.additionalData,
       find_or_create_by_args: findOrCreateByArgs,
@@ -90,7 +111,7 @@ class BaseModel {
     return model
   }
 
-  static modelName () {
+  static modelName() {
     return new ModelName({modelClassData: this.modelClassData()})
   }
 
@@ -98,10 +119,23 @@ class BaseModel {
     return digg(this.modelClassData(), "primaryKey")
   }
 
-  static ransack (query = {}) {
+  static ransack(query = {}) {
     return new Collection({modelClass: this}, {ransack: query})
   }
 
+  static reflections() {
+    const relationships = digg(this.modelClassData(), "relationships")
+    const reflections = []
+
+    for (const relationshipData of relationships) {
+      const reflection = new ApiMakerReflection(relationshipData)
+
+      reflections.push(reflection)
+    }
+
+    return reflections
+  }
+
   constructor (args = {}) {
     this.changes = {}
     this.newRecord = args.isNewRecord
@@ -302,7 +336,7 @@ class BaseModel {
 
     // Load the missing abilities if any
     if (abilitiesToLoad.length > 0) {
-      const primaryKeyName = this.modelClassData().primaryKey
+      const primaryKeyName = this.constructor.primaryKey()
       const ransackParams = {}
       ransackParams[`${primaryKeyName}_eq`] = this.primaryKey()
 
@@ -483,9 +517,8 @@ class BaseModel {
 
   async reload () {
     const params = this.collection && this.collection.params()
-    const primaryKeyName = this.modelClassData().primaryKey
     const ransackParams = {}
-    ransackParams[`${primaryKeyName}_eq`] = this.primaryKey()
+    ransackParams[`${this.constructor.primaryKey()}_eq`] = this.primaryKey()
 
     let query = this.constructor.ransack(ransackParams)
 
@@ -866,7 +899,7 @@ class BaseModel {
   }
 
   primaryKey () {
-    return this.readAttributeUnderscore(digg(this.modelClassData(), "primaryKey"))
+    return this.readAttributeUnderscore(this.constructor.primaryKey())
   }
 
   static _token () {

package/src/collection-loader.jsx

@@ -24,10 +24,7 @@ export default class CollectionLoader extends React.PureComponent {
     abilities: PropTypes.object,
     appHistory: PropTypes.object,
     className: PropTypes.string,
-    collection: PropTypes.oneOfType([
-      instanceOfClassName("ApiMakerCollection"),
-      PropTypes.instanceOf(Collection)
-    ]),
+    collection: PropTypes.instanceOf(Collection),
     component: PropTypes.object,
     defaultParams: PropTypes.object,
     groupBy: PropTypes.array,

package/src/model-load-wrapper.jsx

@@ -22,9 +22,11 @@ export default (WrappedComponent, mdelClassArg, args = {}) => {
     }
 
     resolveModelClass(modelClassArg) {
-      const {queryParams} = digs(this.props, "queryParams")
+      if (typeof modelClassArg == "object") {
+        const {queryParams} = digs(this.props, "queryParams")
 
-      if (typeof modelClassArg == "object") return modelClassArg.callback({queryParams})
+        return modelClassArg.callback({queryParams})
+      }
 
       return modelClassArg
     }
@@ -77,6 +79,7 @@ export default (WrappedComponent, mdelClassArg, args = {}) => {
 
     async loadNewModel() {
       const params = Params.parse()
+      const ModelClass = digg(this, "modelClass")
       const paramKey = ModelClass.modelName().paramKey()
       const modelDataFromParams = params[paramKey] || {}
 

package/src/models.mjs.erb

@@ -10,7 +10,10 @@ const result = loader.load()
 <% model_class_names = [] %>
 <% ApiMaker::ModelClassesJavaScriptGeneratorService.new.resources.each do |resource| %>
   <% model_class_names << resource.short_name %>
-  const <%= resource.short_name %> = digg(result, "<%= resource.short_name %>")
+
+  const <%= resource.short_name %>ModelClass = digg(result, "<%= resource.short_name %>")
+
+  class <%= resource.short_name %> extends <%= resource.short_name %>ModelClass {}
 <% end %>
 
 export {<%= model_class_names.join(", ") %>}

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

@@ -0,0 +1,24 @@
+import {digs} from "diggerize"
+import ModelClassTable from "./model-class-table"
+import PropTypes from "prop-types"
+import React from "react"
+
+export default class ApiMakerSuperAdminIndexPage extends React.PureComponent {
+  static propTypes = {
+    currentUser: PropTypes.object,
+    modelClass: PropTypes.func.isRequired,
+    queryParams: PropTypes.object.isRequired
+  }
+
+  render() {
+    const {currentUser, modelClass, queryParams} = digs(this.props, "currentUser", "modelClass", "queryParams")
+
+    return (
+      <ModelClassTable
+        currentUser={currentUser}
+        modelClass={modelClass}
+        queryParams={queryParams}
+      />
+    )
+  }
+}

package/src/super-admin/index.jsx

@@ -4,11 +4,13 @@ import Layout from "./layout"
 import * as modelsModule from "@kaspernj/api-maker/src/models.mjs.erb"
 import PropTypes from "prop-types"
 import ShowPage from "./show-page"
+import ShowReflectionPage from "./show-reflection-page"
 import withQueryParams from "on-location-changed/src/with-query-params"
 
 class ApiMakerSuperAdmin extends React.PureComponent {
   static propTypes = {
-    currentUser: PropTypes.object
+    currentUser: PropTypes.object,
+    queryParams: PropTypes.object.isRequired
   }
 
   render() {
@@ -31,9 +33,19 @@ class ApiMakerSuperAdmin extends React.PureComponent {
         }
         {pageToShow == "show" &&
           <ShowPage
-            key={`show-page-${digg(modelClass.modelClassData(), "name")}`}
+            key={`show-page-${digg(modelClass.modelClassData(), "name")}-${queryParams.modelId}`}
             modelClass={modelClass}
             modelId={queryParams.modelId}
+            queryParams={queryParams}
+          />
+        }
+        {pageToShow == "show_reflection" &&
+          <ShowReflectionPage
+            currentUser={currentUser}
+            key={`show-reflection-page-${digg(modelClass.modelClassData(), "name")}-${queryParams.modelId}`}
+            modelClass={modelClass}
+            modelId={queryParams.modelId}
+            queryParams={queryParams}
           />
         }
       </Layout>
@@ -43,7 +55,9 @@ class ApiMakerSuperAdmin extends React.PureComponent {
   pageToShow() {
     const {queryParams} = digs(this.props, "queryParams")
 
-    if (queryParams.model && queryParams.model_id) {
+    if (queryParams.model && queryParams.model_id && queryParams.model_reflection) {
+      return "show_reflection"
+    } else if (queryParams.model && queryParams.model_id) {
       return "show"
     } else if (queryParams.model) {
       return "index"

package/src/super-admin/{index-page/index.jsx → model-class-table.jsx}

@@ -1,11 +1,11 @@
-import ConfigReader from "../config-reader"
+import ConfigReader from "./config-reader"
 import {digg, digs} from "diggerize"
-import Params from "../../params"
+import Params from "../params"
 import PropTypes from "prop-types"
 import React from "react"
-import Table from "../../table/table"
+import Table from "../table/table"
 
-export default class ApiMakerSuperAdminIndexPage extends React.PureComponent {
+export default class ApiMakerSuperAdminModelClassTable extends React.PureComponent {
   static propTypes = {
     currentUser: PropTypes.object,
     modelClass: PropTypes.func.isRequired,
@@ -13,7 +13,7 @@ export default class ApiMakerSuperAdminIndexPage extends React.PureComponent {
   }
 
   render() {
-    const {currentUser, modelClass} = digs(this.props, "currentUser", "modelClass")
+    const {currentUser, modelClass, queryParams, ...restProps} = this.props
 
     return (
       <Table
@@ -21,6 +21,7 @@ export default class ApiMakerSuperAdminIndexPage extends React.PureComponent {
         currentUser={currentUser}
         modelClass={modelClass}
         viewModelPath={digg(this, "viewModelPath")}
+        {...restProps}
       />
     )
   }

package/src/super-admin/show-nav.jsx

@@ -0,0 +1,35 @@
+import {digg, digs} from "diggerize"
+import Link from "../link"
+import PropTypes from "prop-types"
+import PropTypesExact from "prop-types-exact"
+import React from "react"
+
+export default class ApiMakerSuperAdminShowNav extends React.PureComponent {
+  static propTypes = PropTypesExact({
+    model: PropTypes.object.isRequired,
+    modelClass: PropTypes.func.isRequired,
+    queryParams: PropTypes.object.isRequired
+  })
+
+  render() {
+    const {model, modelClass, queryParams} = digs(this.props, "model", "modelClass", "queryParams")
+    const reflections = modelClass.reflections()
+
+    return (
+      <div>
+        <div>
+          <Link to={Params.withParams({model: modelClass.modelClassData().name, model_id: queryParams.model_id})}>
+            {I18n.t("js.api_maker.suprt_admin.show_reflection_page.general", {defaultValue: "General"})}
+          </Link>
+        </div>
+        {model && reflections.filter((reflection) => reflection.macro() == "has_many").map((reflection) =>
+          <div key={reflection.name()}>
+            <Link to={Params.withParams({model: digg(modelClass.modelClassData(), "name"), model_id: model.primaryKey(), model_reflection: reflection.name()})}>
+              {modelClass.humanAttributeName(reflection.name())}
+            </Link>
+          </div>
+        )}
+      </div>
+    )
+  }
+}

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

@@ -2,15 +2,26 @@ import AttributeRows from "../bootstrap/attribute-rows"
 import ConfigReader from "./config-reader"
 import {digg, digs} from "diggerize"
 import modelLoadWrapper from "../model-load-wrapper"
+import PropTypes from "prop-types"
 import React from "react"
+import ShowNav from "./show-nav"
 
 class ApiMakerSuperAdminShowPage extends React.PureComponent {
+  static propTypes = {
+    modelClass: PropTypes.func.isRequired,
+    queryParams: PropTypes.object.isRequired
+  }
+
   render() {
+    const {modelClass, queryParams} = digs(this.props, "modelClass", "queryParams")
     const attributes = this.attributes()
     const model = this.model()
 
     return (
       <div className="super-admin--show-page">
+        {model &&
+          <ShowNav model={model} modelClass={modelClass} queryParams={queryParams} />
+        }
         {attributes && model &&
           <AttributeRows attributes={attributes} model={model} />
         }

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

@@ -0,0 +1,64 @@
+import {digg, digs} from "diggerize"
+import modelLoadWrapper from "../model-load-wrapper"
+import PropTypes from "prop-types"
+import React from "react"
+import ModelClassTable from "./model-class-table"
+import ShowNav from "./show-nav"
+
+class ApiMakerSuperAdminShowReflectionPage extends React.PureComponent {
+  static propTypes = {
+    currentUser: PropTypes.object,
+    modelClass: PropTypes.func.isRequired,
+    queryParams: PropTypes.object.isRequired
+  }
+
+  render() {
+    const {currentUser, modelClass, queryParams} = digs(this.props, "currentUser", "modelClass", "queryParams")
+    const model = this.model()
+    const reflections = modelClass.reflections()
+    const reflection = reflections.find((reflectionI) => reflectionI.name() == queryParams.model_reflection)
+    const reflectionModelClass = reflection.modelClass()
+    let collection
+
+    if (model) collection = model[reflection.name()]()
+
+    return (
+      <div className="super-admin--show-page">
+        {model &&
+          <ShowNav model={model} modelClass={modelClass} queryParams={queryParams} />
+        }
+        {collection &&
+          <ModelClassTable
+            collection={collection}
+            currentUser={currentUser}
+            key={reflectionModelClass.modelName().human()}
+            modelClass={reflectionModelClass}
+            queryParams={queryParams}
+          />
+        }
+      </div>
+    )
+  }
+
+  model() {
+    const {modelClass} = digs(this.props, "modelClass")
+    const camelizedLower = digg(modelClass.modelClassData(), "camelizedLower")
+
+    return digg(this, "props", camelizedLower)
+  }
+}
+
+const modelClassResolver = {callback: ({queryParams}) => {
+  const modelClassName = digg(queryParams, "model")
+  const modelClass = digg(require("../models.mjs.erb"), modelClassName)
+
+  return modelClass
+}}
+
+export default modelLoadWrapper(
+  ApiMakerSuperAdminShowReflectionPage,
+  modelClassResolver,
+  {
+    loadByQueryParam: ({props}) => props.queryParams.model_id
+  }
+)

package/src/table/table.jsx

@@ -39,10 +39,7 @@ class ApiMakerTable extends React.PureComponent {
     appHistory: PropTypes.object,
     card: PropTypes.bool.isRequired,
     className: PropTypes.string,
-    collection: PropTypes.oneOfType([
-      instanceOfClassName("ApiMakerCollection"),
-      PropTypes.instanceOf(Collection)
-    ]),
+    collection: PropTypes.instanceOf(Collection),
     columns: PropTypes.oneOfType([PropTypes.array, PropTypes.func]),
     columnsContent: PropTypes.func,
     controls: PropTypes.func,
@@ -134,7 +131,7 @@ class ApiMakerTable extends React.PureComponent {
 
   render () {
     const {modelClass, noRecordsAvailableContent, noRecordsFoundContent} = digs(this.props, "modelClass", "noRecordsAvailableContent", "noRecordsFoundContent")
-    const {collection, defaultParams, select, selectColumns} = this.props
+    const {collection, defaultParams, selectColumns} = this.props
     const {
       overallCount,
       preload,