EPMRPP-83970 || Update the Filter on Monitoring page with new events

reportportal · Sep 25, 2023 · d9ebd55 · d9ebd55
1 parent 3bc4c99
commit d9ebd55
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 38 deletions.
diff --git a/app/localization/translated/be.json b/app/localization/translated/be.json
@@ -698,14 +698,13 @@
   "EventActions.deleteLaunch": "Выдаленне запуску",
   "EventActions.deletePattern": "Выдаленне шаблону",
   "EventActions.deleteWidget": "Выдаленне віджэта",
-  "EventActions.finishImport": "Канчатак імпарту",
+  "EventActions.import": "Імпарт",
   "EventActions.finishLaunch": "Канчатак запуску",
   "EventActions.generateIndex": "Генерацыя індэкса",
   "EventActions.linkIssue": "Прывязка праблемы",
   "EventActions.linkIssueAA": "Прывязка праблемы автоанализом",
   "EventActions.matchedPattern": "Патэрн-аналіз выявіў адпаведнасць",
   "EventActions.postIssue": "Cтварэнне праблемы",
-  "EventActions.startImport": "Старт імпарту",
   "EventActions.startLaunch": "Старт запуску",
   "EventActions.unassignUser": "Адмяніў прызначэнне",
   "EventActions.changeRole": "Змяніць ролю",
@@ -717,7 +716,7 @@
   "EventActions.updateIntegration": "Абнаўленне інтэграцыі",
   "EventActions.updateItem": "Абнавіць элемент",
   "EventActions.updatePattern": "Абнаўленне шаблону",
-  "EventActions.updateAutoPatternAnalysis": "Абнавіў патэрн аналіз",
+  "EventActions.updateAutoPatternAnalysisSettings": "Абнавіць налады Pattern-Analysis",
   "EventActions.updateProject": "Абнаўленне праекта",
   "EventActions.updateWidget": "Абнаўленне відждэт",
   "EventObjectTypes.dashboard": "Панэль кіравання",

diff --git a/app/localization/translated/ru.json b/app/localization/translated/ru.json
@@ -695,14 +695,13 @@
   "EventActions.deleteLaunch": "Удаление запуска",
   "EventActions.deletePattern": "Удаление шаблона",
   "EventActions.deleteWidget": "Удаление виджета",
-  "EventActions.finishImport": "Конец импорта",
+  "EventActions.import": "Импорт",
   "EventActions.finishLaunch": "Окончание запуска",
   "EventActions.generateIndex": "Генерация индекса",
   "EventActions.linkIssue": "Привязка ошибки",
   "EventActions.linkIssueAA": "Привязка ошибки автоанализом",
   "EventActions.matchedPattern": "Паттерн-анализ обнаружил соответствие",
   "EventActions.postIssue": "Создание ошибки",
-  "EventActions.startImport": "Начало импорта",
   "EventActions.startLaunch": "Старт запуска",
   "EventActions.unassignUser": "Отменил назначение",
   "EventActions.changeRole": "Изменить роль",
@@ -714,7 +713,7 @@
   "EventActions.updateIntegration": "Обновление интеграции",
   "EventActions.updateItem": "Обновление элемента",
   "EventActions.updatePattern": "Обновление шаблона",
-  "EventActions.updateAutoPatternAnalysis": "Обновил паттерн анализ",
+  "EventActions.updateAutoPatternAnalysisSettings": "Обновить настройки Pattern-Analysis",
   "EventActions.updateProject": "Обновление проекта",
   "EventActions.updateWidget": "Обновление виджета",
   "EventObjectTypes.dashboard": "Панель управления",

diff --git a/app/localization/translated/uk.json b/app/localization/translated/uk.json
@@ -696,14 +696,13 @@
   "EventActions.deleteLaunch": "Видалення запуску",
   "EventActions.deletePattern": "Видалення шаблону",
   "EventActions.deleteWidget": "Видалення міні-програми",
-  "EventActions.finishImport": "Імпорту Кінець",
+  "EventActions.import": "Імпорт",
   "EventActions.finishLaunch": "Закінчення запуску",
   "EventActions.generateIndex": "Генерація індексу",
   "EventActions.linkIssue": "Прив’язка помилки",
   "EventActions.linkIssueAA": "Прив’язка помилки автоанализом",
   "EventActions.matchedPattern": "Патерн-аналіз виявив відповідність",
   "EventActions.postIssue": "Створення помилки",
-  "EventActions.startImport": "Початок імпорту",
   "EventActions.startLaunch": "Старт запуску",
   "EventActions.unassignUser": "Скасувау прызначанне",
   "EventActions.changeRole": "Змінити роль",
@@ -715,7 +714,7 @@
   "EventActions.updateIntegration": "Оновлення інтеграції",
   "EventActions.updateItem": "Оновлення елемента",
   "EventActions.updatePattern": "Оновлення шаблону",
-  "EventActions.updateAutoPatternAnalysis": "Оновиу патерн аналіз",
+  "EventActions.updateAutoPatternAnalysisSettings": "Оновити параметри Pattern-Analysis",
   "EventActions.updateProject": "Оновлення проекту",
   "EventActions.updateWidget": "Оновлення віджету",
   "EventObjectTypes.dashboard": "Панель управління",

diff --git a/app/localization/translated/zh.json b/app/localization/translated/zh.json
@@ -692,14 +692,13 @@
   "EventActions.deleteLaunch": "删除测试任务",
   "EventActions.deletePattern": "删除模板规则",
   "EventActions.deleteWidget": "删除小部件",
-  "EventActions.finishImport": "完成导入",
+  "EventActions.import": "导入",
   "EventActions.finishLaunch": "完成测试任务",
   "EventActions.generateIndex": "生成索引",
   "EventActions.linkIssue": "与问题关联",
   "EventActions.linkIssueAA": "自动分析服务关联的问题",
   "EventActions.matchedPattern": "模板分析已找到模板",
   "EventActions.postIssue": "发布问题",
-  "EventActions.startImport": "开始导入",
   "EventActions.startLaunch": "开始执行测试任务",
   "EventActions.unassignUser": "Unassign",
   "EventActions.unlinkIssue": "取消已关联的问题",
@@ -710,14 +709,15 @@
   "EventActions.updateIntegration": "更新集成",
   "EventActions.updateItem": "更新测试项",
   "EventActions.updatePattern": "更新模板规则",
+  "EventActions.updateAutoPatternAnalysisSettings": "Update Pattern-Analysis settings",
   "EventActions.updateProject": "更新项目",
   "EventActions.updateWidget": "更新小部件",
   "EventObjectTypes.dashboard": "报告面板",
   "EventObjectTypes.defectType": "自定义缺陷类型",
   "EventObjectTypes.emailConfig": "通知规则",
   "EventObjectTypes.filter": "过滤器",
   "EventObjectTypes.import": "导入",
-  "EventObjectTypes.itegration": "集成",
+  "EventObjectTypes.integration": "集成",
   "EventObjectTypes.itemIssue": "缺陷",
   "EventObjectTypes.launch": "测试任务",
   "EventObjectTypes.patternRule": "模板规则",

diff --git a/app/src/common/constants/actionTypes.js b/app/src/common/constants/actionTypes.js
@@ -43,6 +43,7 @@ export const DELETE_INDEX = 'deleteIndex';
 export const CREATE_DEFECT = 'createDefect';
 export const UPDATE_DEFECT = 'updateDefect';
 export const DELETE_DEFECT = 'deleteDefect';
+export const IMPORT = 'import';
 export const START_IMPORT = 'startImport';
 export const FINISH_IMPORT = 'finishImport';
 export const UPDATE_ITEM = 'updateItem';

diff --git a/app/src/common/constants/localization/eventsLocalization.js b/app/src/common/constants/localization/eventsLocalization.js
@@ -44,8 +44,7 @@ import {
   START_LAUNCH,
   FINISH_LAUNCH,
   DELETE_LAUNCH,
-  START_IMPORT,
-  FINISH_IMPORT,
+  IMPORT as EVENT_ACTIONS_IMPORT,
   UPDATE_PROJECT,
   CREATE_DEFECT,
   UPDATE_DEFECT,
@@ -123,13 +122,9 @@ export const actionMessages = defineMessages({
     id: 'EventActions.deleteLaunch',
     defaultMessage: 'Delete launch',
   },
-  [START_IMPORT]: {
+  [EVENT_ACTIONS_IMPORT]: {
     id: 'EventActions.startImport',
-    defaultMessage: 'Start import',
-  },
-  [FINISH_IMPORT]: {
-    id: 'EventActions.finishImport',
-    defaultMessage: 'Finish import',
+    defaultMessage: 'Import',
   },
   [ASSIGN_USER]: {
     id: 'EventActions.assignUser',
@@ -140,14 +135,6 @@ export const actionMessages = defineMessages({
     defaultMessage: 'Unassign',
   },
   [CHANGE_ROLE]: { id: 'EventActions.changeRole', defaultMessage: 'Change role' },
-  [ASSIGN_USER]: {
-    id: 'EventActions.assignUser',
-    defaultMessage: 'Assign',
-  },
-  [UNASSIGN_USER]: {
-    id: 'EventActions.unassignUser',
-    defaultMessage: 'Unassign',
-  },
   [UPDATE_PROJECT]: {
     id: 'EventActions.updateProject',
     defaultMessage: 'Update project',
@@ -225,8 +212,8 @@ export const actionMessages = defineMessages({
     defaultMessage: 'Delete pattern rule',
   },
   [UPDATE_AUTO_PATTERN_ANALYSIS_SETTINGS]: {
-    id: 'EventActions.updateAutoPatternAnalysis',
-    defaultMessage: 'Update pattern analysis',
+    id: 'EventActions.updateAutoPatternAnalysisSettings',
+    defaultMessage: 'Update Pattern-Analysis settings',
   },
   [MATCHED_PATTERN]: {
     id: 'EventActions.matchedPattern',

diff --git a/app/src/pages/admin/projectEventsPage/eventsEntities.jsx b/app/src/pages/admin/projectEventsPage/eventsEntities.jsx
@@ -66,8 +66,7 @@ import {
   CREATE_DEFECT,
   UPDATE_DEFECT,
   DELETE_DEFECT,
-  START_IMPORT,
-  FINISH_IMPORT,
+  IMPORT as EVENT_ACTIONS_IMPORT,
   UPDATE_ITEM,
   LINK_ISSUE_AA,
   ANALYZE_ITEM,
@@ -76,6 +75,11 @@ import {
   DELETE_PATTERN,
   MATCHED_PATTERN,
   CREATE_INVITATION_LINK,
+  ASSIGN_USER,
+  UNASSIGN_USER,
+  CHANGE_ROLE,
+  UPDATE_AUTO_PATTERN_ANALYSIS_SETTINGS,
+  CREATE_PROJECT,
 } from 'common/constants/actionTypes';
 import {
   DASHBOARD,
@@ -256,6 +260,18 @@ export class EventsEntities extends Component {
               label: intl.formatMessage(actionMessages[UNLINK_ISSUE]),
               value: UNLINK_ISSUE,
             },
+            {
+              label: intl.formatMessage(actionMessages[ASSIGN_USER]),
+              value: ASSIGN_USER,
+            },
+            {
+              label: intl.formatMessage(actionMessages[UNASSIGN_USER]),
+              value: UNASSIGN_USER,
+            },
+            {
+              label: intl.formatMessage(actionMessages[CHANGE_ROLE]),
+              value: CHANGE_ROLE,
+            },
             {
               label: intl.formatMessage(actionMessages[CREATE_INVITATION_LINK]),
               value: CREATE_INVITATION_LINK,
@@ -269,12 +285,8 @@ export class EventsEntities extends Component {
               value: DELETE_INDEX,
             },
             {
-              label: intl.formatMessage(actionMessages[START_IMPORT]),
-              value: START_IMPORT,
-            },
-            {
-              label: intl.formatMessage(actionMessages[FINISH_IMPORT]),
-              value: FINISH_IMPORT,
+              label: intl.formatMessage(actionMessages[EVENT_ACTIONS_IMPORT]),
+              value: EVENT_ACTIONS_IMPORT,
             },
             {
               label: intl.formatMessage(actionMessages[UPDATE_ITEM]),
@@ -288,6 +300,10 @@ export class EventsEntities extends Component {
               label: intl.formatMessage(actionMessages[ANALYZE_ITEM]),
               value: ANALYZE_ITEM,
             },
+            {
+              label: intl.formatMessage(actionMessages[UPDATE_AUTO_PATTERN_ANALYSIS_SETTINGS]),
+              value: UPDATE_AUTO_PATTERN_ANALYSIS_SETTINGS,
+            },
             {
               label: intl.formatMessage(actionMessages[CREATE_PATTERN]),
               value: CREATE_PATTERN,
@@ -304,6 +320,10 @@ export class EventsEntities extends Component {
               label: intl.formatMessage(actionMessages[MATCHED_PATTERN]),
               value: MATCHED_PATTERN,
             },
+            {
+              label: intl.formatMessage(actionMessages[CREATE_PROJECT]),
+              value: CREATE_PROJECT,
+            },
           ],
         },
       },