Skip to content

Commit 1d58810

Browse files
fix: fix issue with clean runtime lop failed (#8900)
1 parent 109dc26 commit 1d58810

File tree

14 files changed

+56
-10
lines changed

14 files changed

+56
-10
lines changed

agent/app/dto/response/app.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ type AppInstallDTO struct {
126126
CreatedAt time.Time `json:"createdAt"`
127127
Favorite bool `json:"favorite"`
128128
App AppDetail `json:"app"`
129+
Container string `json:"container"`
129130
}
130131

131132
type DatabaseConn struct {

agent/app/dto/response/runtime.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ type RuntimeDTO struct {
2929
Environments []request.Environment `json:"environments"`
3030
Volumes []request.Volume `json:"volumes"`
3131
ContainerStatus string `json:"containerStatus"`
32+
Container string `json:"container"`
3233
}
3334

3435
type PackageScripts struct {
@@ -51,6 +52,7 @@ func NewRuntimeDTO(runtime model.Runtime) RuntimeDTO {
5152
Version: runtime.Version,
5253
Port: runtime.Port,
5354
Path: runtime.GetPath(),
55+
Container: runtime.ContainerName,
5456
}
5557
}
5658

agent/app/service/app_utils.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1483,7 +1483,8 @@ func handleInstalled(appInstallList []model.AppInstall, updated bool, sync bool)
14831483
Website: installed.App.Website,
14841484
Document: installed.App.Document,
14851485
},
1486-
Favorite: installed.Favorite,
1486+
Favorite: installed.Favorite,
1487+
Container: installed.ContainerName,
14871488
}
14881489
if updated {
14891490
installDTO.DockerCompose = installed.DockerCompose

frontend/src/api/interface/runtime.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ export namespace Runtime {
4141
exposedPorts?: ExposedPort[];
4242
environments?: Environment[];
4343
volumes?: Volume[];
44+
container: string;
4445
}
4546

4647
export interface RuntimeCreate {

frontend/src/components/log/compose/index.vue

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,12 @@
1212
</el-tooltip>
1313
</template>
1414
<template #content>
15-
<ContainerLog :compose="compose" :resource="resource" :highlightDiff="highlightDiff" />
15+
<ContainerLog
16+
:compose="compose"
17+
:resource="resource"
18+
:container="container"
19+
:highlightDiff="highlightDiff"
20+
/>
1621
</template>
1722
</DrawerPro>
1823
</template>
@@ -26,6 +31,7 @@ import ContainerLog from '@/components/log/container/index.vue';
2631
2732
const open = ref(false);
2833
const resource = ref('');
34+
const container = ref('');
2935
const globalStore = GlobalStore();
3036
const logVisible = ref(false);
3137
const compose = ref('');
@@ -34,6 +40,7 @@ const highlightDiff = ref(320);
3440
interface DialogProps {
3541
compose: string;
3642
resource: string;
43+
container: string;
3744
}
3845
3946
const defaultProps = defineProps({
@@ -67,6 +74,7 @@ const acceptParams = (props: DialogProps): void => {
6774
highlightDiff.value = defaultProps.highlightDiff;
6875
compose.value = props.compose;
6976
resource.value = props.resource;
77+
container.value = props.container;
7078
open.value = true;
7179
};
7280

frontend/src/components/log/container/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ const onClean = async () => {
197197
cancelButtonText: i18n.global.t('commons.button.cancel'),
198198
type: 'info',
199199
}).then(async () => {
200+
console.log(logSearch);
200201
await cleanContainerLog(logSearch.container);
201202
searchLogs();
202203
MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));

frontend/src/views/ai/mcp/server/index.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,11 @@ const openCreate = () => {
203203
};
204204
205205
const openLog = (row: AI.McpServer) => {
206-
composeLogRef.value.acceptParams({ compose: row.dir + '/docker-compose.yml', resource: row.name });
206+
composeLogRef.value.acceptParams({
207+
compose: row.dir + '/docker-compose.yml',
208+
resource: row.name,
209+
container: row.containerName,
210+
});
207211
};
208212
209213
const deleteServer = async (row: AI.McpServer) => {

frontend/src/views/app-store/installed/index.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,11 @@ const openLog = (row: any) => {
694694
taskLogRef.value.openWithResourceID('App', 'TaskInstall', row.id);
695695
break;
696696
default:
697-
composeLogRef.value.acceptParams({ compose: row.path + '/docker-compose.yml', resource: row.name });
697+
composeLogRef.value.acceptParams({
698+
compose: row.path + '/docker-compose.yml',
699+
resource: row.name,
700+
container: row.container,
701+
});
698702
}
699703
};
700704

frontend/src/views/website/runtime/dotnet/index.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,11 @@ const openTerminal = (row: Runtime.Runtime) => {
225225
};
226226
227227
const openLog = (row: any) => {
228-
composeLogRef.value.acceptParams({ compose: row.path + '/docker-compose.yml', resource: row.name });
228+
composeLogRef.value.acceptParams({
229+
compose: row.path + '/docker-compose.yml',
230+
resource: row.name,
231+
container: row.container,
232+
});
229233
};
230234
231235
const goDashboard = async (port: any, protocol: string) => {

frontend/src/views/website/runtime/go/index.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,11 @@ const openDelete = async (row: Runtime.Runtime) => {
219219
};
220220
221221
const openLog = (row: any) => {
222-
composeLogRef.value.acceptParams({ compose: row.path + '/docker-compose.yml', resource: row.name });
222+
composeLogRef.value.acceptParams({
223+
compose: row.path + '/docker-compose.yml',
224+
resource: row.name,
225+
container: row.container,
226+
});
223227
};
224228
225229
const goDashboard = async (port: any, protocol: string) => {

0 commit comments

Comments
 (0)