EPMRPP-90322 || Quality Gate and translation fix

app/localization/translated/be.json

@@ -1783,6 +1783,8 @@
   "Service.FAQcontent.improvePerformance": "Як палепшыць прадукцыйнасць асобніка?",
   "Service.FAQcontent.integrateJira": "Як інтэгравацца з Jira Server?",
   "Service.FAQcontent.pricingOptions": "Якія варыянты цэнаўтварэння даступныя?",
+  "Service.FAQcontent.slackChannel": "Slack канал",
+  "Service.FAQcontent.supportTeam": "каманда падтрымкі",
   "Service.helpAndServiceVersions": "Даведка і сэрвісныя версіі",
   "ServiceVersionItem.newVersion": "Даступны новыя версіі: {newVersion}",
   "ServiceVersionsBlock.currentVersion": "Бягучая версія",
@@ -1919,6 +1921,21 @@
   "SuiteLevelEntities.entityItemStatistics.placeholder": "Увядзіце колькасць",
   "SuiteLevelEntities.launchNumberPlaceholder": "Увядзіце нумар",
   "SuiteLevelEntities.suiteName.placeholder": "Увядзіце iмя",
+  "SupportBlock.askQuestion": "Ask a question",
+  "SupportBlock.companyNamePlaceholder": "Company name",
+  "SupportBlock.emailPlaceholder": "E-mail",
+  "SupportBlock.firstNamePlaceholder": "First name",
+  "SupportBlock.helpAndSupport": "help & support",
+  "SupportBlock.instruction": "Instruction",
+  "SupportBlock.lastNamePlaceholder": "Last name",
+  "SupportBlock.modalText": "ReportPortal is free and open source under the Apache 2.0 license, with no charges or hidden fees.<br/>But if you’re looking for dedicated professional support for installation, integration, or customization, we offer support plans for businesses of all sizes. Want to learn more? Please send a request and we will be in touch!",
+  "SupportBlock.note": "If you have some special issue ask help {ourSupportTeam} or submit your question in our {slackChannel}",
+  "SupportBlock.ourSupportTeam": "our Support team",
+  "SupportBlock.requestSent": "Request has been sent",
+  "SupportBlock.requestSentFail": "Request was not sent",
+  "SupportBlock.requestSupport": "Request support",
+  "SupportBlock.slackChannel": "Slack channel",
+  "SupportBlock.tryFindSolution": "You can try to find a problem & solution below",
   "TableWidgets.failedColumnFull": "Няўдала",
   "TableWidgets.failedColumnShort": "няўд",
   "TableWidgets.passedColumnFull": "Паспяхова",

app/localization/translated/ru.json

@@ -1783,6 +1783,8 @@
   "Service.FAQcontent.improvePerformance": "Как улучшить производительность экземпляра?",
   "Service.FAQcontent.integrateJira": "Как интегрироваться с Jira Server?",
   "Service.FAQcontent.pricingOptions": "Какие варианты ценообразования доступны?",
+  "Service.FAQcontent.slackChannel": "Слак канал",
+  "Service.FAQcontent.supportTeam": "группа поддержки",
   "Service.helpAndServiceVersions": "Версии справки и обслуживания",
   "ServiceVersionItem.newVersion": "Доступна новая версия: {newVersion}",
   "ServiceVersionsBlock.currentVersion": "Текущая версия",
@@ -1919,6 +1921,21 @@
   "SuiteLevelEntities.entityItemStatistics.placeholder": "Введите количество",
   "SuiteLevelEntities.launchNumberPlaceholder": "Введите номер",
   "SuiteLevelEntities.suiteName.placeholder": "Введите имя",
+  "SupportBlock.askQuestion": "Ask a question",
+  "SupportBlock.companyNamePlaceholder": "Company name",
+  "SupportBlock.emailPlaceholder": "E-mail",
+  "SupportBlock.firstNamePlaceholder": "First name",
+  "SupportBlock.helpAndSupport": "help & support",
+  "SupportBlock.instruction": "Instruction",
+  "SupportBlock.lastNamePlaceholder": "Last name",
+  "SupportBlock.modalText": "ReportPortal is free and open source under the Apache 2.0 license, with no charges or hidden fees.<br/>But if you’re looking for dedicated professional support for installation, integration, or customization, we offer support plans for businesses of all sizes. Want to learn more? Please send a request and we will be in touch!",
+  "SupportBlock.note": "If you have some special issue ask help {ourSupportTeam} or submit your question in our {slackChannel}",
+  "SupportBlock.ourSupportTeam": "our Support team",
+  "SupportBlock.requestSent": "Request has been sent",
+  "SupportBlock.requestSentFail": "Request was not sent",
+  "SupportBlock.requestSupport": "Request support",
+  "SupportBlock.slackChannel": "Slack channel",
+  "SupportBlock.tryFindSolution": "You can try to find a problem & solution below",
   "TableWidgets.failedColumnFull": "Неудачно",
   "TableWidgets.failedColumnShort": "неуд",
   "TableWidgets.passedColumnFull": "Успешно",

app/localization/translated/uk.json

@@ -1783,6 +1783,8 @@
   "Service.FAQcontent.improvePerformance": "Як покращити продуктивність екземпляра?",
   "Service.FAQcontent.integrateJira": "Як інтегруватися з Jira Server?",
   "Service.FAQcontent.pricingOptions": "Які варіанти ціноутворення доступні?",
+  "Service.FAQcontent.slackChannel": "Slack канал",
+  "Service.FAQcontent.supportTeam": "команда підтримки",
   "Service.helpAndServiceVersions": "Версії довідки та сервісу",
   "ServiceVersionItem.newVersion": "Доступна новая версия: {newVersion}",
   "ServiceVersionsBlock.currentVersion": "Поточна версія",
@@ -1919,6 +1921,21 @@
   "SuiteLevelEntities.entityItemStatistics.placeholder": "Введіть Кількість",
   "SuiteLevelEntities.launchNumberPlaceholder": "Введіть номер",
   "SuiteLevelEntities.suiteName.placeholder": "Введіть ім’я",
+  "SupportBlock.askQuestion": "Ask a question",
+  "SupportBlock.companyNamePlaceholder": "Company name",
+  "SupportBlock.emailPlaceholder": "E-mail",
+  "SupportBlock.firstNamePlaceholder": "First name",
+  "SupportBlock.helpAndSupport": "help & support",
+  "SupportBlock.instruction": "Instruction",
+  "SupportBlock.lastNamePlaceholder": "Last name",
+  "SupportBlock.modalText": "ReportPortal is free and open source under the Apache 2.0 license, with no charges or hidden fees.<br/>But if you’re looking for dedicated professional support for installation, integration, or customization, we offer support plans for businesses of all sizes. Want to learn more? Please send a request and we will be in touch!",
+  "SupportBlock.note": "If you have some special issue ask help {ourSupportTeam} or submit your question in our {slackChannel}",
+  "SupportBlock.ourSupportTeam": "our Support team",
+  "SupportBlock.requestSent": "Request has been sent",
+  "SupportBlock.requestSentFail": "Request was not sent",
+  "SupportBlock.requestSupport": "Request support",
+  "SupportBlock.slackChannel": "Slack channel",
+  "SupportBlock.tryFindSolution": "You can try to find a problem & solution below",
   "TableWidgets.failedColumnFull": "Невдало",
   "TableWidgets.failedColumnShort": "незадовільно",
   "TableWidgets.passedColumnFull": "Успішно",

app/localization/translated/zh.json

@@ -1783,6 +1783,8 @@
   "Service.FAQcontent.improvePerformance": "如何提高实例性能？",
   "Service.FAQcontent.integrateJira": "如何与JIRA服务器集成？",
   "Service.FAQcontent.pricingOptions": "有哪些定价选项？",
+  "Service.FAQcontent.slackChannel": "Slack 渠道",
+  "Service.FAQcontent.supportTeam": "支持团队",
   "Service.helpAndServiceVersions": "帮助和服务版本",
   "ServiceVersionItem.newVersion": "新版本可用：{newVersion}",
   "ServiceVersionsBlock.currentVersion": "当前版本",
@@ -1919,6 +1921,21 @@
   "SuiteLevelEntities.entityItemStatistics.placeholder": "请输入数量",
   "SuiteLevelEntities.launchNumberPlaceholder": "请输入编号",
   "SuiteLevelEntities.suiteName.placeholder": "请输入名称",
+  "SupportBlock.askQuestion": "Ask a question",
+  "SupportBlock.companyNamePlaceholder": "Company name",
+  "SupportBlock.emailPlaceholder": "E-mail",
+  "SupportBlock.firstNamePlaceholder": "First name",
+  "SupportBlock.helpAndSupport": "help & support",
+  "SupportBlock.instruction": "Instruction",
+  "SupportBlock.lastNamePlaceholder": "Last name",
+  "SupportBlock.modalText": "ReportPortal is free and open source under the Apache 2.0 license, with no charges or hidden fees.<br/>But if you’re looking for dedicated professional support for installation, integration, or customization, we offer support plans for businesses of all sizes. Want to learn more? Please send a request and we will be in touch!",
+  "SupportBlock.note": "If you have some special issue ask help {ourSupportTeam} or submit your question in our {slackChannel}",
+  "SupportBlock.ourSupportTeam": "our Support team",
+  "SupportBlock.requestSent": "Request has been sent",
+  "SupportBlock.requestSentFail": "Request was not sent",
+  "SupportBlock.requestSupport": "Request support",
+  "SupportBlock.slackChannel": "Slack channel",
+  "SupportBlock.tryFindSolution": "You can try to find a problem & solution below",
   "TableWidgets.failedColumnFull": "失败",
   "TableWidgets.failedColumnShort": "失败",
   "TableWidgets.passedColumnFull": "通过",

app/src/layouts/common/appSidebar/appSidebar.jsx

@@ -77,7 +77,7 @@ export const AppSidebar = ({
   const createFooterBlock = (openNavbar) => (
     <>
       <div className={cx('policy-block')} />
-      <div
+      <button
         className={cx('service-block', { 'active-tooltip': !isFAQOpened })}
         onClick={() => {
           openNavbar();
@@ -87,7 +87,7 @@ export const AppSidebar = ({
         onMouseLeave={onClearService}
       >
         <i>{Parser(LogoHelp)}</i>
-      </div>
+      </button>
       <UserAvatar
         onClick={() => {
           openNavbar();

app/src/layouts/common/appSidebar/appSidebar.scss

@@ -148,6 +148,8 @@
   align-items: center;
   justify-content: center;
   cursor: pointer;
+  background-color: transparent;
+  border: none;
 
   svg {
     width: 20px;

app/src/layouts/common/appSidebar/helpAndService/FAQcontent/FAQContent.jsx

@@ -69,13 +69,33 @@ export const FAQContent = ({ onFAQOpen, closeNavbar, closePopover }) => {
     },
   ];
   const openModal = () => {
+    closePopover();
+    closeNavbar();
     dispatch(
       showModalAction({
-        id: 'RequestSupportModal',
+        id: 'requestSupportModal',
       }),
     );
   };
 
+  const furtherAssistanceValues = {
+    support: (
+      <LinkItem
+        link={referenceDictionary.rpEmail}
+        content={formatMessage(messages.supportTeam)}
+        icon={OpenIcon}
+        className={cx('inline-ref')}
+      />
+    ),
+    channel: (
+      <LinkItem
+        link={referenceDictionary.rpSlack}
+        content={formatMessage(messages.slackChannel)}
+        className={cx('inline-ref')}
+        icon={OpenIcon}
+      />
+    ),
+  };
   return (
     <>
       {FAQContentItems.map((contentItem) => {
@@ -94,31 +114,17 @@ export const FAQContent = ({ onFAQOpen, closeNavbar, closePopover }) => {
       })}
       <p className={cx('assistance')}>
         {formatMessage(messages.furtherAssistance, {
-          support: (data) => (
-            <LinkItem
-              link={referenceDictionary.rpEmail}
-              content={data}
-              icon={OpenIcon}
-              className={cx('inline-ref')}
-            />
-          ),
-          channel: (data) => (
-            <LinkItem
-              link={referenceDictionary.rpSlack}
-              content={data}
-              className={cx('inline-ref')}
-              icon={OpenIcon}
-            />
-          ),
+          support: () => furtherAssistanceValues.support,
+          channel: () => furtherAssistanceValues.channel,
         })}
       </p>
       <div className={cx('divider')} />
-      <span className={cx('menu-item')} onClick={openModal}>
+      <button className={cx('menu-item')} onClick={openModal}>
         <FormattedMessage
           id={'Sidebar.services.requestService'}
           defaultMessage={'Request professional service'}
         />
-      </span>
+      </button>
     </>
   );
 };

app/src/layouts/common/appSidebar/helpAndService/FAQcontent/FAQContent.scss

@@ -34,7 +34,9 @@
   cursor: pointer;
   display: flex;
   align-items: center;
-  padding: 8px 0px;
+  padding: 8px 16px;
+  border: none;
+  width: 100%;
 
   &:hover:not(.active) {
     color: $COLOR--white-two;
@@ -68,7 +70,7 @@
   line-height: 20px;
   text-align: left;
   color: $COLOR--darkmode-gray-150;
-  margin: 8px 0;
+  padding: 8px 16px;
   cursor: default;
 
   .inline-ref {

app/src/layouts/common/appSidebar/helpAndService/FAQcontent/index.js

@@ -15,3 +15,4 @@
  */
 
 export { FAQContent } from './FAQContent';
+export { RequestSupportModal } from '../../supportBlock/modal';

app/src/layouts/common/appSidebar/helpAndService/FAQpreview/FAQpreview.scss

@@ -40,8 +40,7 @@
 }
 
 .popover {
-  padding: 8px 16px;
-  margin-left: 4px;
+  padding: 8px 0;
   width: 300px;
   max-width: 300px;
 }
@@ -52,7 +51,7 @@
   border: 2px solid transparent;
   display: flex;
   align-items: center;
-  padding-left: 16px;
+  padding-left: 8px;
 }
 
 .arrow-icon {

app/src/layouts/common/appSidebar/helpAndService/messages.js

@@ -48,7 +48,15 @@ export const messages = defineMessages({
   furtherAssistance: {
     id: 'Service.FAQcontent.furtherAssistance',
     defaultMessage:
-      "For any further queries or assistance, don't hesitate to reach out to our <support>support Team</support> or post your question in our <channel>Slack channel</channel>",
+      "For any further queries or assistance, don't hesitate to reach out to our <support>support team</support> or post your question in our <channel>Slack channel</channel>",
+  },
+  supportTeam: {
+    id: 'Service.FAQcontent.supportTeam',
+    defaultMessage: 'support team',
+  },
+  slackChannel: {
+    id: 'Service.FAQcontent.slackChannel',
+    defaultMessage: 'Slack channel',
   },
   helpAndServiceVersions: {
     id: 'Service.helpAndServiceVersions',

app/src/layouts/common/appSidebar/helpAndService/servicesContent/servicesContent.jsx

@@ -70,7 +70,7 @@ export const ServicesContent = ({ closePopover, closeNavbar, isFAQOpened, onFAQO
   const currentYear = new Date().getFullYear();
   return (
     <>
-      <div
+      <button
         className={cx('FAQ-control', { hover: isHovered })}
         onMouseLeave={onClearHover}
         onMouseEnter={onSetHover}
@@ -81,7 +81,7 @@ export const ServicesContent = ({ closePopover, closeNavbar, isFAQOpened, onFAQO
           isFAQOpened={isFAQOpened}
           onFAQOpen={onFAQOpen}
         />
-      </div>
+      </button>
 
       {ServiceContentItems.map((contentItem) => {
         return (

app/src/layouts/common/appSidebar/helpAndService/servicesContent/servicesContent.scss

@@ -73,3 +73,12 @@
     }
   }
 }
+
+.FAQ-control{
+  background-color: transparent;
+  border: none;
+
+  &.hover{
+    background-color: $COLOR--darkmode-gray-500;
+  }
+}