Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EPMRPP-91775 & EPMRPP-91774 || Notification modal bugfixes #3879

Merged
Show file tree
Hide file tree
Changes from 3 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
10 changes: 5 additions & 5 deletions app/localization/translated/be.json
Original file line number Diff line number Diff line change
Expand Up @@ -563,16 +563,12 @@
"DeleteFilterDialog.deleteFilterOwnerWarning": "Вы збіраецеся выдаліць не свой фільтр. Гэта можа паўплываць на інфармацыю іншых карыстальнікаў праекта.",
"DeleteImageModal.header": "Выдаліць фота",
"DeleteImageModal.text": "Вы ўпэўненыя, што жадаеце выдаліць фота профілю?",
"DeleteLaunchModal.deleteImportantLaunch": "Выдаліць важны запуск",
"DeleteLaunchModal.deleteImportantLaunchMessage": "<b>”{name}” пазначан як важны.</b><br />Вы ўпэўнены, што хочаце выдаліць гэты важны запуск?",
"DeleteLaunchModal.deleteImportantLaunches": "Выдаліць важныя запускі",
"DeleteLaunchModal.deleteImportantLaunchesMessage": "<b>Ёсць {importantCount} запускаў, пазначаных як важныя.</b><br />Вы ўпэўнены, што хочаце выдаліць гэтыя важныя запускі?",
"DeleteLaunchModal.deleteModalContent": "Вы ўпэўненыя, што хочаце выдаліць запуск '<b>{name}</b>'? Вы страціце доступ да яго.",
"DeleteLaunchModal.deleteModalHeader": "Выдаліць запуск",
"DeleteLaunchModal.deleteModalMultipleContent": "Вы ўпэўненыя, што хочаце выдаліць запускі? Вы страціце доступ да іх.",
"DeleteLaunchModal.deleteModalMultipleHeader": "Выдаліць запускі",
"DeleteLaunchModal.deleteOnlyRegular": "Выдаляць толькі звычайныя",
"DeleteLaunchModal.deleteWithImportantLaunch": "Выдаліць з важнымі запускамі",
"DeleteLaunchModal.deleteWithImportantLaunchMessage": "<b>Запуск \"{name}\" пазначаны як важны.</b><br />Вы ўпэўнены, што хочаце таксама выдаліць гэтыя важныя запускі?",
"DeleteLaunchModal.deleteWithImportantLaunchesMessage": "Ёсць <b>{importantCount} запускаў, пазначаных як важныя</b> сярод {totalCount} запускаў, якія вы спрабуеце выдаліць. Вы ўпэўнены, што хочаце таксама выдаліць гэтыя важныя запускі?",
"DeleteLaunchModal.warning": "Вы збіраецеся выдаліць не свой запуск. Гэта можа паўплываць на інфармацыю іншых карыстальнікаў праекта.",
Expand Down Expand Up @@ -851,6 +847,10 @@
"Footer.build": "Зборка",
"Footer.contact": "Звяжыцеся з намі",
"Footer.copyright": "Усе правы абаронены.",
"Footer.deleteImportantLaunch": "Delete Important Launch",
"Footer.deleteImportantLaunches": "Delete Important Launches",
"Footer.deleteOnlyRegular": "Delete only regular",
"Footer.deleteWithImportantLaunch": "Delete with Important Launches",
"Footer.documentation": "Дакументацыя",
"Footer.git": "Мы на GitHub",
"Footer.privacy": "Палітыка прыватнасці",
Expand Down Expand Up @@ -1491,7 +1491,7 @@
"NotificationRule.launchNameLabel": "Імя запуску",
"NotificationRule.launchOwner": "Уласнік запуску",
"Notifications.notifications": "Апавяшчэнні па электроннай пошце",
"Notifications.ruleNameDuplicateHint": "Правіла з такой жа назвай ужо існуе ў праекце",
"Notifications.ruleNameDuplicateHint": "Для гэтага канала сувязі ўжо існуе правіла з такім жа імем",
"Notifications.updateEmail": "абноўлены",
"NotificationsEnableForm.allNotifications": "Усе апавяшчэнні",
"NotificationsEnableForm.attributes": "Атрыбуты",
Expand Down
10 changes: 5 additions & 5 deletions app/localization/translated/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -563,16 +563,12 @@
"DeleteFilterDialog.deleteFilterOwnerWarning": "Вы собираетесь удалить не свой фильтр. Это может повлиять на информацию других пользователей проекта.",
"DeleteImageModal.header": "Удалить фото",
"DeleteImageModal.text": "Вы уверены, что хотите удалить фото профиля?",
"DeleteLaunchModal.deleteImportantLaunch": "Удалить важный запуск",
"DeleteLaunchModal.deleteImportantLaunchMessage": "<b>”{name}” отмечен как важный.</b><br />Вы уверены, что хотите удалить этот важный запуск?",
"DeleteLaunchModal.deleteImportantLaunches": "Удалить важные запуски",
"DeleteLaunchModal.deleteImportantLaunchesMessage": "<b>{importantCount} запусков, отмеченных как важные.</b><br />Вы уверены, что хотите удалить эти важные запуски?",
"DeleteLaunchModal.deleteModalContent": "Вы уверены, что хотите удалить запуск '<b>{name}</b>'? Вы потеряете доступ к нему.",
"DeleteLaunchModal.deleteModalHeader": "Удалить запуск",
"DeleteLaunchModal.deleteModalMultipleContent": "Вы уверены, что хотите удалить запуски? Вы потеряете доступ к ним.",
"DeleteLaunchModal.deleteModalMultipleHeader": "Удалить запуски",
"DeleteLaunchModal.deleteOnlyRegular": "Удалить только обычные",
"DeleteLaunchModal.deleteWithImportantLaunch": "Удалить с важными запусками",
"DeleteLaunchModal.deleteWithImportantLaunchMessage": "<b>\"{name}\" запуск отмечен как важный.</b><br />Вы уверены, что хотите удалить и эти важные запуски?",
"DeleteLaunchModal.deleteWithImportantLaunchesMessage": "<b>{importantCount} запусков отмечены как важные</b> среди {totalCount} запусков, которые вы пытаетесь удалить. Вы уверены, что хотите удалить эти важные запуски тоже?",
"DeleteLaunchModal.warning": "Вы собираетесь удалить не свой запуск. Это может повлиять на информацию других пользователей проекта.",
Expand Down Expand Up @@ -851,6 +847,10 @@
"Footer.build": "Сборка",
"Footer.contact": "Свяжитесь с нами",
"Footer.copyright": "Все права защищены",
"Footer.deleteImportantLaunch": "Delete Important Launch",
"Footer.deleteImportantLaunches": "Delete Important Launches",
"Footer.deleteOnlyRegular": "Delete only regular",
"Footer.deleteWithImportantLaunch": "Delete with Important Launches",
"Footer.documentation": "Документация",
"Footer.git": "Мы на GitHub",
"Footer.privacy": "Политика конфиденциальности",
Expand Down Expand Up @@ -1491,7 +1491,7 @@
"NotificationRule.launchNameLabel": "Название запуска",
"NotificationRule.launchOwner": "Владелец запуска",
"Notifications.notifications": "Уведомления по электронной почте",
"Notifications.ruleNameDuplicateHint": "Правило с таким названием уже существует в проекте",
"Notifications.ruleNameDuplicateHint": "Правило с таким названием уже существует для этого канала связи",
"Notifications.updateEmail": "обновлено",
"NotificationsEnableForm.allNotifications": "Все уведомления",
"NotificationsEnableForm.attributes": "Атрибуты",
Expand Down
10 changes: 5 additions & 5 deletions app/localization/translated/uk.json
Original file line number Diff line number Diff line change
Expand Up @@ -563,16 +563,12 @@
"DeleteFilterDialog.deleteFilterOwnerWarning": "Ви збираєтеся видалити свій фільтр. Це може вплинути на інформацію інших користувачів проекту.",
"DeleteImageModal.header": "Фото Видалити",
"DeleteImageModal.text": "Ви впевнені, що хочете видалити фото профілю?",
"DeleteLaunchModal.deleteImportantLaunch": "Видалити важливий запуск",
"DeleteLaunchModal.deleteImportantLaunchMessage": "<b>”{name}” позначений як важливий.</b><br />Ви впевнені, що хочете видалити цей важливий запуск?",
"DeleteLaunchModal.deleteImportantLaunches": "Видалення важливих запусків",
"DeleteLaunchModal.deleteImportantLaunchesMessage": "<b>{importantCount} запусків, позначених як важливі.</b><br />Ви впевнені, що хочете видалити ці важливі запуски?",
"DeleteLaunchModal.deleteModalContent": "Вы уверены, что хотите удалить запуск '<b>{name}</b>'? Вы потеряете доступ к нему.",
"DeleteLaunchModal.deleteModalHeader": "Видалити запуск",
"DeleteLaunchModal.deleteModalMultipleContent": "Ви впевнені, що хочете видалити запуски? Ви втратите доступ до них.",
"DeleteLaunchModal.deleteModalMultipleHeader": "Видалити запуски",
"DeleteLaunchModal.deleteOnlyRegular": "Видаляти тільки звичайні",
"DeleteLaunchModal.deleteWithImportantLaunch": "Видалити з важливими запусками",
"DeleteLaunchModal.deleteWithImportantLaunchMessage": "<b>\"{name}\" запуск позначений як важливий..</b><br />Ви впевнені, що хочете також видалити ці важливі запуски?",
"DeleteLaunchModal.deleteWithImportantLaunchesMessage": "<b>{importantCount} запусків позначено як важливі</b> серед {totalCount} запусків, які ви намагаєтеся видалити. Ви впевнені, що хочете також видалити ці важливі запуски?",
"DeleteLaunchModal.warning": "Ви збираєтеся видалити свій запуск. Це може вплинути на інформацію інших користувачів проекту.",
Expand Down Expand Up @@ -851,6 +847,10 @@
"Footer.build": "Збірка",
"Footer.contact": "Зв’яжіться з нами",
"Footer.copyright": "Всі права захищені",
"Footer.deleteImportantLaunch": "Delete Important Launch",
"Footer.deleteImportantLaunches": "Delete Important Launches",
"Footer.deleteOnlyRegular": "Delete only regular",
"Footer.deleteWithImportantLaunch": "Delete with Important Launches",
maria-hambardzumian marked this conversation as resolved.
Show resolved Hide resolved
"Footer.documentation": "Документація",
"Footer.git": "Ми на Гітхабі",
"Footer.privacy": "Політика конфіденційності",
Expand Down Expand Up @@ -1491,7 +1491,7 @@
"NotificationRule.launchNameLabel": "Назва запуску",
"NotificationRule.launchOwner": "Власник запуску",
"Notifications.notifications": "Повідомлення електронною поштою",
"Notifications.ruleNameDuplicateHint": "Правило з такою ж назвою вже існує в проекті",
"Notifications.ruleNameDuplicateHint": "Правило з такою назвою вже існує для цього каналу зв’язку",
"Notifications.updateEmail": "оновлено",
"NotificationsEnableForm.allNotifications": "Усі сповіщення",
"NotificationsEnableForm.attributes": "Атрибути",
Expand Down
10 changes: 5 additions & 5 deletions app/localization/translated/zh.json
Original file line number Diff line number Diff line change
Expand Up @@ -563,16 +563,12 @@
"DeleteFilterDialog.deleteFilterOwnerWarning": "您要删除的过滤器不属于您。这可能会影响项目上的其他用户信息。",
"DeleteImageModal.header": "删除图片",
"DeleteImageModal.text": "您确定要删除简介照片吗?",
"DeleteLaunchModal.deleteImportantLaunch": "Delete Important Launch",
"DeleteLaunchModal.deleteImportantLaunchMessage": "<b>”{name}” is marked as important.</b><br />Are you sure you want to delete this important launch?",
"DeleteLaunchModal.deleteImportantLaunches": "Delete Important Launches",
"DeleteLaunchModal.deleteImportantLaunchesMessage": "<b>There are {importantCount} launches marked as important.</b><br />Are you sure you want to delete these important launches?",
"DeleteLaunchModal.deleteModalContent": "您确定要删除测试任务<b>“{name}”</b>吗?它将被永久删除。",
"DeleteLaunchModal.deleteModalHeader": "删除测试任务",
"DeleteLaunchModal.deleteModalMultipleContent": "您确定要删除这些测试任务吗?它们将被永久删除。",
"DeleteLaunchModal.deleteModalMultipleHeader": "删除测试任务",
"DeleteLaunchModal.deleteOnlyRegular": "Delete only regular",
"DeleteLaunchModal.deleteWithImportantLaunch": "Delete with Important Launches",
"DeleteLaunchModal.deleteWithImportantLaunchMessage": "<b>There is \"{name}\" launch marked as important.</b><br />Are you sure you want to delete these important launches also?",
"DeleteLaunchModal.deleteWithImportantLaunchesMessage": "There are <b>{importantCount} launches marked as important</b> among the {totalCount} launches you are trying to delete. Are you sure you want to delete these important launches also?",
"DeleteLaunchModal.warning": "您要删除的测试任务不属于您。这可能会影响项目上的其他用户信息。",
Expand Down Expand Up @@ -851,6 +847,10 @@
"Footer.build": "构建",
"Footer.contact": "联系我们",
"Footer.copyright": "版权所有",
"Footer.deleteImportantLaunch": "Delete Important Launch",
"Footer.deleteImportantLaunches": "Delete Important Launches",
"Footer.deleteOnlyRegular": "Delete only regular",
"Footer.deleteWithImportantLaunch": "Delete with Important Launches",
"Footer.documentation": "文档",
"Footer.git": "在GitHub上基于我们的代码创建分叉(Fork)",
"Footer.privacy": "隐私政策",
Expand Down Expand Up @@ -1491,7 +1491,7 @@
"NotificationRule.launchNameLabel": "测试任务名称",
"NotificationRule.launchOwner": "测试任务负责人",
"Notifications.notifications": "电子邮件通知",
"Notifications.ruleNameDuplicateHint": "项目中已存在同名规则",
"Notifications.ruleNameDuplicateHint": "此通信渠道已存在同名规则",
"Notifications.updateEmail": "更新成功",
"NotificationsEnableForm.allNotifications": "所有通知",
"NotificationsEnableForm.attributes": "属性",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ const messages = defineMessages({
},
ruleNameDuplicateHint: {
id: 'Notifications.ruleNameDuplicateHint',
defaultMessage: 'Rule with the same name already exist on the project',
defaultMessage: 'Rule with the same name already exists for this communication channel',
},
customColumnsDuplicationHint: {
id: 'ProductStatusControls.customColumnsDuplicationHint',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import { RadioGroup } from 'componentLibrary/radioGroup';
import { EMAIL } from 'common/constants/pluginNames';
import { FieldTextFlex } from 'componentLibrary/fieldTextFlex';
import { ruleField } from 'pages/inside/projectSettingsPageContainer/content/notifications/propTypes';
import { capitalizeWord } from 'pages/inside/projectSettingsPageContainer/content/notifications/modals/addEditNotificationModal/util';
maria-hambardzumian marked this conversation as resolved.
Show resolved Hide resolved
import { RecipientsContainer } from './recipientsContainer';
import { LaunchNamesContainer } from './launchNamesContainer';
import {
Expand Down Expand Up @@ -70,7 +71,7 @@ const cx = className.bind(styles);
const messages = defineMessages({
title: {
id: 'AddEditNotificationCaseModal.title',
defaultMessage: '{actionType} Notification Rule',
defaultMessage: '{actionType} {pluginType} Notification Rule',
},
description: {
id: 'AddEditNotificationCaseModal.description',
Expand Down Expand Up @@ -323,6 +324,7 @@ const AddEditNotificationModal = ({
<ModalLayout
title={formatMessage(messages.title, {
actionType: formatMessage(messages[data.actionType]),
pluginType: capitalizeWord(data.type),
})}
okButton={okButton}
cancelButton={cancelButton}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const capitalizeWord = (word) => word.charAt(0).toUpperCase() + word.slice(1).toLowerCase();
Loading