Fix the truncate and alignment problem for some admin tables #26042

wxiaoguang · 2023-07-21T15:53:20Z

Some "text truncate email" code were just copied&pasted, they are not suitable for most admin tables.

For the table layouts, some "max-width" helpers could be very helpful. At least, we can get rid of the confusing "email" CSS class.

silverwind · 2023-07-21T16:06:05Z

Did you check all admin tables?

silverwind

Works and is the same approach I had used in #25942 (comment).

wxiaoguang · 2023-07-21T16:06:50Z

Did you check all admin tables?

I have checked, I think that's all.

silverwind · 2023-07-21T16:09:02Z

Yes, looks complete for admin tables. Quick search for text.+truncate:

templates/admin/emails/list.tmpl:50
templates/admin/packages/list.tmpl:59
templates/admin/packages/list.tmpl:60
templates/admin/user/list.tmpl:88

silverwind · 2023-07-21T18:42:47Z

Some odd failures with a ldap test, already the second time now:

    auth_ldap_test.go:246: 
        	Error Trace:	/home/runner/work/gitea/gitea/tests/integration/auth_ldap_test.go:246
        	Error:      	Not equal: 
        	            	expected: "professor@planetexpress.com"
        	            	actual  : ""
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1 +1 @@
        	            	-professor@planetexpress.com
        	            	+
        	Test:       	TestLDAPUserSync
    testlogger.go:60: 2023/07/21 17:01:52 ...eb/routing/logger.go:102:func1() [I] router: completed GET /admin/users?q=hermes for test-mock:12345, 200 OK in 25.4ms @ admin/users.go:38(admin.Users)
    auth_ldap_test.go:246: 
        	Error Trace:	/home/runner/work/gitea/gitea/tests/integration/auth_ldap_test.go:246
        	Error:      	Not equal: 
        	            	expected: "hermes@planetexpress.com"
        	            	actual  : ""
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1 +1 @@
        	            	-hermes@planetexpress.com
        	            	+
        	Test:       	TestLDAPUserSync
    testlogger.go:60: 2023/07/21 17:01:52 ...eb/routing/logger.go:102:func1() [I] router: completed GET /admin/users?q=fry for test-mock:12345, 200 OK in 26.5ms @ admin/users.go:38(admin.Users)
    auth_ldap_test.go:246: 
        	Error Trace:	/home/runner/work/gitea/gitea/tests/integration/auth_ldap_test.go:246
        	Error:      	Not equal: 
        	            	expected: "fry@planetexpress.com"
        	            	actual  : ""
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1 +1 @@
        	            	-fry@planetexpress.com
        	            	+
        	Test:       	TestLDAPUserSync
    testlogger.go:60: 2023/07/21 17:01:52 ...eb/routing/logger.go:102:func1() [I] router: completed GET /admin/users?q=leela for test-mock:12345, 200 OK in 26.7ms @ admin/users.go:38(admin.Users)
    auth_ldap_test.go:246: 
        	Error Trace:	/home/runner/work/gitea/gitea/tests/integration/auth_ldap_test.go:246
        	Error:      	Not equal: 
        	            	expected: "leela@planetexpress.com"
        	            	actual  : ""
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1 +1 @@
        	            	-leela@planetexpress.com
        	            	+
        	Test:       	TestLDAPUserSync
    testlogger.go:60: 2023/07/21 17:01:52 ...eb/routing/logger.go:102:func1() [I] router: completed GET /admin/users?q=bender for test-mock:12345, 200 OK in 25.7ms @ admin/users.go:38(admin.Users)
    auth_ldap_test.go:246: 
        	Error Trace:	/home/runner/work/gitea/gitea/tests/integration/auth_ldap_test.go:246
        	Error:      	Not equal: 
        	            	expected: "bender@planetexpress.com"
        	            	actual  : ""
        	            	
        	            	Diff:
        	            	--- Expected
        	            	+++ Actual
        	            	@@ -1 +1 @@
        	            	-bender@planetexpress.com
        	            	+
        	Test:       	TestLDAPUserSync

silverwind · 2023-07-21T18:43:23Z

I think there might be some integration integration test that hooked onto the .text class.

denyskon · 2023-07-21T21:34:36Z

The LDAP test is one I have been breaking a few times now..... We have some tests including this one which rely on some CSS classes - I wonder if there's any better solution for it.... maybe something like data-test-element-id=

silverwind · 2023-07-21T22:59:13Z

Yes, just give it a unique id/class.

wxiaoguang · 2023-07-22T04:57:36Z

~~Removed~~ Refactored all "HTML-baesd tests", now CI psases

* giteaofficial/main: (23 commits) Avoid writing config file if not installed (go-gitea#26107) Implement auto-cancellation of concurrent jobs if the event is push (go-gitea#25716) [skip ci] Updated translations via Crowdin doc guide the user to create the appropriate level runner (go-gitea#26091) Fix handling of Debian files with trailing slash (go-gitea#26087) fix Missing 404 swagger response docs for /admin/users/{username} (go-gitea#26086) Allow the use of alternative net.Listener implementations by downstreams (go-gitea#25855) Add missing default value for some Bool cli flags (go-gitea#26082) Reduce unnecessary DB queries for Actions tasks (go-gitea#25199) Use stderr as fallback if the log file can't be opened (go-gitea#26074) Make organization redirect warning more clear (go-gitea#26077) Replace gogs/cron with go-co-op/gocron (go-gitea#25977) Remove `db.DefaultContext` in `routers/` and `cmd/` (go-gitea#26076) Categorize admin settings sidebar panel (go-gitea#26030) [skip ci] Updated translations via Crowdin Fix duplicated url prefix on issue context menu (go-gitea#26066) Add context parameter to some database functions (go-gitea#26055) Fix branch list auth (go-gitea#26041) Fix the truncate and alignment problem for some admin tables (go-gitea#26042) Update secrets.en-us.md (go-gitea#26057) ...

fix

bcfa35a

GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jul 21, 2023

pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Jul 21, 2023

wxiaoguang mentioned this pull request Jul 21, 2023

Fix alignment of truncated text in tables #25942

Closed

wxiaoguang added this to the 1.21.0 milestone Jul 21, 2023

wxiaoguang added type/bug topic/ui Change the appearance of the Gitea UI labels Jul 21, 2023

silverwind approved these changes Jul 21, 2023

View reviewed changes

GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Jul 21, 2023

lunny approved these changes Jul 21, 2023

View reviewed changes

GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Jul 21, 2023

lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 21, 2023

silverwind enabled auto-merge (squash) July 21, 2023 16:46

silverwind removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 21, 2023

auto-merge was automatically disabled July 22, 2023 04:00
Head branch was pushed to by a user without write access

fix test

11dd1f8

wxiaoguang force-pushed the fix-admin-table-truncate branch from 61a43ac to 11dd1f8 Compare July 22, 2023 04:32

pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jul 22, 2023

lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 22, 2023

lunny enabled auto-merge (squash) July 22, 2023 08:47

GiteaBot added 3 commits July 22, 2023 05:01

Merge branch 'main' into fix-admin-table-truncate

f060bab

Merge branch 'main' into fix-admin-table-truncate

924586a

Merge branch 'main' into fix-admin-table-truncate

7c39755

lunny merged commit a7e8273 into go-gitea:main Jul 22, 2023
24 checks passed

GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jul 22, 2023

wxiaoguang deleted the fix-admin-table-truncate branch July 22, 2023 10:55

go-gitea locked as resolved and limited conversation to collaborators Oct 20, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix the truncate and alignment problem for some admin tables #26042

Fix the truncate and alignment problem for some admin tables #26042

wxiaoguang commented Jul 21, 2023 •

edited

silverwind commented Jul 21, 2023

silverwind left a comment

wxiaoguang commented Jul 21, 2023 •

edited

silverwind commented Jul 21, 2023

silverwind commented Jul 21, 2023

silverwind commented Jul 21, 2023 •

edited

denyskon commented Jul 21, 2023 •

edited

silverwind commented Jul 21, 2023 •

edited

wxiaoguang commented Jul 22, 2023 •

edited

Fix the truncate and alignment problem for some admin tables #26042

Fix the truncate and alignment problem for some admin tables #26042

Conversation

wxiaoguang commented Jul 21, 2023 • edited

silverwind commented Jul 21, 2023

silverwind left a comment

Choose a reason for hiding this comment

wxiaoguang commented Jul 21, 2023 • edited

silverwind commented Jul 21, 2023

silverwind commented Jul 21, 2023

silverwind commented Jul 21, 2023 • edited

denyskon commented Jul 21, 2023 • edited

silverwind commented Jul 21, 2023 • edited

wxiaoguang commented Jul 22, 2023 • edited

wxiaoguang commented Jul 21, 2023 •

edited

wxiaoguang commented Jul 21, 2023 •

edited

silverwind commented Jul 21, 2023 •

edited

denyskon commented Jul 21, 2023 •

edited

silverwind commented Jul 21, 2023 •

edited

wxiaoguang commented Jul 22, 2023 •

edited