JNG-5775 fix filterable attributes (#72)

BlackBeltTechnology · Jun 14, 2024 · d8867d9 · d8867d9
1 parent 8ffad91
commit d8867d9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/...api/src/main/java/hu/blackbelt/judo/ui/generator/typescript/rest/api/UiGeneralHelper.java b/...api/src/main/java/hu/blackbelt/judo/ui/generator/typescript/rest/api/UiGeneralHelper.java
@@ -342,8 +342,4 @@ public static List<ClassType> getRelatedClasses(ClassType classType) {
                 .sorted(Comparator.comparing(NamedElement::getFQName))
                 .toList();
     }
-
-    public static boolean isAttributeFilterable(AttributeType attributeType) {
-        return !(attributeType.getDataType() instanceof BinaryType) && !attributeType.getIsMemberTypeTransient();
-    }
 }
diff --git a/judo-ui-typescript-rest-api/src/main/resources/rest/queryCustomizerSerializer.ts.hbs b/judo-ui-typescript-rest-api/src/main/resources/rest/queryCustomizerSerializer.ts.hbs
@@ -15,7 +15,7 @@ export function serialize{{ classDataName classType "QueryCustomizer" }}(queryCu
   const {
     _seek,
     {{# each classType.attributes as |attribute| }}
-    {{# if (isAttributeFilterable attribute) }}
+    {{# if attribute.isFilterable }}
     {{ attribute.name }}: filter{{ firstToUpper attribute.name }},
     {{/ if }}
     {{/ each }}
@@ -24,7 +24,7 @@ export function serialize{{ classDataName classType "QueryCustomizer" }}(queryCu
   const result: any = { ...rest };
 
   {{# each classType.attributes as |attribute| }}
-  {{# if (isAttributeFilterable attribute) }}
+  {{# if attribute.isFilterable }}
   if (Array.isArray(filter{{ firstToUpper attribute.name }})) {
     result.{{ attribute.name }} = filter{{ firstToUpper attribute.name }}.map(({ operator, value }) => ({
       operator,