@kaspernj/api-maker 1.0.439 → 1.0.441

package/package.json

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

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

@@ -184,7 +184,7 @@ export default memo(shapeComponent(class ApiMakerTableFiltersFilterForm extends
           </View>
           <View style={{flexDirection: "row"}}>
             <View>
-              {this.s.associations?.map((reflection) =>
+              {this.s.associations && this.sortedReflectionsByName(this.s.associations).map((reflection) =>
                 <ReflectionElement
                   key={reflection.reflectionName}
                   modelClassName={this.s.modelClassName}
@@ -194,7 +194,7 @@ export default memo(shapeComponent(class ApiMakerTableFiltersFilterForm extends
               )}
             </View>
             <View>
-              {this.s.ransackableAttributes?.map((attribute) =>
+              {this.s.ransackableAttributes && this.sortedAttributesByName(this.s.ransackableAttributes)?.map((attribute) =>
                 <AttributeElement
                   active={attribute.attributeName == this.s.attribute?.attributeName}
                   attribute={attribute}
@@ -377,9 +377,23 @@ export default memo(shapeComponent(class ApiMakerTableFiltersFilterForm extends
     })
   }
 
-  sortedByName(reflections, currentModelClass) {
+  sortedAttributesByName(attributes) {
+    return attributes.sort((a, b) =>
+      digg(a, "humanName")
+        .toLowerCase()
+        .localeCompare(
+          digg(b, "humanName").toLowerCase()
+        )
+    )
+  }
+
+  sortedReflectionsByName(reflections) {
     return reflections.sort((a, b) =>
-      currentModelClass.humanAttributeName(a.name()).toLowerCase().localeCompare(currentModelClass.humanAttributeName(b.name()).toLowerCase())
+      digg(a, "humanName")
+        .toLowerCase()
+        .localeCompare(
+          digg(b, "humanName").toLowerCase()
+        )
     )
   }
 }))

package/src/table/header-column-content.jsx

@@ -44,7 +44,7 @@ export default memo(shapeComponent(class ApiMakerTableHeaderColumn extends BaseC
           />
         }
         {(!tableSettingColumn.hasSortKey() || !query) &&
-          <Text ellipsizeMode="clip" numberOfLines={1}>
+          <Text ellipsizeMode="clip" numberOfLines={1} style={{fontWeight: "bold"}}>
             {table.headerLabelForColumn(column)}
           </Text>
         }

package/src/table/table.jsx

@@ -9,6 +9,7 @@ import debounce from "debounce"
 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"
@@ -157,6 +158,7 @@ export default memo(shapeComponent(class ApiMakerTable extends BaseComponent {
       columns: columnsAsArray,
       currentWorkplace: undefined,
       currentWorkplaceCount: null,
+      filterForm: null,
       identifier: () => this.props.identifier || `${collectionKey}-default`,
       lastUpdate: () => new Date(),
       preload: undefined,
@@ -529,18 +531,20 @@ export default memo(shapeComponent(class ApiMakerTable extends BaseComponent {
   filterForm = () => {
     const {filterFormRef, submitFilter, submitFilterDebounce} = this.tt
     const {filterContent, filterSubmitButton} = this.p
+    const {queryQName} = this.s
     const {filterSubmitLabel} = this.props
     const {qParams} = digs(this.collection, "qParams")
 
     return (
-      <form className="live-table--filter-form" onSubmit={this.onFilterFormSubmit} ref={filterFormRef}>
+      <Form className="live-table--filter-form" formRef={filterFormRef} onSubmit={this.onFilterFormSubmit} setForm={this.setStates.filterForm}>
         {"s" in qParams &&
           <input name="s" type="hidden" value={qParams.s} />
         }
         {filterContent({
           onFilterChanged: submitFilter,
           onFilterChangedWithDelay: submitFilterDebounce,
-          qParams
+          qParams,
+          queryQName
         })}
         {filterSubmitButton &&
           <input
@@ -550,7 +554,7 @@ export default memo(shapeComponent(class ApiMakerTable extends BaseComponent {
             value={filterSubmitLabel || this.t(".filter", {defaultValue: "Filter"})}
           />
         }
-      </form>
+      </Form>
     )
   }
 
@@ -843,11 +847,7 @@ export default memo(shapeComponent(class ApiMakerTable extends BaseComponent {
     throw new Error("No 'label' or 'attribute' was given")
   }
 
-  onFilterFormSubmit = (e) => {
-    e.preventDefault()
-    this.submitFilter()
-  }
-
+  onFilterFormSubmit = () => this.submitFilter()
   onRequestCloseSettings = () => this.setState({showSettings: false})
 
   onSettingsClicked = (e) => {

package/src/use-input.mjs

@@ -63,7 +63,7 @@ const useInput = ({props, wrapperOptions}) => {
   const inputDefaultValue = useCallback(() => {
     if ("defaultValue" in s.props) {
       return formatValue(s.props.defaultValue)
-    } else if (s.props.model) {
+    } else if (s.props.model && s.props.attribute) {
       if (!s.props.model[s.props.attribute]) {
         throw new Error(`No such attribute defined on resource: ${digg(s.props.model.modelClassData(), "name")}#${s.props.attribute}`)
       }