clean code

Author: kerwin612

modules/structs/hook.go

@@ -51,7 +51,7 @@ type CreateHookOption struct {
 	BranchFilter        string                 `json:"branch_filter" binding:"GlobPattern"`
 	AuthorizationHeader string                 `json:"authorization_header"`
 	// Webhook metadata settings including payload optimization
-	MetaSettings map[string]any `json:"meta_settings"` // {"payload_optimization": {"files": {"enable": bool, "limit": int}, "commits": {"enable": bool, "limit": int}}}
+	MetaSettings map[string]any `json:"meta_settings"` // {"payload_config": {"files": {"enable": bool, "limit": int}, "commits": {"enable": bool, "limit": int}}}
 	// default: false
 	Active bool `json:"active"`
 }
@@ -63,7 +63,7 @@ type EditHookOption struct {
 	BranchFilter        string            `json:"branch_filter" binding:"GlobPattern"`
 	AuthorizationHeader string            `json:"authorization_header"`
 	// Webhook metadata settings including payload optimization
-	MetaSettings *map[string]any `json:"meta_settings"` // {"payload_optimization": {"files": {"enable": bool, "limit": int}, "commits": {"enable": bool, "limit": int}}}
+	MetaSettings *map[string]any `json:"meta_settings"` // {"payload_config": {"files": {"enable": bool, "limit": int}, "commits": {"enable": bool, "limit": int}}}
 	Active       *bool           `json:"active"`
 }
 

services/forms/repo_form.go

@@ -239,7 +239,7 @@ type WebhookForm struct {
 	BranchFilter             string `binding:"GlobPattern"`
 	AuthorizationHeader      string
 	Secret                   string
-	// Payload optimization settings
+	// Payload config settings
 	PayloadOptimizationFilesEnable   bool `form:"payload_optimization_files_enable"`
 	PayloadOptimizationFilesLimit    int  `form:"payload_optimization_files_limit"`
 	PayloadOptimizationCommitsEnable bool `form:"payload_optimization_commits_enable"`

templates/repo/settings/webhook/settings.tmpl

@@ -59,7 +59,7 @@
 				<span class="help">{{ctx.Locale.Tr "repo.settings.payload_optimization_enable_desc"}}</span>
 			</div>
 		</div>
-		<div class="field">
+		<div class="field {{if not .Webhook.IsFilesConfigEnabled}}tw-hidden{{end}}">
 			<label>{{ctx.Locale.Tr "repo.settings.payload_optimization_limit"}}</label>
 			<input name="payload_optimization_files_limit" type="number" value="{{.Webhook.GetFilesConfigLimit}}" placeholder="0" {{if not .Webhook.IsFilesConfigEnabled}}disabled{{end}}>
 			<span class="help">{{ctx.Locale.Tr "repo.settings.payload_optimization_limit_desc"}}</span>
@@ -74,7 +74,7 @@
 				<span class="help">{{ctx.Locale.Tr "repo.settings.payload_optimization_enable_desc"}}</span>
 			</div>
 		</div>
-		<div class="field">
+		<div class="field {{if not .Webhook.IsCommitsConfigEnabled}}tw-hidden{{end}}">
 			<label>{{ctx.Locale.Tr "repo.settings.payload_optimization_limit"}}</label>
 			<input name="payload_optimization_commits_limit" type="number" value="{{.Webhook.GetCommitsConfigLimit}}" placeholder="0" {{if not .Webhook.IsCommitsConfigEnabled}}disabled{{end}}>
 			<span class="help">{{ctx.Locale.Tr "repo.settings.payload_optimization_limit_desc"}}</span>

tests/integration/repo_webhook_test.go

@@ -1299,7 +1299,7 @@ func Test_WebhookPayloadOptimizationAPI(t *testing.T) {
 		session := loginUser(t, "user2")
 		token := getTokenForLoggedInUser(t, session, auth_model.AccessTokenScopeAll)
 
-		// Test creating webhook with payload optimization options via API
+		// Test creating webhook with payload config options via API
 		createHookOption := map[string]any{
 			"type": "gitea",
 			"config": map[string]string{
@@ -1308,7 +1308,7 @@ func Test_WebhookPayloadOptimizationAPI(t *testing.T) {
 			},
 			"events": []string{"push"},
 			"meta_settings": map[string]any{
-				"payload_optimization": map[string]any{
+				"payload_config": map[string]any{
 					"files": map[string]any{
 						"enable": true,
 						"limit":  2,
@@ -1328,20 +1328,20 @@ func Test_WebhookPayloadOptimizationAPI(t *testing.T) {
 		var hook api.Hook
 		DecodeJSON(t, resp, &hook)
 
-		// Verify the webhook was created with correct payload optimization settings
+		// Verify the webhook was created with correct payload config settings
 		assert.NotNil(t, hook.MetaSettings)
-		payloadOptConfig := hook.MetaSettings["payload_optimization"].(map[string]any)
+		payloadOptConfig := hook.MetaSettings["payload_config"].(map[string]any)
 		filesConfig := payloadOptConfig["files"].(map[string]any)
 		commitsConfig := payloadOptConfig["commits"].(map[string]any)
 		assert.Equal(t, true, filesConfig["enable"])
 		assert.InEpsilon(t, 2.0, filesConfig["limit"], 0.01)
 		assert.Equal(t, true, commitsConfig["enable"])
 		assert.InEpsilon(t, 1.0, commitsConfig["limit"], 0.01)
 
-		// Test updating webhook with different payload optimization options
+		// Test updating webhook with different payload config options
 		editHookOption := map[string]any{
 			"meta_settings": map[string]any{
-				"payload_optimization": map[string]any{
+				"payload_config": map[string]any{
 					"files": map[string]any{
 						"enable": false,
 						"limit":  0,
@@ -1360,9 +1360,9 @@ func Test_WebhookPayloadOptimizationAPI(t *testing.T) {
 		var updatedHook api.Hook
 		DecodeJSON(t, resp, &updatedHook)
 
-		// Verify the webhook was updated with correct payload optimization settings
+		// Verify the webhook was updated with correct payload config settings
 		assert.NotNil(t, updatedHook.MetaSettings)
-		payloadOptConfig = updatedHook.MetaSettings["payload_optimization"].(map[string]any)
+		payloadOptConfig = updatedHook.MetaSettings["payload_config"].(map[string]any)
 		filesConfig = payloadOptConfig["files"].(map[string]any)
 		commitsConfig = payloadOptConfig["commits"].(map[string]any)
 		assert.Equal(t, false, filesConfig["enable"])
@@ -1379,7 +1379,7 @@ func Test_WebhookPayloadOptimizationAPI(t *testing.T) {
 
 		// Verify the webhook settings are correctly retrieved
 		assert.NotNil(t, retrievedHook.MetaSettings)
-		payloadOptConfig = retrievedHook.MetaSettings["payload_optimization"].(map[string]any)
+		payloadOptConfig = retrievedHook.MetaSettings["payload_config"].(map[string]any)
 		filesConfig = payloadOptConfig["files"].(map[string]any)
 		commitsConfig = payloadOptConfig["commits"].(map[string]any)
 		assert.Equal(t, false, filesConfig["enable"])