@kaspernj/api-maker 1.0.461 → 1.0.463

package/src/table/header-column.jsx

@@ -1,9 +1,9 @@
 import React, {useMemo} from "react"
 import BaseComponent from "../base-component"
 import classNames from "classnames"
-import FontAwesomeIcon from "react-native-vector-icons/FontAwesome"
 import Header from "./components/header"
 import HeaderColumnContent from "./header-column-content"
+import Icon from "../utils/icon"
 import memo from "set-state-compare/src/memo"
 import {Animated, PanResponder} from "react-native"
 import PropTypes from "prop-types"
@@ -100,7 +100,7 @@ export default memo(shapeComponent(class ApiMakerTableHeaderColumn extends BaseC
         {...restColumnProps}
       >
         {mdUp &&
-          <FontAwesomeIcon name="bars" style={{marginRight: 3, fontSize: 12}} {...touchProps} />
+          <Icon name="bars" style={{marginRight: 3, fontSize: 12}} {...touchProps} />
         }
         <HeaderColumnContent column={column} table={table} tableSettingColumn={tableSettingColumn} />
         {mdUp &&

package/src/table/model-row.jsx

@@ -4,7 +4,7 @@ import Column from "./components/column"
 import columnIdentifier from "./column-identifier"
 import EventEmitter from "events"
 import FlashMessage from "../flash-message"
-import FontAwesomeIcon from "react-native-vector-icons/FontAwesome"
+import Icon from "../utils/icon"
 import * as inflection from "inflection"
 import modelCallbackArgs from "./model-callback-args"
 import Link from "../link"
@@ -76,17 +76,17 @@ export default memo(shapeComponent(class ApiMakerBootStrapLiveTableModelRow exte
           {actionsContent && actionsContent(this.tt.modelCallbackArgs)}
           {viewPath &&
             <Link dataSet={{class: "view-button"}} style={{marginLeft: 2, marginRight: 2}} to={viewPath}>
-              <FontAwesomeIcon name="search" size={18} />
+              <Icon name="search" size={18} />
             </Link>
           }
           {editPath &&
             <Link dataSet={{class: "edit-button"}} style={{marginLeft: 2, marginRight: 2}} to={editPath}>
-              <FontAwesomeIcon name="pencil" size={20} />
+              <Icon name="pencil" size={20} />
             </Link>
           }
           {destroyEnabled && model.can("destroy") &&
             <Pressable dataSet={{class: "destroy-button"}} style={{marginLeft: 2, marginRight: 2}} onPress={this.tt.onDestroyClicked}>
-              <FontAwesomeIcon name="remove" size={22} />
+              <Icon name="remove" size={22} />
             </Pressable>
           }
         </Column>

package/src/table/settings/download-action.jsx

@@ -3,7 +3,7 @@ import ColumnContent from "../column-content"
 import columnIdentifier from "../column-identifier"
 import columnVisible from "../column-visible"
 import {saveAs} from "file-saver"
-import FontAwesomeIcon from "react-native-vector-icons/FontAwesome"
+import Icon from "../../utils/icon"
 import memo from "set-state-compare/src/memo"
 import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
@@ -21,7 +21,7 @@ export default memo(shapeComponent(class ApiMakerTableSettingsDownloadAction ext
   render() {
     return (
       <Pressable onPress={this.tt.onDownloadPress} style={{flexDirection: "row", alignItems: "center"}}>
-        <FontAwesomeIcon name="download" size={20} />
+        <Icon name="download" size={20} />
         <Text style={{marginLeft: 5}}>
           Download
         </Text>

package/src/table/table.jsx

@@ -11,11 +11,11 @@ import DraggableSort from "../draggable-sort/index"
 import EventEmitter from "events"
 import Filters from "./filters"
 import FlatList from "./components/flat-list"
-import FontAwesomeIcon from "react-native-vector-icons/FontAwesome"
 import {Form} from "../form"
 import Header from "./components/header"
 import HeaderColumn from "./header-column"
 import HeaderSelect from "./header-select"
+import Icon from "../utils/icon"
 import * as inflection from "inflection"
 import memo from "set-state-compare/src/memo"
 import modelClassRequire from "../model-class-require"
@@ -36,7 +36,7 @@ import useCollection from "../use-collection"
 import useI18n from "i18n-on-steroids/src/use-i18n"
 import useEventEmitter from "../use-event-emitter"
 import useModelEvent from "../use-model-event"
-import useQueryParams from "on-location-changed/src/use-query-params"
+import useQueryParams from "on-location-changed/build/use-query-params"
 import Widths from "./widths"
 
 const paginationOptions = [30, 60, 90, ["All", "all"]]
@@ -732,14 +732,14 @@ export default memo(shapeComponent(class ApiMakerTable extends BaseComponent {
       <View style={{flexDirection: "row"}}>
         {controls && controls({models, qParams, query, result})}
         <Pressable dataSet={{class: "filter-button"}} onPress={this.tt.onFilterClicked}>
-          <FontAwesomeIcon name="search" size={20} />
+          <Icon name="search" size={20} />
         </Pressable>
         <View style={{position: "relative"}}>
           {showSettings &&
             <Settings onRequestClose={this.tt.onRequestCloseSettings} table={this} />
           }
           <Pressable dataSet={{class: "settings-button"}} onPress={this.tt.onSettingsClicked}>
-            <FontAwesomeIcon name="gear" size={20} />
+            <Icon name="gear" size={20} />
           </Pressable>
         </View>
       </View>

package/src/table/use-sorting.js

@@ -1,5 +1,5 @@
 import {camelize} from "inflection"
-import useQueryParams from "on-location-changed/src/use-query-params"
+import useQueryParams from "on-location-changed/build/use-query-params"
 
 const calculateQParams = (defaultParams, queryParams, searchKey) => {
   if (searchKey in queryParams) {

package/src/translated-collections.js

@@ -1,6 +1,6 @@
 import {digg} from "diggerize"
 import I18nOnSteroids from "i18n-on-steroids"
-import translatedCollectionsData from "../src/translated-collections-data.js.erb"
+import translatedCollectionsData from "translated-collections-data.json"
 
 export default class ApiMakerTranslatedCollections {
   static get (modelClass, collectionName) {

package/src/use-breakpoint.js

@@ -1,6 +1,7 @@
 import {useCallback, useLayoutEffect} from "react"
 import apiMakerConfig from "@kaspernj/api-maker/build/config"
 import {Dimensions} from "react-native"
+import * as inflection from "inflection"
 import useShape from "set-state-compare/src/use-shape"
 
 const calculateBreakPoint = (window) => {
@@ -26,6 +27,8 @@ const calculateBreakPoint = (window) => {
   throw new Error(`Couldn't not find breakpoint from window width: ${windowWidth}`)
 }
 
+const sizeTypes = ["down", "up"]
+
 const useBreakpoint = () => {
   const s = useShape()
   const onCalled = useCallback(({window}) => {
@@ -40,13 +43,34 @@ const useBreakpoint = () => {
     breakpoint: () => calculateBreakPoint(Dimensions.get("window"))
   })
 
+  const styling = useCallback((args) => {
+    const style = Object.assign({}, args.base)
+
+    for (const breakpointData of apiMakerConfig.getBreakPoints()) {
+      const breakpoint = breakpointData[0]
+
+      for (const sizeType of sizeTypes) {
+        const breakpointWithSizeType = `${breakpoint}${inflection.camelize(sizeType)}`
+
+        if (args[breakpointWithSizeType] && s.s.breakpoint[breakpointWithSizeType]) {
+          Object.assign(style, args[breakpointWithSizeType])
+        }
+      }
+    }
+
+    return style
+  }, [])
+
   useLayoutEffect(() => {
     const subscription = Dimensions.addEventListener("change", onCalled)
 
     return () => subscription?.remove()
   })
 
-  return s.s.breakpoint
+  return {
+    styling,
+    ...s.s.breakpoint
+  }
 }
 
 export default useBreakpoint

package/src/use-collection.js

@@ -5,7 +5,7 @@ import ModelEvents from "./model-events"
 import {useCallback, useLayoutEffect, useMemo} from "react"
 import useCreatedEvent from "./use-created-event"
 import useShape from "set-state-compare/src/use-shape"
-import useQueryParams from "on-location-changed/src/use-query-params"
+import useQueryParams from "on-location-changed/build/use-query-params"
 
 const useCollection = (props, cacheKeys = []) => {
   const {

package/src/use-current-user.js

@@ -2,6 +2,7 @@ import {useCallback, useMemo} from "react"
 import {camelize} from "inflection"
 import Devise from "./devise"
 import {digg} from "diggerize"
+import * as inflection from "inflection"
 import Logger from "./logger"
 import Services from "./services"
 import useEventEmitter from "./use-event-emitter"
@@ -21,11 +22,13 @@ const useCurrentUser = (args) => {
 
   const loadCurrentUserFromRequest = useCallback(async () => {
     const {scope, scopeName} = s.m
+    const getArgsMethodName = `get${inflection.camelize(scope)}Args`
+    const args = Devise[getArgsMethodName]()
 
     logger.debug(() => `Loading ${scope} with request`)
 
-    const result = await Services.current().sendRequest("Devise::Current", {scope})
-    const current = digg(result, "current")
+    const result = await Services.current().sendRequest("Devise::Current", {query: args.query, scope})
+    const current = digg(result, "current")[0]
 
     if (!(scopeName in s.setStates)) throw new Error(`'${scopeName}' not found in setStates`)
     if (current) Devise.updateSession(current)

package/src/use-model.js

@@ -2,7 +2,7 @@ import {useCallback, useLayoutEffect, useMemo} from "react"
 import Devise from "./devise"
 import * as inflection from "inflection"
 import ModelEvents from "./model-events"
-import useQueryParams from "on-location-changed/src/use-query-params"
+import useQueryParams from "on-location-changed/build/use-query-params"
 import useShape from "set-state-compare/src/use-shape"
 
 const useModel = (modelClassArg, argsArg = {}) => {

package/src/utils/icon.jsx

@@ -0,0 +1,21 @@
+import BaseComponent from "../base-component"
+import FontAwesomeIcon from "react-native-vector-icons/FontAwesome"
+import memo from "set-state-compare/src/memo"
+import React from "react"
+import {shapeComponent} from "set-state-compare/src/shape-component"
+import {useDefaultStyle} from "./default-style"
+
+export default memo(shapeComponent(class ApiMakerUtilsIcon extends BaseComponent {
+  render() {
+    const defaultStyle = useDefaultStyle()
+    const {style, ...restProps} = this.props
+    const actualStyle = Object.assign(
+      {color: defaultStyle.Text.color},
+      style
+    )
+
+    return (
+      <FontAwesomeIcon style={actualStyle} {...restProps} />
+    )
+  }
+}))

package/src/utils/modal.jsx

@@ -1,7 +1,7 @@
 import {Modal, Pressable, View} from "react-native"
 import BaseComponent from "../base-component"
 import Card from "./card"
-import FontAwesomeIcon from "react-native-vector-icons/FontAwesome"
+import Icon from "../utils/icon"
 import memo from "set-state-compare/src/memo"
 import {shapeComponent} from "set-state-compare/src/shape-component"
 import useBreakpoint from "../use-breakpoint"
@@ -50,7 +50,7 @@ export default memo(shapeComponent(class ApiMakerUtilsComponent extends BaseComp
   cardHeaderControls() {
     return (
       <Pressable onPress={this.tt.onModalClosePress} style={{marginLeft: "auto", padding: 5}}>
-        <FontAwesomeIcon name="remove" />
+        <Icon name="remove" />
       </Pressable>
     )
   }

package/src/with-api-maker.jsx

@@ -0,0 +1,31 @@
+import React, {createContext, useContext, useMemo} from "react"
+import ApiMakerConfig from "./config"
+import memo from "set-state-compare/src/memo"
+
+const ApiMakerContext = createContext()
+const useApiMaker = () => {
+  const apiMakerContext = useContext(ApiMakerContext)
+
+  if (apiMakerContext) {
+    return apiMakerContext
+  }
+
+  return {
+    config: ApiMakerConfig
+  }
+}
+
+const WithApiMaker = memo(({children, config, ...restProps}) => {
+  const restPropsKeys = Object.keys(restProps)
+  const value = useMemo(() => ({config}), [config])
+
+  if (restPropsKeys.length > 0) throw new Error(`Unhandled props: ${restPropsKeys.join(", ")}`)
+
+  return (
+    <ApiMakerContext.Provider value={value}>
+      {children}
+    </ApiMakerContext.Provider>
+  )
+})
+
+export {useApiMaker, WithApiMaker}

package/build/history.native.js

@@ -1,10 +0,0 @@
-class HistoryNative {
-  push(...args) {
-    throw new Error("Stub: Push from history.nativejs", {
-      args
-    });
-  }
-}
-const historyNative = new HistoryNative();
-export default historyNative;
-//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJuYW1lcyI6WyJIaXN0b3J5TmF0aXZlIiwicHVzaCIsImFyZ3MiLCJFcnJvciIsImhpc3RvcnlOYXRpdmUiXSwic291cmNlcyI6WyIuLi9zcmMvaGlzdG9yeS5uYXRpdmUuanMiXSwic291cmNlc0NvbnRlbnQiOlsiY2xhc3MgSGlzdG9yeU5hdGl2ZSB7XG4gIHB1c2goLi4uYXJncykge1xuICAgIHRocm93IG5ldyBFcnJvcihcIlN0dWI6IFB1c2ggZnJvbSBoaXN0b3J5Lm5hdGl2ZWpzXCIsIHthcmdzfSlcbiAgfVxufVxuXG5jb25zdCBoaXN0b3J5TmF0aXZlID0gbmV3IEhpc3RvcnlOYXRpdmUoKVxuXG5leHBvcnQgZGVmYXVsdCBoaXN0b3J5TmF0aXZlXG4iXSwibWFwcGluZ3MiOiJBQUFBLE1BQU1BLGFBQWEsQ0FBQztFQUNsQkMsSUFBSUEsQ0FBQyxHQUFHQyxJQUFJLEVBQUU7SUFDWixNQUFNLElBQUlDLEtBQUssQ0FBQyxrQ0FBa0MsRUFBRTtNQUFDRDtJQUFJLENBQUMsQ0FBQztFQUM3RDtBQUNGO0FBRUEsTUFBTUUsYUFBYSxHQUFHLElBQUlKLGFBQWEsQ0FBQyxDQUFDO0FBRXpDLGVBQWVJLGFBQWEiLCJpZ25vcmVMaXN0IjpbXX0=

package/src/history.native.js

@@ -1,9 +0,0 @@
-class HistoryNative {
-  push(...args) {
-    throw new Error("Stub: Push from history.nativejs", {args})
-  }
-}
-
-const historyNative = new HistoryNative()
-
-export default historyNative

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

@@ -1,25 +0,0 @@
-@use "@kaspernj/api-maker/src/super-admin/stylesheets/variables" as *;
-
-[data-component="super-admin--layout"] {
-  width: 100%;
-  min-height: 100vh;
-  background: #fff;
-  color: #000;
-
-  [data-class="app-layout-content-container"] {
-    min-height: 100vh;
-    background: #f7f7f7;
-
-    @media (max-width: $sm-to) {
-      padding: 130px 30px 30px;
-    }
-
-    @media (min-width: $md-from) {
-      padding: 130px 30px 30px 280px;
-    }
-
-    @media (min-width: $lg-from) {
-      padding: 130px 30px 30px 320px;
-    }
-  }
-}