JNG-5669 frontend fixes (#385)

* JNG-5669 fix nested tab redundant labels * JNG-5675 fix enum memo dep * JNG-5678 fix row click selection on selection dialogs
BlackBeltTechnology · Apr 10, 2024 · c205068 · c205068
1 parent dd8a4fb
commit c205068
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/judo-ui-react/src/main/java/hu/blackbelt/judo/ui/generator/react/UiWidgetHelper.java b/judo-ui-react/src/main/java/hu/blackbelt/judo/ui/generator/react/UiWidgetHelper.java
@@ -432,6 +432,10 @@ public static Integer calculateLinkAutocompleteRows(Link link) {
         return defaultValue != null ? defaultValue : 10;
     }
 
+    public static boolean flexParentIsNotTab(Flex flex) {
+        return !(flex.eContainer() instanceof Tab);
+    }
+
     public static boolean flexHasIconOrLabel(Flex flex) {
         return flex.getIcon() != null || flexHasLabel(flex);
     }

diff --git a/judo-ui-react/src/main/resources/actor/src/components/table/LazyTable.tsx.hbs b/judo-ui-react/src/main/resources/actor/src/components/table/LazyTable.tsx.hbs
@@ -588,7 +588,7 @@ export function LazyTable<T extends GridValidRowModel, TStored extends T, S exte
           onColumnOrderChange={onColumnsChanged}
           onColumnWidthChange={onColumnsChanged}
         {{/ if }}
-        disableRowSelectionOnClick
+        disableRowSelectionOnClick={!containerIsSelector}
         isRowSelectable={handleIsRowSelectable}
         hideFooterSelectedRowCount={ !allowSelectMultiple }
         checkboxSelection

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/container.tsx.hbs b/judo-ui-react/src/main/resources/actor/src/containers/container.tsx.hbs
@@ -124,7 +124,7 @@ export default function {{ containerComponentName container }}(props: {{ contain
           return actions.filter{{ firstToUpper ve.attributeType.name }}Options(data, {{ ve.attributeType.name }}Options);
         }
         return {{ ve.attributeType.name }}Options;
-      }, [actions.filter{{ safeName ve }}Options]);
+      }, [actions.filter{{ firstToUpper ve.attributeType.name }}Options]);
     {{/ each }}
     {{# if container.form }}
     const autoFocusInputRef = useRef<any>(null);

diff --git a/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/flex.hbs b/judo-ui-react/src/main/resources/actor/src/containers/widget-fragments/flex.hbs
@@ -68,7 +68,7 @@
         </Card>
     {{ else }}
         <Grid container direction="row" spacing={2}>
-            {{# if (flexHasIconOrLabel this) }}
+            {{# and (flexHasIconOrLabel this) (flexParentIsNotTab this) }}
                 <Grid item xs={12} sm={12}>
                     <Grid container direction="row" alignItems="center" justifyContent="flex-start">
                     {{# if this.icon }}
@@ -81,7 +81,7 @@
                     {{/ if }}
                     </Grid>
                 </Grid>
-            {{/ if }}
+            {{/ and }}
             <Grid item xs={12} sm={12}>
                 <Grid id="{{ getXMIID this }}" data-name="{{ this.name }}" container direction="{{# if child.isDirectionHorizontal }}row{{ else }}column{{/ if }}" alignItems="{{ alignItems this }}" justifyContent="{{ justifyContent this }}" spacing={2}>
                     {{# each this.children as |child| }}