diff --git a/backend/src/main/java/io/metersphere/xpack b/backend/src/main/java/io/metersphere/xpack index 27109d6d98..15587f94ea 160000 --- a/backend/src/main/java/io/metersphere/xpack +++ b/backend/src/main/java/io/metersphere/xpack @@ -1 +1 @@ -Subproject commit 27109d6d986204b7579b2212294db289a8755d5a +Subproject commit 15587f94ea8a28aab0272a6055151bc0477c0d69 diff --git a/backend/src/main/resources/db/migration/V115__1.20__release.sql b/backend/src/main/resources/db/migration/V115__1.20__release.sql index 6570ae20e3..62c81e7c71 100644 --- a/backend/src/main/resources/db/migration/V115__1.20__release.sql +++ b/backend/src/main/resources/db/migration/V115__1.20__release.sql @@ -135,12 +135,8 @@ VALUES (UUID(), 'project_admin', 'PROJECT_UI_SCENARIO:READ+CREATE', 'PROJECT_UI_ INSERT INTO user_group_permission (id, group_id, permission_id, module_id) VALUES (UUID(), 'project_admin', 'PROJECT_UI_SCENARIO:READ+BATCH_COPY', 'PROJECT_UI_SCENARIO'); INSERT INTO user_group_permission (id, group_id, permission_id, module_id) -VALUES (UUID(), 'project_admin', 'PROJECT_UI_SCENARIO:READ+CREATE_PERFORMANCE_BATCH', 'PROJECT_UI_SCENARIO'); -INSERT INTO user_group_permission (id, group_id, permission_id, module_id) VALUES (UUID(), 'project_admin', 'PROJECT_UI_SCENARIO:READ+SCHEDULE', 'PROJECT_UI_SCENARIO'); INSERT INTO user_group_permission (id, group_id, permission_id, module_id) -VALUES (UUID(), 'project_admin', 'PROJECT_UI_SCENARIO:READ+CREATE_PERFORMANCE', 'PROJECT_UI_SCENARIO'); -INSERT INTO user_group_permission (id, group_id, permission_id, module_id) VALUES (UUID(), 'project_admin', 'PROJECT_UI_SCENARIO:READ+COPY', 'PROJECT_UI_SCENARIO'); INSERT INTO user_group_permission (id, group_id, permission_id, module_id) VALUES (UUID(), 'project_admin', 'PROJECT_UI_SCENARIO:READ+DELETE', 'PROJECT_UI_SCENARIO'); @@ -168,6 +164,8 @@ INSERT INTO user_group_permission (id, group_id, permission_id, module_id) VALUES (UUID(), 'project_admin', 'PROJECT_UI_ELEMENT:READ+DELETE', 'PROJECT_UI_ELEMENT'); INSERT INTO user_group_permission (id, group_id, permission_id, module_id) VALUES (UUID(), 'project_admin', 'PROJECT_UI_ELEMENT:READ+EDIT', 'PROJECT_UI_ELEMENT'); +INSERT INTO user_group_permission (id, group_id, permission_id, module_id) +VALUES (UUID(), 'project_admin', 'PROJECT_UI_ELEMENT:READ+COPY', 'PROJECT_UI_ELEMENT'); -- diff --git a/backend/src/main/resources/permission.json b/backend/src/main/resources/permission.json index e9b96952c2..1cbb75c2fb 100644 --- a/backend/src/main/resources/permission.json +++ b/backend/src/main/resources/permission.json @@ -796,6 +796,12 @@ "resourceId": "PROJECT_UI_ELEMENT", "license": true }, + { + "id": "PROJECT_UI_ELEMENT:READ+COPY", + "name": "permission.project_ui_element.copy", + "resourceId": "PROJECT_UI_ELEMENT", + "license": true + }, { "id": "PROJECT_UI_SCENARIO:READ", "name": "permission.project_ui_scenario.read", @@ -862,18 +868,6 @@ "resourceId": "PROJECT_UI_SCENARIO", "license": true }, - { - "id": "PROJECT_UI_SCENARIO:READ+CREATE_PERFORMANCE", - "name": "permission.project_ui_scenario.create_performance", - "resourceId": "PROJECT_UI_SCENARIO", - "license": true - }, - { - "id": "PROJECT_UI_SCENARIO:READ+CREATE_PERFORMANCE_BATCH", - "name": "permission.project_ui_scenario.create_performance_batch", - "resourceId": "PROJECT_UI_SCENARIO", - "license": true - }, { "id": "PROJECT_UI_SCENARIO:READ+BATCH_COPY", "name": "permission.project_ui_scenario.batch_copy", diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack index 62aafadf61..8ee1df272a 160000 --- a/frontend/src/business/components/xpack +++ b/frontend/src/business/components/xpack @@ -1 +1 @@ -Subproject commit 62aafadf6171553cdec3dc60e4f5c0ec3a15944e +Subproject commit 8ee1df272a1ba3ca6e8ab2ceca227cf1899ccce9