|
|
|
// Copyright 2018 The Gitea Authors. All rights reserved.
|
|
|
|
// Copyright 2014 The Gogs Authors. All rights reserved.
|
|
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
|
|
|
|
package templates
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
|
|
|
"context"
|
Scoped labels (#22585)
Add a new "exclusive" option per label. This makes it so that when the
label is named `scope/name`, no other label with the same `scope/`
prefix can be set on an issue.
The scope is determined by the last occurence of `/`, so for example
`scope/alpha/name` and `scope/beta/name` are considered to be in
different scopes and can coexist.
Exclusive scopes are not enforced by any database rules, however they
are enforced when editing labels at the models level, automatically
removing any existing labels in the same scope when either attaching a
new label or replacing all labels.
In menus use a circle instead of checkbox to indicate they function as
radio buttons per scope. Issue filtering by label ensures that only a
single scoped label is selected at a time. Clicking with alt key can be
used to remove a scoped label, both when editing individual issues and
batch editing.
Label rendering refactor for consistency and code simplification:
* Labels now consistently have the same shape, emojis and tooltips
everywhere. This includes the label list and label assignment menus.
* In label list, show description below label same as label menus.
* Don't use exactly black/white text colors to look a bit nicer.
* Simplify text color computation. There is no point computing luminance
in linear color space, as this is a perceptual problem and sRGB is
closer to perceptually linear.
* Increase height of label assignment menus to show more labels. Showing
only 3-4 labels at a time leads to a lot of scrolling.
* Render all labels with a new RenderLabel template helper function.
Label creation and editing in multiline modal menu:
* Change label creation to open a modal menu like label editing.
* Change menu layout to place name, description and colors on separate
lines.
* Don't color cancel button red in label editing modal menu.
* Align text to the left in model menu for better readability and
consistent with settings layout elsewhere.
Custom exclusive scoped label rendering:
* Display scoped label prefix and suffix with slightly darker and
lighter background color respectively, and a slanted edge between them
similar to the `/` symbol.
* In menus exclusive labels are grouped with a divider line.
---------
Co-authored-by: Yarden Shoham <hrsi88@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
2 years ago
|
|
|
"encoding/hex"
|
|
|
|
"errors"
|
|
|
|
"fmt"
|
|
|
|
"html"
|
|
|
|
"html/template"
|
Scoped labels (#22585)
Add a new "exclusive" option per label. This makes it so that when the
label is named `scope/name`, no other label with the same `scope/`
prefix can be set on an issue.
The scope is determined by the last occurence of `/`, so for example
`scope/alpha/name` and `scope/beta/name` are considered to be in
different scopes and can coexist.
Exclusive scopes are not enforced by any database rules, however they
are enforced when editing labels at the models level, automatically
removing any existing labels in the same scope when either attaching a
new label or replacing all labels.
In menus use a circle instead of checkbox to indicate they function as
radio buttons per scope. Issue filtering by label ensures that only a
single scoped label is selected at a time. Clicking with alt key can be
used to remove a scoped label, both when editing individual issues and
batch editing.
Label rendering refactor for consistency and code simplification:
* Labels now consistently have the same shape, emojis and tooltips
everywhere. This includes the label list and label assignment menus.
* In label list, show description below label same as label menus.
* Don't use exactly black/white text colors to look a bit nicer.
* Simplify text color computation. There is no point computing luminance
in linear color space, as this is a perceptual problem and sRGB is
closer to perceptually linear.
* Increase height of label assignment menus to show more labels. Showing
only 3-4 labels at a time leads to a lot of scrolling.
* Render all labels with a new RenderLabel template helper function.
Label creation and editing in multiline modal menu:
* Change label creation to open a modal menu like label editing.
* Change menu layout to place name, description and colors on separate
lines.
* Don't color cancel button red in label editing modal menu.
* Align text to the left in model menu for better readability and
consistent with settings layout elsewhere.
Custom exclusive scoped label rendering:
* Display scoped label prefix and suffix with slightly darker and
lighter background color respectively, and a slanted edge between them
similar to the `/` symbol.
* In menus exclusive labels are grouped with a divider line.
---------
Co-authored-by: Yarden Shoham <hrsi88@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
2 years ago
|
|
|
"math"
|
|
|
|
"mime"
|
|
|
|
"net/url"
|
|
|
|
"path/filepath"
|
|
|
|
"reflect"
|
|
|
|
"regexp"
|
|
|
|
"runtime"
|
|
|
|
"strconv"
|
|
|
|
"strings"
|
|
|
|
texttmpl "text/template"
|
|
|
|
"time"
|
|
|
|
"unicode"
|
|
|
|
|
|
|
|
activities_model "code.gitea.io/gitea/models/activities"
|
Avatar refactor, move avatar code from `models` to `models.avatars`, remove duplicated code (#17123)
Why this refactor
The goal is to move most files from `models` package to `models.xxx` package. Many models depend on avatar model, so just move this first.
And the existing logic is not clear, there are too many function like `AvatarLink`, `RelAvatarLink`, `SizedRelAvatarLink`, `SizedAvatarLink`, `MakeFinalAvatarURL`, `HashedAvatarLink`, etc. This refactor make everything clear:
* user.AvatarLink()
* user.AvatarLinkWithSize(size)
* avatars.GenerateEmailAvatarFastLink(email, size)
* avatars.GenerateEmailAvatarFinalLink(email, size)
And many duplicated code are deleted in route handler, the handler and the model share the same avatar logic now.
3 years ago
|
|
|
"code.gitea.io/gitea/models/avatars"
|
|
|
|
issues_model "code.gitea.io/gitea/models/issues"
|
|
|
|
"code.gitea.io/gitea/models/organization"
|
|
|
|
repo_model "code.gitea.io/gitea/models/repo"
|
|
|
|
system_model "code.gitea.io/gitea/models/system"
|
|
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
|
|
"code.gitea.io/gitea/modules/base"
|
|
|
|
"code.gitea.io/gitea/modules/emoji"
|
|
|
|
"code.gitea.io/gitea/modules/git"
|
|
|
|
giturl "code.gitea.io/gitea/modules/git/url"
|
|
|
|
gitea_html "code.gitea.io/gitea/modules/html"
|
|
|
|
"code.gitea.io/gitea/modules/json"
|
|
|
|
"code.gitea.io/gitea/modules/log"
|
|
|
|
"code.gitea.io/gitea/modules/markup"
|
|
|
|
"code.gitea.io/gitea/modules/markup/markdown"
|
|
|
|
"code.gitea.io/gitea/modules/repository"
|
|
|
|
"code.gitea.io/gitea/modules/setting"
|
|
|
|
"code.gitea.io/gitea/modules/svg"
|
|
|
|
"code.gitea.io/gitea/modules/timeutil"
|
|
|
|
"code.gitea.io/gitea/modules/util"
|
|
|
|
"code.gitea.io/gitea/services/gitdiff"
|
|
|
|
|
|
|
|
"github.com/editorconfig/editorconfig-core-go/v2"
|
|
|
|
)
|
|
|
|
|
|
|
|
// Used from static.go && dynamic.go
|
|
|
|
var mailSubjectSplit = regexp.MustCompile(`(?m)^-{3,}[\s]*$`)
|
|
|
|
|
|
|
|
// NewFuncMap returns functions for injecting to templates
|
|
|
|
func NewFuncMap() []template.FuncMap {
|
|
|
|
return []template.FuncMap{map[string]interface{}{
|
|
|
|
"GoVer": func() string {
|
|
|
|
return util.ToTitleCase(runtime.Version())
|
|
|
|
},
|
|
|
|
"UseHTTPS": func() bool {
|
|
|
|
return strings.HasPrefix(setting.AppURL, "https")
|
|
|
|
},
|
|
|
|
"AppName": func() string {
|
|
|
|
return setting.AppName
|
|
|
|
},
|
|
|
|
"AppSubUrl": func() string {
|
|
|
|
return setting.AppSubURL
|
|
|
|
},
|
|
|
|
"AssetUrlPrefix": func() string {
|
|
|
|
return setting.StaticURLPrefix + "/assets"
|
|
|
|
},
|
|
|
|
"AppUrl": func() string {
|
|
|
|
// The usage of AppUrl should be avoided as much as possible,
|
|
|
|
// because the AppURL(ROOT_URL) may not match user's visiting site and the ROOT_URL in app.ini may be incorrect.
|
|
|
|
// And it's difficult for Gitea to guess absolute URL correctly with zero configuration,
|
|
|
|
// because Gitea doesn't know whether the scheme is HTTP or HTTPS unless the reverse proxy could tell Gitea.
|
|
|
|
return setting.AppURL
|
|
|
|
},
|
|
|
|
"AppVer": func() string {
|
|
|
|
return setting.AppVer
|
|
|
|
},
|
|
|
|
"AppBuiltWith": func() string {
|
|
|
|
return setting.AppBuiltWith
|
|
|
|
},
|
|
|
|
"AppDomain": func() string {
|
|
|
|
return setting.Domain
|
|
|
|
},
|
|
|
|
"AssetVersion": func() string {
|
|
|
|
return setting.AssetVersion
|
|
|
|
},
|
Add context cache as a request level cache (#22294)
To avoid duplicated load of the same data in an HTTP request, we can set
a context cache to do that. i.e. Some pages may load a user from a
database with the same id in different areas on the same page. But the
code is hidden in two different deep logic. How should we share the
user? As a result of this PR, now if both entry functions accept
`context.Context` as the first parameter and we just need to refactor
`GetUserByID` to reuse the user from the context cache. Then it will not
be loaded twice on an HTTP request.
But of course, sometimes we would like to reload an object from the
database, that's why `RemoveContextData` is also exposed.
The core context cache is here. It defines a new context
```go
type cacheContext struct {
ctx context.Context
data map[any]map[any]any
lock sync.RWMutex
}
var cacheContextKey = struct{}{}
func WithCacheContext(ctx context.Context) context.Context {
return context.WithValue(ctx, cacheContextKey, &cacheContext{
ctx: ctx,
data: make(map[any]map[any]any),
})
}
```
Then you can use the below 4 methods to read/write/del the data within
the same context.
```go
func GetContextData(ctx context.Context, tp, key any) any
func SetContextData(ctx context.Context, tp, key, value any)
func RemoveContextData(ctx context.Context, tp, key any)
func GetWithContextCache[T any](ctx context.Context, cacheGroupKey string, cacheTargetID any, f func() (T, error)) (T, error)
```
Then let's take a look at how `system.GetString` implement it.
```go
func GetSetting(ctx context.Context, key string) (string, error) {
return cache.GetWithContextCache(ctx, contextCacheKey, key, func() (string, error) {
return cache.GetString(genSettingCacheKey(key), func() (string, error) {
res, err := GetSettingNoCache(ctx, key)
if err != nil {
return "", err
}
return res.SettingValue, nil
})
})
}
```
First, it will check if context data include the setting object with the
key. If not, it will query from the global cache which may be memory or
a Redis cache. If not, it will get the object from the database. In the
end, if the object gets from the global cache or database, it will be
set into the context cache.
An object stored in the context cache will only be destroyed after the
context disappeared.
2 years ago
|
|
|
"DisableGravatar": func(ctx context.Context) bool {
|
|
|
|
return system_model.GetSettingWithCacheBool(ctx, system_model.KeyPictureDisableGravatar)
|
|
|
|
},
|
|
|
|
"DefaultShowFullName": func() bool {
|
|
|
|
return setting.UI.DefaultShowFullName
|
|
|
|
},
|
|
|
|
"ShowFooterTemplateLoadTime": func() bool {
|
|
|
|
return setting.ShowFooterTemplateLoadTime
|
|
|
|
},
|
|
|
|
"LoadTimes": func(startTime time.Time) string {
|
|
|
|
return fmt.Sprint(time.Since(startTime).Nanoseconds()/1e6) + "ms"
|
|
|
|
},
|
|
|
|
"AllowedReactions": func() []string {
|
|
|
|
return setting.UI.Reactions
|
|
|
|
},
|
|
|
|
"CustomEmojis": func() map[string]string {
|
|
|
|
return setting.UI.CustomEmojisMap
|
|
|
|
},
|
|
|
|
"Safe": Safe,
|
|
|
|
"SafeJS": SafeJS,
|
|
|
|
"JSEscape": JSEscape,
|
|
|
|
"Str2html": Str2html,
|
|
|
|
"TimeSince": timeutil.TimeSince,
|
|
|
|
"TimeSinceUnix": timeutil.TimeSinceUnix,
|
|
|
|
"FileSize": base.FileSize,
|
|
|
|
"PrettyNumber": base.PrettyNumber,
|
|
|
|
"JsPrettyNumber": JsPrettyNumber,
|
|
|
|
"Subtract": base.Subtract,
|
|
|
|
"EntryIcon": base.EntryIcon,
|
|
|
|
"MigrationIcon": MigrationIcon,
|
|
|
|
"Add": func(a ...int) int {
|
|
|
|
sum := 0
|
|
|
|
for _, val := range a {
|
|
|
|
sum += val
|
|
|
|
}
|
|
|
|
return sum
|
|
|
|
},
|
|
|
|
"Mul": func(a ...int) int {
|
|
|
|
sum := 1
|
|
|
|
for _, val := range a {
|
|
|
|
sum *= val
|
|
|
|
}
|
|
|
|
return sum
|
|
|
|
},
|
|
|
|
"ActionIcon": ActionIcon,
|
|
|
|
"DateFmtLong": func(t time.Time) string {
|
|
|
|
return t.Format(time.RFC1123Z)
|
|
|
|
},
|
|
|
|
"DateFmtShort": func(t time.Time) string {
|
|
|
|
return t.Format("Jan 02, 2006")
|
|
|
|
},
|
|
|
|
"CountFmt": base.FormatNumberSI,
|
|
|
|
"SubStr": func(str string, start, length int) string {
|
|
|
|
if len(str) == 0 {
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
end := start + length
|
|
|
|
if length == -1 {
|
|
|
|
end = len(str)
|
|
|
|
}
|
|
|
|
if len(str) < end {
|
|
|
|
return str
|
|
|
|
}
|
|
|
|
return str[start:end]
|
|
|
|
},
|
|
|
|
"EllipsisString": base.EllipsisString,
|
|
|
|
"DiffTypeToStr": DiffTypeToStr,
|
|
|
|
"DiffLineTypeToStr": DiffLineTypeToStr,
|
|
|
|
"ShortSha": base.ShortSha,
|
|
|
|
"ActionContent2Commits": ActionContent2Commits,
|
|
|
|
"PathEscape": url.PathEscape,
|
|
|
|
"PathEscapeSegments": util.PathEscapeSegments,
|
|
|
|
"URLJoin": util.URLJoin,
|
|
|
|
"RenderCommitMessage": RenderCommitMessage,
|
|
|
|
"RenderCommitMessageLink": RenderCommitMessageLink,
|
|
|
|
"RenderCommitMessageLinkSubject": RenderCommitMessageLinkSubject,
|
|
|
|
"RenderCommitBody": RenderCommitBody,
|
|
|
|
"RenderCodeBlock": RenderCodeBlock,
|
|
|
|
"RenderIssueTitle": RenderIssueTitle,
|
|
|
|
"RenderEmoji": RenderEmoji,
|
|
|
|
"RenderEmojiPlain": emoji.ReplaceAliases,
|
|
|
|
"ReactionToEmoji": ReactionToEmoji,
|
|
|
|
"RenderNote": RenderNote,
|
|
|
|
"RenderMarkdownToHtml": func(ctx context.Context, input string) template.HTML {
|
|
|
|
output, err := markdown.RenderString(&markup.RenderContext{
|
|
|
|
Ctx: ctx,
|
|
|
|
URLPrefix: setting.AppSubURL,
|
|
|
|
}, input)
|
|
|
|
if err != nil {
|
|
|
|
log.Error("RenderString: %v", err)
|
|
|
|
}
|
|
|
|
return template.HTML(output)
|
|
|
|
},
|
|
|
|
"IsMultilineCommitMessage": IsMultilineCommitMessage,
|
|
|
|
"ThemeColorMetaTag": func() string {
|
|
|
|
return setting.UI.ThemeColorMetaTag
|
|
|
|
},
|
|
|
|
"MetaAuthor": func() string {
|
|
|
|
return setting.UI.Meta.Author
|
|
|
|
},
|
|
|
|
"MetaDescription": func() string {
|
|
|
|
return setting.UI.Meta.Description
|
|
|
|
},
|
|
|
|
"MetaKeywords": func() string {
|
|
|
|
return setting.UI.Meta.Keywords
|
|
|
|
},
|
|
|
|
"UseServiceWorker": func() bool {
|
|
|
|
return setting.UI.UseServiceWorker
|
|
|
|
},
|
|
|
|
"EnableTimetracking": func() bool {
|
|
|
|
return setting.Service.EnableTimetracking
|
|
|
|
},
|
|
|
|
"FilenameIsImage": func(filename string) bool {
|
|
|
|
mimeType := mime.TypeByExtension(filepath.Ext(filename))
|
|
|
|
return strings.HasPrefix(mimeType, "image/")
|
|
|
|
},
|
|
|
|
"TabSizeClass": func(ec interface{}, filename string) string {
|
|
|
|
var (
|
|
|
|
value *editorconfig.Editorconfig
|
|
|
|
ok bool
|
|
|
|
)
|
|
|
|
if ec != nil {
|
|
|
|
if value, ok = ec.(*editorconfig.Editorconfig); !ok || value == nil {
|
|
|
|
return "tab-size-8"
|
|
|
|
}
|
|
|
|
def, err := value.GetDefinitionForFilename(filename)
|
|
|
|
if err != nil {
|
|
|
|
log.Error("tab size class: getting definition for filename: %v", err)
|
|
|
|
return "tab-size-8"
|
|
|
|
}
|
|
|
|
if def.TabWidth > 0 {
|
|
|
|
return fmt.Sprintf("tab-size-%d", def.TabWidth)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return "tab-size-8"
|
|
|
|
},
|
|
|
|
"SubJumpablePath": func(str string) []string {
|
|
|
|
var path []string
|
|
|
|
index := strings.LastIndex(str, "/")
|
|
|
|
if index != -1 && index != len(str) {
|
|
|
|
path = append(path, str[0:index+1], str[index+1:])
|
|
|
|
} else {
|
|
|
|
path = append(path, str)
|
|
|
|
}
|
|
|
|
return path
|
|
|
|
},
|
|
|
|
"DiffStatsWidth": func(adds, dels int) string {
|
|
|
|
return fmt.Sprintf("%f", float64(adds)/(float64(adds)+float64(dels))*100)
|
|
|
|
},
|
|
|
|
"Json": func(in interface{}) string {
|
|
|
|
out, err := json.Marshal(in)
|
|
|
|
if err != nil {
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
return string(out)
|
|
|
|
},
|
|
|
|
"JsonPrettyPrint": func(in string) string {
|
|
|
|
var out bytes.Buffer
|
|
|
|
err := json.Indent(&out, []byte(in), "", " ")
|
|
|
|
if err != nil {
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
return out.String()
|
|
|
|
},
|
|
|
|
"DisableGitHooks": func() bool {
|
|
|
|
return setting.DisableGitHooks
|
|
|
|
},
|
|
|
|
"DisableWebhooks": func() bool {
|
|
|
|
return setting.DisableWebhooks
|
|
|
|
},
|
|
|
|
"DisableImportLocal": func() bool {
|
|
|
|
return !setting.ImportLocalPaths
|
|
|
|
},
|
|
|
|
"Dict": func(values ...interface{}) (map[string]interface{}, error) {
|
|
|
|
if len(values)%2 != 0 {
|
|
|
|
return nil, errors.New("invalid dict call")
|
|
|
|
}
|
|
|
|
dict := make(map[string]interface{}, len(values)/2)
|
|
|
|
for i := 0; i < len(values); i += 2 {
|
|
|
|
key, ok := values[i].(string)
|
|
|
|
if !ok {
|
|
|
|
return nil, errors.New("dict keys must be strings")
|
|
|
|
}
|
|
|
|
dict[key] = values[i+1]
|
|
|
|
}
|
|
|
|
return dict, nil
|
|
|
|
},
|
|
|
|
"Printf": fmt.Sprintf,
|
|
|
|
"Escape": Escape,
|
|
|
|
"Sec2Time": util.SecToTime,
|
|
|
|
"ParseDeadline": func(deadline string) []string {
|
|
|
|
return strings.Split(deadline, "|")
|
|
|
|
},
|
|
|
|
"DefaultTheme": func() string {
|
|
|
|
return setting.UI.DefaultTheme
|
|
|
|
},
|
|
|
|
// pass key-value pairs to a partial template which receives them as a dict
|
|
|
|
"dict": func(values ...interface{}) (map[string]interface{}, error) {
|
|
|
|
if len(values) == 0 {
|
|
|
|
return nil, errors.New("invalid dict call")
|
|
|
|
}
|
|
|
|
|
|
|
|
dict := make(map[string]interface{})
|
|
|
|
return util.MergeInto(dict, values...)
|
|
|
|
},
|
|
|
|
/* like dict but merge key-value pairs into the first dict and return it */
|
|
|
|
"mergeinto": func(root map[string]interface{}, values ...interface{}) (map[string]interface{}, error) {
|
|
|
|
if len(values) == 0 {
|
|
|
|
return nil, errors.New("invalid mergeinto call")
|
|
|
|
}
|
|
|
|
|
|
|
|
dict := make(map[string]interface{})
|
|
|
|
for key, value := range root {
|
|
|
|
dict[key] = value
|
|
|
|
}
|
|
|
|
|
|
|
|
return util.MergeInto(dict, values...)
|
|
|
|
},
|
|
|
|
"percentage": func(n int, values ...int) float32 {
|
|
|
|
sum := 0
|
|
|
|
for i := 0; i < len(values); i++ {
|
|
|
|
sum += values[i]
|
|
|
|
}
|
|
|
|
return float32(n) * 100 / float32(sum)
|
|
|
|
},
|
|
|
|
"CommentMustAsDiff": gitdiff.CommentMustAsDiff,
|
|
|
|
"MirrorRemoteAddress": mirrorRemoteAddress,
|
|
|
|
"NotificationSettings": func() map[string]interface{} {
|
|
|
|
return map[string]interface{}{
|
|
|
|
"MinTimeout": int(setting.UI.Notification.MinTimeout / time.Millisecond),
|
|
|
|
"TimeoutStep": int(setting.UI.Notification.TimeoutStep / time.Millisecond),
|
|
|
|
"MaxTimeout": int(setting.UI.Notification.MaxTimeout / time.Millisecond),
|
|
|
|
"EventSourceUpdateTime": int(setting.UI.Notification.EventSourceUpdateTime / time.Millisecond),
|
|
|
|
}
|
|
|
|
},
|
|
|
|
"containGeneric": func(arr, v interface{}) bool {
|
|
|
|
arrV := reflect.ValueOf(arr)
|
|
|
|
if arrV.Kind() == reflect.String && reflect.ValueOf(v).Kind() == reflect.String {
|
|
|
|
return strings.Contains(arr.(string), v.(string))
|
|
|
|
}
|
|
|
|
|
|
|
|
if arrV.Kind() == reflect.Slice {
|
|
|
|
for i := 0; i < arrV.Len(); i++ {
|
|
|
|
iV := arrV.Index(i)
|
|
|
|
if !iV.CanInterface() {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
if iV.Interface() == v {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return false
|
|
|
|
},
|
|
|
|
"contain": func(s []int64, id int64) bool {
|
|
|
|
for i := 0; i < len(s); i++ {
|
|
|
|
if s[i] == id {
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return false
|
|
|
|
},
|
|
|
|
"svg": svg.RenderHTML,
|
|
|
|
"avatar": Avatar,
|
|
|
|
"avatarHTML": AvatarHTML,
|
|
|
|
"avatarByAction": AvatarByAction,
|
|
|
|
"avatarByEmail": AvatarByEmail,
|
|
|
|
"repoAvatar": RepoAvatar,
|
|
|
|
"SortArrow": func(normSort, revSort, urlSort string, isDefault bool) template.HTML {
|
|
|
|
// if needed
|
|
|
|
if len(normSort) == 0 || len(urlSort) == 0 {
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
|
|
|
|
if len(urlSort) == 0 && isDefault {
|
|
|
|
// if sort is sorted as default add arrow tho this table header
|
|
|
|
if isDefault {
|
|
|
|
return svg.RenderHTML("octicon-triangle-down", 16)
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// if sort arg is in url test if it correlates with column header sort arguments
|
|
|
|
// the direction of the arrow should indicate the "current sort order", up means ASC(normal), down means DESC(rev)
|
|
|
|
if urlSort == normSort {
|
|
|
|
// the table is sorted with this header normal
|
|
|
|
return svg.RenderHTML("octicon-triangle-up", 16)
|
|
|
|
} else if urlSort == revSort {
|
|
|
|
// the table is sorted with this header reverse
|
|
|
|
return svg.RenderHTML("octicon-triangle-down", 16)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// the table is NOT sorted with this header
|
|
|
|
return ""
|
|
|
|
},
|
|
|
|
"RenderLabel": func(ctx context.Context, label *issues_model.Label) template.HTML {
|
|
|
|
return template.HTML(RenderLabel(ctx, label))
|
Scoped labels (#22585)
Add a new "exclusive" option per label. This makes it so that when the
label is named `scope/name`, no other label with the same `scope/`
prefix can be set on an issue.
The scope is determined by the last occurence of `/`, so for example
`scope/alpha/name` and `scope/beta/name` are considered to be in
different scopes and can coexist.
Exclusive scopes are not enforced by any database rules, however they
are enforced when editing labels at the models level, automatically
removing any existing labels in the same scope when either attaching a
new label or replacing all labels.
In menus use a circle instead of checkbox to indicate they function as
radio buttons per scope. Issue filtering by label ensures that only a
single scoped label is selected at a time. Clicking with alt key can be
used to remove a scoped label, both when editing individual issues and
batch editing.
Label rendering refactor for consistency and code simplification:
* Labels now consistently have the same shape, emojis and tooltips
everywhere. This includes the label list and label assignment menus.
* In label list, show description below label same as label menus.
* Don't use exactly black/white text colors to look a bit nicer.
* Simplify text color computation. There is no point computing luminance
in linear color space, as this is a perceptual problem and sRGB is
closer to perceptually linear.
* Increase height of label assignment menus to show more labels. Showing
only 3-4 labels at a time leads to a lot of scrolling.
* Render all labels with a new RenderLabel template helper function.
Label creation and editing in multiline modal menu:
* Change label creation to open a modal menu like label editing.
* Change menu layout to place name, description and colors on separate
lines.
* Don't color cancel button red in label editing modal menu.
* Align text to the left in model menu for better readability and
consistent with settings layout elsewhere.
Custom exclusive scoped label rendering:
* Display scoped label prefix and suffix with slightly darker and
lighter background color respectively, and a slanted edge between them
similar to the `/` symbol.
* In menus exclusive labels are grouped with a divider line.
---------
Co-authored-by: Yarden Shoham <hrsi88@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
2 years ago
|
|
|
},
|
|
|
|
"RenderLabels": func(ctx context.Context, labels []*issues_model.Label, repoLink string) template.HTML {
|
|
|
|
htmlCode := `<span class="labels-list">`
|
|
|
|
for _, label := range labels {
|
|
|
|
// Protect against nil value in labels - shouldn't happen but would cause a panic if so
|
|
|
|
if label == nil {
|
|
|
|
continue
|
|
|
|
}
|
Scoped labels (#22585)
Add a new "exclusive" option per label. This makes it so that when the
label is named `scope/name`, no other label with the same `scope/`
prefix can be set on an issue.
The scope is determined by the last occurence of `/`, so for example
`scope/alpha/name` and `scope/beta/name` are considered to be in
different scopes and can coexist.
Exclusive scopes are not enforced by any database rules, however they
are enforced when editing labels at the models level, automatically
removing any existing labels in the same scope when either attaching a
new label or replacing all labels.
In menus use a circle instead of checkbox to indicate they function as
radio buttons per scope. Issue filtering by label ensures that only a
single scoped label is selected at a time. Clicking with alt key can be
used to remove a scoped label, both when editing individual issues and
batch editing.
Label rendering refactor for consistency and code simplification:
* Labels now consistently have the same shape, emojis and tooltips
everywhere. This includes the label list and label assignment menus.
* In label list, show description below label same as label menus.
* Don't use exactly black/white text colors to look a bit nicer.
* Simplify text color computation. There is no point computing luminance
in linear color space, as this is a perceptual problem and sRGB is
closer to perceptually linear.
* Increase height of label assignment menus to show more labels. Showing
only 3-4 labels at a time leads to a lot of scrolling.
* Render all labels with a new RenderLabel template helper function.
Label creation and editing in multiline modal menu:
* Change label creation to open a modal menu like label editing.
* Change menu layout to place name, description and colors on separate
lines.
* Don't color cancel button red in label editing modal menu.
* Align text to the left in model menu for better readability and
consistent with settings layout elsewhere.
Custom exclusive scoped label rendering:
* Display scoped label prefix and suffix with slightly darker and
lighter background color respectively, and a slanted edge between them
similar to the `/` symbol.
* In menus exclusive labels are grouped with a divider line.
---------
Co-authored-by: Yarden Shoham <hrsi88@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
2 years ago
|
|
|
htmlCode += fmt.Sprintf("<a href='%s/issues?labels=%d'>%s</a> ",
|
|
|
|
repoLink, label.ID, RenderLabel(ctx, label))
|
|
|
|
}
|
|
|
|
htmlCode += "</span>"
|
|
|
|
return template.HTML(htmlCode)
|
|
|
|
},
|
|
|
|
"MermaidMaxSourceCharacters": func() int {
|
|
|
|
return setting.MermaidMaxSourceCharacters
|
|
|
|
},
|
|
|
|
"Join": strings.Join,
|
|
|
|
"QueryEscape": url.QueryEscape,
|
|
|
|
"DotEscape": DotEscape,
|
|
|
|
"Iterate": func(arg interface{}) (items []uint64) {
|
|
|
|
count := uint64(0)
|
|
|
|
switch val := arg.(type) {
|
|
|
|
case uint64:
|
|
|
|
count = val
|
|
|
|
case *uint64:
|
|
|
|
count = *val
|
|
|
|
case int64:
|
|
|
|
if val < 0 {
|
|
|
|
val = 0
|
|
|
|
}
|
|
|
|
count = uint64(val)
|
|
|
|
case *int64:
|
|
|
|
if *val < 0 {
|
|
|
|
*val = 0
|
|
|
|
}
|
|
|
|
count = uint64(*val)
|
|
|
|
case int:
|
|
|
|
if val < 0 {
|
|
|
|
val = 0
|
|
|
|
}
|
|
|
|
count = uint64(val)
|
|
|
|
case *int:
|
|
|
|
if *val < 0 {
|
|
|
|
*val = 0
|
|
|
|
}
|
|
|
|
count = uint64(*val)
|
|
|
|
case uint:
|
|
|
|
count = uint64(val)
|
|
|
|
case *uint:
|
|
|
|
count = uint64(*val)
|
|
|
|
case int32:
|
|
|
|
if val < 0 {
|
|
|
|
val = 0
|
|
|
|
}
|
|
|
|
count = uint64(val)
|
|
|
|
case *int32:
|
|
|
|
if *val < 0 {
|
|
|
|
*val = 0
|
|
|
|
}
|
|
|
|
count = uint64(*val)
|
|
|
|
case uint32:
|
|
|
|
count = uint64(val)
|
|
|
|
case *uint32:
|
|
|
|
count = uint64(*val)
|
|
|
|
case string:
|
|
|
|
cnt, _ := strconv.ParseInt(val, 10, 64)
|
|
|
|
if cnt < 0 {
|
|
|
|
cnt = 0
|
|
|
|
}
|
|
|
|
count = uint64(cnt)
|
|
|
|
}
|
|
|
|
if count <= 0 {
|
|
|
|
return items
|
|
|
|
}
|
|
|
|
for i := uint64(0); i < count; i++ {
|
|
|
|
items = append(items, i)
|
|
|
|
}
|
|
|
|
return items
|
|
|
|
},
|
|
|
|
"HasPrefix": strings.HasPrefix,
|
|
|
|
"CompareLink": func(baseRepo, repo *repo_model.Repository, branchName string) string {
|
|
|
|
var curBranch string
|
|
|
|
if repo.ID != baseRepo.ID {
|
|
|
|
curBranch += fmt.Sprintf("%s/%s:", url.PathEscape(repo.OwnerName), url.PathEscape(repo.Name))
|
|
|
|
}
|
|
|
|
curBranch += util.PathEscapeSegments(branchName)
|
|
|
|
|
|
|
|
return fmt.Sprintf("%s/compare/%s...%s",
|
|
|
|
baseRepo.Link(),
|
|
|
|
util.PathEscapeSegments(baseRepo.DefaultBranch),
|
|
|
|
curBranch,
|
|
|
|
)
|
|
|
|
},
|
Implement actions (#21937)
Close #13539.
Co-authored by: @lunny @appleboy @fuxiaohei and others.
Related projects:
- https://gitea.com/gitea/actions-proto-def
- https://gitea.com/gitea/actions-proto-go
- https://gitea.com/gitea/act
- https://gitea.com/gitea/act_runner
### Summary
The target of this PR is to bring a basic implementation of "Actions",
an internal CI/CD system of Gitea. That means even though it has been
merged, the state of the feature is **EXPERIMENTAL**, and please note
that:
- It is disabled by default;
- It shouldn't be used in a production environment currently;
- It shouldn't be used in a public Gitea instance currently;
- Breaking changes may be made before it's stable.
**Please comment on #13539 if you have any different product design
ideas**, all decisions reached there will be adopted here. But in this
PR, we don't talk about **naming, feature-creep or alternatives**.
### ⚠️ Breaking
`gitea-actions` will become a reserved user name. If a user with the
name already exists in the database, it is recommended to rename it.
### Some important reviews
- What is `DEFAULT_ACTIONS_URL` in `app.ini` for?
- https://github.com/go-gitea/gitea/pull/21937#discussion_r1055954954
- Why the api for runners is not under the normal `/api/v1` prefix?
- https://github.com/go-gitea/gitea/pull/21937#discussion_r1061173592
- Why DBFS?
- https://github.com/go-gitea/gitea/pull/21937#discussion_r1061301178
- Why ignore events triggered by `gitea-actions` bot?
- https://github.com/go-gitea/gitea/pull/21937#discussion_r1063254103
- Why there's no permission control for actions?
- https://github.com/go-gitea/gitea/pull/21937#discussion_r1090229868
### What it looks like
<details>
#### Manage runners
<img width="1792" alt="image"
src="https://user-images.githubusercontent.com/9418365/205870657-c72f590e-2e08-4cd4-be7f-2e0abb299bbf.png">
#### List runs
<img width="1792" alt="image"
src="https://user-images.githubusercontent.com/9418365/205872794-50fde990-2b45-48c1-a178-908e4ec5b627.png">
#### View logs
<img width="1792" alt="image"
src="https://user-images.githubusercontent.com/9418365/205872501-9b7b9000-9542-4991-8f55-18ccdada77c3.png">
</details>
### How to try it
<details>
#### 1. Start Gitea
Clone this branch and [install from
source](https://docs.gitea.io/en-us/install-from-source).
Add additional configurations in `app.ini` to enable Actions:
```ini
[actions]
ENABLED = true
```
Start it.
If all is well, you'll see the management page of runners:
<img width="1792" alt="image"
src="https://user-images.githubusercontent.com/9418365/205877365-8e30a780-9b10-4154-b3e8-ee6c3cb35a59.png">
#### 2. Start runner
Clone the [act_runner](https://gitea.com/gitea/act_runner), and follow
the
[README](https://gitea.com/gitea/act_runner/src/branch/main/README.md)
to start it.
If all is well, you'll see a new runner has been added:
<img width="1792" alt="image"
src="https://user-images.githubusercontent.com/9418365/205878000-216f5937-e696-470d-b66c-8473987d91c3.png">
#### 3. Enable actions for a repo
Create a new repo or open an existing one, check the `Actions` checkbox
in settings and submit.
<img width="1792" alt="image"
src="https://user-images.githubusercontent.com/9418365/205879705-53e09208-73c0-4b3e-a123-2dcf9aba4b9c.png">
<img width="1792" alt="image"
src="https://user-images.githubusercontent.com/9418365/205879383-23f3d08f-1a85-41dd-a8b3-54e2ee6453e8.png">
If all is well, you'll see a new tab "Actions":
<img width="1792" alt="image"
src="https://user-images.githubusercontent.com/9418365/205881648-a8072d8c-5803-4d76-b8a8-9b2fb49516c1.png">
#### 4. Upload workflow files
Upload some workflow files to `.gitea/workflows/xxx.yaml`, you can
follow the [quickstart](https://docs.github.com/en/actions/quickstart)
of GitHub Actions. Yes, Gitea Actions is compatible with GitHub Actions
in most cases, you can use the same demo:
```yaml
name: GitHub Actions Demo
run-name: ${{ github.actor }} is testing out GitHub Actions 🚀
on: [push]
jobs:
Explore-GitHub-Actions:
runs-on: ubuntu-latest
steps:
- run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event."
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
- run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
- name: Check out repository code
uses: actions/checkout@v3
- run: echo "💡 The ${{ github.repository }} repository has been cloned to the runner."
- run: echo "🖥️ The workflow is now ready to test your code on the runner."
- name: List files in the repository
run: |
ls ${{ github.workspace }}
- run: echo "🍏 This job's status is ${{ job.status }}."
```
If all is well, you'll see a new run in `Actions` tab:
<img width="1792" alt="image"
src="https://user-images.githubusercontent.com/9418365/205884473-79a874bc-171b-4aaf-acd5-0241a45c3b53.png">
#### 5. Check the logs of jobs
Click a run and you'll see the logs:
<img width="1792" alt="image"
src="https://user-images.githubusercontent.com/9418365/205884800-994b0374-67f7-48ff-be9a-4c53f3141547.png">
#### 6. Go on
You can try more examples in [the
documents](https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions)
of GitHub Actions, then you might find a lot of bugs.
Come on, PRs are welcome.
</details>
See also: [Feature Preview: Gitea
Actions](https://blog.gitea.io/2022/12/feature-preview-gitea-actions/)
---------
Co-authored-by: a1012112796 <1012112796@qq.com>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: delvh <dev.lh@web.de>
Co-authored-by: ChristopherHX <christopher.homberger@web.de>
Co-authored-by: John Olheiser <john.olheiser@gmail.com>
2 years ago
|
|
|
"RefShortName": func(ref string) string {
|
|
|
|
return git.RefName(ref).ShortName()
|
|
|
|
},
|
|
|
|
}}
|
|
|
|
}
|
|
|
|
|
|
|
|
// NewTextFuncMap returns functions for injecting to text templates
|
|
|
|
// It's a subset of those used for HTML and other templates
|
|
|
|
func NewTextFuncMap() []texttmpl.FuncMap {
|
|
|
|
return []texttmpl.FuncMap{map[string]interface{}{
|
|
|
|
"GoVer": func() string {
|
|
|
|
return util.ToTitleCase(runtime.Version())
|
|
|
|
},
|
|
|
|
"AppName": func() string {
|
|
|
|
return setting.AppName
|
|
|
|
},
|
|
|
|
"AppSubUrl": func() string {
|
|
|
|
return setting.AppSubURL
|
|
|
|
},
|
|
|
|
"AppUrl": func() string {
|
|
|
|
return setting.AppURL
|
|
|
|
},
|
|
|
|
"AppVer": func() string {
|
|
|
|
return setting.AppVer
|
|
|
|
},
|
|
|
|
"AppBuiltWith": func() string {
|
|
|
|
return setting.AppBuiltWith
|
|
|
|
},
|
|
|
|
"AppDomain": func() string {
|
|
|
|
return setting.Domain
|
|
|
|
},
|
|
|
|
"TimeSince": timeutil.TimeSince,
|
|
|
|
"TimeSinceUnix": timeutil.TimeSinceUnix,
|
|
|
|
"DateFmtLong": func(t time.Time) string {
|
|
|
|
return t.Format(time.RFC1123Z)
|
|
|
|
},
|
|
|
|
"DateFmtShort": func(t time.Time) string {
|
|
|
|
return t.Format("Jan 02, 2006")
|
|
|
|
},
|
|
|
|
"SubStr": func(str string, start, length int) string {
|
|
|
|
if len(str) == 0 {
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
end := start + length
|
|
|
|
if length == -1 {
|
|
|
|
end = len(str)
|
|
|
|
}
|
|
|
|
if len(str) < end {
|
|
|
|
return str
|
|
|
|
}
|
|
|
|
return str[start:end]
|
|
|
|
},
|
|
|
|
"EllipsisString": base.EllipsisString,
|
|
|
|
"URLJoin": util.URLJoin,
|
|
|
|
"Dict": func(values ...interface{}) (map[string]interface{}, error) {
|
|
|
|
if len(values)%2 != 0 {
|
|
|
|
return nil, errors.New("invalid dict call")
|
|
|
|
}
|
|
|
|
dict := make(map[string]interface{}, len(values)/2)
|
|
|
|
for i := 0; i < len(values); i += 2 {
|
|
|
|
key, ok := values[i].(string)
|
|
|
|
if !ok {
|
|
|
|
return nil, errors.New("dict keys must be strings")
|
|
|
|
}
|
|
|
|
dict[key] = values[i+1]
|
|
|
|
}
|
|
|
|
return dict, nil
|
|
|
|
},
|
|
|
|
"Printf": fmt.Sprintf,
|
|
|
|
"Escape": Escape,
|
|
|
|
"Sec2Time": util.SecToTime,
|
|
|
|
"ParseDeadline": func(deadline string) []string {
|
|
|
|
return strings.Split(deadline, "|")
|
|
|
|
},
|
|
|
|
"dict": func(values ...interface{}) (map[string]interface{}, error) {
|
|
|
|
if len(values) == 0 {
|
|
|
|
return nil, errors.New("invalid dict call")
|
|
|
|
}
|
|
|
|
|
|
|
|
dict := make(map[string]interface{})
|
|
|
|
|
|
|
|
for i := 0; i < len(values); i++ {
|
|
|
|
switch key := values[i].(type) {
|
|
|
|
case string:
|
|
|
|
i++
|
|
|
|
if i == len(values) {
|
|
|
|
return nil, errors.New("specify the key for non array values")
|
|
|
|
}
|
|
|
|
dict[key] = values[i]
|
|
|
|
case map[string]interface{}:
|
|
|
|
m := values[i].(map[string]interface{})
|
|
|
|
for i, v := range m {
|
|
|
|
dict[i] = v
|
|
|
|
}
|
|
|
|
default:
|
|
|
|
return nil, errors.New("dict values must be maps")
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return dict, nil
|
|
|
|
},
|
|
|
|
"percentage": func(n int, values ...int) float32 {
|
|
|
|
sum := 0
|
|
|
|
for i := 0; i < len(values); i++ {
|
|
|
|
sum += values[i]
|
|
|
|
}
|
|
|
|
return float32(n) * 100 / float32(sum)
|
|
|
|
},
|
|
|
|
"Add": func(a ...int) int {
|
|
|
|
sum := 0
|
|
|
|
for _, val := range a {
|
|
|
|
sum += val
|
|
|
|
}
|
|
|
|
return sum
|
|
|
|
},
|
|
|
|
"Mul": func(a ...int) int {
|
|
|
|
sum := 1
|
|
|
|
for _, val := range a {
|
|
|
|
sum *= val
|
|
|
|
}
|
|
|
|
return sum
|
|
|
|
},
|
|
|
|
"QueryEscape": url.QueryEscape,
|
|
|
|
}}
|
|
|
|
}
|
|
|
|
|
|
|
|
// AvatarHTML creates the HTML for an avatar
|
|
|
|
func AvatarHTML(src string, size int, class, name string) template.HTML {
|
|
|
|
sizeStr := fmt.Sprintf(`%d`, size)
|
|
|
|
|
|
|
|
if name == "" {
|
|
|
|
name = "avatar"
|
|
|
|
}
|
|
|
|
|
|
|
|
return template.HTML(`<img class="` + class + `" src="` + src + `" title="` + html.EscapeString(name) + `" width="` + sizeStr + `" height="` + sizeStr + `"/>`)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Avatar renders user avatars. args: user, size (int), class (string)
|
Add context cache as a request level cache (#22294)
To avoid duplicated load of the same data in an HTTP request, we can set
a context cache to do that. i.e. Some pages may load a user from a
database with the same id in different areas on the same page. But the
code is hidden in two different deep logic. How should we share the
user? As a result of this PR, now if both entry functions accept
`context.Context` as the first parameter and we just need to refactor
`GetUserByID` to reuse the user from the context cache. Then it will not
be loaded twice on an HTTP request.
But of course, sometimes we would like to reload an object from the
database, that's why `RemoveContextData` is also exposed.
The core context cache is here. It defines a new context
```go
type cacheContext struct {
ctx context.Context
data map[any]map[any]any
lock sync.RWMutex
}
var cacheContextKey = struct{}{}
func WithCacheContext(ctx context.Context) context.Context {
return context.WithValue(ctx, cacheContextKey, &cacheContext{
ctx: ctx,
data: make(map[any]map[any]any),
})
}
```
Then you can use the below 4 methods to read/write/del the data within
the same context.
```go
func GetContextData(ctx context.Context, tp, key any) any
func SetContextData(ctx context.Context, tp, key, value any)
func RemoveContextData(ctx context.Context, tp, key any)
func GetWithContextCache[T any](ctx context.Context, cacheGroupKey string, cacheTargetID any, f func() (T, error)) (T, error)
```
Then let's take a look at how `system.GetString` implement it.
```go
func GetSetting(ctx context.Context, key string) (string, error) {
return cache.GetWithContextCache(ctx, contextCacheKey, key, func() (string, error) {
return cache.GetString(genSettingCacheKey(key), func() (string, error) {
res, err := GetSettingNoCache(ctx, key)
if err != nil {
return "", err
}
return res.SettingValue, nil
})
})
}
```
First, it will check if context data include the setting object with the
key. If not, it will query from the global cache which may be memory or
a Redis cache. If not, it will get the object from the database. In the
end, if the object gets from the global cache or database, it will be
set into the context cache.
An object stored in the context cache will only be destroyed after the
context disappeared.
2 years ago
|
|
|
func Avatar(ctx context.Context, item interface{}, others ...interface{}) template.HTML {
|
|
|
|
size, class := gitea_html.ParseSizeAndClass(avatars.DefaultAvatarPixelSize, avatars.DefaultAvatarClass, others...)
|
|
|
|
|
|
|
|
switch t := item.(type) {
|
|
|
|
case *user_model.User:
|
Add context cache as a request level cache (#22294)
To avoid duplicated load of the same data in an HTTP request, we can set
a context cache to do that. i.e. Some pages may load a user from a
database with the same id in different areas on the same page. But the
code is hidden in two different deep logic. How should we share the
user? As a result of this PR, now if both entry functions accept
`context.Context` as the first parameter and we just need to refactor
`GetUserByID` to reuse the user from the context cache. Then it will not
be loaded twice on an HTTP request.
But of course, sometimes we would like to reload an object from the
database, that's why `RemoveContextData` is also exposed.
The core context cache is here. It defines a new context
```go
type cacheContext struct {
ctx context.Context
data map[any]map[any]any
lock sync.RWMutex
}
var cacheContextKey = struct{}{}
func WithCacheContext(ctx context.Context) context.Context {
return context.WithValue(ctx, cacheContextKey, &cacheContext{
ctx: ctx,
data: make(map[any]map[any]any),
})
}
```
Then you can use the below 4 methods to read/write/del the data within
the same context.
```go
func GetContextData(ctx context.Context, tp, key any) any
func SetContextData(ctx context.Context, tp, key, value any)
func RemoveContextData(ctx context.Context, tp, key any)
func GetWithContextCache[T any](ctx context.Context, cacheGroupKey string, cacheTargetID any, f func() (T, error)) (T, error)
```
Then let's take a look at how `system.GetString` implement it.
```go
func GetSetting(ctx context.Context, key string) (string, error) {
return cache.GetWithContextCache(ctx, contextCacheKey, key, func() (string, error) {
return cache.GetString(genSettingCacheKey(key), func() (string, error) {
res, err := GetSettingNoCache(ctx, key)
if err != nil {
return "", err
}
return res.SettingValue, nil
})
})
}
```
First, it will check if context data include the setting object with the
key. If not, it will query from the global cache which may be memory or
a Redis cache. If not, it will get the object from the database. In the
end, if the object gets from the global cache or database, it will be
set into the context cache.
An object stored in the context cache will only be destroyed after the
context disappeared.
2 years ago
|
|
|
src := t.AvatarLinkWithSize(ctx, size*setting.Avatar.RenderedSizeFactor)
|
|
|
|
if src != "" {
|
|
|
|
return AvatarHTML(src, size, class, t.DisplayName())
|
|
|
|
}
|
|
|
|
case *repo_model.Collaborator:
|
Add context cache as a request level cache (#22294)
To avoid duplicated load of the same data in an HTTP request, we can set
a context cache to do that. i.e. Some pages may load a user from a
database with the same id in different areas on the same page. But the
code is hidden in two different deep logic. How should we share the
user? As a result of this PR, now if both entry functions accept
`context.Context` as the first parameter and we just need to refactor
`GetUserByID` to reuse the user from the context cache. Then it will not
be loaded twice on an HTTP request.
But of course, sometimes we would like to reload an object from the
database, that's why `RemoveContextData` is also exposed.
The core context cache is here. It defines a new context
```go
type cacheContext struct {
ctx context.Context
data map[any]map[any]any
lock sync.RWMutex
}
var cacheContextKey = struct{}{}
func WithCacheContext(ctx context.Context) context.Context {
return context.WithValue(ctx, cacheContextKey, &cacheContext{
ctx: ctx,
data: make(map[any]map[any]any),
})
}
```
Then you can use the below 4 methods to read/write/del the data within
the same context.
```go
func GetContextData(ctx context.Context, tp, key any) any
func SetContextData(ctx context.Context, tp, key, value any)
func RemoveContextData(ctx context.Context, tp, key any)
func GetWithContextCache[T any](ctx context.Context, cacheGroupKey string, cacheTargetID any, f func() (T, error)) (T, error)
```
Then let's take a look at how `system.GetString` implement it.
```go
func GetSetting(ctx context.Context, key string) (string, error) {
return cache.GetWithContextCache(ctx, contextCacheKey, key, func() (string, error) {
return cache.GetString(genSettingCacheKey(key), func() (string, error) {
res, err := GetSettingNoCache(ctx, key)
if err != nil {
return "", err
}
return res.SettingValue, nil
})
})
}
```
First, it will check if context data include the setting object with the
key. If not, it will query from the global cache which may be memory or
a Redis cache. If not, it will get the object from the database. In the
end, if the object gets from the global cache or database, it will be
set into the context cache.
An object stored in the context cache will only be destroyed after the
context disappeared.
2 years ago
|
|
|
src := t.AvatarLinkWithSize(ctx, size*setting.Avatar.RenderedSizeFactor)
|
|
|
|
if src != "" {
|
|
|
|
return AvatarHTML(src, size, class, t.DisplayName())
|
|
|
|
}
|
|
|
|
case *organization.Organization:
|
Add context cache as a request level cache (#22294)
To avoid duplicated load of the same data in an HTTP request, we can set
a context cache to do that. i.e. Some pages may load a user from a
database with the same id in different areas on the same page. But the
code is hidden in two different deep logic. How should we share the
user? As a result of this PR, now if both entry functions accept
`context.Context` as the first parameter and we just need to refactor
`GetUserByID` to reuse the user from the context cache. Then it will not
be loaded twice on an HTTP request.
But of course, sometimes we would like to reload an object from the
database, that's why `RemoveContextData` is also exposed.
The core context cache is here. It defines a new context
```go
type cacheContext struct {
ctx context.Context
data map[any]map[any]any
lock sync.RWMutex
}
var cacheContextKey = struct{}{}
func WithCacheContext(ctx context.Context) context.Context {
return context.WithValue(ctx, cacheContextKey, &cacheContext{
ctx: ctx,
data: make(map[any]map[any]any),
})
}
```
Then you can use the below 4 methods to read/write/del the data within
the same context.
```go
func GetContextData(ctx context.Context, tp, key any) any
func SetContextData(ctx context.Context, tp, key, value any)
func RemoveContextData(ctx context.Context, tp, key any)
func GetWithContextCache[T any](ctx context.Context, cacheGroupKey string, cacheTargetID any, f func() (T, error)) (T, error)
```
Then let's take a look at how `system.GetString` implement it.
```go
func GetSetting(ctx context.Context, key string) (string, error) {
return cache.GetWithContextCache(ctx, contextCacheKey, key, func() (string, error) {
return cache.GetString(genSettingCacheKey(key), func() (string, error) {
res, err := GetSettingNoCache(ctx, key)
if err != nil {
return "", err
}
return res.SettingValue, nil
})
})
}
```
First, it will check if context data include the setting object with the
key. If not, it will query from the global cache which may be memory or
a Redis cache. If not, it will get the object from the database. In the
end, if the object gets from the global cache or database, it will be
set into the context cache.
An object stored in the context cache will only be destroyed after the
context disappeared.
2 years ago
|
|
|
src := t.AsUser().AvatarLinkWithSize(ctx, size*setting.Avatar.RenderedSizeFactor)
|
|
|
|
if src != "" {
|
|
|
|
return AvatarHTML(src, size, class, t.AsUser().DisplayName())
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return template.HTML("")
|
|
|
|
}
|
|
|
|
|
|
|
|
// AvatarByAction renders user avatars from action. args: action, size (int), class (string)
|
Add context cache as a request level cache (#22294)
To avoid duplicated load of the same data in an HTTP request, we can set
a context cache to do that. i.e. Some pages may load a user from a
database with the same id in different areas on the same page. But the
code is hidden in two different deep logic. How should we share the
user? As a result of this PR, now if both entry functions accept
`context.Context` as the first parameter and we just need to refactor
`GetUserByID` to reuse the user from the context cache. Then it will not
be loaded twice on an HTTP request.
But of course, sometimes we would like to reload an object from the
database, that's why `RemoveContextData` is also exposed.
The core context cache is here. It defines a new context
```go
type cacheContext struct {
ctx context.Context
data map[any]map[any]any
lock sync.RWMutex
}
var cacheContextKey = struct{}{}
func WithCacheContext(ctx context.Context) context.Context {
return context.WithValue(ctx, cacheContextKey, &cacheContext{
ctx: ctx,
data: make(map[any]map[any]any),
})
}
```
Then you can use the below 4 methods to read/write/del the data within
the same context.
```go
func GetContextData(ctx context.Context, tp, key any) any
func SetContextData(ctx context.Context, tp, key, value any)
func RemoveContextData(ctx context.Context, tp, key any)
func GetWithContextCache[T any](ctx context.Context, cacheGroupKey string, cacheTargetID any, f func() (T, error)) (T, error)
```
Then let's take a look at how `system.GetString` implement it.
```go
func GetSetting(ctx context.Context, key string) (string, error) {
return cache.GetWithContextCache(ctx, contextCacheKey, key, func() (string, error) {
return cache.GetString(genSettingCacheKey(key), func() (string, error) {
res, err := GetSettingNoCache(ctx, key)
if err != nil {
return "", err
}
return res.SettingValue, nil
})
})
}
```
First, it will check if context data include the setting object with the
key. If not, it will query from the global cache which may be memory or
a Redis cache. If not, it will get the object from the database. In the
end, if the object gets from the global cache or database, it will be
set into the context cache.
An object stored in the context cache will only be destroyed after the
context disappeared.
2 years ago
|
|
|
func AvatarByAction(ctx context.Context, action *activities_model.Action, others ...interface{}) template.HTML {
|
|
|
|
action.LoadActUser(ctx)
|
|
|
|
return Avatar(ctx, action.ActUser, others...)
|
|
|
|
}
|
|
|
|
|
|
|
|
// RepoAvatar renders repo avatars. args: repo, size(int), class (string)
|
|
|
|
func RepoAvatar(repo *repo_model.Repository, others ...interface{}) template.HTML {
|
|
|
|
size, class := gitea_html.ParseSizeAndClass(avatars.DefaultAvatarPixelSize, avatars.DefaultAvatarClass, others...)
|
|
|
|
|
|
|
|
src := repo.RelAvatarLink()
|
|
|
|
if src != "" {
|
|
|
|
return AvatarHTML(src, size, class, repo.FullName())
|
|
|
|
}
|
|
|
|
return template.HTML("")
|
|
|
|
}
|
|
|
|
|
|
|
|
// AvatarByEmail renders avatars by email address. args: email, name, size (int), class (string)
|
Add context cache as a request level cache (#22294)
To avoid duplicated load of the same data in an HTTP request, we can set
a context cache to do that. i.e. Some pages may load a user from a
database with the same id in different areas on the same page. But the
code is hidden in two different deep logic. How should we share the
user? As a result of this PR, now if both entry functions accept
`context.Context` as the first parameter and we just need to refactor
`GetUserByID` to reuse the user from the context cache. Then it will not
be loaded twice on an HTTP request.
But of course, sometimes we would like to reload an object from the
database, that's why `RemoveContextData` is also exposed.
The core context cache is here. It defines a new context
```go
type cacheContext struct {
ctx context.Context
data map[any]map[any]any
lock sync.RWMutex
}
var cacheContextKey = struct{}{}
func WithCacheContext(ctx context.Context) context.Context {
return context.WithValue(ctx, cacheContextKey, &cacheContext{
ctx: ctx,
data: make(map[any]map[any]any),
})
}
```
Then you can use the below 4 methods to read/write/del the data within
the same context.
```go
func GetContextData(ctx context.Context, tp, key any) any
func SetContextData(ctx context.Context, tp, key, value any)
func RemoveContextData(ctx context.Context, tp, key any)
func GetWithContextCache[T any](ctx context.Context, cacheGroupKey string, cacheTargetID any, f func() (T, error)) (T, error)
```
Then let's take a look at how `system.GetString` implement it.
```go
func GetSetting(ctx context.Context, key string) (string, error) {
return cache.GetWithContextCache(ctx, contextCacheKey, key, func() (string, error) {
return cache.GetString(genSettingCacheKey(key), func() (string, error) {
res, err := GetSettingNoCache(ctx, key)
if err != nil {
return "", err
}
return res.SettingValue, nil
})
})
}
```
First, it will check if context data include the setting object with the
key. If not, it will query from the global cache which may be memory or
a Redis cache. If not, it will get the object from the database. In the
end, if the object gets from the global cache or database, it will be
set into the context cache.
An object stored in the context cache will only be destroyed after the
context disappeared.
2 years ago
|
|
|
func AvatarByEmail(ctx context.Context, email, name string, others ...interface{}) template.HTML {
|
|
|
|
size, class := gitea_html.ParseSizeAndClass(avatars.DefaultAvatarPixelSize, avatars.DefaultAvatarClass, others...)
|
Add context cache as a request level cache (#22294)
To avoid duplicated load of the same data in an HTTP request, we can set
a context cache to do that. i.e. Some pages may load a user from a
database with the same id in different areas on the same page. But the
code is hidden in two different deep logic. How should we share the
user? As a result of this PR, now if both entry functions accept
`context.Context` as the first parameter and we just need to refactor
`GetUserByID` to reuse the user from the context cache. Then it will not
be loaded twice on an HTTP request.
But of course, sometimes we would like to reload an object from the
database, that's why `RemoveContextData` is also exposed.
The core context cache is here. It defines a new context
```go
type cacheContext struct {
ctx context.Context
data map[any]map[any]any
lock sync.RWMutex
}
var cacheContextKey = struct{}{}
func WithCacheContext(ctx context.Context) context.Context {
return context.WithValue(ctx, cacheContextKey, &cacheContext{
ctx: ctx,
data: make(map[any]map[any]any),
})
}
```
Then you can use the below 4 methods to read/write/del the data within
the same context.
```go
func GetContextData(ctx context.Context, tp, key any) any
func SetContextData(ctx context.Context, tp, key, value any)
func RemoveContextData(ctx context.Context, tp, key any)
func GetWithContextCache[T any](ctx context.Context, cacheGroupKey string, cacheTargetID any, f func() (T, error)) (T, error)
```
Then let's take a look at how `system.GetString` implement it.
```go
func GetSetting(ctx context.Context, key string) (string, error) {
return cache.GetWithContextCache(ctx, contextCacheKey, key, func() (string, error) {
return cache.GetString(genSettingCacheKey(key), func() (string, error) {
res, err := GetSettingNoCache(ctx, key)
if err != nil {
return "", err
}
return res.SettingValue, nil
})
})
}
```
First, it will check if context data include the setting object with the
key. If not, it will query from the global cache which may be memory or
a Redis cache. If not, it will get the object from the database. In the
end, if the object gets from the global cache or database, it will be
set into the context cache.
An object stored in the context cache will only be destroyed after the
context disappeared.
2 years ago
|
|
|
src := avatars.GenerateEmailAvatarFastLink(ctx, email, size*setting.Avatar.RenderedSizeFactor)
|
|
|
|
|
|
|
|
if src != "" {
|
|
|
|
return AvatarHTML(src, size, class, name)
|
|
|
|
}
|
|
|
|
|
|
|
|
return template.HTML("")
|
|
|
|
}
|
|
|
|
|
|
|
|
// Safe render raw as HTML
|
|
|
|
func Safe(raw string) template.HTML {
|
|
|
|
return template.HTML(raw)
|
|
|
|
}
|
|
|
|
|
|
|
|
// SafeJS renders raw as JS
|
|
|
|
func SafeJS(raw string) template.JS {
|
|
|
|
return template.JS(raw)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Str2html render Markdown text to HTML
|
|
|
|
func Str2html(raw string) template.HTML {
|
|
|
|
return template.HTML(markup.Sanitize(raw))
|
|
|
|
}
|
|
|
|
|
|
|
|
// Escape escapes a HTML string
|
|
|
|
func Escape(raw string) string {
|
|
|
|
return html.EscapeString(raw)
|
|
|
|
}
|
|
|
|
|
|
|
|
// JSEscape escapes a JS string
|
|
|
|
func JSEscape(raw string) string {
|
|
|
|
return template.JSEscapeString(raw)
|
|
|
|
}
|
|
|
|
|
|
|
|
// DotEscape wraps a dots in names with ZWJ [U+200D] in order to prevent autolinkers from detecting these as urls
|
|
|
|
func DotEscape(raw string) string {
|
|
|
|
return strings.ReplaceAll(raw, ".", "\u200d.\u200d")
|
|
|
|
}
|
|
|
|
|
|
|
|
// RenderCommitMessage renders commit message with XSS-safe and special links.
|
|
|
|
func RenderCommitMessage(ctx context.Context, msg, urlPrefix string, metas map[string]string) template.HTML {
|
|
|
|
return RenderCommitMessageLink(ctx, msg, urlPrefix, "", metas)
|
|
|
|
}
|
|
|
|
|
|
|
|
// RenderCommitMessageLink renders commit message as a XXS-safe link to the provided
|
|
|
|
// default url, handling for special links.
|
|
|
|
func RenderCommitMessageLink(ctx context.Context, msg, urlPrefix, urlDefault string, metas map[string]string) template.HTML {
|
|
|
|
cleanMsg := template.HTMLEscapeString(msg)
|
|
|
|
// we can safely assume that it will not return any error, since there
|
|
|
|
// shouldn't be any special HTML.
|
|
|
|
fullMessage, err := markup.RenderCommitMessage(&markup.RenderContext{
|
|
|
|
Ctx: ctx,
|
|
|
|
URLPrefix: urlPrefix,
|
|
|
|
DefaultLink: urlDefault,
|
|
|
|
Metas: metas,
|
|
|
|
}, cleanMsg)
|
|
|
|
if err != nil {
|
|
|
|
log.Error("RenderCommitMessage: %v", err)
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
msgLines := strings.Split(strings.TrimSpace(fullMessage), "\n")
|
|
|
|
if len(msgLines) == 0 {
|
|
|
|
return template.HTML("")
|
|
|
|
}
|
|
|
|
return template.HTML(msgLines[0])
|
|
|
|
}
|
|
|
|
|
|
|
|
// RenderCommitMessageLinkSubject renders commit message as a XXS-safe link to
|
|
|
|
// the provided default url, handling for special links without email to links.
|
|
|
|
func RenderCommitMessageLinkSubject(ctx context.Context, msg, urlPrefix, urlDefault string, metas map[string]string) template.HTML {
|
|
|
|
msgLine := strings.TrimLeftFunc(msg, unicode.IsSpace)
|
|
|
|
lineEnd := strings.IndexByte(msgLine, '\n')
|
|
|
|
if lineEnd > 0 {
|
|
|
|
msgLine = msgLine[:lineEnd]
|
|
|
|
}
|
|
|
|
msgLine = strings.TrimRightFunc(msgLine, unicode.IsSpace)
|
|
|
|
if len(msgLine) == 0 {
|
|
|
|
return template.HTML("")
|
|
|
|
}
|
|
|
|
|
|
|
|
// we can safely assume that it will not return any error, since there
|
|
|
|
// shouldn't be any special HTML.
|
|
|
|
renderedMessage, err := markup.RenderCommitMessageSubject(&markup.RenderContext{
|
|
|
|
Ctx: ctx,
|
|
|
|
URLPrefix: urlPrefix,
|
|
|
|
DefaultLink: urlDefault,
|
|
|
|
Metas: metas,
|
|
|
|
}, template.HTMLEscapeString(msgLine))
|
|
|
|
if err != nil {
|
|
|
|
log.Error("RenderCommitMessageSubject: %v", err)
|
|
|
|
return template.HTML("")
|
|
|
|
}
|
|
|
|
return template.HTML(renderedMessage)
|
|
|
|
}
|
|
|
|
|
|
|
|
// RenderCommitBody extracts the body of a commit message without its title.
|
|
|
|
func RenderCommitBody(ctx context.Context, msg, urlPrefix string, metas map[string]string) template.HTML {
|
|
|
|
msgLine := strings.TrimRightFunc(msg, unicode.IsSpace)
|
|
|
|
lineEnd := strings.IndexByte(msgLine, '\n')
|
|
|
|
if lineEnd > 0 {
|
|
|
|
msgLine = msgLine[lineEnd+1:]
|
|
|
|
} else {
|
|
|
|
return template.HTML("")
|
|
|
|
}
|
|
|
|
msgLine = strings.TrimLeftFunc(msgLine, unicode.IsSpace)
|
|
|
|
if len(msgLine) == 0 {
|
|
|
|
return template.HTML("")
|
|
|
|
}
|
|
|
|
|
|
|
|
renderedMessage, err := markup.RenderCommitMessage(&markup.RenderContext{
|
|
|
|
Ctx: ctx,
|
|
|
|
URLPrefix: urlPrefix,
|
|
|
|
Metas: metas,
|
|
|
|
}, template.HTMLEscapeString(msgLine))
|
|
|
|
if err != nil {
|
|
|
|
log.Error("RenderCommitMessage: %v", err)
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
return template.HTML(renderedMessage)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Match text that is between back ticks.
|
|
|
|
var codeMatcher = regexp.MustCompile("`([^`]+)`")
|
|
|
|
|
|
|
|
// RenderCodeBlock renders "`…`" as highlighted "<code>" block.
|
|
|
|
// Intended for issue and PR titles, these containers should have styles for "<code>" elements
|
|
|
|
func RenderCodeBlock(htmlEscapedTextToRender template.HTML) template.HTML {
|
|
|
|
htmlWithCodeTags := codeMatcher.ReplaceAllString(string(htmlEscapedTextToRender), "<code>$1</code>") // replace with HTML <code> tags
|
|
|
|
return template.HTML(htmlWithCodeTags)
|
|
|
|
}
|
|
|
|
|
|
|
|
// RenderIssueTitle renders issue/pull title with defined post processors
|
|
|
|
func RenderIssueTitle(ctx context.Context, text, urlPrefix string, metas map[string]string) template.HTML {
|
|
|
|
renderedText, err := markup.RenderIssueTitle(&markup.RenderContext{
|
|
|
|
Ctx: ctx,
|
|
|
|
URLPrefix: urlPrefix,
|
|
|
|
Metas: metas,
|
|
|
|
}, template.HTMLEscapeString(text))
|
|
|
|
if err != nil {
|
|
|
|
log.Error("RenderIssueTitle: %v", err)
|
|
|
|
return template.HTML("")
|
|
|
|
}
|
|
|
|
return template.HTML(renderedText)
|
|
|
|
}
|
|
|
|
|
Scoped labels (#22585)
Add a new "exclusive" option per label. This makes it so that when the
label is named `scope/name`, no other label with the same `scope/`
prefix can be set on an issue.
The scope is determined by the last occurence of `/`, so for example
`scope/alpha/name` and `scope/beta/name` are considered to be in
different scopes and can coexist.
Exclusive scopes are not enforced by any database rules, however they
are enforced when editing labels at the models level, automatically
removing any existing labels in the same scope when either attaching a
new label or replacing all labels.
In menus use a circle instead of checkbox to indicate they function as
radio buttons per scope. Issue filtering by label ensures that only a
single scoped label is selected at a time. Clicking with alt key can be
used to remove a scoped label, both when editing individual issues and
batch editing.
Label rendering refactor for consistency and code simplification:
* Labels now consistently have the same shape, emojis and tooltips
everywhere. This includes the label list and label assignment menus.
* In label list, show description below label same as label menus.
* Don't use exactly black/white text colors to look a bit nicer.
* Simplify text color computation. There is no point computing luminance
in linear color space, as this is a perceptual problem and sRGB is
closer to perceptually linear.
* Increase height of label assignment menus to show more labels. Showing
only 3-4 labels at a time leads to a lot of scrolling.
* Render all labels with a new RenderLabel template helper function.
Label creation and editing in multiline modal menu:
* Change label creation to open a modal menu like label editing.
* Change menu layout to place name, description and colors on separate
lines.
* Don't color cancel button red in label editing modal menu.
* Align text to the left in model menu for better readability and
consistent with settings layout elsewhere.
Custom exclusive scoped label rendering:
* Display scoped label prefix and suffix with slightly darker and
lighter background color respectively, and a slanted edge between them
similar to the `/` symbol.
* In menus exclusive labels are grouped with a divider line.
---------
Co-authored-by: Yarden Shoham <hrsi88@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
2 years ago
|
|
|
// RenderLabel renders a label
|
|
|
|
func RenderLabel(ctx context.Context, label *issues_model.Label) string {
|
Scoped labels (#22585)
Add a new "exclusive" option per label. This makes it so that when the
label is named `scope/name`, no other label with the same `scope/`
prefix can be set on an issue.
The scope is determined by the last occurence of `/`, so for example
`scope/alpha/name` and `scope/beta/name` are considered to be in
different scopes and can coexist.
Exclusive scopes are not enforced by any database rules, however they
are enforced when editing labels at the models level, automatically
removing any existing labels in the same scope when either attaching a
new label or replacing all labels.
In menus use a circle instead of checkbox to indicate they function as
radio buttons per scope. Issue filtering by label ensures that only a
single scoped label is selected at a time. Clicking with alt key can be
used to remove a scoped label, both when editing individual issues and
batch editing.
Label rendering refactor for consistency and code simplification:
* Labels now consistently have the same shape, emojis and tooltips
everywhere. This includes the label list and label assignment menus.
* In label list, show description below label same as label menus.
* Don't use exactly black/white text colors to look a bit nicer.
* Simplify text color computation. There is no point computing luminance
in linear color space, as this is a perceptual problem and sRGB is
closer to perceptually linear.
* Increase height of label assignment menus to show more labels. Showing
only 3-4 labels at a time leads to a lot of scrolling.
* Render all labels with a new RenderLabel template helper function.
Label creation and editing in multiline modal menu:
* Change label creation to open a modal menu like label editing.
* Change menu layout to place name, description and colors on separate
lines.
* Don't color cancel button red in label editing modal menu.
* Align text to the left in model menu for better readability and
consistent with settings layout elsewhere.
Custom exclusive scoped label rendering:
* Display scoped label prefix and suffix with slightly darker and
lighter background color respectively, and a slanted edge between them
similar to the `/` symbol.
* In menus exclusive labels are grouped with a divider line.
---------
Co-authored-by: Yarden Shoham <hrsi88@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
2 years ago
|
|
|
labelScope := label.ExclusiveScope()
|
|
|
|
|
|
|
|
textColor := "#111"
|
|
|
|
if label.UseLightTextColor() {
|
|
|
|
textColor = "#eee"
|
|
|
|
}
|
|
|
|
|
|
|
|
description := emoji.ReplaceAliases(template.HTMLEscapeString(label.Description))
|
|
|
|
|
|
|
|
if labelScope == "" {
|
|
|
|
// Regular label
|
|
|
|
return fmt.Sprintf("<div class='ui label' style='color: %s !important; background-color: %s !important' title='%s'>%s</div>",
|
|
|
|
textColor, label.Color, description, RenderEmoji(ctx, label.Name))
|
Scoped labels (#22585)
Add a new "exclusive" option per label. This makes it so that when the
label is named `scope/name`, no other label with the same `scope/`
prefix can be set on an issue.
The scope is determined by the last occurence of `/`, so for example
`scope/alpha/name` and `scope/beta/name` are considered to be in
different scopes and can coexist.
Exclusive scopes are not enforced by any database rules, however they
are enforced when editing labels at the models level, automatically
removing any existing labels in the same scope when either attaching a
new label or replacing all labels.
In menus use a circle instead of checkbox to indicate they function as
radio buttons per scope. Issue filtering by label ensures that only a
single scoped label is selected at a time. Clicking with alt key can be
used to remove a scoped label, both when editing individual issues and
batch editing.
Label rendering refactor for consistency and code simplification:
* Labels now consistently have the same shape, emojis and tooltips
everywhere. This includes the label list and label assignment menus.
* In label list, show description below label same as label menus.
* Don't use exactly black/white text colors to look a bit nicer.
* Simplify text color computation. There is no point computing luminance
in linear color space, as this is a perceptual problem and sRGB is
closer to perceptually linear.
* Increase height of label assignment menus to show more labels. Showing
only 3-4 labels at a time leads to a lot of scrolling.
* Render all labels with a new RenderLabel template helper function.
Label creation and editing in multiline modal menu:
* Change label creation to open a modal menu like label editing.
* Change menu layout to place name, description and colors on separate
lines.
* Don't color cancel button red in label editing modal menu.
* Align text to the left in model menu for better readability and
consistent with settings layout elsewhere.
Custom exclusive scoped label rendering:
* Display scoped label prefix and suffix with slightly darker and
lighter background color respectively, and a slanted edge between them
similar to the `/` symbol.
* In menus exclusive labels are grouped with a divider line.
---------
Co-authored-by: Yarden Shoham <hrsi88@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
2 years ago
|
|
|
}
|
|
|
|
|
|
|
|
// Scoped label
|
|
|
|
scopeText := RenderEmoji(ctx, labelScope)
|
|
|
|
itemText := RenderEmoji(ctx, label.Name[len(labelScope)+1:])
|
Scoped labels (#22585)
Add a new "exclusive" option per label. This makes it so that when the
label is named `scope/name`, no other label with the same `scope/`
prefix can be set on an issue.
The scope is determined by the last occurence of `/`, so for example
`scope/alpha/name` and `scope/beta/name` are considered to be in
different scopes and can coexist.
Exclusive scopes are not enforced by any database rules, however they
are enforced when editing labels at the models level, automatically
removing any existing labels in the same scope when either attaching a
new label or replacing all labels.
In menus use a circle instead of checkbox to indicate they function as
radio buttons per scope. Issue filtering by label ensures that only a
single scoped label is selected at a time. Clicking with alt key can be
used to remove a scoped label, both when editing individual issues and
batch editing.
Label rendering refactor for consistency and code simplification:
* Labels now consistently have the same shape, emojis and tooltips
everywhere. This includes the label list and label assignment menus.
* In label list, show description below label same as label menus.
* Don't use exactly black/white text colors to look a bit nicer.
* Simplify text color computation. There is no point computing luminance
in linear color space, as this is a perceptual problem and sRGB is
closer to perceptually linear.
* Increase height of label assignment menus to show more labels. Showing
only 3-4 labels at a time leads to a lot of scrolling.
* Render all labels with a new RenderLabel template helper function.
Label creation and editing in multiline modal menu:
* Change label creation to open a modal menu like label editing.
* Change menu layout to place name, description and colors on separate
lines.
* Don't color cancel button red in label editing modal menu.
* Align text to the left in model menu for better readability and
consistent with settings layout elsewhere.
Custom exclusive scoped label rendering:
* Display scoped label prefix and suffix with slightly darker and
lighter background color respectively, and a slanted edge between them
similar to the `/` symbol.
* In menus exclusive labels are grouped with a divider line.
---------
Co-authored-by: Yarden Shoham <hrsi88@gmail.com>
Co-authored-by: Lauris BH <lauris@nix.lv>
2 years ago
|
|
|
|
|
|
|
itemColor := label.Color
|
|
|
|
scopeColor := label.Color
|
|
|
|
if r, g, b, err := label.ColorRGB(); err == nil {
|
|
|
|
// Make scope and item background colors slightly darker and lighter respectively.
|
|
|
|
// More contrast needed with higher luminance, empirically tweaked.
|
|
|
|
luminance := (0.299*r + 0.587*g + 0.114*b) / 255
|
|
|
|
contrast := 0.01 + luminance*0.06
|
|
|
|
// Ensure we add the same amount of contrast also near 0 and 1.
|
|
|
|
darken := contrast + math.Max(luminance+contrast-1.0, 0.0)
|
|
|
|
lighten := contrast + math.Max(contrast-luminance, 0.0)
|
|
|
|
// Compute factor to keep RGB values proportional.
|
|
|
|
darkenFactor := math.Max(luminance-darken, 0.0) / math.Max(luminance, 1.0/255.0)
|
|
|
|
lightenFactor := math.Min(luminance+lighten, 1.0) / math.Max(luminance, 1.0/255.0)
|
|
|
|
|
|
|
|
scopeBytes := []byte{
|
|
|
|
uint8(math.Min(math.Round(r*darkenFactor), 255)),
|
|
|
|
uint8(math.Min(math.Round(g*darkenFactor), 255)),
|
|
|
|
uint8(math.Min(math.Round(b*darkenFactor), 255)),
|
|
|
|
}
|
|
|
|
itemBytes := []byte{
|
|
|
|
uint8(math.Min(math.Round(r*lightenFactor), 255)),
|
|
|
|
uint8(math.Min(math.Round(g*lightenFactor), 255)),
|
|
|
|
uint8(math.Min(math.Round(b*lightenFactor), 255)),
|
|
|
|
}
|
|
|
|
|
|
|
|
itemColor = "#" + hex.EncodeToString(itemBytes)
|
|
|
|
scopeColor = "#" + hex.EncodeToString(scopeBytes)
|
|
|
|
}
|
|
|
|
|
|
|
|
return fmt.Sprintf("<span class='ui label scope-parent' title='%s'>"+
|
|
|
|
"<div class='ui label scope-left' style='color: %s !important; background-color: %s !important'>%s</div>"+
|
|
|
|
"<div class='ui label scope-middle' style='background: linear-gradient(-80deg, %s 48%%, %s 52%% 0%%);'> </div>"+
|
|
|
|
"<div class='ui label scope-right' style='color: %s !important; background-color: %s !important''>%s</div>"+
|
|
|
|
"</span>",
|
|
|
|
description,
|
|
|
|
textColor, scopeColor, scopeText,
|
|
|
|
itemColor, scopeColor,
|
|
|
|
textColor, itemColor, itemText)
|
|
|
|
}
|
|
|
|
|
|
|
|
// RenderEmoji renders html text with emoji post processors
|
|
|
|
func RenderEmoji(ctx context.Context, text string) template.HTML {
|
|
|
|
renderedText, err := markup.RenderEmoji(&markup.RenderContext{Ctx: ctx},
|
|
|
|
template.HTMLEscapeString(text))
|
|
|
|
if err != nil {
|
|
|
|
log.Error("RenderEmoji: %v", err)
|
|
|
|
return template.HTML("")
|
|
|
|
}
|
|
|
|
return template.HTML(renderedText)
|
|
|
|
}
|
|
|
|
|
|
|
|
// ReactionToEmoji renders emoji for use in reactions
|
|
|
|
func ReactionToEmoji(reaction string) template.HTML {
|
|
|
|
val := emoji.FromCode(reaction)
|
|
|
|
if val != nil {
|
|
|
|
return template.HTML(val.Emoji)
|
|
|
|
}
|
|
|
|
val = emoji.FromAlias(reaction)
|
|
|
|
if val != nil {
|
|
|
|
return template.HTML(val.Emoji)
|
|
|
|
}
|
|
|
|
return template.HTML(fmt.Sprintf(`<img alt=":%s:" src="%s/assets/img/emoji/%s.png"></img>`, reaction, setting.StaticURLPrefix, url.PathEscape(reaction)))
|
|
|
|
}
|
|
|
|
|
|
|
|
// RenderNote renders the contents of a git-notes file as a commit message.
|
|
|
|
func RenderNote(ctx context.Context, msg, urlPrefix string, metas map[string]string) template.HTML {
|
|
|
|
cleanMsg := template.HTMLEscapeString(msg)
|
|
|
|
fullMessage, err := markup.RenderCommitMessage(&markup.RenderContext{
|
|
|
|
Ctx: ctx,
|
|
|
|
URLPrefix: urlPrefix,
|
|
|
|
Metas: metas,
|
|
|
|
}, cleanMsg)
|
|
|
|
if err != nil {
|
|
|
|
log.Error("RenderNote: %v", err)
|
|
|
|
return ""
|
|
|
|
}
|
|
|
|
return template.HTML(fullMessage)
|
|
|
|
}
|
|
|
|
|
|
|
|
// IsMultilineCommitMessage checks to see if a commit message contains multiple lines.
|
|
|
|
func IsMultilineCommitMessage(msg string) bool {
|
|
|
|
return strings.Count(strings.TrimSpace(msg), "\n") >= 1
|
|
|
|
}
|
|
|
|
|
|
|
|
// Actioner describes an action
|
|
|
|
type Actioner interface {
|
|
|
|
GetOpType() activities_model.ActionType
|
|
|
|
GetActUserName() string
|
|
|
|
GetRepoUserName() string
|
|
|
|
GetRepoName() string
|
|
|
|
GetRepoPath() string
|
|
|
|
GetRepoLink() string
|
|
|
|
GetBranch() string
|
|
|
|
GetContent() string
|
|
|
|
GetCreate() time.Time
|
|
|
|
GetIssueInfos() []string
|
|
|
|
}
|
|
|
|
|
|
|
|
// ActionIcon accepts an action operation type and returns an icon class name.
|
|
|
|
func ActionIcon(opType activities_model.ActionType) string {
|
|
|
|
switch opType {
|
|
|
|
case activities_model.ActionCreateRepo, activities_model.ActionTransferRepo, activities_model.ActionRenameRepo:
|
|
|
|
return "repo"
|
|
|
|
case activities_model.ActionCommitRepo, activities_model.ActionPushTag, activities_model.ActionDeleteTag, activities_model.ActionDeleteBranch:
|
|
|
|
return "git-commit"
|
|
|
|
case activities_model.ActionCreateIssue:
|
|
|
|
return "issue-opened"
|
|
|
|
case activities_model.ActionCreatePullRequest:
|
|
|
|
return "git-pull-request"
|
|
|
|
case activities_model.ActionCommentIssue, activities_model.ActionCommentPull:
|
|
|
|
return "comment-discussion"
|
|
|
|
case activities_model.ActionMergePullRequest, activities_model.ActionAutoMergePullRequest:
|
|
|
|
return "git-merge"
|
|
|
|
case activities_model.ActionCloseIssue, activities_model.ActionClosePullRequest:
|
|
|
|
return "issue-closed"
|
|
|
|
case activities_model.ActionReopenIssue, activities_model.ActionReopenPullRequest:
|
|
|
|
return "issue-reopened"
|
|
|
|
case activities_model.ActionMirrorSyncPush, activities_model.ActionMirrorSyncCreate, activities_model.ActionMirrorSyncDelete:
|
|
|
|
return "mirror"
|
|
|
|
case activities_model.ActionApprovePullRequest:
|
|
|
|
return "check"
|
|
|
|
case activities_model.ActionRejectPullRequest:
|
|
|
|
return "diff"
|
|
|
|
case activities_model.ActionPublishRelease:
|
|
|
|
return "tag"
|
|
|
|
case activities_model.ActionPullReviewDismissed:
|
|
|
|
return "x"
|
|
|
|
default:
|
|
|
|
return "question"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// ActionContent2Commits converts action content to push commits
|
|
|
|
func ActionContent2Commits(act Actioner) *repository.PushCommits {
|
|
|
|
push := repository.NewPushCommits()
|
|
|
|
|
|
|
|
if act == nil || act.GetContent() == "" {
|
|
|
|
return push
|
|
|
|
}
|
|
|
|
|
|
|
|
if err := json.Unmarshal([]byte(act.GetContent()), push); err != nil {
|
|
|
|
log.Error("json.Unmarshal:\n%s\nERROR: %v", act.GetContent(), err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if push.Len == 0 {
|
|
|
|
push.Len = len(push.Commits)
|
|
|
|
}
|
|
|
|
|
|
|
|
return push
|
|
|
|
}
|
|
|
|
|
|
|
|
// DiffTypeToStr returns diff type name
|
|
|
|
func DiffTypeToStr(diffType int) string {
|
|
|
|
diffTypes := map[int]string{
|
|
|
|
1: "add", 2: "modify", 3: "del", 4: "rename", 5: "copy",
|
|
|
|
}
|
|
|
|
return diffTypes[diffType]
|
|
|
|
}
|
|
|
|
|
|
|
|
// DiffLineTypeToStr returns diff line type name
|
|
|
|
func DiffLineTypeToStr(diffType int) string {
|
|
|
|
switch diffType {
|
|
|
|
case 2:
|
|
|
|
return "add"
|
|
|
|
case 3:
|
|
|
|
return "del"
|
|
|
|
case 4:
|
|
|
|
return "tag"
|
|
|
|
}
|
|
|
|
return "same"
|
|
|
|
}
|
|
|
|
|
|
|
|
// MigrationIcon returns a SVG name matching the service an issue/comment was migrated from
|
|
|
|
func MigrationIcon(hostname string) string {
|
|
|
|
switch hostname {
|
|
|
|
case "github.com":
|
|
|
|
return "octicon-mark-github"
|
|
|
|
default:
|
|
|
|
return "gitea-git"
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func buildSubjectBodyTemplate(stpl *texttmpl.Template, btpl *template.Template, name string, content []byte) {
|
|
|
|
// Split template into subject and body
|
|
|
|
var subjectContent []byte
|
|
|
|
bodyContent := content
|
|
|
|
loc := mailSubjectSplit.FindIndex(content)
|
|
|
|
if loc != nil {
|
|
|
|
subjectContent = content[0:loc[0]]
|
|
|
|
bodyContent = content[loc[1]:]
|
|
|
|
}
|
|
|
|
if _, err := stpl.New(name).
|
|
|
|
Parse(string(subjectContent)); err != nil {
|
|
|
|
log.Warn("Failed to parse template [%s/subject]: %v", name, err)
|
|
|
|
}
|
|
|
|
if _, err := btpl.New(name).
|
|
|
|
Parse(string(bodyContent)); err != nil {
|
|
|
|
log.Warn("Failed to parse template [%s/body]: %v", name, err)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
type remoteAddress struct {
|
|
|
|
Address string
|
|
|
|
Username string
|
|
|
|
Password string
|
|
|
|
}
|
|
|
|
|
|
|
|
func mirrorRemoteAddress(ctx context.Context, m *repo_model.Repository, remoteName string, ignoreOriginalURL bool) remoteAddress {
|
|
|
|
a := remoteAddress{}
|
|
|
|
|
|
|
|
remoteURL := m.OriginalURL
|
|
|
|
if ignoreOriginalURL || remoteURL == "" {
|
|
|
|
var err error
|
|
|
|
remoteURL, err = git.GetRemoteAddress(ctx, m.RepoPath(), remoteName)
|
|
|
|
if err != nil {
|
|
|
|
log.Error("GetRemoteURL %v", err)
|
|
|
|
return a
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
u, err := giturl.Parse(remoteURL)
|
|
|
|
if err != nil {
|
|
|
|
log.Error("giturl.Parse %v", err)
|
|
|
|
return a
|
|
|
|
}
|
|
|
|
|
|
|
|
if u.Scheme != "ssh" && u.Scheme != "file" {
|
|
|
|
if u.User != nil {
|
|
|
|
a.Username = u.User.Username()
|
|
|
|
a.Password, _ = u.User.Password()
|
|
|
|
}
|
|
|
|
u.User = nil
|
|
|
|
}
|
|
|
|
a.Address = u.String()
|
|
|
|
|
|
|
|
return a
|
|
|
|
}
|
|
|
|
|
|
|
|
// JsPrettyNumber renders a number using english decimal separators, e.g. 1,200 and subsequent
|
|
|
|
// JS will replace the number with locale-specific separators, based on the user's selected language
|
|
|
|
func JsPrettyNumber(i interface{}) template.HTML {
|
|
|
|
num := util.NumberIntoInt64(i)
|
|
|
|
|
|
|
|
return template.HTML(`<span class="js-pretty-number" data-value="` + strconv.FormatInt(num, 10) + `">` + base.PrettyNumber(num) + `</span>`)
|
|
|
|
}
|