mirrors/nginx-ui
1
0
Fork 0
mirror of https://github.com/0xJacky/nginx-ui.git synced 2025-05-11 02:15:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

feat(env_group): add post-sync action to environment and stream configurations #725

Browse source
This commit is contained in:
Jacky 2025-04-05 10:55:26 +00:00
parent c0f0980e9e
commit 94fcbf6362
No known key found for this signature in database
GPG key ID: 215C21B10DF38B4D
31 changed files with 606 additions and 337 deletions
Download patch file Download diff file Expand all files Collapse all files

10
api/cluster/group.go
View file

@ -54,8 +54,9 @@ func RestartNginx(c *gin.Context) {
func AddGroup(c *gin.Context) {
cosy.Core[model.EnvGroup](c).
SetValidRules(gin.H{
"name": "required",
"sync_node_ids": "omitempty",
"name": "required",
"sync_node_ids": "omitempty",
"post_sync_action": "omitempty,oneof=" + model.PostSyncActionNone + " " + model.PostSyncActionReloadNginx,
}).
Create()
}
@ -63,8 +64,9 @@ func AddGroup(c *gin.Context) {
func ModifyGroup(c *gin.Context) {
cosy.Core[model.EnvGroup](c).
SetValidRules(gin.H{
"name": "required",
"sync_node_ids": "omitempty",
"name": "required",
"sync_node_ids": "omitempty",
"post_sync_action": "omitempty,oneof=" + model.PostSyncActionNone + " " + model.PostSyncActionReloadNginx,
}).
Modify()
}

3
api/sites/site.go
View file

@ -118,13 +118,14 @@ func SaveSite(c *gin.Context) {
EnvGroupID uint64 `json:"env_group_id"`
SyncNodeIDs []uint64 `json:"sync_node_ids"`
Overwrite bool `json:"overwrite"`
PostAction string `json:"post_action"`
}
if !cosy.BindAndValid(c, &json) {
return
}
err := site.Save(name, json.Content, json.Overwrite, json.EnvGroupID, json.SyncNodeIDs)
err := site.Save(name, json.Content, json.Overwrite, json.EnvGroupID, json.SyncNodeIDs, json.PostAction)
if err != nil {
cosy.ErrHandler(c, err)
return

17
api/streams/streams.go
View file

@ -60,7 +60,7 @@ func GetStreams(c *gin.Context) {
var configs []config.Config
// Get all streams map for environment group lookup
// Get all streams map for Node Group lookup
s := query.Stream
var streams []*model.Stream
if queryEnvGroupId != 0 {
@ -73,21 +73,21 @@ func GetStreams(c *gin.Context) {
return
}
// Retrieve environment groups data
// Retrieve Node Groups data
eg := query.EnvGroup
envGroups, err := eg.Find()
if err != nil {
cosy.ErrHandler(c, err)
return
}
// Create a map of environment groups for quick lookup by ID
// Create a map of Node Groups for quick lookup by ID
envGroupMap := lo.SliceToMap(envGroups, func(item *model.EnvGroup) (uint64, *model.EnvGroup) {
return item.ID, item
})
// Convert streams slice to map for efficient lookups
streamsMap := lo.SliceToMap(streams, func(item *model.Stream) (string, *model.Stream) {
// Associate each stream with its corresponding environment group
// Associate each stream with its corresponding Node Group
if item.EnvGroupID > 0 {
item.EnvGroup = envGroupMap[item.EnvGroupID]
}
@ -121,13 +121,13 @@ func GetStreams(c *gin.Context) {
envGroup *model.EnvGroup
)
// Lookup stream in the streams map to get environment group info
// Lookup stream in the streams map to get Node Group info
if stream, ok := streamsMap[file.Name()]; ok {
envGroupId = stream.EnvGroupID
envGroup = stream.EnvGroup
}
// Apply environment group filter if specified
// Apply Node Group filter if specified
if queryEnvGroupId != 0 && envGroupId != queryEnvGroupId {
continue
}
@ -245,6 +245,7 @@ func SaveStream(c *gin.Context) {
EnvGroupID uint64 `json:"env_group_id"`
SyncNodeIDs []uint64 `json:"sync_node_ids"`
Overwrite bool `json:"overwrite"`
PostAction string `json:"post_action"`
}
// Validate input JSON
@ -261,7 +262,7 @@ func SaveStream(c *gin.Context) {
return
}
// Update environment group ID if provided
// Update Node Group ID if provided
if json.EnvGroupID > 0 {
streamModel.EnvGroupID = json.EnvGroupID
}
@ -279,7 +280,7 @@ func SaveStream(c *gin.Context) {
}
// Save the stream configuration file
err = stream.Save(name, json.Content, json.Overwrite, json.SyncNodeIDs)
err = stream.Save(name, json.Content, json.Overwrite, json.SyncNodeIDs, json.PostAction)
if err != nil {
cosy.ErrHandler(c, err)
return