@kaspernj/api-maker 1.0.349 → 1.0.351

package/package.json

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

package/src/api.mjs

@@ -10,23 +10,12 @@ const logger = new Logger({name: "ApiMaker / Api"})
 // logger.setDebug(true)
 
 export default class Api {
-  static get(path, pathParams = null) {
-    return Api.requestLocal({path, pathParams, method: "GET"})
-  }
-
-  static delete(path, pathParams = null) {
-    return Api.requestLocal({path, pathParams, method: "DELETE"})
-  }
-
-  static patch(path, data = {}) {
-    return Api.requestLocal({path, data, method: "PATCH"})
-  }
-
-  static post(path, data = {}) {
-    return Api.requestLocal({path, data, method: "POST"})
-  }
+  static get = async (path, pathParams = null) =>  await Api.requestLocal({path, pathParams, method: "GET"})
+  static delete = async (path, pathParams = null) => await Api.requestLocal({path, pathParams, method: "DELETE"})
+  static patch = async (path, data = {}) => await Api.requestLocal({path, data, method: "PATCH"})
+  static post = async (path, data = {}) => await Api.requestLocal({path, data, method: "POST"})
 
-  static request({data, headers, method, path, pathParams}) {
+  static async request({data, headers, method, path, pathParams}) {
     let requestPath = ""
     if (config.getHost()) requestPath += config.getHost()
     requestPath += path
@@ -36,16 +25,24 @@ export default class Api {
       requestPath += `?${pathParamsString}`
     }
 
-    return new Promise((resolve, reject) => {
-      const xhr = new XMLHttpRequest()
-      xhr.open(method, requestPath, true)
+    const xhr = new XMLHttpRequest()
 
-      if (headers) {
-        for (const headerName in headers) {
-          xhr.setRequestHeader(headerName, headers[headerName])
-        }
+    xhr.open(method, requestPath, true)
+    xhr.withCredentials = true
+
+    if (headers) {
+      for (const headerName in headers) {
+        xhr.setRequestHeader(headerName, headers[headerName])
       }
+    }
+
+    const response = await Api.executeXhr(xhr, data)
 
+    return response
+  }
+
+  static executeXhr(xhr, data) {
+    return new Promise((resolve, reject) => {
       xhr.onload = () => {
         const response = this._parseResponse(xhr)
 
@@ -93,8 +90,8 @@ export default class Api {
     return await this.request(args)
   }
 
-  static put(path, data = {}) {
-    return this.requestLocal({path, data, method: "PUT"})
+  static async put(path, data = {}) {
+    return await this.requestLocal({path, data, method: "PUT"})
   }
 
   static _token = async () => await SessionStatusUpdater.current().getCsrfToken()

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/devise.mjs

@@ -54,9 +54,7 @@ export default class ApiMakerDevise {
   }
 
   static updateSession(model, args = {}) {
-    if (!args.scope) {
-      args.scope = digg(model.modelClassData(), "name")
-    }
+    if (!args.scope) args.scope = "user"
 
     const camelizedScopeName = inflection.camelize(args.scope, true)
 

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-screen-layout.mjs

@@ -0,0 +1,49 @@
+import {Platform, useWindowDimensions} from "react-native"
+
+const getWindowLayout = (width) => {
+  if (width <= 575) {
+    return "xs"
+  } else if (width <= 767) {
+    return "sm"
+  } else if (width <= 991) {
+    return "md"
+  } else if (width <= 1199) {
+    return "lg"
+  } else if (width <= 1399) {
+    return "xl"
+  } else if (width >= 1400) {
+    return "xxl"
+  } else {
+    console.error(`Couldn't determine window layout from width: ${width}`)
+  }
+}
+
+const useScreenSize = () => {
+  if (Platform.OS == "web") {
+    const shared = useMemo(() => ({}))
+
+    shared.width = window.innerWidth
+
+    const [screenLayout, setScreenLayout] = useState(() => getWindowLayout(shared.width))
+
+    const onResize = useCallback(() => {
+      const newWindowLayout = getWindowLayout(window.innerWidth)
+
+      if (shared.screenlayout != newWindowLayout) {
+        setScreenLayout(newWindowLayout)
+      }
+    }, [])
+
+    useEventListener(window, "resize", onResize)
+
+    shared.screenLayout = screenLayout
+
+    return shared.screenLayout
+  } else {
+    const windowDimensions = useWindowDimensions()
+
+    return getWindowLayout(windowDimensions.width)
+  }
+}
+
+export default useScreenSize