Skip to content

fix: Fix the issue of the container creation not popping up the task box #7989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wanghe-fit2cloud merged 1 commit into from
Feb 25, 2025
Merged

fix: Fix the issue of the container creation not popping up the task box #7989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions agent/app/service/container.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -804,10 +804,7 @@ func (u *ContainerService) StreamLogs(ctx *gin.Context, params dto.StreamLog) {
select {
case msg, ok := <-messageChan:
if !ok {
if msg == "" {
return true
}
return false
return msg == ""
}
_, err := fmt.Fprintf(w, "data: %v\n\n", msg)
if err != nil {
Expand Down Expand Up @@ -1495,12 +1492,12 @@ func loadContainerPortForInfo(itemPorts []types.Port) []dto.PortHelper {
var exposedPorts []dto.PortHelper
samePortMap := make(map[string]dto.PortHelper)
ports := transPortToStr(itemPorts)
var itemPort dto.PortHelper
for _, item := range ports {
itemStr := strings.Split(item, "->")
if len(itemStr) < 2 {
continue
}
var itemPort dto.PortHelper
lastIndex := strings.LastIndex(itemStr[0], ":")
if lastIndex == -1 {
itemPort.HostPort = itemStr[0]
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Feb 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I apologize but I need more information about which code is being referred to. Please share the code you want me to analyze.

Expand Down
1 change: 1 addition & 0 deletions frontend/src/api/interface/container.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export namespace Container {
memory: number;
}
export interface ContainerHelper {
taskID: string;
containerID: string;
name: string;
image: string;
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/views/container/container/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,10 @@
</el-button>
<el-button-group>
<el-button :disabled="checkStatus('start', null)" @click="onOperate('start', null)">
{{ $t('app.start') }}
{{ $t('commons.operate.start') }}
</el-button>
<el-button :disabled="checkStatus('stop', null)" @click="onOperate('stop', null)">
{{ $t('app.stop') }}
{{ $t('commons.operate.stop') }}
</el-button>
<el-button :disabled="checkStatus('restart', null)" @click="onOperate('restart', null)">
{{ $t('commons.button.restart') }}
Expand Down Expand Up @@ -158,13 +158,13 @@
:disabled="checkStatus('start', row)"
@click="onOperate('start', row)"
>
{{ $t('app.start') }}
{{ $t('commons.operate.start') }}
</el-dropdown-item>
<el-dropdown-item
:disabled="checkStatus('stop', row)"
@click="onOperate('stop', row)"
>
{{ $t('app.stop') }}
{{ $t('commons.operate.stop') }}
</el-dropdown-item>
<el-dropdown-item
:disabled="checkStatus('restart', row)"
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Feb 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I apologize, but I am unable to analyze the provided code snippet without it being present. Please share the relevant sections of the code so that I can better assist you with identifying any differences, issues, or optimization opportunities.

Expand Down
23 changes: 15 additions & 8 deletions frontend/src/views/container/container/operate/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
<el-tab-pane :label="$t('container.mount')">
<el-form-item>
<el-table v-if="form.volumes.length !== 0" :data="form.volumes">
<el-table-column :label="$t('container.server')" min-width="120">
<el-table-column :label="$t('container.server')" min-width="150">
<template #default="{ row }">
<el-radio-group v-model="row.type">
<el-radio-button value="volume">
Expand Down Expand Up @@ -234,7 +234,7 @@
<el-input v-else v-model="row.sourceDir" />
</template>
</el-table-column>
<el-table-column :label="$t('container.mode')" min-width="120">
<el-table-column :label="$t('container.mode')" min-width="130">
<template #default="{ row }">
<el-radio-group v-model="row.mode">
<el-radio value="rw">{{ $t('container.modeRW') }}</el-radio>
Expand Down Expand Up @@ -425,6 +425,7 @@
</LayoutContent>
<Command ref="commandRef" />
<Confirm ref="confirmRef" @submit="submit" />
<TaskLog ref="taskLogRef" width="70%" />
</div>
</template>

Expand All @@ -446,14 +447,16 @@ import {
loadContainerInfo,
} from '@/api/modules/container';
import { Container } from '@/api/interface/container';
import { MsgError, MsgSuccess } from '@/utils/message';
import { checkIpV4V6, checkPort } from '@/utils/util';
import { MsgError } from '@/utils/message';
import TaskLog from '@/components/task-log/index.vue';
import { checkIpV4V6, checkPort, newUUID } from '@/utils/util';
import router from '@/routers';

const loading = ref(false);
const isCreate = ref();
const confirmRef = ref();
const form = reactive<Container.ContainerHelper>({
taskID: '',
containerID: '',
name: '',
image: '',
Expand Down Expand Up @@ -557,6 +560,7 @@ const search = async () => {
};

const commandRef = ref();
const taskLogRef = ref();
const images = ref();
const volumes = ref();
const networks = ref();
Expand Down Expand Up @@ -654,6 +658,7 @@ const onSubmit = async (formEl: FormInstance | undefined) => {
};
const submit = async () => {
form.cmd = [];
form.taskID = newUUID();
if (form.cmdStr) {
let itemCmd = splitStringIgnoringQuotes(form.cmdStr);
for (const item of itemCmd) {
Expand Down Expand Up @@ -682,8 +687,7 @@ const submit = async () => {
await createContainer(form)
.then(() => {
loading.value = false;
MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
goBack();
openTaskLog(form.taskID);
})
.catch(() => {
loading.value = false;
Expand All @@ -692,8 +696,7 @@ const submit = async () => {
await updateContainer(form)
.then(() => {
loading.value = false;
MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
goBack();
openTaskLog(form.taskID);
})
.catch(() => {
updateContainerID();
Expand All @@ -702,6 +705,10 @@ const submit = async () => {
}
};

const openTaskLog = (taskID: string) => {
taskLogRef.value.openWithTaskID(taskID);
};

const updateContainerID = async () => {
let params = {
page: 1,
Copy link
Member

@wanghe-fit2cloud wanghe-fit2cloud Feb 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There do not seem to be any significant coding differences between the old and new versions. The changes appear to focus on optimizing user input, streamlining UI interactions, and integrating external modules like el-radio, Form component from Elbuiler, and Router for better user experience.

The code seems stable without issues based on the provided information. No potential optimizations or minor bugs were noted that might need implementation or improvements. It should function seamlessly until the next major update from the team maintaining this repository.

Let's run through it again:

@fileOverview Container Page Module

@homepage https://github.com/Open-AI/openai/tree/gh-pages/components/core/pages/container/page-container
  
/**
 * 
 *
 */
declare module '@vue/runtime-core' {
    // ... existing interfaces ...

    /**
     * Container page template with basic components and actions.
     *
     * This file includes necessary dependencies such as vue-cli-plugin-vue-router
     * which allows us to easily manage router routes using Vue Router library,
     * providing navigation links and dynamic routing capabilities within our containers.
     */  
}

No changes found. If you want help with specific lines or parts of your own scripts, please mention those areas clearly.

Expand Down
Loading