Merge branch 'test' of github.com:apache/answer into test

Author: shuashuai

i18n/en_US.yaml

@@ -2387,6 +2387,7 @@ ui:
     user_normal: This user is already normal.
     user_suspended: This user has been suspended.
     user_deleted: This user has been deleted.
+    user_added: User has been added successfully.
     badge_activated: This badge has been activated.
     badge_inactivated: This badge has been inactivated.
     users_deleted: These users have been deleted.

internal/base/constant/site_info.go

@@ -43,6 +43,9 @@ const (
 	ColorSchemeLight   = "light"
 	ColorSchemeDark    = "dark"
 	ColorSchemeSystem  = "system"
+
+	ThemeLayoutFullWidth  = "Full-width"
+	ThemeLayoutFixedWidth = "Fixed-width"
 )
 
 const (

internal/migrations/init.go

@@ -236,7 +236,7 @@ func (m *Mentor) initSiteInfoLegalConfig() {
 }
 
 func (m *Mentor) initSiteInfoThemeConfig() {
-	themeConfig := `{"theme":"default","theme_config":{"default":{"navbar_style":"#0033ff","primary_color":"#0033ff"}}}`
+	themeConfig := fmt.Sprintf(`{"theme":"default","theme_config":{"default":{"navbar_style":"#0033ff","primary_color":"#0033ff"}},"layout":"%s"}`, constant.ThemeLayoutFullWidth)
 	_, m.err = m.engine.Context(m.ctx).Insert(&entity.SiteInfo{
 		Type:    "theme",
 		Content: themeConfig,

internal/migrations/v5.go

@@ -24,6 +24,7 @@ import (
 	"encoding/json"
 	"fmt"
 
+	"github.com/apache/answer/internal/base/constant"
 	"github.com/apache/answer/internal/entity"
 	"xorm.io/xorm"
 )
@@ -50,7 +51,7 @@ func addThemeAndPrivateMode(ctx context.Context, x *xorm.Engine) error {
 		}
 	}
 
-	themeConfig := `{"theme":"default","theme_config":{"default":{"navbar_style":"#0033ff","primary_color":"#0033ff"}}}`
+	themeConfig := fmt.Sprintf(`{"theme":"default","theme_config":{"default":{"navbar_style":"#0033ff","primary_color":"#0033ff"}},"layout":"%s"}`, constant.ThemeLayoutFullWidth)
 	themeSiteInfo := &entity.SiteInfo{
 		Type:    "theme",
 		Content: themeConfig,

internal/schema/siteinfo_schema.go

@@ -181,6 +181,7 @@ type SiteThemeReq struct {
 	Theme       string         `validate:"required,gt=0,lte=255" json:"theme"`
 	ThemeConfig map[string]any `validate:"omitempty" json:"theme_config"`
 	ColorScheme string         `validate:"omitempty,gt=0,lte=100" json:"color_scheme"`
+	Layout      string         `validate:"omitempty,oneof=Full-width Fixed-width" json:"layout"`
 }
 
 type SiteSeoReq struct {
@@ -217,6 +218,7 @@ type SiteThemeResp struct {
 	Theme        string         `json:"theme"`
 	ThemeConfig  map[string]any `json:"theme_config"`
 	ColorScheme  string         `json:"color_scheme"`
+	Layout       string         `json:"layout"`
 }
 
 func (s *SiteThemeResp) TrTheme(ctx context.Context) {

internal/service/siteinfo/siteinfo_service.go

@@ -252,6 +252,9 @@ func (s *SiteInfoService) SaveSiteCustomCssHTML(ctx context.Context, req *schema
 
 // SaveSiteTheme save site custom html configuration
 func (s *SiteInfoService) SaveSiteTheme(ctx context.Context, req *schema.SiteThemeReq) (err error) {
+	if len(req.Layout) == 0 {
+		req.Layout = constant.ThemeLayoutFullWidth
+	}
 	content, _ := json.Marshal(req)
 	data := &entity.SiteInfo{
 		Type:    constant.SiteTypeTheme,

internal/service/siteinfo_common/siteinfo_service.go

@@ -198,10 +198,14 @@ func (s *siteInfoCommonService) GetSiteCustomCssHTML(ctx context.Context) (resp
 func (s *siteInfoCommonService) GetSiteTheme(ctx context.Context) (resp *schema.SiteThemeResp, err error) {
 	resp = &schema.SiteThemeResp{
 		ThemeOptions: schema.GetThemeOptions,
+		Layout:       constant.ThemeLayoutFullWidth,
 	}
 	if err = s.GetSiteInfoByType(ctx, constant.SiteTypeTheme, resp); err != nil {
 		return nil, err
 	}
+	if resp.Layout == "" {
+		resp.Layout = constant.ThemeLayoutFullWidth
+	}
 	resp.TrTheme(ctx)
 	return resp, nil
 }

ui/src/pages/Admin/Users/index.tsx

@@ -109,9 +109,14 @@ const Users: FC = () => {
       return new Promise((resolve, reject) => {
         addUsers(userModel)
           .then(() => {
-            if (/all|staff/.test(curFilter) && curPage === 1) {
-              refreshUsers();
-            }
+            toastStore.getState().show({
+              msg: t('user_added', { keyPrefix: 'messages' }),
+              variant: 'success',
+            });
+            urlSearchParams.set('filter', 'normal');
+            urlSearchParams.delete('page');
+            setUrlSearchParams(urlSearchParams);
+            refreshUsers();
             resolve(true);
           })
           .catch((e) => {