Merge branch 'develop' into nav-hotfix-thrive-link

Author: sushilshinde

.circleci/config.yml

@@ -175,21 +175,27 @@ workflows:
             branches:
               only:
                 - develop
+                - hot-fix-profile-issue
       # This is alternate dev env for parallel testing
       - "build-test":
           context : org-global      
           filters:
             branches:
               only:
-                - nav-hotfix-thrive-link
+                - feature-contentful
       # This is beta env for production soft releases
       - "build-prod-beta":
           context : org-global
           filters:
             branches:
               only:
                 - develop
-      # Production builds are exectuted only on tagged commits to the
+                - hot-fix-profile-issue
+      # Production builds are exectuted 
+      # when PR is merged to the master
+      # Don't change anything in this configuration
+      # That might trigger wrong branch to be 
+      # deployed on the production
       # master branch.
       - "build-prod":
           context : org-global      

Dockerfile

@@ -29,6 +29,11 @@ ARG CONTENTFUL_TOPGEAR_SPACE_ID
 ARG CONTENTFUL_TOPGEAR_CDN_API_KEY
 ARG CONTENTFUL_TOPGEAR_PREVIEW_API_KEY
 
+# Credentials for access to Comcast space in Contentful CMS
+ARG CONTENTFUL_COMCAST_SPACE_ID
+ARG CONTENTFUL_COMCAST_CDN_API_KEY
+ARG CONTENTFUL_COMCAST_PREVIEW_API_KEY
+
 #Credentials for Contentfu EDU space
 
 ARG CONTENTFUL_MANAGEMENT_TOKEN
@@ -79,6 +84,11 @@ ENV CONTENTFUL_TOPGEAR_SPACE_ID=$CONTENTFUL_TOPGEAR_SPACE_ID
 ENV CONTENTFUL_TOPGEAR_CDN_API_KEY=$CONTENTFUL_TOPGEAR_CDN_API_KEY
 ENV CONTENTFUL_TOPGEAR_PREVIEW_API_KEY=$CONTENTFUL_TOPGEAR_PREVIEW_API_KEY
 
+# Credentials for access to Comcast space in Contentful CMS
+ENV CONTENTFUL_COMCAST_SPACE_ID=$CONTENTFUL_COMCAST_SPACE_ID
+ENV CONTENTFUL_COMCAST_CDN_API_KEY=$CONTENTFUL_COMCAST_CDN_API_KEY
+ENV CONTENTFUL_COMCAST_PREVIEW_API_KEY=$CONTENTFUL_COMCAST_PREVIEW_API_KEY
+
 ENV FILESTACK_API_KEY=$FILESTACK_API_KEY
 ENV FILESTACK_SUBMISSION_CONTAINER=$FILESTACK_SUBMISSION_CONTAINER
 

__tests__/shared/components/__snapshots__/Content.jsx.snap

@@ -512,6 +512,22 @@ exports[`Matches shallow shapshot 1`] = `
         Zurich Community
       </Link>
     </li>
+    <li>
+      <Link
+        replace={false}
+        to="/__community__/tco20"
+      >
+        TCO20
+      </Link>
+    </li>
+    <li>
+      <Link
+        replace={false}
+        to="/__community__/comcast"
+      >
+        Comcast Community
+      </Link>
+    </li>
   </ul>
   <h3>
     Previews of Contentful Components

build.sh

@@ -39,7 +39,10 @@ docker build -t $TAG \
   --build-arg TC_M2M_AUTH0_PROXY_SERVER_URL=$TC_M2M_AUTH0_PROXY_SERVER_URL \
   --build-arg TC_M2M_AUTH0_URL=$TC_M2M_AUTH0_URL \
   --build-arg AUTH_SECRET=$AUTH_SECRET \
-  --build-arg TC_M2M_GRANT_TYPE=$TC_M2M_GRANT_TYPE .
+  --build-arg TC_M2M_GRANT_TYPE=$TC_M2M_GRANT_TYPE \
+  --build-arg CONTENTFUL_COMCAST_SPACE_ID=$CONTENTFUL_COMCAST_SPACE_ID \
+  --build-arg CONTENTFUL_COMCAST_CDN_API_KEY=$CONTENTFUL_COMCAST_CDN_API_KEY \
+  --build-arg CONTENTFUL_COMCAST_PREVIEW_API_KEY=$CONTENTFUL_COMCAST_PREVIEW_API_KEY .
 
 # Copies "node_modules" from the created image, if necessary for caching.
 docker create --name app $TAG