!132 [sync] PR-128: 适配回滚任务、解决部分bug
From: @openeuler-sync-bot Reviewed-by: @zhu-yuncheng Signed-off-by: @zhu-yuncheng
This commit is contained in:
openeuler-ci-bot
Gitee
commit
4aa75ab858
1025
001-bugfix-and-adapt-rollback-tasks.patch
Normal file
1025
001-bugfix-and-adapt-rollback-tasks.patch
Normal file
File diff suppressed because it is too large
Load Diff
24
002-fix-hotpatch-remove-filter.patch
Normal file
24
002-fix-hotpatch-remove-filter.patch
Normal file
@ -0,0 +1,24 @@
|
||||
From a747433cfaf40104eb56d9d3dea6d86ed5d5b82d Mon Sep 17 00:00:00 2001
|
||||
From: Hu gang <18768366022@163.com>
|
||||
Date: Mon, 18 Dec 2023 10:27:00 +0800
|
||||
Subject: [PATCH] fix: fix hotpathch remove filter failed
|
||||
|
||||
---
|
||||
src/views/leaks/LeakTaskDetail.vue | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/views/leaks/LeakTaskDetail.vue b/src/views/leaks/LeakTaskDetail.vue
|
||||
index f7f7438..00438d7 100644
|
||||
--- a/src/views/leaks/LeakTaskDetail.vue
|
||||
+++ b/src/views/leaks/LeakTaskDetail.vue
|
||||
@@ -661,6 +661,8 @@ export default {
|
||||
// 出发排序、筛选、分页时，重新请求主机列表
|
||||
if (this.taskType === 'cve fix' || this.taskType === 'cve rollback') {
|
||||
this.getCveList();
|
||||
+ } else if (this.taskType === 'hotpatch remove') {
|
||||
+ this.getCveListWithHotpathRemove();
|
||||
} else {
|
||||
this.getHostList();
|
||||
}
|
||||
--
|
||||
Gitee
|
||||
24
003-change-search-placeholder.patch
Normal file
24
003-change-search-placeholder.patch
Normal file
@ -0,0 +1,24 @@
|
||||
From 2cc872cddbc8331941507167b23a977aa0b543ad Mon Sep 17 00:00:00 2001
|
||||
From: Hu gang <18768366022@163.com>
|
||||
Date: Mon, 18 Dec 2023 11:05:17 +0800
|
||||
Subject: [PATCH] chore: change search input palceholder
|
||||
|
||||
---
|
||||
src/views/leaks/LeakTaskDetail.vue | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/views/leaks/LeakTaskDetail.vue b/src/views/leaks/LeakTaskDetail.vue
|
||||
index 00438d7..766a1cf 100644
|
||||
--- a/src/views/leaks/LeakTaskDetail.vue
|
||||
+++ b/src/views/leaks/LeakTaskDetail.vue
|
||||
@@ -103,7 +103,7 @@
|
||||
<a-row type="flex" :gutter="6">
|
||||
<a-col>
|
||||
<a-input-search
|
||||
- :placeholder="taskType === 'hotpatch remove' ? `按CVE ID搜索` : `按主机搜索`"
|
||||
+ :placeholder="taskType === 'hotpatch remove' ? `按CVE ID搜索` : `按主机名或主机ip搜索`"
|
||||
style="width: 200px"
|
||||
@search="onSearch"
|
||||
/>
|
||||
--
|
||||
Gitee
|
||||
38
004-modify-search-key-for-hostlist.patch
Normal file
38
004-modify-search-key-for-hostlist.patch
Normal file
@ -0,0 +1,38 @@
|
||||
From 3289156212ecda06c35ace47af0a6033ff41ea1d Mon Sep 17 00:00:00 2001
|
||||
From: Hu gang <18768366022@163.com>
|
||||
Date: Mon, 18 Dec 2023 15:17:42 +0800
|
||||
Subject: [PATCH] chore: change search key
|
||||
|
||||
---
|
||||
src/views/assests/HostManagement.vue | 2 +-
|
||||
src/views/leaks/LeakTaskDetail.vue | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/views/assests/HostManagement.vue b/src/views/assests/HostManagement.vue
|
||||
index 77e0ed8..e3c1635 100644
|
||||
--- a/src/views/assests/HostManagement.vue
|
||||
+++ b/src/views/assests/HostManagement.vue
|
||||
@@ -18,7 +18,7 @@
|
||||
</a-col>
|
||||
<a-col>
|
||||
<!-- <a-button @click="handleReset">重置条件</a-button> -->
|
||||
- <a-input-search placeholder="按主机名或主机ip搜索" style="width: 200px" @search="handleSearch" />
|
||||
+ <a-input-search placeholder="按主机名或IP搜索" style="width: 200px" @search="handleSearch" />
|
||||
</a-col>
|
||||
</a-row>
|
||||
</a-col>
|
||||
diff --git a/src/views/leaks/LeakTaskDetail.vue b/src/views/leaks/LeakTaskDetail.vue
|
||||
index 766a1cf..81f0a88 100644
|
||||
--- a/src/views/leaks/LeakTaskDetail.vue
|
||||
+++ b/src/views/leaks/LeakTaskDetail.vue
|
||||
@@ -103,7 +103,7 @@
|
||||
<a-row type="flex" :gutter="6">
|
||||
<a-col>
|
||||
<a-input-search
|
||||
- :placeholder="taskType === 'hotpatch remove' ? `按CVE ID搜索` : `按主机名或主机ip搜索`"
|
||||
+ :placeholder="taskType === 'hotpatch remove' ? `按CVE ID搜索` : `按主机名或IP搜索`"
|
||||
style="width: 200px"
|
||||
@search="onSearch"
|
||||
/>
|
||||
--
|
||||
Gitee
|
||||
Binary file not shown.
@ -2,12 +2,16 @@
|
||||
|
||||
Name: aops-hermes
|
||||
Version: v1.4.0
|
||||
Release: 1
|
||||
Release: 2
|
||||
Summary: Web for an intelligent diagnose frame
|
||||
License: MulanPSL2
|
||||
URL: https://gitee.com/openeuler/%{name}
|
||||
Source0: %{name}-%{version}.tar.gz
|
||||
Source1: node_modules.tar.gz
|
||||
Patch001: 001-bugfix-and-adapt-rollback-tasks.patch
|
||||
Patch002: 002-fix-hotpatch-remove-filter.patch
|
||||
Patch003: 003-change-search-placeholder.patch
|
||||
Patch004: 004-modify-search-key-for-hostlist.patch
|
||||
|
||||
|
||||
BuildRequires: nodejs node-gyp nodejs-yarn
|
||||
@ -19,7 +23,7 @@ Web for an intelligent diagnose frame
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -n %{name}-%{version}
|
||||
%autosetup -n %{name}-%{version} -p1
|
||||
%setup -T -D -a 1
|
||||
|
||||
|
||||
@ -43,8 +47,16 @@ cp -r deploy/aops-hermes.service %{buildroot}/usr/lib/systemd/system/
|
||||
|
||||
|
||||
%changelog
|
||||
* Mon Dec 18 2023 Hu gang<18768366022@163.com> - v1.4.0-2
|
||||
- Added keyword search for host list
|
||||
- Fixed the problem of abnormal list rendering in task details task running state
|
||||
- Optimize some page copywriting
|
||||
- Adaptation rollback task related (creation, execution, detailed viewing, task report viewing, etc.)
|
||||
- Solve the problem of hot and cold patch execution tasks failing when creating a repair task.
|
||||
- Fix hotpatch remove list filter failed
|
||||
|
||||
* Tue Dec 12 2023 Hu gang<18768366022@163.com> - v1.4.0-1
|
||||
- adaptToNewRepairTasksIncludingDetailsCreationTaskReportsAndTaskExecution
|
||||
- adapt to NewRepair Tasks Including DetailsCreation TaskReports And TaskExecution
|
||||
- Modify the original rollback task to hot patch rollback
|
||||
- Added related rollback tasks
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user