Merge pull request #564 from reportportal/develop

Release
reportportal · Oct 31, 2024 · 6a67275 · 6a67275
2 parents 3408fb7 + fb1f94e
commit 6a67275
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 27 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1 +1 @@
-* @AmsterGet @ViktorSoroka07
+* @AmsterGet @ViktorSoroka07 @maria-hambardzumian
diff --git a/.github/workflows/deploy-dev.yml b/.github/workflows/deploy-dev.yml
@@ -15,14 +15,8 @@ name: Deploy to dev (AWS S3)
 env:
   AWS_S3_BUCKET_NAME : rpp-landing
   AWS_REGION_NAME : eu-central-1
-  BUILD_DIR : public/
-  CONTACT_US_URL: https://testio--partial.sandbox.my.salesforce-sites.com/leadcapture/services/apexrest/leadservice
-  DOCUMENTATION_URL: //reportportal.io/docs
-  GTM_ID: GTM-MK7ZHTL
   CLOUDFRONT_ID: EILUB1IE9EON0
-  GATSBY_MAILCHIMP_LIST_ID: ca6d0eec5b
-  CONTENTFUL_ENV_ID: master
-  CONTENTFUL_HOST: cdn.contentful.com
+  BUILD_DIR : public/
 
 on:
   push:
@@ -88,8 +82,12 @@ jobs:
         run: |
           touch .env.production
 
-          CONTENTFUL_ENV_ID=${{ env.CONTENTFUL_ENV_ID }}
-          CONTENTFUL_HOST=${{ env.CONTENTFUL_HOST }}
+          CONTACT_US_URL=https://testio--partial.sandbox.my.salesforce-sites.com/leadcapture/services/apexrest/leadservice
+          DOCUMENTATION_URL=//reportportal.io/docs
+          GTM_ID=GTM-MK7ZHTL
+          GATSBY_MAILCHIMP_LIST_ID=ca6d0eec5b
+          CONTENTFUL_ENV_ID=master
+          CONTENTFUL_HOST=cdn.contentful.com
           CONTENTFUL_ACCESS_TOKEN=${{ secrets.CONTENTFUL_ACCESS_TOKEN }}
 
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
@@ -100,15 +98,14 @@ jobs:
               CONTENTFUL_ACCESS_TOKEN=${{ secrets.CONTENTFUL_PREVIEW_ACCESS_TOKEN_DEV }}
             fi
           fi
-
-          echo CONTENTFUL_ACCESS_TOKEN=$CONTENTFUL_ACCESS_TOKEN >> .env.production
           echo CONTENTFUL_ENV_ID=$CONTENTFUL_ENV_ID >> .env.production
           echo CONTENTFUL_HOST=$CONTENTFUL_HOST >> .env.production
+          echo CONTENTFUL_ACCESS_TOKEN=$CONTENTFUL_ACCESS_TOKEN >> .env.production
           echo CONTENTFUL_SPACE_ID=${{ secrets.CONTENTFUL_SPACE_ID_DEV }} >> .env.production
-          echo GTM_ID=${{ env.GTM_ID }} >> .env.production
-          echo CONTACT_US_URL=${{ env.CONTACT_US_URL }} >> .env.production
-          echo DOCUMENTATION_URL=${{ env.DOCUMENTATION_URL }} >> .env.production
-          echo GATSBY_MAILCHIMP_LIST_ID=${{ env.GATSBY_MAILCHIMP_LIST_ID }} >> .env.production
+          echo GTM_ID=$GTM_ID >> .env.production
+          echo CONTACT_US_URL=$CONTACT_US_URL >> .env.production
+          echo DOCUMENTATION_URL=$DOCUMENTATION_URL >> .env.production
+          echo GATSBY_MAILCHIMP_LIST_ID=$GATSBY_MAILCHIMP_LIST_ID >> .env.production
 
       - name: Build the source code
         run: npm run build

diff --git a/src/containers/BlogPostPage/BlogPostPage.scss b/src/containers/BlogPostPage/BlogPostPage.scss
@@ -159,6 +159,10 @@
       margin-bottom: 164px;
     }
 
+    p {
+      white-space: pre-wrap;
+    }
+
     .blog-post-page__second-heading:first-child,
     .blog-post-page__paragraph:first-child {
       margin-top: 0;
@@ -386,6 +390,7 @@
 
         margin: 8px 0 0;
         line-height: 24px;
+        white-space: pre-wrap;
         color: var(--dark);
 
         &:first-child {

diff --git a/src/containers/BlogPostPage/constants.tsx b/src/containers/BlogPostPage/constants.tsx
@@ -72,15 +72,4 @@ export const OPTIONS = {
       <td className="blog-post-page__table-cell">{children}</td>
     ),
   },
-  renderText: text =>
-    text
-      .split('\n')
-      .reduce(
-        (children, textSegment, index) => [
-          ...children,
-          index > 0 && <br key={index} />,
-          textSegment,
-        ],
-        [],
-      ),
 };