@kaspernj/api-maker 1.0.423 → 1.0.425

package/package.json

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

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

@@ -1,4 +1,4 @@
-@import "@kaspernj/api-maker/src/super-admin/stylesheets/variables";
+@use "@kaspernj/api-maker/src/super-admin/stylesheets/variables" as *;
 
 [data-component="super-admin--layout--header"] {
   @media (max-width: $sm-to) {

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

@@ -1,4 +1,4 @@
-@import "@kaspernj/api-maker/src/super-admin/stylesheets/variables";
+@use "@kaspernj/api-maker/src/super-admin/stylesheets/variables" as *;
 
 [data-component="super-admin--layout--menu"] {
   position: fixed;

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

@@ -1,4 +1,4 @@
-@import "@kaspernj/api-maker/src/super-admin/stylesheets/variables";
+@use "@kaspernj/api-maker/src/super-admin/stylesheets/variables" as *;
 
 [data-component="super-admin--layout"] {
   width: 100%;

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(".")}.`