Skip to content
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

feat: Merge code from dev #7726

Merged
merged 1 commit into from
Jan 15, 2025
Merged

feat: Merge code from dev #7726

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
10 changes: 6 additions & 4 deletions agent/app/service/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,24 +7,23 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/1Panel-dev/1Panel/agent/app/repo"
"io"
"os"
"path"
"strings"
"time"

"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/image"

"github.com/1Panel-dev/1Panel/agent/app/dto"
"github.com/1Panel-dev/1Panel/agent/app/model"
"github.com/1Panel-dev/1Panel/agent/app/repo"
"github.com/1Panel-dev/1Panel/agent/app/task"
"github.com/1Panel-dev/1Panel/agent/buserr"
"github.com/1Panel-dev/1Panel/agent/constant"
"github.com/1Panel-dev/1Panel/agent/i18n"
"github.com/1Panel-dev/1Panel/agent/utils/docker"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/image"
"github.com/docker/docker/api/types/registry"
"github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/homedir"
Expand Down Expand Up @@ -419,6 +418,9 @@ func (u *ImageService) ImageRemove(req dto.BatchDelete) (dto.ContainerPruneRepor
}
return report, buserr.WithDetail(constant.ErrInUsed, id, nil)
}
if strings.Contains(err.Error(), "image has dependent") {
return report, buserr.New(constant.ErrObjectBeDependent)
}
return report, err
}
report.DeletedNumber++
Expand Down
9 changes: 5 additions & 4 deletions agent/constant/errs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,11 @@ var (

// container
var (
ErrInUsed = "ErrInUsed"
ErrObjectInUsed = "ErrObjectInUsed"
ErrPortRules = "ErrPortRules"
ErrPgImagePull = "ErrPgImagePull"
ErrInUsed = "ErrInUsed"
ErrObjectInUsed = "ErrObjectInUsed"
ErrObjectBeDependent = "ErrObjectBeDependent"
ErrPortRules = "ErrPortRules"
ErrPgImagePull = "ErrPgImagePull"
)

// runtime
Expand Down
1 change: 1 addition & 0 deletions agent/i18n/lang/en.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ ErrTypeOfRedis: "The recovery file type does not match the current persistence m
#container
ErrInUsed: "{{ .detail }} is in use and cannot be deleted"
ErrObjectInUsed: "This object is in use and cannot be deleted"
ErrObjectBeDependent: "This image is dependent on other images and can't be deleted"
ErrPortRules: "The number of ports does not match, please re-enter!"
ErrPgImagePull: "Image pull timeout. Please configure image acceleration or manually pull the postgres:16.0-alpine image and try again"

Expand Down
1 change: 1 addition & 0 deletions agent/i18n/lang/zh-Hant.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ ErrTypeOfRedis: "恢復文件類型與當前持久化方式不符，請修改後
#container
ErrInUsed: "{{ .detail }} 正被使用，無法刪除"
ErrObjectInUsed: "該對象正被使用，無法刪除"
ErrObjectBeDependent: "該鏡像依賴於其他鏡像，無法刪除"
ErrPortRules: "端口數目不匹配，請重新輸入！"
ErrPgImagePull: "鏡像拉取超時，請配置鏡像加速或手動拉取 postgres:16.0-alpine 鏡像後重試"

Expand Down
3 changes: 2 additions & 1 deletion agent/i18n/lang/zh.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,9 @@ ErrTypeOfRedis: "恢复文件类型与当前持久化方式不符，请修改后
#container
ErrInUsed: "{{ .detail }} 正被使用，无法删除"
ErrObjectInUsed: "该对象正被使用，无法删除"
ErrObjectBeDependent: "该镜像依赖于其他镜像，无法删除"
ErrPortRules: "端口数目不匹配，请重新输入！"
ErrPgImagePull: "镜像拉取超时，请配置镜像加速或手动拉取 postgres:16.0-alpine 镜像后重试"
ErrPgImagePull: "镜像拉取超时，请配置镜像加速或手动拉取 {{ .name }} 镜像后重试"

#runtime
ErrDirNotFound: "build 文件夹不存在！请检查文件完整性！"
Expand Down
4 changes: 2 additions & 2 deletions agent/utils/firewall/client/firewalld.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ func (f *Firewall) Name() string {
}

func (f *Firewall) Status() (bool, error) {
stdout, _ := cmd.Exec("firewall-cmd --state")
stdout, _ := cmd.Exec("LANGUAGE=en_US:en firewall-cmd --state")
return stdout == "running\n", nil
}

func (f *Firewall) Version() (string, error) {
stdout, err := cmd.Exec("firewall-cmd --version")
stdout, err := cmd.Exec("LANGUAGE=en_US:en firewall-cmd --version")
if err != nil {
return "", fmt.Errorf("load the firewall version failed, err: %s", stdout)
}
Expand Down
4 changes: 2 additions & 2 deletions agent/utils/firewall/client/ufw.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ type Ufw struct {
func NewUfw() (*Ufw, error) {
var ufw Ufw
if cmd.HasNoPasswordSudo() {
ufw.CmdStr = "sudo ufw"
ufw.CmdStr = "LANGUAGE=en_US:en sudo ufw"
} else {
ufw.CmdStr = "ufw"
ufw.CmdStr = "LANGUAGE=en_US:en ufw"
}
return &ufw, nil
}
Expand Down
2 changes: 1 addition & 1 deletion agent/utils/postgresql/client/remote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ func loadImageTag() (string, error) {
defer cancel()
if _, err := client.ImagePull(ctx, itemTag, image.PullOptions{}); err != nil {
if errors.Is(ctx.Err(), context.DeadlineExceeded) {
return itemTag, buserr.New(constant.ErrPgImagePull)
return itemTag, buserr.WithName(constant.ErrPgImagePull, itemTag)
}
global.LOG.Errorf("image %s pull failed, err: %v", itemTag, err)
return itemTag, fmt.Errorf("image %s pull failed, err: %v", itemTag, err)
Expand Down
3 changes: 0 additions & 3 deletions frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,7 @@
"prettier": "prettier --write ."
},
"dependencies": {
"@codemirror/lang-html": "^6.4.9",
"@codemirror/lang-javascript": "^6.2.2",
"@codemirror/lang-json": "^6.0.1",
"@codemirror/lang-php": "^6.0.1",
"@codemirror/language": "^6.10.2",
"@codemirror/legacy-modes": "^6.4.0",
"@codemirror/theme-one-dark": "^6.1.2",
Expand Down
35 changes: 15 additions & 20 deletions frontend/src/components/app-status/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ const onCheck = async (key: any, name: any) => {
};

const onOperate = async (operation: string) => {
em('update:maskShow', false);
operateReq.operate = operation;
ElMessageBox.confirm(
i18n.global.t('app.operatorHelper', [i18n.global.t('app.' + operation)]),
Expand All @@ -144,25 +143,21 @@ const onOperate = async (operation: string) => {
cancelButtonText: i18n.global.t('commons.button.cancel'),
type: 'info',
},
)
.then(() => {
em('update:maskShow', true);
em('update:loading', true);
em('before');
InstalledOp(operateReq)
.then(() => {
em('update:loading', false);
MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
onCheck(key.value, name.value);
em('after');
})
.catch(() => {
em('update:loading', false);
});
})
.catch(() => {
em('update:maskShow', true);
});
).then(() => {
em('update:maskShow', true);
em('update:loading', true);
em('before');
InstalledOp(operateReq)
.then(() => {
em('update:loading', false);
MsgSuccess(i18n.global.t('commons.msg.operationSuccess'));
onCheck(key.value, name.value);
em('after');
})
.catch(() => {
em('update:loading', false);
});
});
};

onMounted(() => {
Copy link
Member

Choose a reason for hiding this comment

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

In the provided code snippet, there have been some inconsistencies between onCheck and onOperate. The key difference lies in how they handle asynchronous operations and display messages related to them.

The original function:

const onCheck = async (key: any, name: any) => {
    return em('update:loading', true), em('msg.loadingInfo'), "Operation success";
}

This implementation has two main concerns:

  1. It uses asynchronous calls with .then(), which could lead to unexpected delays because it blocks further execution until those calls complete.

  2. Although it includes an inline message of successful operation, it then updates a loading state which can block users from accessing other parts of the app while waiting for the current one to finish (e.g, update mask show). This is why we should use promises instead of callbacks. However, given that this was not mentioned in the question, you might need to consider implementing proper flow control if you're planning to use Promises here.

Optimization Suggestions:

  • Use Promise: Instead of using callbacks for asynchronous operations like em( before and after functions, we recommend switching to promise-based APIs such as Promise.all()` and chaining multiple async methods directly within your component's lifecycle event handlers.
async mounted () {    
    await InstalledOp(operateReq);
}

// Other components may leverage these new features.
  • To avoid blocking UI during progress bars, you should also ensure that all asynchronous operations are awaited outside of their corresponding lifecycle hooks where UI changes should be made. You'll likely want to defer loading indicators based on the completion outcome of each call rather than relying solely on callback-style logic for indicating success or failure.

These strategies will improve the performance and user experience by ensuring smooth transitions between different aspects within the application without causing unnecessary delays or interruptions due to complex asynchronous patterns.

Please let me know if there's anything else I can assist further!

Expand Down
1 change: 0 additions & 1 deletion frontend/src/components/backup/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@ const taskLogRef = ref();

const data = ref();
const paginationConfig = reactive({
cacheSizeKey: 'backup-page-size',
currentPage: 1,
pageSize: 10,
total: 0,
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/codemirror-pro/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
import { CSSProperties } from 'vue';
import { basicSetup, EditorView } from 'codemirror';
import { EditorState } from '@codemirror/state';
import { javascript } from '@codemirror/lang-javascript';
import { oneDark } from '@codemirror/theme-one-dark';
import { StreamLanguage } from '@codemirror/language';
import { nginx } from './nginx';
import { yaml } from '@codemirror/legacy-modes/mode/yaml';
import { shell } from '@codemirror/legacy-modes/mode/shell';
import { dockerFile } from '@codemirror/legacy-modes/mode/dockerfile';
import { javascript } from '@codemirror/legacy-modes/mode/javascript';
import { placeholder } from '@codemirror/view';
import { json } from '@codemirror/lang-json';

Expand Down Expand Up @@ -94,7 +94,7 @@ const initCodeMirror = () => {
extensions.push(StreamLanguage.define(dockerFile));
break;
case 'javascript':
extensions.push(javascript());
extensions.push(StreamLanguage.define(javascript));
break;
case 'nginx':
extensions.push(StreamLanguage.define(nginx));
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/copy-button/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<el-button v-if="type == 'icon'" link @click="copyText(content)" icon="DocumentCopy" class="ml-1.5"></el-button>
<el-button type="primary" @click="copyText(content)" v-else>{{ $t('commons.button.copy') }}</el-button>
<el-button @click="copyText(content)" v-else>{{ $t('commons.button.copy') }}</el-button>
</template>

<script lang="ts" setup>
Expand Down
1 change: 0 additions & 1 deletion frontend/src/components/upload/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ const open = ref();
const data = ref();
const title = ref();
const paginationConfig = reactive({
cacheSizeKey: 'upload-page-size',
currentPage: 1,
pageSize: 10,
total: 0,
Expand Down
19 changes: 19 additions & 0 deletions frontend/src/global/form-rules.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,19 @@ const checkDBName = (rule: any, value: any, callback: any) => {
}
};

const checkComposeName = (rule: any, value: any, callback: any) => {
if (value === '' || typeof value === 'undefined' || value == null) {
callback(new Error(i18n.global.t('commons.rule.composeName')));
} else {
const reg = /^[a-z0-9]{1}[a-z0-9_-]{0,256}$/;
if (!reg.test(value) && value !== '') {
callback(new Error(i18n.global.t('commons.rule.composeName')));
} else {
callback();
}
}
};

const checkImageName = (rule: any, value: any, callback: any) => {
if (value === '' || typeof value === 'undefined' || value == null) {
callback(new Error(i18n.global.t('commons.rule.imageName')));
Expand Down Expand Up @@ -568,6 +581,7 @@ interface CommonRule {
simplePassword: FormItemRule;
dbName: FormItemRule;
imageName: FormItemRule;
composeName: FormItemRule;
volumeName: FormItemRule;
linuxName: FormItemRule;
password: FormItemRule;
Expand Down Expand Up @@ -643,6 +657,11 @@ export const Rules: CommonRule = {
validator: checkDBName,
trigger: 'blur',
},
composeName: {
required: true,
validator: checkComposeName,
trigger: 'blur',
},
imageName: {
required: true,
validator: checkImageName,
Expand Down
12 changes: 10 additions & 2 deletions frontend/src/lang/modules/en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ const message = {
simpleName: 'Supports non-underscore starting, English, numbers, _, length 3-30',
simplePassword: 'Supports non-underscore starting, English, numbers, _, length 1-30',
dbName: 'Supports non-special character starting, including English, Chinese, numbers, .-_, with a length of 1-64',
composeName:
'Supports non-special characters at the beginning, lowercase letters, numbers, - and _, length 1-256',
imageName: 'Support English, numbers, :@/.-_, length 1-256',
volumeName: 'Support English, numbers, .-_, length 2-30',
supervisorName: 'Supports non-special characters starting with English, numbers, - and _, length 1-128',
Expand Down Expand Up @@ -949,6 +951,14 @@ const message = {
retainCopiesUnit: ' copies (View)',
cronSpecRule: 'The execution period format in line {0} is incorrect. Please check and try again!',
cronSpecRule2: 'Execution period format is incorrect, please check and try again!',
perMonthHelper: 'Execute on the {0} day of every month at {1}:{2}',
perWeekHelper: 'Execute every week on {0} at {1}:{2}',
perDayHelper: 'Execute every day at {0}:{1}',
perHourHelper: 'Execute every hour at {0} minutes',
perNDayHelper: 'Execute every {0} days at {1}:{2}',
perNHourHelper: 'Execute every {0} hours at {1}',
perNMinuteHelper: 'Execute every {0} minutes',
perNSecondHelper: 'Execute every {0} seconds',
perMonth: 'Every monthly',
perWeek: 'Every week',
perHour: 'Every hour',
Expand All @@ -957,8 +967,6 @@ const message = {
perNHour: 'Every N hours',
perNMinute: 'Every N minutes',
perNSecond: 'Every N seconds',
per: 'Every ',
handle: 'Handle',
day: 'Day',
monday: 'Monday',
tuesday: 'Tuesday',
Expand Down
11 changes: 9 additions & 2 deletions frontend/src/lang/modules/tw.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ const message = {
simpleName: '支持非底線開頭，英文、數字、_,長度3-30',
simplePassword: '支持非底線開頭，英文、數字、_,長度1-30',
dbName: '支持非特殊字符開頭，英文、中文、數字、.-_，長度1-64',
composeName: '支持非特殊字符開頭，小寫英文、數字、-和_，長度1-256',
imageName: '支持英文、數字、:@/.-_,長度1-256',
volumeName: '支持英文、數字、.-和_,長度2-30',
supervisorName: '支援非特殊字元開頭,英文、數字、-和_,長度1-128',
Expand Down Expand Up @@ -902,6 +903,14 @@ const message = {
retainCopiesUnit: ' 份 (查看)',
cronSpecRule: '第 {0} 行中執行週期格式錯誤，請檢查後重試！',
cronSpecRule2: '執行週期格式錯誤，請檢查後重試！',
perMonthHelper: '每月 {0} 日 {1}:{2} 執行',
perWeekHelper: '每週 {0} {1}:{2} 執行',
perDayHelper: '每日 {0}:{1} 執行',
perHourHelper: '每小時 {0}分 執行',
perNDayHelper: '每 {0} 日 {1}:{2} 執行',
perNHourHelper: '每 {0}小時 {1}分 執行',
perNMinuteHelper: '每 {0}分 執行',
perNSecondHelper: '每 {0}秒 執行',
perMonth: '每月',
perWeek: '每周',
perHour: '每小時',
Expand All @@ -910,8 +919,6 @@ const message = {
perNHour: '每 N 時',
perNMinute: '每 N 分鐘',
perNSecond: '每 N 秒',
per: '每',
handle: '執行',
day: '日',
monday: '周一',
tuesday: '周二',
Expand Down
11 changes: 9 additions & 2 deletions frontend/src/lang/modules/zh.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ const message = {
simpleName: '支持非下划线开头，英文、数字、_,长度3-30',
simplePassword: '支持非下划线开头，英文、数字、_,长度1-30',
dbName: '支持非特殊字符开头，英文、中文、数字、.-_,长度1-64',
composeName: '支持非特殊字符开头，小写英文、数字、-和_,长度1-256',
imageName: '支持英文、数字、:@/.-_,长度1-256',
volumeName: '支持英文、数字、.-和_,长度2-30',
supervisorName: '支持非特殊字符开头,英文、数字、-和_,长度1-128',
Expand Down Expand Up @@ -902,6 +903,14 @@ const message = {
retainCopiesUnit: ' 份 (查看)',
cronSpecRule: '第 {0} 行中执行周期格式错误，请检查后重试！',
cronSpecRule2: '执行周期格式错误，请检查后重试！',
perMonthHelper: '每月 {0} 日 {1}:{2} 执行',
perWeekHelper: '每周 {0} {1}:{2} 执行',
perDayHelper: '每日 {0}:{1} 执行',
perHourHelper: '每小时 {0}分 执行',
perNDayHelper: '每 {0} 日 {1}:{2} 执行',
perNHourHelper: '每 {0}小时 {1}分 执行',
perNMinuteHelper: '每 {0}分 执行',
perNSecondHelper: '每 {0}秒 执行',
perMonth: '每月',
perWeek: '每周',
perHour: '每小时',
Expand All @@ -910,8 +919,6 @@ const message = {
perNHour: '每 N 时',
perNMinute: '每 N 分钟',
perNSecond: '每 N 秒',
per: '每',
handle: '执行',
day: '日',
monday: '周一',
tuesday: '周二',
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/compose/create/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ const form = reactive({
envFileContent: `env_file:\n - 1panel.env`,
});
const rules = reactive({
name: [Rules.requiredInput, Rules.imageName],
name: [Rules.requiredInput, Rules.composeName],
path: [Rules.requiredInput],
template: [Rules.requiredSelect],
});
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/container/index.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@
/>
<fu-table-operations
fix
width="180px"
width="200px"
:ellipsis="2"
:buttons="buttons"
:label="$t('commons.table.operate')"
Expand Down
Loading
Loading