@kaspernj/api-maker 1.0.318 → 1.0.320

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.318",
+  "version": "1.0.320",
   "type": "module",
   "description": "",
   "main": "index.js",
@@ -52,7 +52,7 @@
     "on-location-changed": ">= 1.0.8",
     "qs": ">= 6.9.3",
     "replaceall": ">= 0.1.6",
-    "set-state-compare": ">= 1.0.26",
+    "set-state-compare": ">= 1.0.28",
     "spark-md5": "^3.0.2",
     "strftime": ">= 0.10.0",
     "uniqunize": "^1.0.1",

package/src/can-can.mjs

@@ -81,6 +81,9 @@ export default class ApiMakerCanCan {
       for (const abilityData of abilities) {
         const subject = abilityData[0]
 
+        if (!subject) throw new Error(`Invalid subject given in abilities: ${subject} - ${JSON.stringify(abilities)}`)
+        if (!Array.isArray(abilityData[1])) throw new Error(`Expected an array of abilities but got: ${typeof abilityData[1]}: ${abilityData[1]}`)
+
         for (const ability of abilityData[1]) {
           const promise = this.loadAbility(ability, subject)
 
@@ -119,7 +122,7 @@ export default class ApiMakerCanCan {
       clearTimeout(this.queueAbilitiesRequestTimeout)
     }
 
-    this.queueAbilitiesRequestTimeout = setTimeout(() => this.sendAbilitiesRequest(), 0)
+    this.queueAbilitiesRequestTimeout = setTimeout(this.sendAbilitiesRequest, 0)
   }
 
   async resetAbilities () {
@@ -129,7 +132,7 @@ export default class ApiMakerCanCan {
     this.events.emit("onResetAbilities")
   }
 
-  async sendAbilitiesRequest () {
+  sendAbilitiesRequest = async () => {
     const abilitiesToLoad = this.abilitiesToLoad
     const abilitiesToLoadData = this.abilitiesToLoadData
 

package/src/super-admin/index.jsx

@@ -20,7 +20,13 @@ const ApiMakerSuperAdmin = () => {
   const modelId = queryParams.model_id
   const modelName = modelClass?.modelClassData()?.name
   const [model, setModel] = useState()
-  const canCan = useCanCan(() => [[modelClass, ["new"]]])
+  const canCan = useCanCan(() => {
+    const abilities = []
+
+    if (modelClass) abilities.push([modelClass, ["new"]])
+
+    return abilities
+  })
 
   const loadModel = useCallback(async () => {
     if (modelId && modelClass) {

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

@@ -2,21 +2,21 @@ import "./style"
 import EventListener from "../../../event-listener"
 import PropTypes from "prop-types"
 import PropTypesExact from "prop-types-exact"
-import {memo, useCallback, useRef, useState} from "react"
-import useShape from "set-state-compare/src/use-shape.js"
+import {memo, useCallback, useRef} from "react"
+import useShape from "set-state-compare/src/use-s.js"
 
 const ApiMakerSuperAdminLayoutHeader = ({actions, onTriggerMenu, title}) => {
-  const shape = useShape()
+  const s = useShape()
   const headerActionsRef = useRef()
-  const setHeaderActionsActive = shape.useState("headerActionsActive", false)
+  const setHeaderActionsActive = s.useState("headerActionsActive", false)
   const onGearsClicked = useCallback((e) => {
     e.preventDefault()
-    setHeaderActionsActive(!shape.state.headerActionsActive)
+    setHeaderActionsActive(!s.state.headerActionsActive)
   }, [])
 
   const onWindowMouseUp = useCallback((e) => {
     // Close the header actions menu if clicked happened outside
-    if (shape.state.headerActionsActive && headerActionsRef.current && !headerActionsRef.current.contains(e.target)) setHeaderActionsActive(false)
+    if (s.state.headerActionsActive && headerActionsRef.current && !headerActionsRef.current.contains(e.target)) setHeaderActionsActive(false)
   }, [])
 
   return (
@@ -26,7 +26,7 @@ const ApiMakerSuperAdminLayoutHeader = ({actions, onTriggerMenu, title}) => {
         {title}
       </div>
       {actions &&
-        <div className="header-actions-container" data-active={shape.state.headerActionsActive}>
+        <div className="header-actions-container" data-active={s.state.headerActionsActive}>
           <div className="header-actions" ref={headerActionsRef}>
             {actions}
           </div>

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

@@ -6,9 +6,9 @@ import Header from "./header"
 import Menu from "./menu"
 import PropTypes from "prop-types"
 import PropTypesExact from "prop-types-exact"
-import {memo, useCallback, useEffect, useState} from "react"
+import {memo, useCallback, useEffect} from "react"
 import useCurrentUser from "../../use-current-user"
-import useShape from "set-state-compare/src/use-shape.js"
+import useShape from "set-state-compare/src/use-s.js"
 
 const NoAccess = React.lazy(() => import("./no-access"))
 
@@ -23,13 +23,13 @@ const ApiMakerSuperAdminLayout = ({
   menu,
   ...restProps
 }) => {
-  const shape = useShape()
+  const s = useShape()
   const currentUser = useCurrentUser()
 
   useEffect(() => {
     CommandsPool.current().globalRequestData.layout = "admin"
     CommandsPool.current().globalRequestData.locale = I18n.locale
-  }, [])
+  }, [I18n.locale])
 
   const headTitle = headTitle || headerTitle
 
@@ -39,21 +39,21 @@ const ApiMakerSuperAdminLayout = ({
     document.title = "Wooftech"
   }
 
-  const setMenuTriggered = shape.useState("menuTriggered", false)
+  const setMenuTriggered = s.useState("menuTriggered", false)
   const noAccess = !currentUser
   const onRequestMenuClose = useCallback(() => setMenuTriggered(false), [])
   const onTriggerMenu = useCallback((e) => {
     e.preventDefault()
-    setMenuTriggered(!shape.state.menuTriggered)
+    setMenuTriggered(!s.state.menuTriggered)
   }, [])
 
   return (
-    <div className={classNames("components--admin--layout", className)} data-menu-triggered={shape.state.menuTriggered} {...restProps}>
+    <div className={classNames("components--admin--layout", className)} data-menu-triggered={s.state.menuTriggered} {...restProps}>
       <Menu
         active={active}
         noAccess={noAccess}
         onRequestMenuClose={onRequestMenuClose}
-        triggered={shape.state.menuTriggered}
+        triggered={s.state.menuTriggered}
       />
       <Header actions={actions} onTriggerMenu={onTriggerMenu} title={headerTitle} />
       <div className="app-layout-content-container">

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

@@ -63,7 +63,6 @@ const ComponentsAdminLayoutMenu = ({active, noAccess, triggered}) => {
 
 ComponentsAdminLayoutMenu.propTypes = PropTypesExact({
   active: PropTypes.string,
-  currentUser: PropTypes.instanceOf(User),
   noAccess: PropTypes.bool.isRequired,
   onRequestMenuClose: PropTypes.func.isRequired,
   triggered: PropTypes.bool.isRequired

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

@@ -1,4 +1,3 @@
-import CanCan from "../../../can-can"
 import {digg} from "diggerize"
 import {memo, useMemo} from "react"
 import MenuItem from "./menu-item"
@@ -6,20 +5,13 @@ import models from "../../models"
 import Params from "../../../params"
 import PropTypes from "prop-types"
 import PropTypesExact from "prop-types-exact"
-import withCanCan from "@kaspernj/api-maker/src/with-can-can"
+import useCanCan from "../../../use-can-can"
 
-const abilities = []
-
-for (const model of models) {
-  abilities.push(
-    [model, ["index"]]
-  )
-}
-
-const ComponentsAdminLayoutMenuContent = ({active, canCan}) => {
+const ComponentsAdminLayoutMenuContent = ({active}) => {
+  const canCan = useCanCan(() => models.map((model) => [model, ["index"]]))
   const sortedModels = useMemo(
     () => models.sort((a, b) => a.modelName().human({count: 2}).toLowerCase().localeCompare(b.modelName().human({count: 2}).toLowerCase())),
-    []
+    [I18n.locale]
   )
 
   return (
@@ -39,8 +31,7 @@ const ComponentsAdminLayoutMenuContent = ({active, canCan}) => {
 }
 
 ComponentsAdminLayoutMenuContent.propTypes = PropTypesExact({
-  active: PropTypes.string,
-  canCan: PropTypes.instanceOf(CanCan)
+  active: PropTypes.string
 })
 
-export default withCanCan(memo(ComponentsAdminLayoutMenuContent), abilities)
+export default memo(ComponentsAdminLayoutMenuContent)

package/src/use-can-can.mjs

@@ -1,14 +1,16 @@
 import CanCan from "./can-can.mjs"
 import {useCallback, useEffect, useState} from "react"
+import useCurrentUser from "./use-current-user.mjs"
 import useShape from "set-state-compare/src/use-shape.js"
 
 const useCanCan = (abilitiesCallback, dependencies) => {
+  const currentUser = useCurrentUser()
   const s = useShape({abilitiesCallback})
   const [canCan, setCanCan] = useState()
 
-  useEffect(() => {
-    loadAbilities()
-  }, dependencies)
+  if (!dependencies) {
+    dependencies = [currentUser?.id()]
+  }
 
   const loadAbilities = useCallback(async () => {
     const canCan = CanCan.current()
@@ -24,6 +26,10 @@ const useCanCan = (abilitiesCallback, dependencies) => {
     loadAbilities()
   }, [])
 
+  useEffect(() => {
+    loadAbilities()
+  }, dependencies)
+
   useEffect(() => {
     CanCan.current().events.addListener("onResetAbilities", onResetAbilities)