Merge pull request #2562 from withspectrum/2.1.5

2.1.5
withspectrum · Mar 13, 2018 · 71bf8d1 · 71bf8d1
2 parents aba3d7f + ffb3bd8
commit 71bf8d1
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 8 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Spectrum",
-  "version": "2.1.3",
+  "version": "2.1.5",
   "private": true,
   "devDependencies": {
     "babel-cli": "^6.24.1",

diff --git a/shared/graphql/mutations/community/disableBrandedLogin.js b/shared/graphql/mutations/community/disableBrandedLogin.js
@@ -9,7 +9,7 @@ export type DisableBrandedLoginType = {
       slug: string,
       brandedLogin: {
         isEnabled: boolean,
-        customMessage: ?string,
+        message: ?string,
       },
     },
   },
@@ -22,7 +22,7 @@ export const disableBrandedLoginMutation = gql`
       slug
       brandedLogin {
         isEnabled
-        customMessage
+        message
       }
     }
   }

diff --git a/shared/graphql/mutations/community/enableBrandedLogin.js b/shared/graphql/mutations/community/enableBrandedLogin.js
@@ -9,7 +9,7 @@ export type EnableBrandedLoginType = {
       slug: string,
       brandedLogin: {
         isEnabled: boolean,
-        customMessage: ?string,
+        message: ?string,
       },
     },
   },
@@ -22,7 +22,7 @@ export const enableBrandedLoginMutation = gql`
       slug
       brandedLogin {
         isEnabled
-        customMessage
+        message
       }
     }
   }

diff --git a/src/views/communityLogin/style.js b/src/views/communityLogin/style.js
@@ -24,7 +24,7 @@ export const Subtitle = styled.h2`
   margin-bottom: 16px;
   padding: 0 32px;
   text-align: center;
-  white-space: pre;
+  white-space: pre-wrap;
 
   b {
     font-weight: 700;

diff --git a/src/views/communitySettings/components/brandedLogin.js b/src/views/communitySettings/components/brandedLogin.js
@@ -35,12 +35,14 @@ type Props = {
 type State = {
   messageValue: ?string,
   messageLengthError: boolean,
+  isLoading: boolean,
 };
 
 class BrandedLogin extends React.Component<Props, State> {
   state = {
     messageValue: null,
     messageLengthError: false,
+    isLoading: false,
   };
 
   componentDidUpdate(prevProps) {
@@ -69,17 +71,21 @@ class BrandedLogin extends React.Component<Props, State> {
       });
     }
 
+    this.setState({
+      isLoading: true,
+    });
+
     return this.props
       .saveBrandedLoginSettings({
         message: messageValue,
         id: this.props.data.community.id,
       })
       .then(() => {
-        this.setState({ messageLengthError: false });
+        this.setState({ messageLengthError: false, isLoading: false });
         return this.props.dispatch(addToastWithTimeout('success', 'Saved!'));
       })
       .catch(err => {
-        this.setState({ messageLengthError: false });
+        this.setState({ messageLengthError: false, isLoading: false });
         return this.props.dispatch(addToastWithTimeout('error', err));
       });
   };
@@ -127,6 +133,7 @@ class BrandedLogin extends React.Component<Props, State> {
                   onSubmit={this.saveCustomMessage}
                   onClick={this.saveCustomMessage}
                   disabled={messageLengthError}
+                  loading={this.state.isLoading}
                 >
                   Save
                 </Button>