@kaspernj/api-maker 1.0.349 → 1.0.350

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.349",
+  "version": "1.0.350",
   "type": "module",
   "description": "",
   "main": "index.js",
@@ -70,7 +70,7 @@
     "babel-jest": "^29.0.1",
     "eslint": "^8.2.0",
     "eslint-find-rules": "^4.0.0",
-    "eslint-plugin-jest": "^28.2.0",
+    "eslint-plugin-jest": "^27.0.1",
     "eslint-plugin-react": "^7.23.2",
     "i18n-on-steroids": "^1.0.7",
     "jest": "^29.0.1",

package/src/api.mjs

@@ -1,13 +1,7 @@
 import config from "./config.mjs"
 import CustomError from "./custom-error.mjs"
 import FormDataObjectizer from "form-data-objectizer"
-import Logger from "./logger.mjs"
 import qs from "qs"
-import SessionStatusUpdater from "./session-status-updater.mjs"
-
-const logger = new Logger({name: "ApiMaker / Api"})
-
-// logger.setDebug(true)
 
 export default class Api {
   static get(path, pathParams = null) {
@@ -68,14 +62,12 @@ export default class Api {
     })
   }
 
-  static async requestLocal(args) {
+  static requestLocal(args) {
     if (!args.headers) {
       args.headers = {}
     }
 
-    const token = await this._token()
-
-    logger.debug(() => `Got token: ${token}`)
+    const token = this._token()
 
     if (token) {
       args.headers["X-CSRF-Token"] = token
@@ -90,14 +82,19 @@ export default class Api {
       args.data = args.rawData
     }
 
-    return await this.request(args)
+    return this.request(args)
   }
 
   static put(path, data = {}) {
     return this.requestLocal({path, data, method: "PUT"})
   }
 
-  static _token = async () => await SessionStatusUpdater.current().getCsrfToken()
+  static _token() {
+    const tokenElement = document.querySelector("meta[name='csrf-token']")
+
+    if (tokenElement)
+      return tokenElement.getAttribute("content")
+  }
 
   static _parseResponse(xhr) {
     const responseType = xhr.getResponseHeader("content-type")

package/src/base-model.mjs

@@ -107,6 +107,10 @@ export default class BaseModel {
     return new Collection({modelClass: this}, {ransack: query})
   }
 
+  static select(select) {
+    return this.ransack().select(select)
+  }
+
   static ransackableAssociations() {
     const relationships = digg(this.modelClassData(), "ransackable_associations")
     const reflections = []

package/src/commands-pool.mjs

@@ -14,7 +14,7 @@ import {ValidationErrors} from "./validation-errors.mjs"
 const shared = {}
 
 export default class ApiMakerCommandsPool {
-  static addCommand(data, args = {}) {
+  static addCommand (data, args = {}) {
     let pool
 
     if (args.instant) {
@@ -34,17 +34,17 @@ export default class ApiMakerCommandsPool {
     return promiseResult
   }
 
-  static current() {
+  static current () {
     if (!shared.currentApiMakerCommandsPool) shared.currentApiMakerCommandsPool = new ApiMakerCommandsPool()
 
     return shared.currentApiMakerCommandsPool
   }
 
-  static flush() {
+  static flush () {
     ApiMakerCommandsPool.current().flush()
   }
 
-  constructor() {
+  constructor () {
     this.flushCount = 0
     this.pool = {}
     this.poolData = {}
@@ -52,7 +52,7 @@ export default class ApiMakerCommandsPool {
     this.globalRequestData = {}
   }
 
-  addCommand(data) {
+  addCommand (data) {
     return new Promise((resolve, reject) => {
       const id = this.currentId
       this.currentId += 1
@@ -87,11 +87,11 @@ export default class ApiMakerCommandsPool {
     })
   }
 
-  commandsCount() {
+  commandsCount () {
     return Object.keys(this.pool)
   }
 
-  async sendRequest({commandSubmitData, url}) {
+  async sendRequest ({commandSubmitData, url}) {
     let response
 
     for (let i = 0; i < 3; i++) {
@@ -113,7 +113,7 @@ export default class ApiMakerCommandsPool {
     throw new Error("Couldnt successfully execute request")
   }
 
-  async flush() {
+  async flush () {
     if (this.commandsCount() == 0) {
       return
     }
@@ -166,7 +166,7 @@ export default class ApiMakerCommandsPool {
     }
   }
 
-  handleFailedResponse(commandData, commandResponseData) {
+  handleFailedResponse (commandData, commandResponseData) {
     let error
 
     if (commandResponseData.error_type == "destroy_error") {
@@ -190,13 +190,13 @@ export default class ApiMakerCommandsPool {
     commandData.reject(error)
   }
 
-  clearTimeout() {
+  clearTimeout () {
     if (this.flushTimeout) {
       clearTimeout(this.flushTimeout)
     }
   }
 
-  isActive() {
+  isActive () {
     if (this.commandsCount() > 0) {
       return true
     }
@@ -208,7 +208,7 @@ export default class ApiMakerCommandsPool {
     return false
   }
 
-  setFlushTimeout() {
+  setFlushTimeout () {
     this.clearTimeout()
     this.flushTimeout = setTimeout(() => this.flush(), 0)
   }

package/src/devise.mjs

@@ -9,11 +9,11 @@ import Services from "./services.mjs"
 const shared = {}
 
 export default class ApiMakerDevise {
-  static callSignOutEvent(args) {
+  static callSignOutEvent (args) {
     events.emit("onDeviseSignOut", {args})
   }
 
-  static current() {
+  static current () {
     if (!shared.currentApiMakerDevise) {
       shared.currentApiMakerDevise = new ApiMakerDevise()
     }
@@ -21,11 +21,11 @@ export default class ApiMakerDevise {
     return shared.currentApiMakerDevise
   }
 
-  static events() {
+  static events () {
     return events
   }
 
-  static addUserScope(scope) {
+  static addUserScope (scope) {
     const currentMethodName = `current${inflection.camelize(scope)}`
 
     ApiMakerDevise[currentMethodName] = () => ApiMakerDevise.current().getCurrentScope(scope)
@@ -35,7 +35,7 @@ export default class ApiMakerDevise {
     ApiMakerDevise[isSignedInMethodName] = () => Boolean(ApiMakerDevise.current().getCurrentScope(scope))
   }
 
-  static async signIn(username, password, args = {}) {
+  static async signIn (username, password, args = {}) {
     if (!args.scope) args.scope = "user"
 
     const postData = {username, password, args}
@@ -53,7 +53,7 @@ export default class ApiMakerDevise {
     return {model, response}
   }
 
-  static updateSession(model, args = {}) {
+  static updateSession (model, args = {}) {
     if (!args.scope) {
       args.scope = digg(model.modelClassData(), "name")
     }
@@ -63,17 +63,11 @@ export default class ApiMakerDevise {
     ApiMakerDevise.current().currents[camelizedScopeName] = model
   }
 
-  hasCurrentScope(scope) {
-    const camelizedScopeName = inflection.camelize(scope, true)
-
-    return camelizedScopeName in ApiMakerDevise.current().currents
-  }
-
-  static setSignedOut(args) {
+  static setSignedOut (args) {
     ApiMakerDevise.current().currents[inflection.camelize(args.scope, true)] = null
   }
 
-  static async signOut(args = {}) {
+  static async signOut (args = {}) {
     if (!args.scope) {
       args.scope = "user"
     }
@@ -93,11 +87,11 @@ export default class ApiMakerDevise {
     return response
   }
 
-  constructor() {
+  constructor () {
     this.currents = {}
   }
 
-  getCurrentScope(scope) {
+  getCurrentScope (scope) {
     if (!(scope in this.currents)) {
       this.currents[scope] = this.loadCurrentScope(scope)
     }
@@ -105,7 +99,7 @@ export default class ApiMakerDevise {
     return this.currents[scope]
   }
 
-  hasGlobalCurrentScope(scope) {
+  hasCurrentScope(scope) {
     if (globalThis.apiMakerDeviseCurrent && scope in globalThis.apiMakerDeviseCurrent) {
       return true
     }
@@ -113,8 +107,8 @@ export default class ApiMakerDevise {
     return false
   }
 
-  loadCurrentScope(scope) {
-    if (!this.hasGlobalCurrentScope(scope)) {
+  loadCurrentScope (scope) {
+    if (!this.hasCurrentScope(scope)) {
       return null
     }
 

package/src/logger.mjs

@@ -12,13 +12,7 @@ export default class ApiMakerLogger {
   }
 
   debug(message) {
-    if (this.getDebug()) {
-      this.log(message)
-    }
-  }
-
-  error(message) {
-    console.error(message)
+    if (this.getDebug()) this.log(message)
   }
 
   log(message) {

package/src/session-status-updater.mjs

@@ -1,82 +1,38 @@
-import config from "./config.mjs"
 import Devise from "./devise.mjs"
 import * as inflection from "inflection"
 import Logger from "./logger.mjs"
 import wakeEvent from "wake-event"
 
 const logger = new Logger({name: "ApiMaker / SessionStatusUpdater"})
-const shared = {}
-
-// logger.setDebug(true)
 
 export default class ApiMakerSessionStatusUpdater {
-  static current(args) {
-    if (!shared.apiMakerSessionStatusUpdater) {
-      shared.apiMakerSessionStatusUpdater = new ApiMakerSessionStatusUpdater(args)
-    }
+  static current () {
+    if (!globalThis.apiMakerSessionStatusUpdater)
+      globalThis.apiMakerSessionStatusUpdater = new ApiMakerSessionStatusUpdater()
 
-    return shared.apiMakerSessionStatusUpdater
+    return globalThis.apiMakerSessionStatusUpdater
   }
 
-  constructor(args = {}) {
+  constructor (args = {}) {
     this.events = {}
     this.timeout = args.timeout || 600000
-    this.useMetaElement = ("useMetaElement" in args) ? args.useMetaElement : true
 
     this.connectOnlineEvent()
     this.connectWakeEvent()
   }
 
-  connectOnlineEvent() {
-    window.addEventListener("online", this.updateSessionStatus, false)
+  connectOnlineEvent () {
+    window.addEventListener("online", () => this.updateSessionStatus(), false)
   }
 
-  connectWakeEvent() {
-    wakeEvent(this.updateSessionStatus)
+  connectWakeEvent () {
+    wakeEvent(() => this.updateSessionStatus())
   }
 
-  async getCsrfToken() {
-    if (this.csrfToken) {
-      logger.debug(`Get CSRF token from set variable: ${this.csrfToken}`)
-
-      return this.csrfToken
-    }
-
-    if (this.useMetaElement) {
-      const csrfTokenElement = document.querySelector("meta[name='csrf-token']")
-
-      if (csrfTokenElement) {
-        logger.debug(() => `Get CSRF token from meta element: ${csrfTokenElement.getAttribute("content")}`)
-
-        this.csrfToken = csrfTokenElement.getAttribute("content")
-
-        return this.csrfToken
-      }
-    }
-
-    logger.debug("Updating session status because no CSRF token set yet")
-    await this.updateSessionStatus()
-
-    if (this.csrfToken) {
-      logger.debug(() => `Returning CSRF token after updating session status: ${this.csrfToken}`)
-
-      return this.csrfToken
-    }
-
-    throw new Error("CSRF token hasn't been set")
-  }
-
-  sessionStatus() {
+  async sessionStatus () {
     return new Promise((resolve) => {
-      const host = config.getHost()
-      let requestPath = ""
-
-      if (host) requestPath += host
-
-      requestPath += "/api_maker/session_statuses"
-
       const xhr = new XMLHttpRequest()
-      xhr.open("POST", requestPath, true)
+      xhr.open("POST", "/api_maker/session_statuses", true)
       xhr.onload = () => {
         const response = JSON.parse(xhr.responseText)
         resolve(response)
@@ -85,11 +41,11 @@ export default class ApiMakerSessionStatusUpdater {
     })
   }
 
-  onSignedOut(callback) {
+  onSignedOut (callback) {
     this.addEvent("onSignedOut", callback)
   }
 
-  startTimeout() {
+  startTimeout () {
     logger.debug("startTimeout")
 
     if (this.updateTimeout)
@@ -104,12 +60,12 @@ export default class ApiMakerSessionStatusUpdater {
     )
   }
 
-  stopTimeout() {
+  stopTimeout () {
     if (this.updateTimeout)
       clearTimeout(this.updateTimeout)
   }
 
-  updateSessionStatus = async () => {
+  async updateSessionStatus () {
     logger.debug("updateSessionStatus")
 
     const result = await this.sessionStatus()
@@ -119,30 +75,25 @@ export default class ApiMakerSessionStatusUpdater {
     this.updateUserSessionsFromResult(result)
   }
 
-  updateMetaElementsFromResult(result) {
+  updateMetaElementsFromResult (result) {
     logger.debug("updateMetaElementsFromResult")
+    const csrfTokenElement = document.querySelector("meta[name='csrf-token']")
 
-    this.csrfToken = result.csrf_token
-
-    if (this.useMetaElement) {
-      const csrfTokenElement = document.querySelector("meta[name='csrf-token']")
-
-      if (csrfTokenElement) {
-        logger.debug(() => `Changing token from "${csrfTokenElement.getAttribute("content")}" to "${result.csrf_token}"`)
-        csrfTokenElement.setAttribute("content", result.csrf_token)
-      } else {
-        logger.debug("csrf token element couldn't be found")
-      }
+    if (csrfTokenElement) {
+      logger.debug(() => `Changing token from "${csrfTokenElement.getAttribute("content")}" to "${result.csrf_token}"`)
+      csrfTokenElement.setAttribute("content", result.csrf_token)
+    } else {
+      logger.debug("csrf token element couldn't be found")
     }
   }
 
-  updateUserSessionsFromResult(result) {
+  updateUserSessionsFromResult (result) {
     for (const scopeName in result.scopes) {
       this.updateUserSessionScopeFromResult(scopeName, result.scopes[scopeName])
     }
   }
 
-  updateUserSessionScopeFromResult(scopeName, scope) {
+  updateUserSessionScopeFromResult (scopeName, scope) {
     const deviseIsSignedInMethodName = `is${inflection.camelize(scopeName)}SignedIn`
 
     if (!(deviseIsSignedInMethodName in Devise)) {

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

@@ -3,39 +3,43 @@ import {digg} from "diggerize"
 import * as inflection from "inflection"
 import Params from "../params"
 import PropTypes from "prop-types"
-import {memo, useCallback} from "react"
+import {memo, useCallback, useMemo} from "react"
 import Table from "../table/table"
 import useCurrentUser from "../use-current-user"
+import useShape from "set-state-compare/src/use-shape.js"
 
-const ApiMakerSuperAdminModelClassTable = ({modelClass, ...restProps}) => {
+const ApiMakerSuperAdminModelClassTable = (props) => {
+  const s = useShape(props)
+  const {modelClass, ...restProps} = props
   const currentUser = useCurrentUser()
-
-  const columns = useCallback(() => {
-    const configReader = ConfigReader.forModel(modelClass)
-
-    return configReader.tableColumns()
-  }, [modelClass])
+  const configReader = useMemo(() => ConfigReader.forModel(modelClass), [modelClass])
+  const columns = useMemo(() => configReader.tableColumns(), [modelClass])
+  const tableConfig = configReader.modelConfig?.table
 
   const editModelPath = useCallback((args) => {
-    const argName = inflection.camelize(digg(modelClass.modelClassData(), "name"), true)
+    const argName = inflection.camelize(digg(s.p.modelClass.modelClassData(), "name"), true)
     const model = digg(args, argName)
 
     return Params.withParams({
-      model: modelClass.modelClassData().name,
+      model: s.p.modelClass.modelClassData().name,
       model_id: model.primaryKey(),
       mode: "edit"
     })
-  })
+  }, [])
 
   const viewModelPath = useCallback((args) => {
-    const argName = inflection.camelize(digg(modelClass.modelClassData(), "name"), true)
+    const argName = inflection.camelize(digg(s.p.modelClass.modelClassData(), "name"), true)
     const model = digg(args, argName)
 
     return Params.withParams({
-      model: modelClass.modelClassData().name,
+      model: s.p.modelClass.modelClassData().name,
       model_id: model.primaryKey()
     })
-  }, [modelClass])
+  }, [])
+
+  const tableProps = {}
+
+  if (tableConfig?.query) tableProps.collection = tableConfig.query
 
   return (
     <Table
@@ -44,6 +48,7 @@ const ApiMakerSuperAdminModelClassTable = ({modelClass, ...restProps}) => {
       editModelPath={editModelPath}
       modelClass={modelClass}
       viewModelPath={viewModelPath}
+      {...tableProps}
       {...restProps}
     />
   )

package/src/use-current-user.mjs

@@ -1,15 +1,10 @@
 import {useCallback, useEffect, useMemo} from "react"
 import {camelize} from "inflection"
 import Devise from "./devise.mjs"
-import Logger from "./logger.mjs"
 import Services from "./services.mjs"
 import useEventEmitter from "./use-event-emitter.mjs"
 import useShape from "set-state-compare/src/use-shape.js"
 
-const logger = new Logger({name: "ApiMaker / useCurrentUser"})
-
-// logger.setDebug(true)
-
 const useCurrentUser = (args) => {
   const s = useShape(args || {})
   const scope = args?.scope || "user"
@@ -18,10 +13,20 @@ const useCurrentUser = (args) => {
   s.meta.scope = scope
   s.meta.scopeName = scopeName
 
+  const debugs = useCallback((debugCallback) => {
+    if (s.props.debug) {
+      let debugArgs = debugCallback()
+
+      if (!Array.isArray(debugArgs)) debugArgs = [debugArgs]
+
+      console.log("useCurrentUser", ...debugArgs)
+    }
+  })
+
   const loadCurrentUserFromRequest = useCallback(async () => {
     const {scope, scopeName} = s.m
 
-    logger.debug(() => `Loading ${scope} with request`)
+    debugs(() => `Loading ${scope} with request`)
 
     const result = await Services.current().sendRequest("Devise::Current", {scope})
     const current = digg(result, "current")
@@ -36,28 +41,21 @@ const useCurrentUser = (args) => {
 
   const defaultCurrentUser = useCallback(() => {
     const {scope, scopeName} = s.m
-    let current
 
-    if (Devise.current().hasCurrentScope(s.m.scope)) {
-      current = Devise.current().getCurrentScope(scope)
+    if (Devise.current().hasCurrentScope(scope)) {
+      const current = Devise[scopeName]()
 
-      logger.debug(() => `Setting ${scope} from current scope: ${current?.id()}`)
-    } else if (Devise.current().hasGlobalCurrentScope(scope)) {
-      current = Devise[scopeName]()
+      debugs(() => `Setting ${scope} from current scope: ${current?.id()}`)
 
-      logger.debug(() => `Setting ${scope} from global current scope: ${current?.id()}`)
-    }
+      if (s.props.onCurrentUserLoaded) setTimeout(() => s.props.onCurrentUserLoaded(current), 0)
 
-    if (current && s.props.onCurrentUserLoaded) {
-      setTimeout(() => s.props.onCurrentUserLoaded(current), 0)
+      return current
     }
-
-    return current
   }, [])
 
   const useStatesArgument = {}
 
-  useStatesArgument[scopeName] = () => defaultCurrentUser()
+  useStatesArgument[scopeName] = defaultCurrentUser()
 
   s.useStates(useStatesArgument)
 
@@ -70,8 +68,7 @@ const useCurrentUser = (args) => {
   }, [])
 
   useEffect(() => {
-    if (!Devise.current().hasGlobalCurrentScope(s.m.scope) && !Devise.current().hasCurrentScope(s.m.scope)) {
-      logger.debug(() => `Devise hasn't got current scope ${s.m.scope} so loading from request`)
+    if (!Devise.current().hasCurrentScope(s.m.scope)) {
       loadCurrentUserFromRequest()
     }
   }, [])