fix(nginx_log): use path instead of log_path

Author: 0xJacky

api/nginx_log/nginx_log.go

@@ -22,8 +22,8 @@ const (
 
 // controlStruct represents the request parameters for getting log content
 type controlStruct struct {
-	Type    string `json:"type"`     // Type of log: "access" or "error"
-	LogPath string `json:"log_path"` // Path to the log file
+	Type string `json:"type"` // Type of log: "access" or "error"
+	Path string `json:"path"` // Path to the log file
 }
 
 // nginxLogPageResp represents the response format for log content

api/nginx_log/websocket.go

@@ -21,8 +21,8 @@ import (
 // It checks if the path is under the whitelist directories
 func getLogPath(control *controlStruct) (logPath string, err error) {
 	// If direct log path is provided, use it
-	if control.LogPath != "" {
-		logPath = control.LogPath
+	if control.Path != "" {
+		logPath = control.Path
 		// Check if logPath is under one of the paths in LogDirWhiteList
 		if !nginx_log.IsLogPathUnderWhiteList(logPath) {
 			return "", nginx_log.ErrLogPathIsNotUnderTheLogDirWhiteList

app/package.json

@@ -18,13 +18,13 @@
     "@fingerprintjs/fingerprintjs": "^4.6.2",
     "@formkit/auto-animate": "^0.8.2",
     "@simplewebauthn/browser": "^13.1.2",
-    "@uozi-admin/curd": "^4.5.7",
+    "@uozi-admin/curd": "^4.5.8",
     "@uozi-admin/request": "^2.8.4",
     "@vue/reactivity": "^3.5.18",
     "@vue/shared": "^3.5.18",
-    "@vueuse/components": "^13.5.0",
-    "@vueuse/core": "^13.5.0",
-    "@vueuse/integrations": "^13.5.0",
+    "@vueuse/components": "^13.6.0",
+    "@vueuse/core": "^13.6.0",
+    "@vueuse/integrations": "^13.6.0",
     "@xterm/addon-attach": "^0.11.0",
     "@xterm/addon-fit": "^0.10.0",
     "@xterm/xterm": "^5.5.0",

app/pnpm-lock.yaml

@@ -1,22 +1,14 @@
-import { http } from '@uozi-admin/request'
+import { extendCurdApi, http, useCurdApi } from '@uozi-admin/request'
 
-export interface INginxLogData {
-  type: string
-  log_path?: string
+export interface NginxLogData {
+  type?: string
+  path?: string
 }
 
-const nginx_log = {
-  page(page = 0, data: INginxLogData | undefined = undefined) {
+const nginx_log = extendCurdApi(useCurdApi('/nginx_logs'), {
+  page(page = 0, data: NginxLogData | undefined = undefined) {
     return http.post(`/nginx_log?page=${page}`, data)
   },
-
-  getList(params: {
-    type?: string
-    name?: string
-    path?: string
-  }) {
-    return http.get(`/nginx_logs`, { params })
-  },
-}
+})
 
 export default nginx_log

app/src/api/nginx_log.ts

@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type ReconnectingWebSocket from 'reconnecting-websocket'
-import type { INginxLogData } from '@/api/nginx_log'
+import type { NginxLogData } from '@/api/nginx_log'
 import { debounce } from 'lodash'
 import nginx_log from '@/api/nginx_log'
 import FooterToolBar from '@/components/FooterToolbar'
@@ -17,9 +17,9 @@ const loading = ref(false)
 const filter = ref('')
 
 // Setup log control data based on route params
-const control = reactive<INginxLogData>({
+const control = reactive<NginxLogData>({
   type: logType(),
-  log_path: route.query.log_path as string,
+  path: route.query.log_path as string,
 })
 
 function logType() {
@@ -92,7 +92,7 @@ watch(autoRefresh, async value => {
 watch(route, () => {
   // Update control data when route changes
   control.type = logType()
-  control.log_path = route.query.log_path as string
+  control.path = route.query.log_path as string
 
   clearLog()
   init()
@@ -169,7 +169,7 @@ const computedBuffer = computed(() => {
         @scroll="debounceScrollLog"
       />
     </ACard>
-    <FooterToolBar v-if="control.log_path">
+    <FooterToolBar v-if="control.path">
       <AButton @click="router.go(-1)">
         {{ $gettext('Back') }}
       </AButton>

app/src/views/nginx_log/NginxLog.vue

@@ -1,5 +1,6 @@
 <script setup lang="tsx">
 import type { CustomRenderArgs, StdTableColumn } from '@uozi-admin/curd'
+import type { NginxLogData } from '@/api/nginx_log'
 import { SyncOutlined } from '@ant-design/icons-vue'
 import { StdCurd } from '@uozi-admin/curd'
 import { Tag } from 'ant-design-vue'
@@ -71,11 +72,11 @@ const columns: StdTableColumn[] = [
   },
 ]
 
-function viewLog(record: { type: string, path: string }) {
+function viewLog(record: NginxLogData) {
   router.push({
     path: `/nginx_log/${record.type}`,
     query: {
-      log_path: record.path,
+      path: record.path,
     },
   })
 }