clean up

Author: wxiaoguang

models/user/setting_keys.go

@@ -10,13 +10,15 @@ const (
 	SettingsKeyDiffWhitespaceBehavior = "diff.whitespace_behaviour"
 	// SettingsKeyShowOutdatedComments is the setting key wether or not to show outdated comments in PRs
 	SettingsKeyShowOutdatedComments = "comment_code.show_outdated"
+
 	// UserActivityPubPrivPem is user's private key
 	UserActivityPubPrivPem = "activitypub.priv_pem"
 	// UserActivityPubPubPem is user's public key
 	UserActivityPubPubPem = "activitypub.pub_pem"
 	// SignupIP is the IP address that the user signed up with
 	SignupIP = "signup.ip"
 	// SignupUserAgent is the user agent that the user signed up with
-	SignupUserAgent                    = "signup.user_agent"
-	SettingsKeyShowFileViewTreeSidebar = "tree.show_file_view_tree_sidebar"
+	SignupUserAgent = "signup.user_agent"
+
+	SettingsKeyCodeViewShowFileTree = "code_view.show_file_tree"
 )

modules/git/parse_nogogit.go

@@ -19,7 +19,7 @@ func ParseTreeEntries(data []byte) ([]*TreeEntry, error) {
 	return parseTreeEntries(data, nil)
 }
 
-// parseTreeEntries FIXME this function's design is not right, it should make the caller read all data into memory
+// parseTreeEntries FIXME this function's design is not right, it should not make the caller read all data into memory
 func parseTreeEntries(data []byte, ptree *Tree) ([]*TreeEntry, error) {
 	entries := make([]*TreeEntry, 0, bytes.Count(data, []byte{'\n'})+1)
 	for pos := 0; pos < len(data); {

routers/web/repo/repo.go

@@ -651,18 +651,17 @@ func PrepareBranchList(ctx *context.Context) {
 	ctx.Data["Branches"] = brs
 }
 
-type preferencesForm struct {
-	ShowFileViewTreeSidebar bool `json:"show_file_view_tree_sidebar"`
-}
-
 func UpdatePreferences(ctx *context.Context) {
+	type preferencesForm struct {
+		CodeViewShowFileTree bool `json:"codeViewShowFileTree"`
+	}
 	form := &preferencesForm{}
 	if err := json.NewDecoder(ctx.Req.Body).Decode(&form); err != nil {
 		ctx.ServerError("DecodePreferencesForm", err)
 		return
 	}
-	if err := user_model.SetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsKeyShowFileViewTreeSidebar,
-		strconv.FormatBool(form.ShowFileViewTreeSidebar)); err != nil {
+	if err := user_model.SetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsKeyCodeViewShowFileTree,
+		strconv.FormatBool(form.CodeViewShowFileTree)); err != nil {
 		log.Error("SetUserSetting: %v", err)
 	}
 

routers/web/repo/view_home.go

@@ -331,18 +331,16 @@ func handleRepoHomeFeed(ctx *context.Context) bool {
 }
 
 func prepareHomeTreeSideBarSwitch(ctx *context.Context) {
-	showFileViewTreeSidebar := true
+	showFileTree := true
 	if ctx.Doer != nil {
-		v, err := user_model.GetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsKeyShowFileViewTreeSidebar, "true")
+		v, err := user_model.GetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsKeyCodeViewShowFileTree, "true")
 		if err != nil {
 			log.Error("GetUserSetting: %v", err)
 		} else {
-			showFileViewTreeSidebar, _ = strconv.ParseBool(v)
+			showFileTree, _ = strconv.ParseBool(v)
 		}
 	}
-	ctx.Data["RepoPreferences"] = &preferencesForm{
-		ShowFileViewTreeSidebar: showFileViewTreeSidebar,
-	}
+	ctx.Data["UserSettingCodeViewShowFileTree"] = showFileTree
 }
 
 // Home render repository home page

routers/web/web.go

@@ -580,6 +580,7 @@ func registerRoutes(m *web.Router) {
 	m.Group("/user/settings", func() {
 		m.Get("", user_setting.Profile)
 		m.Post("", web.Bind(forms.UpdateProfileForm{}), user_setting.ProfilePost)
+		m.Post("/update_preferences", repo.UpdatePreferences)
 		m.Get("/change_password", auth.MustChangePassword)
 		m.Post("/change_password", web.Bind(forms.MustChangePasswordForm{}), auth.MustChangePasswordPost)
 		m.Post("/avatar", web.Bind(forms.AvatarForm{}), user_setting.AvatarPost)
@@ -1001,7 +1002,6 @@ func registerRoutes(m *web.Router) {
 		m.Get("/migrate", repo.Migrate)
 		m.Post("/migrate", web.Bind(forms.MigrateRepoForm{}), repo.MigratePost)
 		m.Get("/search", repo.SearchRepo)
-		m.Put("/preferences", repo.UpdatePreferences)
 	}, reqSignIn)
 	// end "/repo": create, migrate, search
 

templates/repo/view.tmpl

@@ -16,8 +16,8 @@
 
 		{{template "repo/code/recently_pushed_new_branches" .}}
 
-		<div class="repo-view-container {{Iif .RepoPreferences.ShowFileViewTreeSidebar "repo-view-with-sidebar" "repo-view-content-only"}}">
-			<div class="repo-view-file-tree-sidebar not-mobile {{if not .RepoPreferences.ShowFileViewTreeSidebar}}tw-hidden{{end}}" {{if .IsSigned}} data-is-signed {{end}}>{{template "repo/view_file_tree_sidebar" .}}</div>
+		<div class="repo-view-container {{Iif .UserSettingCodeViewShowFileTree "repo-view-with-sidebar" "repo-view-content-only"}}">
+			<div class="repo-view-file-tree-sidebar not-mobile {{if not .UserSettingCodeViewShowFileTree}}tw-hidden{{end}}" {{if .IsSigned}} data-is-signed {{end}}>{{template "repo/view_file_tree_sidebar" .}}</div>
 			<div class="repo-view-content">
 				{{template "repo/view_content" .}}
 			</div>

templates/repo/view_content.tmpl

@@ -4,7 +4,7 @@
 <div class="repo-button-row">
 	<div class="repo-button-row-left">
 	{{if not $isTreePathRoot}}
-		<button class="show-tree-sidebar-button ui compact basic button icon not-mobile {{if .RepoPreferences.ShowFileViewTreeSidebar}}tw-hidden{{end}}" title="{{ctx.Locale.Tr "repo.diff.show_file_tree"}}">
+		<button class="show-tree-sidebar-button ui compact basic button icon not-mobile {{if .UserSettingCodeViewShowFileTree}}tw-hidden{{end}}" title="{{ctx.Locale.Tr "repo.diff.show_file_tree"}}">
 			{{svg "octicon-sidebar-collapse"}}
 		</button>
 	{{end}}

web_src/js/features/repo-view-file-tree-sidebar.ts

@@ -1,7 +1,7 @@
 import {createApp, ref} from 'vue';
 import {toggleElem} from '../utils/dom.ts';
 import {pathEscapeSegments, pathUnescapeSegments} from '../utils/url.ts';
-import {GET, PUT} from '../modules/fetch.ts';
+import {GET, POST} from '../modules/fetch.ts';
 import ViewFileTree from '../components/ViewFileTree.vue';
 
 const {appSubUrl} = window.config;
@@ -19,9 +19,9 @@ async function toggleSidebar(sidebarEl: HTMLElement, shouldShow: boolean) {
   if (!sidebarEl.hasAttribute('data-is-signed')) return;
 
   // save to session
-  await PUT(`${appSubUrl}/repo/preferences`, {
+  await POST(`${appSubUrl}/user/settings/update_preferences`, {
     data: {
-      show_file_view_tree_sidebar: shouldShow,
+      codeViewShowFileTree: shouldShow,
     },
   });
 }