Fix: rewire Zurich community to the dedicated CMS space, instead of CS one

Author: birdofpreyru

Dockerfile

@@ -20,9 +20,9 @@ ARG CONTENTFUL_PREVIEW_API_KEY
 ARG CONTENTFUL_SPACE_ID
 
 # Credentials for access to Expert Communities space in Contentful CMS
-ARG CONTENTFUL_EXPERT_COMMUNITIES_SPACE_ID
-ARG CONTENTFUL_EXPERT_COMMUNITIES_CDN_API_KEY
-ARG CONTENTFUL_EXPERT_COMMUNITIES_PREVIEW_API_KEY
+ARG CONTENTFUL_ZURICH_SPACE_ID
+ARG CONTENTFUL_ZURICH_CDN_API_KEY
+ARG CONTENTFUL_ZURICH_PREVIEW_API_KEY
 
 # Credentials for access to TopGear space in Contentful CMS
 ARG CONTENTFUL_TOPGEAR_SPACE_ID
@@ -53,9 +53,9 @@ ENV CONTENTFUL_PREVIEW_API_KEY=$CONTENTFUL_PREVIEW_API_KEY
 ENV CONTENTFUL_SPACE_ID=$CONTENTFUL_SPACE_ID
 
 # Credentials for access to Expert Communities space in Contentful CMS
-ENV CONTENTFUL_EXPERT_COMMUNITIES_SPACE_ID=$CONTENTFUL_EXPERT_COMMUNITIES_SPACE_ID
-ENV CONTENTFUL_EXPERT_COMMUNITIES_CDN_API_KEY=$CONTENTFUL_EXPERT_COMMUNITIES_CDN_API_KEY
-ENV CONTENTFUL_EXPERT_COMMUNITIES_PREVIEW_API_KEY=$CONTENTFUL_EXPERT_COMMUNITIES_PREVIEW_API_KEY
+ENV CONTENTFUL_ZURICH_SPACE_ID=$CONTENTFUL_ZURICH_SPACE_ID
+ENV CONTENTFUL_ZURICH_CDN_API_KEY=$CONTENTFUL_ZURICH_CDN_API_KEY
+ENV CONTENTFUL_ZURICH_PREVIEW_API_KEY=$CONTENTFUL_ZURICH_PREVIEW_API_KEY
 
 # Credentials for access to TopGear space in Contentful CMS
 ENV CONTENTFUL_TOPGEAR_SPACE_ID=$CONTENTFUL_TOPGEAR_SPACE_ID

build.sh

@@ -43,9 +43,9 @@ docker build -t $TAG \
   --build-arg CONTENTFUL_CDN_API_KEY=$CONTENTFUL_CDN_API_KEY \
   --build-arg CONTENTFUL_PREVIEW_API_KEY=$CONTENTFUL_PREVIEW_API_KEY \
   --build-arg CONTENTFUL_SPACE_ID=$CONTENTFUL_SPACE_ID \
-  --build-arg CONTENTFUL_EXPERT_COMMUNITIES_SPACE_ID=$CONTENTFUL_EXPERT_COMMUNITIES_SPACE_ID \
-  --build-arg CONTENTFUL_EXPERT_COMMUNITIES_CDN_API_KEY=$CONTENTFUL_EXPERT_COMMUNITIES_CDN_API_KEY \
-  --build-arg CONTENTFUL_EXPERT_COMMUNITIES_PREVIEW_API_KEY=$CONTENTFUL_EXPERT_COMMUNITIES_PREVIEW_API_KEY \
+  --build-arg CONTENTFUL_ZURICH_SPACE_ID=$CONTENTFUL_ZURICH_SPACE_ID \
+  --build-arg CONTENTFUL_ZURICH_CDN_API_KEY=$CONTENTFUL_ZURICH_CDN_API_KEY \
+  --build-arg CONTENTFUL_ZURICH_PREVIEW_API_KEY=$CONTENTFUL_ZURICH_PREVIEW_API_KEY \
   --build-arg CONTENTFUL_TOPGEAR_CDN_API_KEY=$CONTENTFUL_TOPGEAR_CDN_API_KEY \
   --build-arg CONTENTFUL_TOPGEAR_PREVIEW_API_KEY=$CONTENTFUL_TOPGEAR_PREVIEW_API_KEY \
   --build-arg CONTENTFUL_TOPGEAR_SPACE_ID=$CONTENTFUL_TOPGEAR_SPACE_ID \

config/contentful/expertCommunities.json renamed to config/contentful/zurich.json

@@ -37,11 +37,11 @@ module.exports = {
           PREVIEW_API_KEY: 'CONTENTFUL_PREVIEW_API_KEY',
         },
       },
-      expertCommunities: {
-        SPACE_ID: 'CONTENTFUL_EXPERT_COMMUNITIES_SPACE_ID',
+      zurich: {
+        SPACE_ID: 'CONTENTFUL_ZURICH_SPACE_ID',
         master: {
-          CDN_API_KEY: 'CONTENTFUL_EXPERT_COMMUNITIES_CDN_API_KEY',
-          PREVIEW_API_KEY: 'CONTENTFUL_EXPERT_COMMUNITIES_PREVIEW_API_KEY',
+          CDN_API_KEY: 'CONTENTFUL_ZURICH_CDN_API_KEY',
+          PREVIEW_API_KEY: 'CONTENTFUL_ZURICH_PREVIEW_API_KEY',
         },
       },
       topgear: {

config/custom-environment-variables.js

@@ -163,7 +163,7 @@ module.exports = {
         },
       },
       /* Space for expert communities. */
-      expertCommunities: {
+      zurich: {
         SPACE_ID: '',
         master: {
           CDN_API_KEY: '',

config/default.js

@@ -7,7 +7,6 @@ export default function Catalog() {
       query={{
         'fields.name': 'CS Community - Catalog',
       }}
-      spaceName="expertCommunities"
     />
   );
 }

package-lock.json

@@ -12,7 +12,6 @@ export default function ChallengeListingBanner() {
       }}
       render={d => d.entries.matches[0].items.map(id => <Banner id={id} />)}
       renderPlaceholder={LoadingIndicator}
-      spaceName="expertCommunities"
     />
   );
 }

src/shared/components/tc-communities/communities/cs/Catalog.jsx

@@ -15,7 +15,6 @@ export default function Learn() {
       query={{
         'fields.name': 'CS Community - FAQ',
       }}
-      spaceName="expertCommunities"
     />
   );
 }

src/shared/components/tc-communities/communities/cs/ChallengeListingBanner.jsx

@@ -7,7 +7,6 @@ export default function Home() {
       query={{
         'fields.name': 'CS Community - Home',
       }}
-      spaceName="expertCommunities"
     />
   );
 }

src/shared/components/tc-communities/communities/cs/FAQ.jsx

@@ -7,7 +7,6 @@ export default function Home() {
       query={{
         'fields.name': 'CS Community - Learn',
       }}
-      spaceName="expertCommunities"
     />
   );
 }

src/shared/components/tc-communities/communities/cs/Home.jsx

@@ -7,6 +7,7 @@ export default function Catalog() {
       query={{
         'fields.name': 'Zurich Community - Catalog',
       }}
+      spaceName="zurich"
     />
   );
 }

src/shared/components/tc-communities/communities/cs/Learn.jsx

@@ -12,6 +12,7 @@ export default function ChallengeListingBanner() {
       }}
       render={d => d.entries.matches[0].items.map(id => <Banner id={id} />)}
       renderPlaceholder={LoadingIndicator}
+      spaceName="zurich"
     />
   );
 }

src/shared/components/tc-communities/communities/zurich/Catalog.jsx

@@ -15,6 +15,7 @@ export default function Learn() {
       query={{
         'fields.name': 'Zurich Community - FAQ',
       }}
+      spaceName="zurich"
     />
   );
 }

src/shared/components/tc-communities/communities/zurich/ChallengeListingBanner.jsx

@@ -7,6 +7,7 @@ export default function Home() {
       query={{
         'fields.name': 'Zurich Community - Home',
       }}
+      spaceName="zurich"
     />
   );
 }

src/shared/components/tc-communities/communities/zurich/FAQ.jsx

@@ -7,6 +7,7 @@ export default function Home() {
       query={{
         'fields.name': 'Zurich Community - Learn',
       }}
+      spaceName="zurich"
     />
   );
 }