clean up css, fix trees/group mess, update todos

Taack · Jun 28, 2024 · ed2f3ff · ed2f3ff
1 parent ccdbf1c
commit ed2f3ff
Show file tree

Hide file tree

Showing 14 changed files with 70 additions and 5,587 deletions.
diff --git a/TODO.md b/TODO.md
@@ -37,7 +37,7 @@
 - ~~Hook to register form field (view, update, remove, secure)~~
 - ~~Improve restore state~~
 - ~~Reduce CSS and JS~~
-- Fix table grouping / trees with pagination, rework grouping to be trees (do an iterateOnGroup) 
+- ~~rework grouping to be trees~~
 - ~~Improve form layout, add row in DSL~~
 - ~~More coherent button style in forms~~
 - ~~More restrictive DSL~~

diff --git a/browser/client/src/jsMain/kotlin/taack/ui/base/element/TableRow.kt b/browser/client/src/jsMain/kotlin/taack/ui/base/element/TableRow.kt
@@ -12,7 +12,7 @@ class TableRow(val parent: Table, val r: HTMLTableRowElement) :
     companion object {
         fun getSiblingRows(p: Table): List<TableRow> {
             val elements: List<Node>?
-            elements = p.t.querySelectorAll("tr.taackTableRow").asList()
+            elements = p.t.querySelectorAll("tr[taacktag]").asList()
             return elements.map {
                 TableRow(p, it as HTMLTableRowElement)
             }

diff --git a/taack-ui-test/grails-app/controllers/crew/CrewController.groovy b/taack-ui-test/grails-app/controllers/crew/CrewController.groovy
@@ -55,8 +55,6 @@ class CrewController implements WebAttributes {
 
     private UiTableSpecifier buildUserTableHierarchy(final User u) {
 
-        def groups = taackFilterService.getBuilder(User).build().listGroup()
-
         boolean hasActions = crewSecurityService.admin
 
         new UiTableSpecifier().ui {
@@ -105,27 +103,7 @@ class CrewController implements WebAttributes {
                 })
             }
 
-            if (groups) {
-                User filterUser = new User(enabled: true)
-                for (def g : groups) {
-                    int oldCount = count
-                    row {
-                        rowColumn(4) {
-                            rowField g as String
-                        }
-                    }
-                    rec(taackFilterService.getBuilder(User).build().listInGroup(g, new UiFilterSpecifier().sec(User, {
-                        filterFieldExpressionBool new FilterExpression(true, Operator.EQ, filterUser.enabled_)
-                    })).aValue, 0)
-                    row {
-                        rowColumn(4) {
-                            rowField "Count: ${count - oldCount}"
-                        }
-                    }
-                }
-            } else {
-                rec(User.findAllByManagerIsNullAndEnabled(true), 0)
-            }
+            rec(User.findAllByManagerIsNullAndEnabled(true), 0)
         }
     }
 

diff --git a/taack-ui/grails-app/assets/stylesheets/alert.css b/taack-ui/grails-app/assets/stylesheets/alert.css
diff --git a/taack-ui/grails-app/assets/stylesheets/application-taack.css b/taack-ui/grails-app/assets/stylesheets/application-taack.css
@@ -11,7 +11,7 @@
 *= require github-markdown
 *= require grids-responsive-min
 *= require wysiwyg
-*= require taack
+*= require taack.css
 *= require custom.css
 *= require_self
 */