fix(page): create page without title

also improve notifications on API response fix gravitee-io/issues#171
gravitee-io · Jul 27, 2016 · 24819a5 · 24819a5
1 parent f46beda
commit 24819a5
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 6 deletions.
diff --git a/src/app/api/admin/documentation/page/apiPage.controller.js b/src/app/api/admin/documentation/page/apiPage.controller.js
@@ -97,18 +97,22 @@ class PageController {
     if(this.createMode) {
       this.DocumentationService.createPage(this.$state.params.apiId, this.page)
         .then(function (page) {
+          that.onPageUpdate();
           that.$state.go(that.$state.current, that.$state.params, {reload: true});
         })
         .catch(function (error) {
           that.$scope.error = error;
+          that.NotificationService.error(error);
       });
     } else {
       this.DocumentationService.editPage(this.$state.params.apiId, this.page.id, this.page)
         .then(function () {
+          that.onPageUpdate();
           that.$state.go(that.$state.current, that.$state.params, {reload: true});
         })
         .catch(function (error) {
           that.$scope.error = error;
+          that.NotificationService.error(error);
         });
     }
   }
@@ -171,6 +175,14 @@ class PageController {
       that.NotificationService.show('Page ' + editPage.name + ' has been ' + (editPage.published ? '':'un') + 'published with success');
     });
   }
+
+  hasNoTitle() {
+    return _.isNil(this.page) || _.isNil(this.page.name) || _.isEmpty(this.page.name);
+  }
+
+  onPageUpdate() {
+    this.NotificationService.show('Page \'' + this.page.name + '\' saved');
+  }
 }
 
 export default PageController;
diff --git a/src/app/api/admin/documentation/page/apiPage.html b/src/app/api/admin/documentation/page/apiPage.html
@@ -84,10 +84,10 @@ <h5>Or you could also import a file :</h5>
       </div>
     </md-card-content>
     <div class="md-actions gravitee-api-save-button" layout="row" layout-align="end center">
-      <md-button class="md-raised" type="submit" ng-click="pageCtrl.upsert()" ng-disabled="formApi.$invalid || formApi.$pristine">
+      <md-button class="md-raised" type="submit" ng-click="pageCtrl.upsert()" ng-disabled="pageCtrl.hasNoTitle()">
         Save
       </md-button>
-      <md-button class="md-raised md-primary" type="button" ng-click="pageCtrl.reset()" ng-disabled="formApi.$invalid || formApi.$pristine">
+      <md-button class="md-raised md-primary" type="button" ng-click="pageCtrl.reset()">
         Cancel
       </md-button>
     </div>
@@ -121,7 +121,7 @@ <h4>Fetch content from an external resource:</h4>
     <div layout="column">
       <form name="PageConfigFetcherForm" sf-schema="fetcherJsonSchema" sf-form="pageCtrl.fetcherJsonSchemaForm" sf-model="pageCtrl.page.source.configuration"></form>
     </div>
-    <md-button class="md-raised" type="submit" ng-click="pageCtrl.upsert()">
+    <md-button ng-disabled="pageCtrl.hasNoTitle()" class="md-raised" type="submit" ng-click="pageCtrl.upsert()">
       Save
     </md-button>
   </md-content>

diff --git a/src/app/components/notification/notification.service.js b/src/app/components/notification/notification.service.js
@@ -28,7 +28,13 @@ class NotificationService {
     };
 
     this.error = function (error, message) {
-      this.show(message || (error.data ? error.data.message : error), true);
+      this.show(message || (
+        error.data ?
+          Array.isArray(error.data) ?
+            error.data[0].message
+            : error.data.message
+          : error
+        ), true);
     };
   }
 }

diff --git a/src/app/index.interceptor.js b/src/app/index.interceptor.js
@@ -42,9 +42,9 @@ function interceptorConfig($httpProvider) {
           }
         } else {
           if (error.status === 500) {
-            errorMessage = 'Unexpected error';
+            errorMessage = error.data ? error.data.message : 'Unexpected error';
           } else if (error.status === 503) {
-            errorMessage = 'Server unavailable';
+            errorMessage = error.data ? error.data.message : 'Server unavailable';
           }
         }
         if (!sessionExpired) {