@kaspernj/api-maker 1.0.424 → 1.0.426

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kaspernj/api-maker",
-  "version": "1.0.424",
+  "version": "1.0.426",
   "type": "module",
   "description": "",
   "main": "index.js",

package/src/modal.jsx

@@ -0,0 +1,36 @@
+import BaseComponent from "./base-component"
+import {memo} from "react"
+import {shapeComponent} from "set-state-compare/src/shape-component.js"
+import {Modal, Pressable, View} from "react-native"
+
+export default memo(shapeComponent(class ApiMakerModal extends BaseComponent {
+  render() {
+    const {children, onRequestClose, ...restProps} = this.props
+
+    return (
+      <Modal onRequestClose={onRequestClose} {...restProps}>
+        <View
+          style={{
+            alignItems: "center",
+            justifyContent: "center",
+            minWidth: "100%",
+            minHeight: "100%",
+            padding: 20,
+          }}
+        >
+          <Pressable
+            dataSet={{class: "modal-backdrop"}}
+            onPress={onRequestClose}
+            style={{
+              position: "absolute",
+              minWidth: "100%",
+              minHeight: "100%",
+              backgroundColor: "rgba(0, 0, 0, 0.5)"
+            }}
+          />
+          {children}
+        </View>
+      </Modal>
+    )
+  }
+}))

package/src/table/filters/filter-form.jsx

@@ -74,6 +74,8 @@ export default memo(shapeComponent(class ApiMakerTableFiltersFilterForm extends
     this.increaseLoading()
 
     try {
+      if (!this.s.modelClassName) throw new Error("'modelClassName' not set in state")
+
       const result = await Services.current().sendRequest("Models::Associations", {model_class_name: this.s.modelClassName})
       const {associations, ransackableAttributes, ransackableScopes} = this.parseAssociationData(result)
 
@@ -96,9 +98,11 @@ export default memo(shapeComponent(class ApiMakerTableFiltersFilterForm extends
   }
 
   async loadInitialValues() {
+    if (!this.s.modelClassName) throw new Error("'modelClassName' not set in state")
+
     let result = await Services.current().sendRequest("Models::Associations", {model_class_name: this.s.modelClassName})
     let data = this.parseAssociationData(result)
-    let modelClassName
+    let modelClassName = this.s.modelClassName
     const path = []
 
     for (const pathPart of this.props.filter.p) {
@@ -108,6 +112,12 @@ export default memo(shapeComponent(class ApiMakerTableFiltersFilterForm extends
 
       modelClassName = digg(reflection, "modelClassName")
 
+      if (!modelClassName) {
+        const pathNames = path.map((pathPart) => pathPart.name()).join(".")
+
+        throw new Error(`No model class name from ${pathNames}.${reflection.name()}`)
+      }
+
       result = await Services.current().sendRequest("Models::Associations", {model_class_name: modelClassName})
       data = this.parseAssociationData(result)
 
@@ -201,7 +211,7 @@ export default memo(shapeComponent(class ApiMakerTableFiltersFilterForm extends
               )}
             </View>
             <View>
-              {predicates && !this.state.scope &&
+              {predicates && !this.s.scope &&
                 <Select
                   className="predicate-select"
                   defaultValue={predicate?.name}
@@ -289,7 +299,6 @@ export default memo(shapeComponent(class ApiMakerTableFiltersFilterForm extends
   onAttributeClicked = ({attribute}) => {
     this.setState({
       attribute,
-      predicate: undefined,
       scope: undefined
     })
   }
@@ -317,6 +326,7 @@ export default memo(shapeComponent(class ApiMakerTableFiltersFilterForm extends
   onScopeClicked = ({scope}) => {
     this.setState({
       attribute: undefined,
+      predicate: undefined,
       scope
     })
   }

package/src/table/filters/filter.jsx

@@ -29,7 +29,13 @@ export default memo(shapeComponent(class ApiMakerTableFilter extends BaseCompone
 
     return (
       <View style={{alignItems: "center", flexDirection: "row", backgroundColor: "grey", paddingVertical: 10, paddingHorizontal: 6}}>
-        <Pressable dataSet={{class: "filter-label"}} onPress={this.tt.onFilterPressed}>
+        <Pressable
+          dataSet={{
+            attribute: a,
+            class: "filter-label"
+          }}
+          onPress={this.tt.onFilterPressed}
+        >
           <Text>
             {p.length > 0 &&
               `${p.join(".")}.`

package/src/table/settings/index.jsx

@@ -3,10 +3,12 @@ import columnIdentifier from "../column-identifier.mjs"
 import ColumnRow from "./column-row"
 import DownloadAction from "./download-action"
 import {memo, useRef} from "react"
+import Modal from "../../modal"
 import PropTypes from "prop-types"
 import propTypesExact from "prop-types-exact"
 import {shapeComponent} from "set-state-compare/src/shape-component.js"
-import {Modal, Text, View} from "react-native"
+import {Text, View} from "react-native"
+import useI18n from "i18n-on-steroids/src/use-i18n.mjs"
 
 export default memo(shapeComponent(class ApiMakerTableSettings extends BaseComponent {
   static propTypes = propTypesExact({
@@ -15,24 +17,26 @@ export default memo(shapeComponent(class ApiMakerTableSettings extends BaseCompo
   })
 
   setup() {
+    const {t} = useI18n({namespace: "js.api_maker.table.settings"})
+
     this.rootRef = useRef()
+    this.t = t
   }
 
   tableSetting = () => this.p.table.s.tableSetting
 
   render() {
+    const {t} = this.tt
     const {table} = this.p
     const {preparedColumns} = table.s
 
     return (
-      <Modal onBackdropPress={this.p.onRequestClose} onRequestClose={this.p.onRequestClose} transparent>
+      <Modal onBackdropPress={this.p.onRequestClose} onRequestClose={this.p.onRequestClose} style={{backgroundColor: "#000"}} transparent>
         <View
           dataSet={{class: "api-maker--table--settings"}}
           style={{
             width: "100%",
             maxWidth: 800,
-            marginHorizontal: "auto",
-            marginVertical: "auto",
             padding: 20,
             backgroundColor: "#fff",
             border: "1px solid black"
@@ -40,13 +44,13 @@ export default memo(shapeComponent(class ApiMakerTableSettings extends BaseCompo
         >
           <View style={{marginBottom: 5}}>
             <Text style={{fontSize: 16, fontWeight: "bold"}}>
-              Settings
+              {t(".settings", {defaultValue: "Settings"})}
             </Text>
           </View>
           <DownloadAction table={table} />
           <View style={{marginBottom: 5}}>
             <Text style={{fontSize: 16, fontWeight: "bold"}}>
-              Columns
+              {t(".columns", {defaultValue: "Columns"})}
             </Text>
           </View>
           {preparedColumns?.map(({column, tableSettingColumn}) =>