@kaspernj/api-maker 1.0.220 → 1.0.221

package/.eslintrc.cjs

@@ -66,6 +66,7 @@ module.exports = {
     "implicit-arrow-linebreak": "error",
     "indent": ["error", 2, {"MemberExpression": "off"}],
     "init-declarations": "off",
+    "jest/max-expects": "error",
     "jest/max-nested-describe": "error",
     "jest/no-alias-methods": "error",
     "jest/no-conditional-in-test": "error",
@@ -76,10 +77,12 @@ module.exports = {
     "jest/no-restricted-matchers": "error",
     "jest/no-test-return-statement": "error",
     "jest/prefer-comparison-matcher": "error",
+    "jest/prefer-each": "error",
     "jest/prefer-equality-matcher": "error",
     "jest/prefer-expect-resolves": "off", // Needs configuration and no documentation could be found?
     "jest/prefer-hooks-on-top": "error",
     "jest/prefer-lowercase-title": "off",
+    "jest/prefer-mock-promise-shorthand": "error",
     "prefer-object-has-own": "error",
     "jest/prefer-snapshot-hint": "error",
     "jest/prefer-to-be": "off", // Needs configuration and no documentation could be found?
@@ -249,7 +252,7 @@ module.exports = {
     "react/jsx-props-no-multi-spaces": "error",
     "react/jsx-props-no-spreading": "off",
     "react/jsx-sort-default-props": "error",
-    "react/jsx-sort-props": "error",
+    "react/jsx-sort-props": ["error", {ignoreCase: true}],
     "react/jsx-tag-spacing": "error",
     "react/jsx-wrap-multilines": "error",
     "react/jsx-max-props-per-line": "off",

package/package.json

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

package/src/params.mjs

@@ -15,7 +15,7 @@ export default class Params {
     return incorporator.merge()
   }
 
-  static withParams (params, opts = {}) {
+  static withParams (params) {
     const newParams = qs.stringify(params)
     const newPath = `${location.pathname}?${newParams}`
 

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

@@ -1,5 +1,8 @@
 import {digg, digs} from "diggerize"
+import inflection from "inflection"
 import Params from "../../params"
+import PropTypes from "prop-types"
+import React from "react"
 import Table from "../../table/table"
 
 export default class ApiMakerSuperAdminIndexPage extends React.PureComponent {
@@ -13,14 +16,12 @@ export default class ApiMakerSuperAdminIndexPage extends React.PureComponent {
     const {currentUser, modelClass} = digs(this.props, "currentUser", "modelClass")
 
     return (
-      <div>
-        <Table
-          columns={digg(this, "columns")}
-          currentUser={currentUser}
-          modelClass={modelClass}
-          viewModelPath={digg(this, "viewModelPath")}
-        />
-      </div>
+      <Table
+        columns={digg(this, "columns")}
+        currentUser={currentUser}
+        modelClass={modelClass}
+        viewModelPath={digg(this, "viewModelPath")}
+      />
     )
   }
 

package/src/super-admin/index.jsx

@@ -1,7 +1,8 @@
-import {digs} from "diggerize"
+import {digg, digs} from "diggerize"
 import IndexPage from "./index-page"
 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 withQueryParams from "on-location-changed/src/with-query-params"
 
@@ -21,10 +22,19 @@ class ApiMakerSuperAdmin extends React.PureComponent {
     return (
       <Layout>
         {pageToShow == "index" &&
-          <IndexPage currentUser={currentUser} modelClass={modelClass} queryParams={queryParams} />
+          <IndexPage
+            currentUser={currentUser}
+            key={`index-page-${digg(modelClass.modelClassData(), "name")}`}
+            modelClass={modelClass}
+            queryParams={queryParams}
+          />
         }
         {pageToShow == "show" &&
-          <ShowPage modelClass={modelClass} modelId={queryParams.modelId} />
+          <ShowPage
+            key={`show-page-${digg(modelClass.modelClassData(), "name")}`}
+            modelClass={modelClass}
+            modelId={queryParams.modelId}
+          />
         }
       </Layout>
     )

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

@@ -1,6 +1,11 @@
 import "./style"
+import {digg, digs} from "diggerize"
+import EventListener from "../../../event-listener"
+import PropTypes from "prop-types"
+import PropTypesExact from "prop-types-exact"
+import React from "react"
 
-export default class ApiMakerSuperAdminLayoutHeader extends BaseComponent {
+export default class ApiMakerSuperAdminLayoutHeader extends React.PureComponent {
   static propTypes = PropTypesExact({
     actions: PropTypes.node,
     onTriggerMenu: PropTypes.func.isRequired,
@@ -8,13 +13,13 @@ export default class ApiMakerSuperAdminLayoutHeader extends BaseComponent {
   })
 
   headerActionsRef = React.createRef()
-  shape = new Shape(this, {headerActionsActive: false})
+  state = {headerActionsActive: false}
 
   render() {
     const {headerActionsRef} = digs(this, "headerActionsRef")
     const {onGearsClicked} = digs(this, "onGearsClicked")
     const {actions, onTriggerMenu, title} = this.props
-    const {headerActionsActive} = digs(this.shape, "headerActionsActive")
+    const {headerActionsActive} = digs(this.state, "headerActionsActive")
 
     return (
       <div className="components--admin--layout--header">
@@ -45,16 +50,16 @@ export default class ApiMakerSuperAdminLayoutHeader extends BaseComponent {
 
   onGearsClicked = (e) => {
     e.preventDefault()
-    this.shape.set({
-      headerActionsActive: !this.shape.headerActionsActive
+    this.setState({
+      headerActionsActive: !this.state.headerActionsActive
     })
   }
 
   onWindowMouseUp = (e) => {
     const {headerActionsRef} = digs(this, "headerActionsRef")
-    const {headerActionsActive} = digs(this.shape, "headerActionsActive")
+    const {headerActionsActive} = digs(this.state, "headerActionsActive")
 
     // Close the header actions menu if clicked happened outside
-    if (headerActionsActive && headerActionsRef.current && !headerActionsRef.current.contains(e.target)) this.shape.set({headerActionsActive: false})
+    if (headerActionsActive && headerActionsRef.current && !headerActionsRef.current.contains(e.target)) this.state.set({headerActionsActive: false})
   }
 }

package/src/super-admin/layout/header/style.scss

@@ -1,4 +1,4 @@
-@import "stylesheets/variables";
+@import "@kaspernj/api-maker/src/super-admin/stylesheets/variables";
 
 .components--admin--layout--header {
   top: 0;

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

@@ -1,16 +1,17 @@
 import "./style"
-import CommandsPool from "@kaspernj/api-maker/src/commands-pool"
+import classNames from "classnames"
+import CommandsPool from "../../commands-pool"
+import {digg, digs} from "diggerize"
 import Header from "./header"
+import Link from "../../link"
 import Menu from "./menu"
+import PropTypes from "prop-types"
+import PropTypesExact from "prop-types-exact"
+import withCurrentUser from "../../with-current-user"
 
-const UsersSignIn = React.lazy(() => import("components/users/sign-in"))
 const NoAccess = React.lazy(() => import("./no-access"))
 
 class ApiMakerSuperAdminLayout extends React.PureComponent {
-  static defaultProps = {
-    requireAdmin: true
-  }
-
   static propTypes = PropTypesExact({
     actions: PropTypes.node,
     active: PropTypes.string,
@@ -20,8 +21,7 @@ class ApiMakerSuperAdminLayout extends React.PureComponent {
     currentCustomerId: PropTypes.string,
     currentUser: PropTypes.instanceOf(User),
     headTitle: PropTypes.string,
-    headerTitle: PropTypes.string,
-    requireAdmin: PropTypes.bool.isRequired
+    headerTitle: PropTypes.string
   })
 
   componentDidMount() {
@@ -45,9 +45,9 @@ class ApiMakerSuperAdminLayout extends React.PureComponent {
     }
   }
 
-  shape = new Shape(this, {
+  state = {
     menuTriggered: false
-  })
+  }
 
   render() {
     const {
@@ -60,10 +60,9 @@ class ApiMakerSuperAdminLayout extends React.PureComponent {
       currentUser,
       headerTitle,
       menu,
-      requireAdmin,
       ...restProps
     } = this.props
-    const {menuTriggered} = digs(this.shape, "menuTriggered")
+    const {menuTriggered} = digs(this.state, "menuTriggered")
     const noAccess = this.noAccess()
 
     return (
@@ -82,21 +81,15 @@ class ApiMakerSuperAdminLayout extends React.PureComponent {
               {currentUser &&
                 <>
                   <div className="mb-4">
-                    {I18n.t("js.components.app_layout.try_signing_out_and_in_with_a_different_user")}
+                    {I18n.t("js.api_maker.super_admin.layout.try_signing_out_and_in_with_a_different_user")}
                   </div>
-                  {(isCurrentUserA("teacher") || isCurrentUserA("student")) &&
-                    <div className="mb-4">
-                      {this.clickHereToAccessTheUserUniverse()}
-                    </div>
-                  }
                 </>
               }
               {!currentUser &&
                 <>
                   <div className="mb-4">
-                    {I18n.t("js.components.app_layout.try_signing_in")}
+                    {I18n.t("js.api_maker.super_admin.layout.try_signing_in")}
                   </div>
-                  <UsersSignIn />
                 </>
               }
             </>
@@ -107,47 +100,18 @@ class ApiMakerSuperAdminLayout extends React.PureComponent {
     )
   }
 
-  clickHereToAccessTheUserUniverse() {
-    const replaces = [
-      {
-        component: (
-          <Link key="here-user-universe-link" to={Routes.userRootPath()}>
-            {I18n.t("js.components.app_layout.here")}
-          </Link>
-        ),
-        text: "%{here}"
-      },
-      {
-        component: (
-          <Link key="user-universe-link" to={Routes.userRootPath()}>
-            {I18n.t("js.components.app_layout.user_universe")}
-          </Link>
-        ),
-        text: "%{user_universe}"
-      }
-    ]
-
-    return (
-      <TextComponentReplace
-        replaces={replaces}
-        text={I18n.t("js.components.app_layout.click_here_to_access_the_user_universe")}
-      />
-    )
-  }
-
-  onRequestMenuClose = () => this.shape.set({menuTriggered: false})
+  onRequestMenuClose = () => this.setState({menuTriggered: false})
 
   onTriggerMenu = (e) => {
     e.preventDefault()
 
-    this.shape.set({menuTriggered: !this.shape.menuTriggered})
+    this.setState({menuTriggered: !this.state.menuTriggered})
   }
 
   noAccess() {
-    const {currentUser, requireAdmin} = digs(this.props, "currentUser", "requireAdmin")
+    const {currentUser} = digs(this.props, "currentUser")
 
-    if (requireAdmin && currentUser && !isCurrentUserA("admin") && !isCurrentUserA("hacker")) return true
-    if (requireAdmin && !currentUser) return true
+    if (!currentUser) return true
 
     return false
   }

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

@@ -1,9 +1,14 @@
 import "./style"
-import {PopupMenu, PopupMenuItem} from "components/popup-menu"
+import {digg, digs} from "diggerize"
+import Link from "../../../link"
 import MenuContent from "./menu-content"
 import MenuItem from "./menu-item"
+import React from "react"
+import PropTypes from "prop-types"
+import PropTypesExact from "prop-types-exact"
+import withCurrentUser from "../../../with-current-user"
 
-class ComponentsAdminLayoutMenu extends BaseComponent {
+class ComponentsAdminLayoutMenu extends React.PureComponent {
   static propTypes = PropTypesExact({
     active: PropTypes.string,
     currentUser: PropTypes.instanceOf(User),
@@ -12,12 +17,10 @@ class ComponentsAdminLayoutMenu extends BaseComponent {
     triggered: PropTypes.bool.isRequired
   })
 
-  menuUserItemsRef = React.createRef()
   rootRef = React.createRef()
-  shape = new Shape(this, {userMenuItemOpen: false})
 
   render() {
-    const {menuUserItemsRef, onUserItemsClicked, rootRef} = digs(this, "menuUserItemsRef", "onUserItemsClicked", "rootRef")
+    const {rootRef} = digs(this, "rootRef")
     const {active} = this.props
     const {
       currentUser,
@@ -29,13 +32,10 @@ class ComponentsAdminLayoutMenu extends BaseComponent {
       "noAccess",
       "triggered"
     )
-    const {userMenuItemOpen} = digs(this.shape, "userMenuItemOpen")
-
     return (
       <div className="components--admin--layout--menu" data-triggered={triggered} ref={rootRef}>
-        <EventListener event="mouseup" onCalled={digg(this, "onWindowMouseUp")} target={window} />
         <div className="menu-logo">
-          <Link className="menu-logo-link" to={Routes.adminRootPath()}>
+          <Link className="menu-logo-link" to={Params.withParams({})}>
             Admin
           </Link>
         </div>
@@ -55,20 +55,6 @@ class ComponentsAdminLayoutMenu extends BaseComponent {
                   {currentUser.name()}
                 </div>
               </div>
-              <div className="menu-user-items" ref={menuUserItemsRef}>
-                {userMenuItemOpen &&
-                  <PopupMenu>
-                    <PopupMenuItem
-                      children={I18n.t("js.components.app_layout.menu.notification_settings")}
-                      className="notifications-settings-menu-item"
-                      to="#"
-                    />
-                  </PopupMenu>
-                }
-                <a className="menu-user-items-link" href="#" onClick={onUserItemsClicked}>
-                  <i className="fa fa-ellipsis" />
-                </a>
-              </div>
             </div>
           }
           {currentUser &&
@@ -76,7 +62,7 @@ class ComponentsAdminLayoutMenu extends BaseComponent {
               active
               className="sign-out-menu-item"
               icon="sign-out-alt"
-              label={I18n.t("js.components.admin.layout.menu.sign_out")}
+              label={I18n.t("js.api_maker.super_admin.layout.menu.sign_out", {defaultValue: "Sign out"})}
               onClick={digg(this, "onSignOutClicked")}
             />
           }
@@ -90,27 +76,12 @@ class ComponentsAdminLayoutMenu extends BaseComponent {
 
     try {
       await Devise.signOut()
-      FlashMessage.success(I18n.t("js.components.admin.layout.menu.you_have_been_signed_out"))
+      FlashMessage.success(I18n.t("js.api_maker.super_admin.layout.menu.you_have_been_signed_out", {defaultValue: "You have been signed out"}))
     } catch (error) {
       FlashMessage.errorResponse(error)
     }
   }
 
-  onUserItemsClicked = (e) => {
-    e.preventDefault()
-    this.shape.set({userMenuItemOpen: !this.shape.userMenuItemOpen})
-  }
-
-  onWindowMouseUp = (e) => {
-    const {menuUserItemsRef, rootRef} = digs(this, "menuUserItemsRef", "rootRef")
-    const {triggered} = digs(this.props, "triggered")
-
-    // Close the menu if triggered (menu is open on mobile)
-    if (triggered && !rootRef.current.contains(e.target)) setTimeout(this.props.onRequestMenuClose)
-
-    // Close the user items menu if clicked happened outside of that
-    if (!menuUserItemsRef?.current?.contains(e.target)) this.shape.set({userMenuItemOpen: false})
-  }
 }
 
 export default withCurrentUser(ComponentsAdminLayoutMenu)

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

@@ -1,6 +1,9 @@
 import CanCanLoader from "@kaspernj/api-maker/src/can-can-loader"
-import MenuItem from "components/admin/layout/menu/menu-item"
+import {digg, digs} from "diggerize"
+import MenuItem from "./menu-item"
 import Params from "../../../params"
+import PropTypes from "prop-types"
+import PropTypesExact from "prop-types-exact"
 import * as modelsModule from "@kaspernj/api-maker/src/models.mjs.erb"
 
 const models = []
@@ -19,18 +22,18 @@ for (const model of models) {
   )
 }
 
-export default class ComponentsAdminLayoutMenuContent extends BaseComponent {
+export default class ComponentsAdminLayoutMenuContent extends React.PureComponent {
   static propTypes = PropTypesExact({
     active: PropTypes.string
   })
 
-  shape = new Shape(this, {
+  state = {
     canCan: undefined
-  })
+  }
 
   render() {
     const {active} = digs(this.props, "active")
-    const {canCan} = digs(this.shape, "canCan")
+    const {canCan} = digs(this.state, "canCan")
 
     return (
       <>
@@ -39,7 +42,7 @@ export default class ComponentsAdminLayoutMenuContent extends BaseComponent {
           <MenuItem
             active={active}
             icon="sitemap"
-            identifier="check-ins"
+            identifier={digg(model.modelClassData(), "name")}
             label={model.modelName().human({count: 2})}
             key={model.modelClassData().name}
             to={Params.withParams({model: model.modelClassData().name})}

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

@@ -1,6 +1,10 @@
 import "./style"
+import classNames from "classnames"
+import Link from "../../../../link"
+import PropTypes from "prop-types"
+import React from "react"
 
-export default class ComponentsAdminLayoutMenuMenuItem extends BaseComponent {
+export default class ComponentsAdminLayoutMenuMenuItem extends React.PureComponent {
   static propTypes = {
     active: PropTypes.oneOfType([PropTypes.bool, PropTypes.string]),
     className: PropTypes.string,

package/src/super-admin/layout/menu/style.scss

@@ -1,4 +1,4 @@
-@import "stylesheets/variables";
+@import "@kaspernj/api-maker/src/super-admin/stylesheets/variables";
 
 .components--admin--layout--menu {
   position: fixed;

package/src/super-admin/layout/no-access.jsx

@@ -1,4 +1,4 @@
-class ComponentsAdminLayoutNoAccess extends BaseComponent {
+class ComponentsAdminLayoutNoAccess extends React.PureComponent {
   render() {
     const {currentUser} = digs(this.props, "currentUser")
 
@@ -7,7 +7,7 @@ class ComponentsAdminLayoutNoAccess extends BaseComponent {
         className="components--admin--layout-no-access"
         data-user-roles={currentUser?.userRoles()?.loaded()?.map((userRole) => userRole.role()?.identifier()).join(", ")}
       >
-        {I18n.t("js.components.app_layout.no_access.you_dont_have_no_access_to_this_page")}
+        {I18n.t("js.api_maker.super_admin.layout.no_access.you_dont_have_no_access_to_this_page")}
       </div>
     )
   }

package/src/super-admin/layout/style.scss

@@ -1,4 +1,4 @@
-@import "stylesheets/variables";
+@import "@kaspernj/api-maker/src/super-admin/stylesheets/variables";
 
 .components--admin--layout {
   width: 100%;

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

@@ -1,7 +1,9 @@
+import React from "react"
+
 export default class ApiMakerSuperAdminShowPage extends React.PureComponent {
   render() {
     return (
-      <div>
+      <div className="super-admin--show-page">
         show page
       </div>
     )

package/src/super-admin/stylesheets/variables.scss

@@ -0,0 +1,11 @@
+$xs-from: 0;
+$xs-to: 575;
+$sm-from: 576px;
+$sm-to: 767px;
+$md-from: 768px;
+$md-to: 991px;
+$lg-from: 992px;
+$lg-to: 1199px;
+$xl-from: 1200px;
+$xl-to: 1399px;
+$xxl-from: 1400px;

package/src/table/model-row.jsx

@@ -151,9 +151,9 @@ export default class ApiMakerBootStrapLiveTableModelRow extends React.PureCompon
     } else if (MoneyFormatter.isMoney(value)) {
       return MoneyFormatter.format(value)
     } else if (typeof value == "boolean") {
-      if (value) return I18n.t("js.shared.yes")
+      if (value) return I18n.t("js.shared.yes", {defaultValue: "Yes"})
 
-      return I18n.t("js.shared.no")
+      return I18n.t("js.shared.no", {defaultValue: "No"})
     } else if (Array.isArray(value)) {
       return value
         .map((valuePart) => this.presentColumnValue(valuePart))

package/src/validation-errors.mjs

@@ -3,7 +3,7 @@ import inflection from "inflection"
 import modelClassRequire from "./model-class-require.mjs"
 
 class ValidationError {
-  constructor (args) {
+  constructor(args) {
     this.attributeName = digg(args, "attribute_name")
     this.attributeType = digg(args, "attribute_type")
     this.errorMessages = digg(args, "error_messages")
@@ -13,7 +13,7 @@ class ValidationError {
     this.modelName = digg(args, "model_name")
   }
 
-  matchesAttributeAndInputName (attributeName, inputName) {
+  matchesAttributeAndInputName(attributeName, inputName) {
     if (this.getInputName() == inputName) return true
     if (!attributeName) return false
 
@@ -30,15 +30,15 @@ class ValidationError {
     return false
   }
 
-  getAttributeName () {
+  getAttributeName() {
     return digg(this, "attributeName")
   }
 
-  getErrorMessages () {
+  getErrorMessages() {
     return digg(this, "errorMessages")
   }
 
-  getFullErrorMessages () {
+  getFullErrorMessages() {
     const {attributeType} = digs(this, "attributeType")
 
     if (attributeType == "base") {
@@ -55,32 +55,32 @@ class ValidationError {
     }
   }
 
-  getHandled () {
+  getHandled() {
     return digg(this, "handled")
   }
 
-  getInputName () {
+  getInputName() {
     return digg(this, "inputName")
   }
 
-  getModelClass () {
+  getModelClass() {
     const modelName = inflection.classify(digg(this, "modelName"))
 
     return modelClassRequire(modelName)
   }
 
-  setHandled () {
+  setHandled() {
     this.handled = true
   }
 }
 
 class ValidationErrors {
-  constructor (args) {
+  constructor(args) {
     this.rootModel = digg(args, "model")
     this.validationErrors = digg(args, "validationErrors").map((validationError) => new ValidationError(validationError))
   }
 
-  getErrorMessage () {
+  getErrorMessage() {
     const fullErrorMessages = []
 
     for (const validationError of this.validationErrors) {
@@ -92,7 +92,7 @@ class ValidationErrors {
     return fullErrorMessages.join(". ")
   }
 
-  getValidationErrors () {
+  getValidationErrors() {
     return this.validationErrors
   }
 

package/src/with-current-user.jsx

@@ -1,6 +1,8 @@
+import Devise from "./devise"
 import {digs} from "diggerize"
 import EventEmitterListener from "./event-emitter-listener"
 import PureComponent from "set-state-compare/src/pure-component"
+import React from "react"
 
 export default (WrappedComponent) => class WithCurrentUser extends PureComponent {
   state = {