Merge branch 'statuspage-ssl-provisioning' into 'master'

Statuspage ssl provisioning

See merge request fyipe-project/app!1740

backend/backend/api/statusPage.js

@@ -141,6 +141,11 @@ router.put(
                                 statusPageId
                             )
                         );
+                    } else {
+                        return sendErrorResponse(req, res, {
+                            message: `This domain ${domain.domain} is already associated with another project`,
+                            code: 400,
+                        });
                     }
                 }
                 return sendItemResponse(
@@ -156,8 +161,7 @@ router.put(
 
                 if (doesDomainBelongToProject) {
                     return sendErrorResponse(req, res, {
-                        message:
-                            'This domain is already associated with another project',
+                        message: `This domain ${subDomain} is already associated with another project`,
                         code: 400,
                     });
                 }

dashboard/src/components/statusPage/Setting.js

@@ -70,6 +70,7 @@ export class Setting extends Component {
                 }
             });
         }
+
         if (fields.length > 0 && domains.length > 0) {
             return this.handleCreateDomain(domains);
         }
@@ -102,13 +103,12 @@ export class Setting extends Component {
             projectId: projectId._id || projectId,
             statusPageId: _id,
         };
-        this.props.createDomain(data).then(
-            () => {
+        this.props.createDomain(data).then(() => {
+            if (!this.props.addDomain.error) {
                 this.setState({ fields: [] });
                 reset();
-            },
-            function() {}
-        );
+            }
+        });
         if (SHOULD_LOG_ANALYTICS) {
             logEvent(
                 'EVENT: DASHBOARD > PROJECT > STATUS PAGES > STATUS PAGE > DOMAIN UPDATED'
@@ -169,6 +169,10 @@ export class Setting extends Component {
                     if (window.location.href.indexOf('localhost') <= -1) {
                         thisObj.context.mixpanel.track('Domain verification');
                     }
+
+                    this.props.closeModal({
+                        id: this.state.deleteDomainModalId,
+                    });
                 });
             },
             content: VerifyDomainModal,
@@ -206,6 +210,10 @@ export class Setting extends Component {
                     if (window.location.href.indexOf('localhost') <= -1) {
                         thisObj.context.mixpanel.track('Delete domain');
                     }
+
+                    this.props.closeModal({
+                        id: this.state.deleteDomainModalId,
+                    });
                 });
             },
             content: DeleteDomainModal,
@@ -240,39 +248,6 @@ export class Setting extends Component {
                     disabled={this.props.statusPage.setting.requesting}
                     placeholder="domain"
                 />
-                <ShouldRender
-                    if={
-                        !this.props.addDomain.requesting &&
-                        this.props.addDomain.error
-                    }
-                >
-                    <div id="verifyDomainError" className="bs-Tail-copy">
-                        <div
-                            className="Box-root Flex-flex Flex-alignItems--stretch Flex-direction--row Flex-justifyContent--flexStart"
-                            style={{
-                                marginTop: '10px',
-                            }}
-                        >
-                            <div className="Box-root Margin-right--8">
-                                <div
-                                    className="Icon Icon--info Icon--color--red Icon--size--14 Box-root Flex-flex"
-                                    style={{
-                                        marginTop: '2px',
-                                    }}
-                                ></div>
-                            </div>
-                            <div className="Box-root">
-                                <span
-                                    style={{
-                                        color: 'red',
-                                    }}
-                                >
-                                    {this.props.addDomain.error}
-                                </span>
-                            </div>
-                        </div>
-                    </div>
-                </ShouldRender>
                 <p className="bs-Fieldset-explanation" id="publicStatusPageUrl">
                     {IS_LOCALHOST && (
                         <span>

dashboard/src/pages/StatusPage.js

@@ -45,7 +45,7 @@ class StatusPage extends Component {
     async componentDidMount() {
         if (!this.props.statusPage.status._id) {
             const projectId = history.location.pathname
-                .split('project/')[1]
+                .split('sub-project/')[1]
                 .split('/')[0];
             const statusPageId = history.location.pathname
                 .split('status-page/')[1]