From 8cd0195cbce39256c58e76bb391eeb5100a969e7 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Thu, 25 Aug 2022 18:27:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8A=82=E7=82=B9=E8=BF=90=E8=A1=8C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E5=8F=AF=E4=BB=A5=E6=8C=89=E7=85=A7=E8=8A=82=E7=82=B9?=
 =?UTF-8?q?ID=E8=AE=BE=E7=BD=AE=E4=B8=BA=E5=B7=B2=E8=AF=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/web/actions/default/clusters/logs/index.go   | 11 +++++++++++
 .../web/actions/default/clusters/logs/readLogs.go     |  5 +++++
 web/views/@default/clusters/logs/index.html           |  1 +
 web/views/@default/clusters/logs/index.js             | 10 ++++++++++
 4 files changed, 27 insertions(+)

diff --git a/internal/web/actions/default/clusters/logs/index.go b/internal/web/actions/default/clusters/logs/index.go
index 7d6801de..872661c4 100644
--- a/internal/web/actions/default/clusters/logs/index.go
+++ b/internal/web/actions/default/clusters/logs/index.go
@@ -120,6 +120,8 @@ func (this *IndexAction) RunGet(params struct {
 		return
 	}
 
+	var firstUnreadNodeMap maps.Map = nil
+
 	var logs = []maps.Map{}
 	for _, log := range logsResp.NodeLogs {
 		// 节点信息
@@ -132,6 +134,13 @@ func (this *IndexAction) RunGet(params struct {
 			continue
 		}
 
+		if params.Type == "unread" && firstUnreadNodeMap == nil {
+			firstUnreadNodeMap = maps.Map{
+				"id":   node.Id,
+				"name": node.Name,
+			}
+		}
+
 		// 服务信息
 		var serverMap = maps.Map{"id": 0}
 		if log.ServerId > 0 {
@@ -174,5 +183,7 @@ func (this *IndexAction) RunGet(params struct {
 	}
 	this.Data["logs"] = logs
 
+	this.Data["firstUnreadNode"] = firstUnreadNodeMap
+
 	this.Show()
 }
diff --git a/internal/web/actions/default/clusters/logs/readLogs.go b/internal/web/actions/default/clusters/logs/readLogs.go
index c1fcf023..21b081bb 100644
--- a/internal/web/actions/default/clusters/logs/readLogs.go
+++ b/internal/web/actions/default/clusters/logs/readLogs.go
@@ -5,6 +5,7 @@ package logs
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
+	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 )
 
@@ -14,9 +15,13 @@ type ReadLogsAction struct {
 
 func (this *ReadLogsAction) RunPost(params struct {
 	LogIds []int64
+
+	NodeId int64
 }) {
 	_, err := this.RPC().NodeLogRPC().UpdateNodeLogsRead(this.AdminContext(), &pb.UpdateNodeLogsReadRequest{
 		NodeLogIds: params.LogIds,
+		NodeId:     params.NodeId,
+		Role:       nodeconfigs.NodeRoleNode,
 	})
 	if err != nil {
 		this.ErrorPage(err)
diff --git a/web/views/@default/clusters/logs/index.html b/web/views/@default/clusters/logs/index.html
index d4e89cd3..9d488ae7 100644
--- a/web/views/@default/clusters/logs/index.html
+++ b/web/views/@default/clusters/logs/index.html
@@ -52,6 +52,7 @@
     <second-menu v-if="logs.length > 0">
         <a href="" class="item" @click.prevent="updatePageRead()">[本页已读]</a>
         <a href="" class="item" @click.prevent="updateAllRead()">[全部已读]</a>
+        <a href="" class="item" @click.prevent="updateNodeRead(firstUnreadNode.id)" v-if="firstUnreadNode != null">["{{firstUnreadNode.name}}"已读]</a>
     </second-menu>
 </div>
 
diff --git a/web/views/@default/clusters/logs/index.js b/web/views/@default/clusters/logs/index.js
index efcc8ba0..8e9ab17f 100644
--- a/web/views/@default/clusters/logs/index.js
+++ b/web/views/@default/clusters/logs/index.js
@@ -27,6 +27,16 @@ Tea.context(function () {
 			})
 	}
 
+	this.updateNodeRead = function (nodeId) {
+		this.$post(".readLogs")
+			.params({
+				nodeId: nodeId
+			})
+			.success(function () {
+				teaweb.reload()
+			})
+	}
+
 	this.updateAllRead = function () {
 		this.$post(".readAllLogs")
 			.params({})