fix: close busy dialog on backend error (#348)

package.json

@@ -64,6 +64,10 @@
     "typescript": "5.2.2"
   },
   "lint-staged": {
-    "*.{js,ts,json,xml}": "prettier --write"
+    "**/*.js": [
+      "eslint",
+      "prettier --write"
+    ],
+    "**/*.{ts,json,xml}": "prettier --write"
   }
 }

packages/ui5-cc-spreadsheetimporter-button/SpreadsheetUpload.js

@@ -1,3 +1,4 @@
+/* eslint-disable no-prototype-builtins */
 sap.ui.define(["sap/m/Button"], (Button) => {
 	return Button.extend("cc.spreadsheetimporter.button.v0_10_3.SpreadsheetUpload", {
 		metadata: {
@@ -142,7 +143,11 @@ sap.ui.define(["sap/m/Button"], (Button) => {
 			oControl.spreadsheetUpload.attachUploadButtonPress(function (oEvent) {
 				const rawData = this._extractRawValues(oEvent.getParameter("payload"))
 				const parsedData = this._extractParsedValues(oEvent.getParameter("payload"))
-				const isDefaultNotPrevented = this.fireUploadButtonPress({ payload: oEvent.getParameter("payload"), rawData: rawData, parsedData: parsedData })
+				const isDefaultNotPrevented = this.fireUploadButtonPress({
+					payload: oEvent.getParameter("payload"),
+					rawData: rawData,
+					parsedData: parsedData
+				})
 				if (!isDefaultNotPrevented) {
 					oEvent.preventDefault()
 				}
@@ -173,30 +178,30 @@ sap.ui.define(["sap/m/Button"], (Button) => {
 			}
 		},
 		_extractRawValues(data) {
-			return data.map(item => {
-				const newObj = {};
-		
+			return data.map((item) => {
+				const newObj = {}
+
 				for (const key in item) {
-					if (item[key].hasOwnProperty('rawValue')) {
-						newObj[key] = item[key].rawValue;
+					if (item[key].hasOwnProperty("rawValue")) {
+						newObj[key] = item[key].rawValue
 					}
 				}
-		
-				return newObj;
-			});
+
+				return newObj
+			})
 		},
 		_extractParsedValues(data) {
-			return data.map(item => {
-				const newObj = {};
-		
+			return data.map((item) => {
+				const newObj = {}
+
 				for (const key in item) {
-					if (item[key].hasOwnProperty('formattedValue')) {
-						newObj[key] = item[key].formattedValue;
+					if (item[key].hasOwnProperty("formattedValue")) {
+						newObj[key] = item[key].formattedValue
 					}
 				}
-		
-				return newObj;
-			});
+
+				return newObj
+			})
 		}
 	})
 })

packages/ui5-cc-spreadsheetimporter/src/controller/odata/OData.ts

@@ -66,6 +66,7 @@ export default abstract class OData extends ManagedObject {
 				await this.submitChanges(model);
 				let errorsFound = await this.checkForErrors(model, binding, component.getShowBackendErrorMessages());
 				if (errorsFound) {
+					this.busyDialog.close();
 					break;
 				} else {
 					await this.waitForCreation();
@@ -86,6 +87,7 @@ export default abstract class OData extends ManagedObject {
 			this.busyDialog.close();
 			fnResolve();
 		} catch (error) {
+			this.busyDialog.close();
 			this.resetContexts();
 			Log.error("Error while calling the odata service", error as Error, "SpreadsheetUpload: callOdata");
 			fnReject(error);