improve runner type display

Author: yp05327

models/actions/runner.go

@@ -52,14 +52,40 @@ type ActionRunner struct {
 	Deleted timeutil.TimeStamp `xorm:"deleted"`
 }
 
-func (r *ActionRunner) OwnType() string {
+// RunnerType defines the runner type
+type RunnerType int //revive:disable-line:exported
+
+const (
+	// RunnerTypeGlobal defines a global runner
+	RunnerTypeGlobal RunnerType = iota
+
+	// RunnerTypeOrganization defines an organization runner
+	RunnerTypeOrganization
+
+	// RunnerTypeRepository defines a repository runner
+	RunnerTypeRepository
+)
+
+func (r *ActionRunner) Type() RunnerType {
 	if r.RepoID != 0 {
-		return fmt.Sprintf("Repo(%s)", r.Repo.FullName())
+		return RunnerTypeRepository
 	}
 	if r.OwnerID != 0 {
-		return fmt.Sprintf("Org(%s)", r.Owner.Name)
+		return RunnerTypeOrganization
+	}
+	return RunnerTypeGlobal
+}
+
+func (r RunnerType) String() string {
+	switch r {
+	case RunnerTypeGlobal:
+		return "Global"
+	case RunnerTypeOrganization:
+		return "Organization"
+	case RunnerTypeRepository:
+		return "Repository"
 	}
-	return "Global"
+	return fmt.Sprintf("Unknown Type %d", r)
 }
 
 func (r *ActionRunner) Status() runnerv1.RunnerStatus {

templates/shared/actions/runner_edit.tmpl

@@ -25,7 +25,7 @@
 				</div>
 				<div class="field gt-dib gt-mr-4 disabled">
 					<label>{{.locale.Tr "actions.runners.owner_type"}}</label>
-					<span>{{.Runner.OwnType}}</span>
+					<span>{{.Runner.Type.String}}</span>
 				</div>
 			</div>
 

templates/shared/actions/runner_list.tmpl

@@ -65,7 +65,7 @@
 						<td>{{.ID}}</td>
 						<td><p data-tooltip-content="{{.Description}}">{{.Name}}</p></td>
 						<td>{{.Version}}</td>
-						<td>{{.OwnType}}</td>
+						<td>{{.Type.String}}</td>
 						<td class="runner-tags">
 							{{range .AllLabels}}<span class="ui label">{{.}}</span>{{end}}
 						</td>