Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 12 additions & 8 deletions agent/app/service/website_ssl.go
Original file line number Diff line number Diff line change
Expand Up @@ -448,15 +448,19 @@ func (w WebsiteSSLService) Delete(ids []uint) error {
if err != nil {
return err
}
acmeAccount, err := websiteAcmeRepo.GetFirst(repo.WithByID(websiteSSL.AcmeAccountID))
if err != nil {
return err
}
client, err := ssl.NewAcmeClient(acmeAccount)
if err != nil {
return err
if websiteSSL.Type != constant.Manual && websiteSSL.Type != constant.SelfSigned {
acmeAccount, err := websiteAcmeRepo.GetFirst(repo.WithByID(websiteSSL.AcmeAccountID))
if err != nil {
return err
}
client, err := ssl.NewAcmeClient(acmeAccount)
if err != nil {
return err
}
go func() {
_ = client.RevokeSSL([]byte(websiteSSL.Pem))
}()
}
_ = client.RevokeSSL([]byte(websiteSSL.Pem))
_ = websiteSSLRepo.DeleteBy(repo.WithByID(id))
}
if len(names) > 0 {
Copy link
Member

Choose a reason for hiding this comment

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

Based on the given code snippet, there do not appear to be any clear differences between the current version and previous versions (as per Knowledge cutoff). However, if you provide more specific context about what needs to be checked or optimized regarding these lines of code, I can give you more tailored advice.

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/backup/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
v-model="backupVisible"
:header="$t('commons.button.backup')"
:resource="detailName ? name + ' [' + detailName + ']' : name"
:back="handleClose"
@close="handleClose"
size="large"
>
<template #content>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/compose-log/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<DrawerPro
v-model="open"
:header="resource"
:back="handleClose"
@close="handleClose"
:size="globalStore.isFullScreen ? 'full' : 'large'"
:resource="resource"
>
Expand Down
10 changes: 5 additions & 5 deletions frontend/src/components/drawer-pro/index.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<el-drawer
v-model="localOpenPage"
@close="closePage"
@close="handleClose"
:destroy-on-close="true"
:size="size"
:close-on-press-escape="true"
Expand Down Expand Up @@ -73,8 +73,7 @@ const props = defineProps({
});

const slots = useSlots();

const emit = defineEmits(['update:modelValue']);
const emit = defineEmits(['update:modelValue', 'close']);

const size = computed(() => {
switch (props.size) {
Expand Down Expand Up @@ -106,13 +105,14 @@ const handleBack = () => {
if (props.back) {
props.back();
} else {
closePage();
handleClose();
}
};

const closePage = () => {
const handleClose = () => {
localOpenPage.value = false;
globalStore.isFullScreen = false;
emit('close');
};

function toggleFullscreen() {
Copy link
Member

Choose a reason for hiding this comment

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

There doesn't appear to be any differences or inconsistencies in this code snippet. There may not be anything significant enough to mention unless it specifically requires review based on context or time period that I didn't specify initially. If you're referring to a specific part of the code that needs analysis, please provide its location within the file so I can review it comprehensively.

For general coding best practices regarding modern programming, consider:

  • Make sure all imports are up-to-date,
  • Check for consistent use of functions and classes across your project,
  • Use meaningful variable names, especially when dealing with data structures like slots in Vue,
  • Optimize performance where possible using tools like Jest for checking tests,
  • Implement robust error handling to improve reliability,

If there's a particular area within your codebase that needs attention, feel free to detail what is causing concerns!

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/group/change.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div v-loading="loading">
<DrawerPro v-model="drawerVisible" :header="$t('terminal.groupChange')" :back="handleClose" size="small">
<DrawerPro v-model="drawerVisible" :header="$t('terminal.groupChange')" @close="handleClose" size="small">
<el-form @submit.prevent ref="hostInfoRef" label-position="top" :model="dialogData" :rules="rules">
<el-form-item :label="$t('commons.table.group')" prop="group">
<el-select filterable v-model="dialogData.groupID" clearable style="width: 100%">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/group/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="open" :header="$t('commons.table.group')" @close="handleClose" size="large" :back="handleClose">
<DrawerPro v-model="open" :header="$t('commons.table.group')" @close="handleClose" size="large">
<template #content>
<ComplexTable :data="data" @search="search()">
<template #toolbar>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/log-dialog/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="open" :header="$t('commons.button.log')" size="large" :back="handleClose">
<DrawerPro v-model="open" :header="$t('commons.button.log')" size="large" @close="handleClose">
<LogFile :config="config" :height-diff="config.heightDiff"></LogFile>
</DrawerPro>
</template>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/system-upgrade/upgrade/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<DrawerPro
v-model="drawerVisible"
:header="$t('commons.button.upgrade')"
:back="handleClose"
@close="handleClose"
size="large"
:key="refresh"
>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/upload/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
v-model="uploadOpen"
:header="$t('commons.button.import')"
:resource="title"
:back="handleUploadClose"
@close="handleUploadClose"
size="large"
>
<template #content>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/ai/model/add/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="drawerVisible" :header="$t('aiTools.model.create')" :back="handleClose">
<DrawerPro v-model="drawerVisible" :header="$t('aiTools.model.create')" @close="handleClose">
<el-row type="flex" justify="center">
<el-col :span="22">
<el-alert type="info" :closable="false">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/ai/model/conn/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="drawerVisible" :header="$t('database.databaseConnInfo')" :back="handleClose" size="small">
<DrawerPro v-model="drawerVisible" :header="$t('database.databaseConnInfo')" @close="handleClose" size="small">
<el-form @submit.prevent v-loading="loading" :model="form" label-position="top">
<el-row type="flex" justify="center">
<el-col :span="22">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/ai/model/domain/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="open" :header="$t('aiTools.proxy.proxy')" :back="handleClose" size="large">
<DrawerPro v-model="open" :header="$t('aiTools.proxy.proxy')" @close="handleClose" size="large">
<div v-loading="loading">
<el-form ref="formRef" label-position="top" @submit.prevent :model="req" :rules="rules">
<el-alert class="common-prompt" :closable="false" type="warning">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/ai/model/terminal/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<DrawerPro
v-model="open"
:title="$t('menu.terminal')"
:back="handleClose"
@close="handleClose"
:resource="title"
:size="globalStore.isFullScreen ? 'full' : 'large'"
>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/app-store/detail/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="open" :header="$t('app.detail')" :back="handleClose" size="large">
<DrawerPro v-model="open" :header="$t('app.detail')" @close="handleClose" size="large">
<div class="brief" v-loading="loadingApp">
<div class="detail flex">
<div class="w-12 h-12 rounded p-1 shadow-md icon">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/app-store/detail/install/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="open" :header="$t('commons.button.install')" :back="handleClose" size="large">
<DrawerPro v-model="open" :header="$t('commons.button.install')" @close="handleClose" size="large">
<el-alert
:title="$t('app.hostModeHelper')"
class="common-prompt"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/app-store/installed/detail/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="open" :header="$t('app.param')" :back="handleClose" size="normal">
<DrawerPro v-model="open" :header="$t('app.param')" @close="handleClose" size="normal">
<template #buttons>
<el-button type="primary" plain @click="editParam" :disabled="loading">
{{ edit ? $t('app.detail') : $t('commons.button.edit') }}
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/app-store/installed/ignore/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="open" :header="$t('app.ignoreList')" :back="handleClose" size="small">
<DrawerPro v-model="open" :header="$t('app.ignoreList')" @close="handleClose" size="small">
<template #content>
<el-row :gutter="5">
<el-col v-for="(app, index) in apps" :key="index">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/app-store/installed/upgrade/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
v-model="open"
:header="$t('commons.button.' + operateReq.operate)"
:resource="resourceName"
:back="handleClose"
@close="handleClose"
>
<el-descriptions direction="vertical">
<el-descriptions-item>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="drawerVisible" :header="$t('app.defaultWebDomain')" :back="handleClose" size="small">
<DrawerPro v-model="drawerVisible" :header="$t('app.defaultWebDomain')" @close="handleClose" size="small">
<el-form ref="formRef" label-position="top" :model="form" :rules="rules" @submit.prevent v-loading="loading">
<el-form-item :label="$t('app.defaultWebDomain')" prop="defaultDomain">
<el-input v-model="form.defaultDomain">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/compose/create/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="drawerVisible" :header="$t('container.compose')" :back="handleClose" size="large">
<DrawerPro v-model="drawerVisible" :header="$t('container.compose')" @close="handleClose" size="large">
<el-form ref="formRef" @submit.prevent label-position="top" :model="form" :rules="rules" v-loading="loading">
<el-form-item :label="$t('app.source')">
<el-radio-group v-model="form.from" @change="onEdit('form')">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/compose/edit/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<DrawerPro
v-model="composeVisible"
:header="$t('commons.button.edit')"
:back="handleClose"
@close="handleClose"
:resource="name"
size="large"
>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/container/commit/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<DrawerPro
v-model="drawerVisible"
:header="$t('container.makeImage')"
:back="handleClose"
@close="handleClose"
:resource="form.containerName"
size="large"
>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/container/log/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<DrawerPro
v-model="logVisible"
:header="$t('commons.button.log')"
:back="handleClose"
@close="handleClose"
:resource="logSearch.container"
:size="globalStore.isFullScreen ? 'full' : 'large'"
>
Expand Down
8 changes: 7 additions & 1 deletion frontend/src/views/container/container/monitor/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
<template>
<DrawerPro v-model="monitorVisible" :header="$t('menu.monitor')" :back="handleClose" :resource="title" size="large">
<DrawerPro
v-model="monitorVisible"
:header="$t('menu.monitor')"
@close="handleClose"
:resource="title"
size="large"
>
<el-form label-position="top" @submit.prevent>
<el-form-item :label="$t('container.refreshTime')">
<el-select v-model="timeInterval" @change="changeTimer">
Copy link
Member

Choose a reason for hiding this comment

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

I'm sorry, but I can't check the code without it being shown to me first since it is not provided in this response. Please share the code with me, and I'll be happy to assist you!

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/container/rename/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<DrawerPro
v-model="newNameVisible"
:header="$t('container.rename')"
:back="handleClose"
@close="handleClose"
:resource="renameForm.name"
size="small"
>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/container/terminal/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<DrawerPro
v-model="terminalVisible"
:header="$t('menu.terminal')"
:back="handleClose"
@close="handleClose"
:resource="title"
size="large"
>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/container/upgrade/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<DrawerPro
v-model="drawerVisible"
:header="$t('commons.button.upgrade')"
:back="handleClose"
@close="handleClose"
:resource="form.containerName"
size="large"
>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/image/build/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="drawerVisible" :header="$t('container.imageBuild')" :back="handleClose" size="large">
<DrawerPro v-model="drawerVisible" :header="$t('container.imageBuild')" @close="handleClose" size="large">
<el-form ref="formRef" label-position="top" :model="form" label-width="80px" :rules="rules">
<el-form-item :label="$t('commons.table.name')" prop="name">
<el-input :placeholder="$t('container.imageNameHelper')" v-model.trim="form.name" clearable />
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/image/delete/index.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<DrawerPro v-model="deleteVisible" :header="$t('container.imageDelete')" :back="handleClose" size="small">
<DrawerPro v-model="deleteVisible" :header="$t('container.imageDelete')" @close="handleClose" size="small">
<el-form @submit.prevent :model="form" label-position="top">
<el-form-item :label="$t('container.tag')" prop="tagName">
<div style="width: 100%">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/image/load/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="loadVisible" :header="$t('container.importImage')" :back="handleClose" size="small">
<DrawerPro v-model="loadVisible" :header="$t('container.importImage')" @close="handleClose" size="small">
<el-form @submit.prevent v-loading="loading" ref="formRef" :model="form" label-position="top">
<el-form-item :label="$t('container.path')" :rules="Rules.requiredInput" prop="path">
<el-input v-model="form.path">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/image/prune/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="dialogVisible" :header="$t('container.imagePrune')" :back="handleClose" size="small">
<DrawerPro v-model="dialogVisible" :header="$t('container.imagePrune')" @close="handleClose" size="small">
<el-form ref="deleteForm" v-loading="loading">
<el-form-item>
<el-radio-group class="w-full" v-model="scope" @change="changeScope">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/image/pull/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="drawerVisible" :header="$t('container.imagePull')" :back="onCloseLog" size="large">
<DrawerPro v-model="drawerVisible" :header="$t('container.imagePull')" @close="onCloseLog" size="large">
<el-form ref="formRef" label-position="top" :model="form">
<el-form-item :label="$t('app.source')">
<el-checkbox v-model="form.fromRepo">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/image/push/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="drawerVisible" :header="$t('container.imagePush')" :back="onCloseLog" size="large">
<DrawerPro v-model="drawerVisible" :header="$t('container.imagePush')" @close="onCloseLog" size="large">
<el-form ref="formRef" label-position="top" :model="form" label-width="80px">
<el-form-item :label="$t('container.tag')" :rules="Rules.requiredSelect" prop="tagName">
<el-select filterable v-model="form.tagName">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/image/save/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="drawerVisible" :header="$t('terminal.exportImage')" :back="handleClose" size="small">
<DrawerPro v-model="drawerVisible" :header="$t('terminal.exportImage')" @close="handleClose" size="small">
<el-form v-loading="loading" label-position="top" ref="formRef" :model="form" label-width="80px">
<el-form-item :label="$t('container.tag')" :rules="Rules.requiredSelect" prop="tagName">
<el-select filterable v-model="form.tagName">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/image/tag/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="drawerVisible" :header="$t('container.imageTag')" :back="handleClose" size="large">
<DrawerPro v-model="drawerVisible" :header="$t('container.imageTag')" @close="handleClose" size="large">
<el-form v-loading="loading" label-position="top" ref="formRef" :model="form" label-width="80px">
<el-form-item :label="$t('app.source')">
<el-checkbox v-model="form.fromRepo">{{ $t('container.imageRepo') }}</el-checkbox>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/network/create/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="drawerVisible" :header="$t('container.createNetwork')" :back="handleClose" size="large">
<DrawerPro v-model="drawerVisible" :header="$t('container.createNetwork')" @close="handleClose" size="large">
<el-form ref="formRef" label-position="top" v-loading="loading" :model="form" :rules="rules" label-width="80px">
<el-form-item :label="$t('container.networkName')" prop="name">
<el-input clearable v-model.trim="form.name" />
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/repo/operator/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
v-model="drawerVisible"
:header="title + $t('container.repo')"
:resource="dialogData.rowData?.name"
:back="handleClose"
@close="handleClose"
size="small"
>
<el-form
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/setting/ipv6/index.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<DrawerPro v-model="drawerVisible" header="IPv6" :back="handleClose" size="small">
<DrawerPro v-model="drawerVisible" header="IPv6" @close="handleClose" size="small">
<el-alert class="common-prompt" :closable="false" type="warning">
<template #default>
<span class="input-help">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/setting/log/index.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<DrawerPro v-model="drawerVisible" :header="$t('container.cutLog')" :back="handleClose" size="small">
<DrawerPro v-model="drawerVisible" :header="$t('container.cutLog')" @close="handleClose" size="small">
<el-alert class="common-prompt" :closable="false" type="warning">
<template #default>
<ul style="margin-left: -20px">
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/setting/mirror/index.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<DrawerPro v-model="drawerVisible" :header="$t('container.mirrors')" :back="handleClose" size="small">
<DrawerPro v-model="drawerVisible" :header="$t('container.mirrors')" @close="handleClose" size="small">
<el-form
ref="formRef"
label-position="top"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/setting/registry/index.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<DrawerPro v-model="drawerVisible" :header="$t('container.registries')" :back="handleClose" size="small">
<DrawerPro v-model="drawerVisible" :header="$t('container.registries')" @close="handleClose" size="small">
<el-form
ref="formRef"
label-position="top"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/setting/sock-path/index.vue
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<template>
<div>
<DrawerPro v-model="drawerVisible" :header="$t('container.sockPath')" :back="handleClose" size="small">
<DrawerPro v-model="drawerVisible" :header="$t('container.sockPath')" @close="handleClose" size="small">
<el-form
ref="formRef"
label-position="top"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/template/detail/index.vue
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<DrawerPro v-model="detailVisible" :header="$t('commons.button.view')" :back="handleClose" size="large">
<DrawerPro v-model="detailVisible" :header="$t('commons.button.view')" @close="handleClose" size="large">
<CodemirrorPro
:placeholder="$t('commons.msg.noneData')"
v-model="detailInfo"
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/container/template/operator/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
v-model="drawerVisible"
:header="$t('container.composeTemplate')"
:resource="dialogData.title === 'create' ? '' : dialogData.rowData?.name"
:back="handleClose"
@close="handleClose"
size="large"
>
<el-form
Expand Down
Loading
Loading