introduce window.config.PageData to pass template data to javascript module and small refactor

wxiaoguang · wxiaoguang · commit 0b2604b9b303 · 2021-08-25T20:09:21.000+08:00
move legacy window.ActivityTopAuthors to window.config.PageData.ActivityTopAuthors
make HTML structure more IDE-friendly in footer.tmpl and head.tmpl
remove incorrect &lt;style class="list-search-style"&gt;&lt;/style&gt; in head.tmpl
use log.Error instead of log.Critical in admin user search
diff --git a/models/user.go b/models/user.go
@@ -1669,7 +1669,7 @@ func (opts *SearchUserOptions) toConds() builder.Cond {
 					}
 					cond = cond.And(twoFactorCond)
 				} else {
-					log.Critical("Unknown admin user search filter: %v=%v", filterKey, filterValue)
+					log.Error("Unknown admin user search filter: %v=%v", filterKey, filterValue)
 				}
 			}
 		}
diff --git a/templates/admin/user/list.tmpl b/templates/admin/user/list.tmpl
@@ -63,8 +63,7 @@
 				<script>
 					<!-- /* eslint-disable */ -->
 					(function() {
-						window.giteaContext = window.giteaContext || {};
-						window.giteaContext.adminUserListSearchForm = {
+						window.config.PageData.adminUserListSearchForm = {
 							statusFilterMap: {{.StatusFilterMap}},
 							sortType: {{.SortType}} || 'oldest'
 						}
diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl
@@ -1,8 +1,9 @@
-{{/*
+{{if false}}
+	{{/* to make html structure "likely" complete to prevent IDE warnings */}}
 <html>
 <body>
 	<div>
-*/}}
+{{end}}
 
 	{{template "custom/body_inner_post" .}}
 
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl
@@ -44,6 +44,7 @@
 			},
 			EnableTimetracking: {{if EnableTimetracking}}true{{else}}false{{end}},
 			PageIsProjects: {{if .PageIsProjects }}true{{else}}false{{end}},
+			PageData: {},  // to store page related data, eg: pass variables to javascript module
 			{{if .RequireTribute}}
 			tributeValues: Array.from(new Map([
 				{{ range .Participants }}
@@ -75,7 +76,6 @@
 			.ui.secondary.menu .dropdown.item > .menu { margin-top: 0; }
 		</style>
 	</noscript>
-	<style class="list-search-style"></style>
 {{if .PageIsUserProfile}}
 	<meta property="og:title" content="{{.Owner.Name}}" />
 	<meta property="og:type" content="profile" />
@@ -134,8 +134,10 @@
 				{{template "base/head_navbar" .}}
 			</div><!-- end bar -->
 		{{end}}
-{{/*
+
+{{if false}}
+	{{/* to make html structure "likely" complete to prevent IDE warnings */}}
 	</div>
 </body>
 </html>
-*/}}
+{{end}}
diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl
@@ -110,7 +110,7 @@
 					</div>
 					<div class="ui attached segment" id="app">
 						<script type="text/javascript">
-						var ActivityTopAuthors = {{Json .ActivityTopAuthors | SafeJS}};
+						window.config.PageData.ActivityTopAuthors = {{Json .ActivityTopAuthors | SafeJS}};
 						</script>
 						<activity-top-authors :data="activityTopAuthors" />
 					</div>
diff --git a/web_src/js/features/admin-users.js b/web_src/js/features/admin-users.js
@@ -1,12 +1,10 @@
 export function initAdminUserListSearchForm() {
-  if (!$('.admin').length) return;
-  if (!window.giteaContext || !window.giteaContext.adminUserListSearchForm) return;
+  const searchForm = window.config.PageData.adminUserListSearchForm;
+  if (!searchForm) return;
 
   const $form = $('#user-list-search-form');
   if (!$form.length) return;
 
-  const searchForm = window.giteaContext.adminUserListSearchForm;
-
   $form.find(`button[name=sort][value=${searchForm.sortType}]`).addClass('active');
 
   if (searchForm.statusFilterMap) {
diff --git a/web_src/js/index.js b/web_src/js/index.js
@@ -27,7 +27,7 @@ import {initMarkupContent, initCommentContent} from './markup/content.js';
 import {stripTags, mqBinarySearch} from './utils.js';
 import {svg, svgs} from './svg.js';
 
-const {AppSubUrl, AssetUrlPrefix, csrf} = window.config;
+const {AppSubUrl, AssetUrlPrefix, csrf, PageData} = window.config;
 
 let previewFileModes;
 const commentMDEditors = {};
@@ -3439,7 +3439,7 @@ function initVueApp() {
         searchLimit: Number((document.querySelector('meta[name=_search_limit]') || {}).content),
         suburl: AppSubUrl,
         uid: Number((document.querySelector('meta[name=_context_uid]') || {}).content),
-        activityTopAuthors: window.ActivityTopAuthors || [],
+        activityTopAuthors: PageData.ActivityTopAuthors || [],
       };
     },
   });

Original file line number	Diff line number	Diff line change
`@@ -1669,7 +1669,7 @@ func (opts *SearchUserOptions) toConds() builder.Cond {`
`1669`	`1669`	`}`
`1670`	`1670`	`cond = cond.And(twoFactorCond)`
`1671`	`1671`	`} else {`
`1672`		`- log.Critical("Unknown admin user search filter: %v=%v", filterKey, filterValue)`
	`1672`	`+ log.Error("Unknown admin user search filter: %v=%v", filterKey, filterValue)`
`1673`	`1673`	`}`
`1674`	`1674`	`}`
`1675`	`1675`	`}`