This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new f7509847c [ISSUE-3825][Improve] `/system/role` page miss description
field value (#3826)
f7509847c is described below
commit f7509847ca13a8a1c74d1c7eeba259d74b3b9b39
Author: Zhengke Zhou <[email protected]>
AuthorDate: Sun Jul 7 23:40:45 2024 +0800
[ISSUE-3825][Improve] `/system/role` page miss description field value
(#3826)
* Change `Role` field `remark` to `description`
* Improve role management e2e test
* Fix code format
---
.../src/api/system/model/roleModel.ts | 4 ++--
.../src/views/system/role/components/RoleDrawer.vue | 4 ++--
.../src/views/system/role/components/RoleInfo.vue | 2 +-
.../src/views/system/role/role.data.ts | 4 ++--
.../apache/streampark/e2e/cases/RoleManagementTest.java | 16 +++++++---------
.../streampark/e2e/pages/system/RoleManagementPage.java | 2 +-
6 files changed, 15 insertions(+), 17 deletions(-)
diff --git
a/streampark-console/streampark-console-webapp/src/api/system/model/roleModel.ts
b/streampark-console/streampark-console-webapp/src/api/system/model/roleModel.ts
index 11b97d86a..e91b93ad8 100644
---
a/streampark-console/streampark-console-webapp/src/api/system/model/roleModel.ts
+++
b/streampark-console/streampark-console-webapp/src/api/system/model/roleModel.ts
@@ -17,7 +17,7 @@
export interface RoleParam {
roleId?: number;
roleName: string;
- remark: string;
+ description: string;
menuId: string[];
}
@@ -25,7 +25,7 @@ export interface RoleListRecord {
roleId: string;
roleName: string;
roleCode?: any;
- remark: string;
+ description: string;
createTime: string;
modifyTime: string;
sortField?: any;
diff --git
a/streampark-console/streampark-console-webapp/src/views/system/role/components/RoleDrawer.vue
b/streampark-console/streampark-console-webapp/src/views/system/role/components/RoleDrawer.vue
index 753b59b48..264b648da 100644
---
a/streampark-console/streampark-console-webapp/src/views/system/role/components/RoleDrawer.vue
+++
b/streampark-console/streampark-console-webapp/src/views/system/role/components/RoleDrawer.vue
@@ -95,7 +95,7 @@
? [{ required: true, validator: handleRoleCheck, trigger: 'blur'
}]
: [],
},
- { label: t('common.description'), field: 'remark', component:
'InputTextArea' },
+ { label: t('common.description'), field: 'description', component:
'InputTextArea' },
{
label: t('system.role.form.menuId'),
field: 'menuId',
@@ -146,7 +146,7 @@
setFieldsValue({
roleName: data.record.roleName,
roleId: data.record.roleId,
- remark: data.record.remark,
+ description: data.record.description,
menuId: [...result],
});
});
diff --git
a/streampark-console/streampark-console-webapp/src/views/system/role/components/RoleInfo.vue
b/streampark-console/streampark-console-webapp/src/views/system/role/components/RoleInfo.vue
index 817a7b0c6..5061485ac 100644
---
a/streampark-console/streampark-console-webapp/src/views/system/role/components/RoleInfo.vue
+++
b/streampark-console/streampark-console-webapp/src/views/system/role/components/RoleInfo.vue
@@ -107,7 +107,7 @@
},
{
label: generatedLabelIcon('ant-design:book-outlined',
t('common.description')),
- field: 'remark',
+ field: 'description',
},
{
label: generatedLabelIcon(`ant-design:clock-circle-outlined`,
t('common.createTime')),
diff --git
a/streampark-console/streampark-console-webapp/src/views/system/role/role.data.ts
b/streampark-console/streampark-console-webapp/src/views/system/role/role.data.ts
index 70b6cb3e2..57e35263a 100644
---
a/streampark-console/streampark-console-webapp/src/views/system/role/role.data.ts
+++
b/streampark-console/streampark-console-webapp/src/views/system/role/role.data.ts
@@ -37,7 +37,7 @@ export const columns: BasicColumn[] = [
},
{
title: t('common.description'),
- dataIndex: 'remark',
+ dataIndex: 'description',
ellipsis: true,
},
];
@@ -90,7 +90,7 @@ export const formSchema: FormSchema[] = [
},
{
label: t('common.description'),
- field: 'remark',
+ field: 'description',
component: 'InputTextArea',
},
{
diff --git
a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/cases/RoleManagementTest.java
b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/cases/RoleManagementTest.java
index 9f354c3bb..9f4f4075a 100644
---
a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/cases/RoleManagementTest.java
+++
b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/cases/RoleManagementTest.java
@@ -60,7 +60,7 @@ public class RoleManagementTest {
@Test
@Order(10)
- void testCreateUser() {
+ void testCreateRole() {
final RoleManagementPage roleManagementPage = new
RoleManagementPage(browser);
roleManagementPage.createRole(newRoleName, newDescription,
existMenuName);
@@ -96,14 +96,12 @@ public class RoleManagementTest {
String newEditMenuName = "System";
roleManagementPage.editRole(newRoleName, newEditDescription,
newEditMenuName);
- // TODO: there is no description filed value actual exist
- // Awaitility.await()
- // .untilAsserted(
- // () ->
- // assertThat(roleManagementPage.roleList())
- // .as("Role list should contain newly-created role")
- // .extracting(WebElement::getText)
- // .anyMatch(it -> it.contains(newEditDescription)));
+ Awaitility.await()
+ .untilAsserted(
+ () -> assertThat(roleManagementPage.roleList())
+ .as("Role list should contain edited role")
+ .extracting(WebElement::getText)
+ .anyMatch(it ->
it.contains(newEditDescription)));
}
@Test
diff --git
a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/system/RoleManagementPage.java
b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/system/RoleManagementPage.java
index 7e1141068..51e9dfde4 100644
---
a/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/system/RoleManagementPage.java
+++
b/streampark-e2e/streampark-e2e-case/src/test/java/org/apache/streampark/e2e/pages/system/RoleManagementPage.java
@@ -141,7 +141,7 @@ public class RoleManagementPage extends NavBarPage
implements SystemPage.Tab {
@FindBy(xpath =
"//div[@class='scrollbar__view']//*[@id='form_item_roleName']")
private WebElement inputRoleName;
- @FindBy(id = "form_item_remark")
+ @FindBy(id = "form_item_description")
private WebElement inputDescription;
@FindBys({
