EPMRPP-86302 || Create Global integration modal. New design support (#…

…3628)
reportportal · Oct 31, 2023 · 13121f8 · 13121f8
1 parent d8bdbac
commit 13121f8
Show file tree

Hide file tree

Showing 22 changed files with 126 additions and 316 deletions.
diff --git a/app/localization/translated/be.json b/app/localization/translated/be.json
@@ -91,7 +91,7 @@
   "AddFilter.filterName": "Назва Фільтра",
   "AddFilter.placeholderFilterName": "Увядзіце назву фільтра",
   "AddIntegrationModal.createGlobalTitle": "Стварыць глабальную інтэграцыю",
-  "AddIntegrationModal.createManualTitle": "Стварыць інтэграцыю ўручную",
+  "AddIntegrationModal.createProjectTitle": "Стварыць праектную інтэграцыю",
   "AddIntegrationModal.editAuthTitle": "Змяніць аўтарызацыю",
   "AddNewCaseButton.addNewRuleButton": "Дадаць новае правіла",
   "AddUserForm.addUserTitle": "Дадаць карыстальніка",
@@ -1044,7 +1044,6 @@
   "IntegrationsCase.noIntegrationsDescription": "У вашым праекце яшчэ няма інтэграцый",
   "IntegrationsCase.noIntegrationsMessage": "Ніякіх інтэграцый",
   "IntegrationsDescription.ConnectionErrorMessage": "Памылка злучэння",
-  "IntegrationsDescription.GlobalIntegrationsSystemMessage": "Папярэджанне",
   "IntegrationsDescription.GlobalIntegrationsSystemMessageModalCaption": "Глабальная і праектная інтэграцыі не могуць працаваць адначасова.",
   "IntegrationsDescription.GlobalIntegrationsSystemMessageModalText": "Звярніце ўвагу, што глабальныя інтэграцыі будуць адключаныя, калі вы створыце інтэграцыю праекту!",
   "IntegrationsDescription.GlobalIntegrationsSystemMessageText": "Глабальныя інтэграцыі неактыўныя, паколькі вы наладзілі інтэграцыю праекту.",

diff --git a/app/localization/translated/ru.json b/app/localization/translated/ru.json
@@ -91,7 +91,7 @@
   "AddFilter.filterName": "Имя фильтра",
   "AddFilter.placeholderFilterName": "Ввести имя фильтра",
   "AddIntegrationModal.createGlobalTitle": "Создать глобальную интеграцию",
-  "AddIntegrationModal.createManualTitle": "Создать интеграцию вручную",
+  "AddIntegrationModal.createProjectTitle": "Создать проектную интеграцию",
   "AddIntegrationModal.editAuthTitle": "Изменить авторизацию",
   "AddNewCaseButton.addNewRuleButton": "Добавить новое правило",
   "AddUserForm.addUserTitle": "Добавить пользователя",
@@ -1041,7 +1041,6 @@
   "IntegrationsCase.noIntegrationsDescription": "В вашем проекте еще нет интеграций",
   "IntegrationsCase.noIntegrationsMessage": "Нет интеграций",
   "IntegrationsDescription.ConnectionErrorMessage": "Ошибка соединения",
-  "IntegrationsDescription.GlobalIntegrationsSystemMessage": "Предупреждение",
   "IntegrationsDescription.GlobalIntegrationsSystemMessageModalCaption": "Глобальная и проектная интеграции не могут работать одновременно.",
   "IntegrationsDescription.GlobalIntegrationsSystemMessageModalText": "Обратите внимание, что глобальные интеграции будут отключены, если вы создадите интеграцию проекта!",
   "IntegrationsDescription.GlobalIntegrationsSystemMessageText": "Глобальные интеграции неактивны, поскольку вы настроили интеграцию проекта.",

diff --git a/app/localization/translated/uk.json b/app/localization/translated/uk.json
@@ -91,7 +91,7 @@
   "AddFilter.filterName": "Ім’я фільтру",
   "AddFilter.placeholderFilterName": "Ввести ім’я фільтру",
   "AddIntegrationModal.createGlobalTitle": "Створити глобальну інтеграцію",
-  "AddIntegrationModal.createManualTitle": "Створити інтеграцію вручну",
+  "AddIntegrationModal.createProjectTitle": "Створити проектну інтеграцію",
   "AddIntegrationModal.editAuthTitle": "Змінити авторизацію",
   "AddNewCaseButton.addNewRuleButton": "Додати нове правило",
   "AddUserForm.addUserTitle": "Додати користувача",
@@ -1042,7 +1042,6 @@
   "IntegrationsCase.noIntegrationsDescription": "Ваш проект ще не має інтеграцій",
   "IntegrationsCase.noIntegrationsMessage": "Ніяких інтеграцій",
   "IntegrationsDescription.ConnectionErrorMessage": "Помилка з'єднання",
-  "IntegrationsDescription.GlobalIntegrationsSystemMessage": "Попередження",
   "IntegrationsDescription.GlobalIntegrationsSystemMessageModalCaption": "Глобальна та проектна інтеграції не можуть працювати одночасно.",
   "IntegrationsDescription.GlobalIntegrationsSystemMessageModalText": "Зверніть увагу, що глобальні інтеграції буде відключено, якщо ви створите інтеграцію проекту!",
   "IntegrationsDescription.GlobalIntegrationsSystemMessageText": "Глобальні інтеграції є неактивними, оскільки ви налаштували інтеграцію проекту.",

diff --git a/app/localization/translated/zh.json b/app/localization/translated/zh.json
@@ -91,7 +91,7 @@
   "AddFilter.filterName": "过滤器名称",
   "AddFilter.placeholderFilterName": "请输入过滤器名称",
   "AddIntegrationModal.createGlobalTitle": "创建全局集成",
-  "AddIntegrationModal.createManualTitle": "创建手动集成",
+  "AddIntegrationModal.createProjectTitle": "Create Project Integration",
   "AddIntegrationModal.editAuthTitle": "编辑授权",
   "AddNewCaseButton.addNewRuleButton": "创建规则",
   "AddUserForm.addUserTitle": "添加用户",
@@ -1037,7 +1037,6 @@
   "IntegrationsCase.noIntegrationsDescription": "您的项目还没有任何集成",
   "IntegrationsCase.noIntegrationsMessage": "无集成",
   "IntegrationsDescription.ConnectionErrorMessage": "连接错误",
-  "IntegrationsDescription.GlobalIntegrationsSystemMessage": "警告",
   "IntegrationsDescription.GlobalIntegrationsSystemMessageModalCaption": "全局集成和项目集成不能同时工作。",
   "IntegrationsDescription.GlobalIntegrationsSystemMessageModalText": "请注意！如果您创建了项目集成，全局集成将被取消关联！",
   "IntegrationsDescription.GlobalIntegrationsSystemMessageText": "由于您已配置项目集成，全局集成将不会生效",

diff --git a/...ts/integrations/containers/integrationInfoContainer/instancesSection/instancesSection.jsx b/...ts/integrations/containers/integrationInfoContainer/instancesSection/instancesSection.jsx
@@ -190,7 +190,7 @@ export class InstancesSection extends Component {
       data.name,
     );
 
-  addProjectIntegration = (formData, metaData) => {
+  createIntegration = (formData, metaData) => {
     const { isGlobal, instanceType } = this.props;
     const data = {
       enabled: true,
@@ -253,35 +253,34 @@ export class InstancesSection extends Component {
     });
   };
 
-  showAddProjectIntegrationModal = () => {
-    const { instanceType, pluginDetails, isGlobal, events } = this.props;
+  showAddIntegrationModal = () => {
+    const { instanceType, pluginDetails, isGlobal } = this.props;
 
     this.props.showModalAction({
       id: 'addIntegrationModal',
       data: {
-        onConfirm: this.addProjectIntegration,
+        onConfirm: this.createIntegration,
         instanceType,
         isGlobal,
-        eventsInfo: events.saveIntegrationModalEvents(instanceType, isGlobal),
         customProps: {
           pluginDetails,
         },
       },
     });
   };
 
-  addProjectIntegrationClickHandler = () => {
+  addIntegrationClickHandler = () => {
     const { instanceType, tracking, events } = this.props;
 
     tracking.trackEvent(events.integrationAddClickEvent(instanceType));
-    this.showAddProjectIntegrationModal();
+    this.showAddIntegrationModal();
   };
 
   unlinkAndSetupManuallyClickHandler = () => {
     const { instanceType, tracking } = this.props;
 
     tracking.trackEvent(getIntegrationUnlinkGlobalEvent(instanceType));
-    this.showAddProjectIntegrationModal();
+    this.showAddIntegrationModal();
   };
 
   render() {
@@ -322,7 +321,7 @@ export class InstancesSection extends Component {
                 />
                 {this.multiple && !disabled && (
                   <div className={cx('add-integration-button')}>
-                    <GhostButton icon={PlusIcon} onClick={this.addProjectIntegrationClickHandler}>
+                    <GhostButton icon={PlusIcon} onClick={this.addIntegrationClickHandler}>
                       {formatMessage(messages.addIntegrationButtonTitle)}
                     </GhostButton>
                   </div>
@@ -356,7 +355,7 @@ export class InstancesSection extends Component {
             )}
             {(this.multiple || !globalIntegrations.length) && !disabled && isGlobal && (
               <div className={cx('add-integration-button')}>
-                <GhostButton icon={PlusIcon} onClick={this.addProjectIntegrationClickHandler}>
+                <GhostButton icon={PlusIcon} onClick={this.addIntegrationClickHandler}>
                   {formatMessage(messages.addIntegrationButtonTitle)}
                 </GhostButton>
               </div>

diff --git a/...ponents/integrations/elements/integrationSettings/connectionSection/connectionSection.jsx b/...ponents/integrations/elements/integrationSettings/connectionSection/connectionSection.jsx
@@ -134,7 +134,7 @@ export class ConnectionSection extends Component {
     );
 
     this.props.showModalAction({
-      id: 'deleteProjectIntegrationModal',
+      id: 'deleteIntegrationModal',
       data: {
         onConfirm: this.props.onRemoveIntegration,
         modalTitle: `${formatMessage(COMMON_LOCALE_KEYS.DELETE)} ${data.name}`,

diff --git a/app/src/components/integrations/index.js b/app/src/components/integrations/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019 EPAM Systems
+ * Copyright 2023 EPAM Systems
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,3 +17,4 @@
 export { PLUGIN_IMAGES_MAP, PLUGIN_NAME_TITLES, PLUGIN_DEFAULT_IMAGE } from './constants';
 export { INTEGRATIONS_SETTINGS_COMPONENTS_MAP } from './settingsComponentsMap';
 export { AddIntegrationModal } from './modals/addIntegrationModal';
+export { DeleteIntegrationModal } from './modals/deleteIntegrationModal';
diff --git a/...omponents/integrations/integrationProviders/jiraIntegration/jiraSettings/jiraSettings.jsx b/...omponents/integrations/integrationProviders/jiraIntegration/jiraSettings/jiraSettings.jsx
@@ -71,13 +71,14 @@ export const JiraSettings = (props) => {
   const editAuthorizationClickHandler = (testConnection) => {
     const {
       data: { name, integrationParameters, integrationType },
+      isGlobal,
     } = props;
 
     dispatch(
       showModalAction({
-        id: 'createProjectIntegrationModal',
+        id: 'addIntegrationModal',
         data: {
-          modalTitle: formatMessage(messages.editAuthTitle),
+          isGlobal,
           onConfirm: getConfirmationFunc(testConnection),
           instanceType: integrationType.name,
           customProps: {

diff --git a/app/src/components/integrations/integrationProviders/jiraIntegration/messages.js b/app/src/components/integrations/integrationProviders/jiraIntegration/messages.js
@@ -29,8 +29,4 @@ export const messages = defineMessages({
     id: 'JiraConnectionFormFields.authorizedByTitle',
     defaultMessage: 'Authorized by username',
   },
-  editAuthTitle: {
-    id: 'AddIntegrationModal.editAuthTitle',
-    defaultMessage: 'Edit authorization',
-  },
 });
diff --git a/app/src/components/integrations/integrationProviders/rallyIntegration/messages.js b/app/src/components/integrations/integrationProviders/rallyIntegration/messages.js
@@ -25,8 +25,4 @@ export const messages = defineMessages({
     id: 'RallyConnectionFormFields.accessKeyLabel',
     defaultMessage: 'AccessKey',
   },
-  editAuthTitle: {
-    id: 'AddIntegrationModal.editAuthTitle',
-    defaultMessage: 'Edit authorization',
-  },
 });
diff --git a/...onents/integrations/integrationProviders/rallyIntegration/rallySettings/rallySettings.jsx b/...onents/integrations/integrationProviders/rallyIntegration/rallySettings/rallySettings.jsx
@@ -67,13 +67,14 @@ export const RallySettings = (props) => {
   const editAuthorizationClickHandler = (testConnection) => {
     const {
       data: { name, integrationParameters, integrationType },
+      isGlobal,
     } = props;
 
     dispatch(
       showModalAction({
-        id: 'createProjectIntegrationModal',
+        id: 'addIntegrationModal',
         data: {
-          modalTitle: formatMessage(messages.editAuthTitle),
+          isGlobal,
           onConfirm: getConfirmationFunc(testConnection),
           instanceType: integrationType.name,
           customProps: {