From bf50c66df4c89fe5f82818d412f3e49d42fa8e2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benedikt=20R=C3=B6tsch?= <benedikt@contentful.com>
Date: Wed, 18 Oct 2017 12:24:38 +0200
Subject: [PATCH] feat(settings): display connected space name

---
 routes/settings.js | 33 +++++++++++++++++++++++++--------
 views/settings.pug | 29 +++++++++++++++++++++--------
 2 files changed, 46 insertions(+), 16 deletions(-)

diff --git a/routes/settings.js b/routes/settings.js
index 53fb7b4..aa55cae 100644
--- a/routes/settings.js
+++ b/routes/settings.js
@@ -1,8 +1,28 @@
 const express = require('express')
 const { createClient } = require('contentful')
+const { getSpace } = require('./../services/contentful')
 const { catchErrors } = require('../handlers/errorHandlers')
 const router = express.Router()
 
+async function renderSettings (res, opts) {
+  // Get connectred space to display the space name on top of the settings
+  let space = false
+  try {
+    space = await getSpace()
+  } catch (error) {
+    console.error(error)
+  }
+
+  res.render('settings', {
+    title: 'Settings',
+    errors: {},
+    hasErrors: false,
+    success: false,
+    space,
+    ...opts
+  })
+}
+
 /* GET settings page. */
 router.get('/', catchErrors(async function (req, res, next) {
   const cookie = req.cookies.theExampleAppSettings
@@ -11,12 +31,9 @@ router.get('/', catchErrors(async function (req, res, next) {
     cda: process.env.CF_ACCESS_TOKEN,
     cpa: process.env.CF_PREVIEW_ACCESS_TOKEN
   }
-  res.render('settings', {
-    title: 'Settings',
-    settings,
-    errors: {},
-    hasErrors: false,
-    success: false
+
+  await renderSettings(res, {
+    settings
   })
 }))
 
@@ -105,6 +122,7 @@ router.post('/', catchErrors(async function (req, res, next) {
   }
 
   // Generate error dictionary
+  // Format: { FIELD_NAME: [array, of, error, messages] }
   const errors = errorList.reduce((errors, error) => {
     return {
       ...errors,
@@ -115,8 +133,7 @@ router.post('/', catchErrors(async function (req, res, next) {
     }
   }, {})
 
-  res.render('settings', {
-    title: 'Settings',
+  await renderSettings(res, {
     settings,
     errors,
     hasErrors: errorList.length > 0,
diff --git a/views/settings.pug b/views/settings.pug
index d6cc0a8..b1e507f 100644
--- a/views/settings.pug
+++ b/views/settings.pug
@@ -2,6 +2,13 @@ extends layout
 
 include mixins/_breadcrumb
 
+mixin renderErrors (errors)
+  each message in errors
+    .form-item__error-wrapper
+      svg.form-item__error-icon
+          use(xlink:href='/icons/icons.svg#error')
+      .form-item__error-message= message
+
 block content
   .layout-centered-small
     +breadcrumb
@@ -10,32 +17,39 @@ block content
 
     if success
       .status-block.status-block--success
-        img.status-block__icon(src='/images/success.svg')
+        svg.status-block__icon.status-block__icon--success
+          use(xlink:href='/icons/icons.svg#success')
         .status-block__content
           .status-block__title Changes saved successfully!
 
     if hasErrors
       .status-block.status-block--error
-        img.status-block__icon(src='/images/error.svg')
+        svg.status-block__icon.status-block__icon--error
+          use(xlink:href='/icons/icons.svg#error')
         .status-block__content
           .status-block__title Error occurred
           .status-block__message Some errors occurred. Please check the error messages next to the fields.
 
+    if space && !hasErrors
+      .status-block.status-block--info
+        svg.status-block__icon.status-block__icon--info
+          use(xlink:href='/icons/icons.svg#info')
+        .status-block__content
+          .status-block__message Connected to space “#{space.name}”
+
     form(action=`/settings` method="POST" class="form")
       .form-item
         label(for="space") Space ID
         input(type="text" name="space" value=settings.space)
         if 'space' in errors
-          each message in errors.space
-            .form-item__error-message= message
+          +renderErrors(errors.space)
         .form-item__help-text The Space ID is a unique identifier for your space.
 
       .form-item
         label(for="cda") Content Delivery API - access token
         input(type="text" name="cda" value=settings.cda)
         if 'cda' in errors
-          each message in errors.cda
-            .form-item__error-message= message
+          +renderErrors(errors.cda)
         .form-item__help-text
           | View published content using this API.&nbsp;
           a(href='https://www.contentful.com/developers/docs/references/content-delivery-api/' target='_blank' rel='noopener') Content Delivery API.
@@ -43,8 +57,7 @@ block content
         label(for="cpa") Content Preview API - access token
         input(type="text" name="cpa" value=settings.cpa)
         if 'cpa' in errors
-          each message in errors.cpa
-            .form-item__error-message= message
+          +renderErrors(errors.cpa)
         .form-item__help-text
           | Preview unpublished content using this API (i.e. content with “Draft” status).&nbsp;
           a(href='https://www.contentful.com/developers/docs/references/content-preview-api/' target='_blank' rel='noopener') Content Preview API.