Revert "maybe add a special unit named as misc to sore these special repo level configs"

This reverts commit 7d8595b.

Author: a1012112796

models/repo/repo.go

@@ -468,8 +468,8 @@ func (repo *Repository) MustGetUnit(ctx context.Context, tp unit.Type) *RepoUnit
 			Type:   tp,
 			Config: cfg,
 		}
-	case unit.TypeMisc:
-		cfg := new(MiscConfig)
+	case unit.TypePackages:
+		cfg := new(PackagesConfig)
 		return &RepoUnit{
 			Type:   tp,
 			Config: cfg,

models/repo/repo_unit.go

@@ -264,11 +264,11 @@ func (r *RepoUnit) BeforeSet(colName string, val xorm.Cell) {
 			r.Config = new(IssuesConfig)
 		case unit.TypeActions:
 			r.Config = new(ActionsConfig)
+		case unit.TypePackages:
+			r.Config = new(PackagesConfig)
 		case unit.TypeProjects:
 			r.Config = new(ProjectsConfig)
-		case unit.TypeMisc:
-			r.Config = new(MiscConfig)
-		case unit.TypeCode, unit.TypeReleases, unit.TypeWiki, unit.TypePackages:
+		case unit.TypeCode, unit.TypeReleases, unit.TypeWiki:
 			fallthrough
 		default:
 			r.Config = new(UnitConfig)
@@ -321,23 +321,23 @@ func (r *RepoUnit) ProjectsConfig() *ProjectsConfig {
 	return r.Config.(*ProjectsConfig)
 }
 
-// MiscConfig returns config for unit.MiscConfig
-func (r *RepoUnit) MiscConfig() *MiscConfig {
-	return r.Config.(*MiscConfig)
+// PackagesConfig returns config for unit.PackagesConfig
+func (r *RepoUnit) PackagesConfig() *PackagesConfig {
+	return r.Config.(*PackagesConfig)
 }
 
-// MiscConfig describes repo misc config
-type MiscConfig struct {
+// PackagesConfig describes package config
+type PackagesConfig struct {
 	GoModuleSubDir string
 }
 
-// FromDB fills up a MiscConfig from serialized format.
-func (cfg *MiscConfig) FromDB(bs []byte) error {
+// FromDB fills up a PackagesConfig from serialized format.
+func (cfg *PackagesConfig) FromDB(bs []byte) error {
 	return json.UnmarshalHandleDoubleEncode(bs, &cfg)
 }
 
-// ToDB exports a MiscConfig to a serialized format.
-func (cfg *MiscConfig) ToDB() ([]byte, error) {
+// ToDB exports a PackagesConfig to a serialized format.
+func (cfg *PackagesConfig) ToDB() ([]byte, error) {
 	return json.Marshal(cfg)
 }
 

models/unit/unit.go

@@ -14,7 +14,6 @@ import (
 	"code.gitea.io/gitea/modules/container"
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
-	"code.gitea.io/gitea/modules/util"
 )
 
 // Type is Unit's Type
@@ -35,10 +34,6 @@ const (
 	TypePackages        // 9 Packages
 	TypeActions         // 10 Actions
 
-	// misc is a special uint to store special configs for a repo which is not related to any unit,
-	// it should be considered as enabled anyway
-	TypeMisc Type = 999 // 999 misc
-
 	// FIXME: TEAM-UNIT-PERMISSION: the team unit "admin" permission's design is not right, when a new unit is added in the future,
 	// admin team won't inherit the correct admin permission for the new unit, need to have a complete fix before adding any new unit.
 )
@@ -70,7 +65,6 @@ var (
 		TypeProjects,
 		TypePackages,
 		TypeActions,
-		TypeMisc,
 	}
 
 	// DefaultRepoUnits contains the default unit types
@@ -83,14 +77,12 @@ var (
 		TypeProjects,
 		TypePackages,
 		TypeActions,
-		TypeMisc,
 	}
 
 	// ForkRepoUnits contains the default unit types for forks
 	DefaultForkRepoUnits = []Type{
 		TypeCode,
 		TypePullRequests,
-		TypeMisc,
 	}
 
 	// DefaultMirrorRepoUnits contains the default unit types for mirrors
@@ -101,7 +93,6 @@ var (
 		TypeWiki,
 		TypeProjects,
 		TypePackages,
-		TypeMisc,
 	}
 
 	// DefaultTemplateRepoUnits contains the default unit types for templates
@@ -113,14 +104,12 @@ var (
 		TypeWiki,
 		TypeProjects,
 		TypePackages,
-		TypeMisc,
 	}
 
 	// NotAllowedDefaultRepoUnits contains units that can't be default
 	NotAllowedDefaultRepoUnits = []Type{
 		TypeExternalWiki,
 		TypeExternalTracker,
-		TypeMisc,
 	}
 
 	disabledRepoUnitsAtomic atomic.Pointer[[]Type] // the units that have been globally disabled
@@ -174,11 +163,6 @@ func LoadUnitConfig() error {
 	if len(invalidKeys) > 0 {
 		log.Warn("Invalid keys in disabled repo units: %s", strings.Join(invalidKeys, ", "))
 	}
-	if slices.Contains(disabledRepoUnits, TypeMisc) {
-		log.Warn("Misc unit should not be disabled")
-		disabledRepoUnits = util.SliceRemoveAll(disabledRepoUnits, TypeMisc)
-	}
-
 	DisabledRepoUnitsSet(disabledRepoUnits)
 
 	setDefaultRepoUnits, invalidKeys := FindUnitTypes(setting.Repository.DefaultRepoUnits...)
@@ -344,15 +328,6 @@ var (
 		perm.AccessModeOwner,
 	}
 
-	UnitMisc = Unit{
-		TypeMisc,
-		"repo.misc",
-		"/misc",
-		"misc.unit.desc",
-		999,
-		perm.AccessModeOwner,
-	}
-
 	// Units contains all the units
 	Units = map[Type]Unit{
 		TypeCode:            UnitCode,
@@ -365,7 +340,6 @@ var (
 		TypeProjects:        UnitProjects,
 		TypePackages:        UnitPackages,
 		TypeActions:         UnitActions,
-		TypeMisc:            UnitMisc,
 	}
 )
 

options/locale/locale_en-US.ini

@@ -2629,7 +2629,6 @@ settings.rename_branch_from=old branch name
 settings.rename_branch_to=new branch name
 settings.rename_branch=Rename branch
 
-misc = Misc
 settings.go_module_sub_dir = Golang module subdirectory
 settings.go_module_sub_dir_desc = The subdirectory in repository redirect for go module (which is supported since go 1.25, see <a target="_blank" rel="noopener noreferrer" href="%[1]s">%[2]s</a> for more detail)
 

routers/api/v1/repo/repo.go

@@ -994,9 +994,17 @@ func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error {
 
 	if opts.HasPackages != nil && !unit_model.TypePackages.UnitGlobalDisabled() {
 		if *opts.HasPackages {
+			unit := repo.MustGetUnit(ctx, unit_model.TypePackages)
+			cfg := unit.PackagesConfig()
+
+			if opts.GoModuleSubDir != nil {
+				cfg.GoModuleSubDir = *opts.GoModuleSubDir
+			}
+
 			units = append(units, repo_model.RepoUnit{
 				RepoID: repo.ID,
 				Type:   unit_model.TypePackages,
+				Config: cfg,
 			})
 		} else {
 			deleteUnitTypes = append(deleteUnitTypes, unit_model.TypePackages)
@@ -1014,22 +1022,6 @@ func updateRepoUnits(ctx *context.APIContext, opts api.EditRepoOption) error {
 		}
 	}
 
-	miscCfg := repo.MustGetUnit(ctx, unit_model.TypeMisc).MiscConfig()
-	misCfgUpdated := false
-
-	if opts.GoModuleSubDir != nil {
-		miscCfg.GoModuleSubDir = *opts.GoModuleSubDir
-		misCfgUpdated = true
-	}
-
-	if misCfgUpdated {
-		units = append(units, repo_model.RepoUnit{
-			RepoID: repo.ID,
-			Type:   unit_model.TypeMisc,
-			Config: miscCfg,
-		})
-	}
-
 	if len(units)+len(deleteUnitTypes) > 0 {
 		if err := repo_service.UpdateRepositoryUnits(ctx, repo, units, deleteUnitTypes); err != nil {
 			ctx.APIErrorInternal(err)

routers/web/repo/setting/setting.go

@@ -608,7 +608,9 @@ func handleSettingsPostAdvanced(ctx *context.Context) {
 	}
 
 	if form.EnablePackages && !unit_model.TypePackages.UnitGlobalDisabled() {
-		units = append(units, newRepoUnit(repo, unit_model.TypePackages, nil))
+		units = append(units, newRepoUnit(repo, unit_model.TypePackages, &repo_model.PackagesConfig{
+			GoModuleSubDir: form.GoModuleSubDir,
+		}))
 	} else if !unit_model.TypePackages.UnitGlobalDisabled() {
 		deleteUnitTypes = append(deleteUnitTypes, unit_model.TypePackages)
 	}
@@ -638,10 +640,6 @@ func handleSettingsPostAdvanced(ctx *context.Context) {
 		deleteUnitTypes = append(deleteUnitTypes, unit_model.TypePullRequests)
 	}
 
-	miscCfg := repo.MustGetUnit(ctx, unit_model.TypeMisc).MiscConfig()
-	miscCfg.GoModuleSubDir = form.GoModuleSubDir
-	units = append(units, newRepoUnit(repo, unit_model.TypeMisc, miscCfg))
-
 	if len(units) == 0 {
 		ctx.Flash.Error(ctx.Tr("repo.settings.update_settings_no_unit"))
 		ctx.Redirect(ctx.Repo.RepoLink + "/settings")

services/context/context.go

@@ -119,7 +119,6 @@ func NewTemplateContextForWeb(ctx *Context) TemplateContext {
 		"RepoUnitTypeProjects":        unit.TypeProjects,
 		"RepoUnitTypePackages":        unit.TypePackages,
 		"RepoUnitTypeActions":         unit.TypeActions,
-		"RepoUnitTypeMisc":            unit.TypeMisc,
 	}
 	return tmplCtx
 }

services/context/repo.go

@@ -346,9 +346,9 @@ func EarlyResponseForGoGetMeta(ctx *Context) {
 
 // GetGoModuleSubDirConfig retrieves the subdirectory configuration for a Go module.
 func GetGoModuleSubDirConfig(ctx *Context, repo *repo_model.Repository) string {
-	miscCfg := repo.MustGetUnit(ctx, unit_model.TypeMisc).MiscConfig()
+	pkgCfg := repo.MustGetUnit(ctx, unit_model.TypePackages).PackagesConfig()
 
-	return strings.TrimSpace(miscCfg.GoModuleSubDir)
+	return strings.TrimSpace(pkgCfg.GoModuleSubDir)
 }
 
 // RedirectToRepo redirect to a differently-named repository

templates/repo/settings/options.tmpl

@@ -499,16 +499,28 @@
 					</div>
 				</div>
 
+				<div class="divider"></div>
 				{{$isPackagesEnabled := .Repository.UnitEnabled ctx ctx.Consts.RepoUnitTypePackages}}
 				{{$isPackagesGlobalDisabled := ctx.Consts.RepoUnitTypePackages.UnitGlobalDisabled}}
+				{{$pkgUnit := .Repository.MustGetUnit ctx ctx.Consts.RepoUnitTypePackages}}
 				<div class="inline field">
 					<label>{{ctx.Locale.Tr "repo.packages"}}</label>
 					<div class="ui checkbox{{if $isPackagesGlobalDisabled}} disabled{{end}}"{{if $isPackagesGlobalDisabled}} data-tooltip-content="{{ctx.Locale.Tr "repo.unit_disabled"}}"{{end}}>
-						<input class="enable-system" name="enable_packages" type="checkbox" {{if $isPackagesEnabled}}checked{{end}}>
+						<input class="enable-system" name="enable_packages" type="checkbox" data-target="#packages_box" {{if $isPackagesEnabled}}checked{{end}}>
 						<label>{{ctx.Locale.Tr "repo.settings.packages_desc"}}</label>
 					</div>
 				</div>
 
+				<div class="field{{if not $isPackagesEnabled}} disabled{{end}}" id="packages_box">
+					<div class="field tw-pl-4 {{if $isPackagesGlobalDisabled}}disabled{{end}}">
+						<label for="go_module_sub_dir">{{ctx.Locale.Tr "repo.settings.go_module_sub_dir"}}</label>
+						<input id="go_module_sub_dir" name="go_module_sub_dir" value="{{$pkgUnit.PackagesConfig.GoModuleSubDir}}">
+						<p class="help">{{ctx.Locale.Tr "repo.settings.go_module_sub_dir_desc" "https://github.com/golang/go/commit/835e36fc7f631f74233edfd4ab43b6b56833db86" "github.com/golang/go@835e36fc7f"}}</p>
+					</div>
+				</div>
+
+				<div class="divider"></div>
+
 				{{if .EnableActions}}
 					{{$isActionsEnabled := .Repository.UnitEnabled ctx ctx.Consts.RepoUnitTypeActions}}
 					{{$isActionsGlobalDisabled := ctx.Consts.RepoUnitTypeActions.UnitGlobalDisabled}}
@@ -647,20 +659,6 @@
 					</div>
 				{{end}}
 
-				<div class="divider"></div>
-				{{$miscUnit := .Repository.MustGetUnit ctx ctx.Consts.RepoUnitTypeMisc}}
-				<div class="inline field">
-					<label>{{ctx.Locale.Tr "repo.misc"}}</label>
-				</div>
-
-				<div class="field" id="misc_box">
-					<div class="field tw-pl-4">
-						<label for="go_module_sub_dir">{{ctx.Locale.Tr "repo.settings.go_module_sub_dir"}}</label>
-						<input id="go_module_sub_dir" name="go_module_sub_dir" value="{{$miscUnit.MiscConfig.GoModuleSubDir}}">
-						<p class="help">{{ctx.Locale.Tr "repo.settings.go_module_sub_dir_desc" "https://github.com/golang/go/commit/835e36fc7f631f74233edfd4ab43b6b56833db86" "github.com/golang/go@835e36fc7f"}}</p>
-					</div>
-				</div>
-
 				<div class="divider"></div>
 				<div class="field">
 					<button class="ui primary button">{{ctx.Locale.Tr "repo.settings.update_settings"}}</button>