ISSUE-656: Delete schema metadata when invalid schema is added (#657)

raju-saravanan · Jan 27, 2020 · 47e73d8 · 47e73d8
1 parent e64e11d
commit 47e73d8
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/...main/resources/app/scripts/containers/Registry-Services/SchemaRegistry/SchemaInfoForm.jsx b/...main/resources/app/scripts/containers/Registry-Services/SchemaRegistry/SchemaInfoForm.jsx
@@ -181,7 +181,7 @@ export default class SchemaFormContainer extends Component {
     }
   }
 
-  handleSave(didVersionFailed) {
+  handleSave() {
     let data = {};
     let {name, type, schemaGroup, description, compatibility, evolve, schemaText} = this.state;
     data = {
@@ -195,18 +195,14 @@ export default class SchemaFormContainer extends Component {
     if (compatibility !== '') {
       data.compatibility = compatibility;
     }
-    if(didVersionFailed){
-      return SchemaREST.postVersion(name, {body: JSON.stringify(versionData)});
-    } else {
-      return SchemaREST.postSchema({body: JSON.stringify(data)})
-        .then((schemaResult)=>{
-          if(schemaResult.responseMessage !== undefined){
-            FSReactToastr.error(<CommonNotification flag="error" content={schemaResult.responseMessage}/>, '', toastOpt);
-          } else {
-            return SchemaREST.postVersion(name, {body: JSON.stringify(versionData)});
-          }
-        });
-    }
+    return SchemaREST.postSchema({body: JSON.stringify(data)})
+      .then((schemaResult)=>{
+        if(schemaResult.responseMessage !== undefined){
+          FSReactToastr.error(<CommonNotification flag="error" content={schemaResult.responseMessage}/>, '', toastOpt);
+        } else {
+          return SchemaREST.postVersion(name, {body: JSON.stringify(versionData)});
+        }
+      });
   }
 
   render() {

diff --git a/...urces/app/scripts/containers/Registry-Services/SchemaRegistry/SchemaRegistryContainer.jsx b/...urces/app/scripts/containers/Registry-Services/SchemaRegistry/SchemaRegistryContainer.jsx
@@ -237,12 +237,15 @@ export default class SchemaRegistryContainer extends Component {
   }
   handleSave() {
     if (this.refs.addSchema.validateData()) {
-      this.refs.addSchema.handleSave(this.versionFailed).then((schemas) => {
+      this.refs.addSchema.handleSave().then((schemas) => {
         if (schemas.responseMessage !== undefined) {
-          this.versionFailed = true;
-          FSReactToastr.error(<CommonNotification flag="error" content={schemas.responseMessage}/>, '', toastOpt);
+          let name = this.refs.addSchema.state.name;
+          let content = 'An exception was thrown while adding the schema version'+schemas.responseMessage.slice(schemas.responseMessage.indexOf('message') + 'message'.length);
+          SchemaREST.deleteSchemaMetadata(name)
+          .then(()=>{
+            FSReactToastr.error(<CommonNotification flag="error" content={content} />, '', toastOpt);
+          });
         } else {
-          this.versionFailed = false;
           this.refs.schemaModal.hide();
           this.fetchData();
           let msg = "Schema added successfully";

diff --git a/webservice/src/main/resources/app/scripts/rest/SchemaREST.js b/webservice/src/main/resources/app/scripts/rest/SchemaREST.js
@@ -209,6 +209,19 @@ const SchemaREST = {
       .then((res) => {
         return checkStatus(res, 'DELETE');
       });
+  },
+  deleteSchemaMetadata(name, options){
+    options = options || {};
+    options.method = options.method || 'DELETE';
+    options.headers = options.headers || {
+      'Content-Type': 'application/json',
+      'Accept': 'application/json'
+    };
+    options.credentials = 'same-origin';
+    return fetch(baseUrl + `schemaregistry/schemas/${name}`, options)
+      .then((res) => {
+        return checkStatus(res, 'DELETE');
+      });
   }
 };