Returned full error to browser. (#897)

bexsoft · Benjamin Perez · web-flow · commit a2cde723474e · 2021-07-26T16:25:55.000-07:00
This is first step of new error handling. UI rework will be done

Co-authored-by: Benjamin Perez &lt;benjamin@bexsoft.net&gt;
diff --git a/models/error.go b/models/error.go
diff --git a/operatorapi/embedded_spec.go b/operatorapi/embedded_spec.go
diff --git a/operatorapi/error.go b/operatorapi/error.go
@@ -157,7 +157,7 @@ func prepareError(err ...error) *models.Error {
 			errorMessage = err[0].Error()
 		}
 	}
-	return &models.Error{Code: errorCode, Message: swag.String(errorMessage)}
+	return &models.Error{Code: errorCode, Message: swag.String(errorMessage), DetailedMessage: swag.String(err[0].Error())}
 }
 
 func getFrame(skipFrames int) runtime.Frame {
diff --git a/portal-ui/src/reducer.ts b/portal-ui/src/reducer.ts
@@ -42,10 +42,12 @@ const initialState: SystemState = {
   loadingProgress: 100,
   snackBar: {
     message: "",
+    detailedErrorMsg: "",
     type: "message",
   },
   modalSnackBar: {
     message: "",
+    detailedErrorMsg: "",
     type: "message",
   },
   serverDiagnosticStatus: "",
diff --git a/portal-ui/src/types.ts b/portal-ui/src/types.ts
@@ -15,6 +15,7 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 export interface snackBarMessage {
   message: string;
+  detailedErrorMsg?: string;
   type: "message" | "error";
 }
 
diff --git a/restapi/embedded_spec.go b/restapi/embedded_spec.go
diff --git a/restapi/error.go b/restapi/error.go
@@ -166,7 +166,7 @@ func prepareError(err ...error) *models.Error {
 			errorMessage = err[0].Error()
 		}
 	}
-	return &models.Error{Code: errorCode, Message: swag.String(errorMessage)}
+	return &models.Error{Code: errorCode, Message: swag.String(errorMessage), DetailedMessage: swag.String(err[0].Error())}
 }
 
 func getFrame(skipFrames int) runtime.Frame {
diff --git a/swagger-console.yml b/swagger-console.yml
@@ -2294,12 +2294,15 @@ definitions:
     type: object
     required:
       - message
+      - detailedMessage
     properties:
       code:
         type: integer
         format: int32
       message:
         type: string
+      detailedMessage:
+        type: string
   user:
     type: object
     properties:
diff --git a/swagger-operator.yml b/swagger-operator.yml
@@ -1079,12 +1079,15 @@ definitions:
     type: object
     required:
       - message
+      - detailedMessage
     properties:
       code:
         type: integer
         format: int32
       message:
         type: string
+      detailedMessage:
+        type: string
   user:
     type: object
     properties:

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ func prepareError(err ...error) *models.Error {`
`157`	`157`	`errorMessage = err[0].Error()`
`158`	`158`	`}`
`159`	`159`	`}`
`160`		`- return &models.Error{Code: errorCode, Message: swag.String(errorMessage)}`
	`160`	`+ return &models.Error{Code: errorCode, Message: swag.String(errorMessage), DetailedMessage: swag.String(err[0].Error())}`
`161`	`161`	`}`
`162`	`162`
`163`	`163`	`func getFrame(skipFrames int) runtime.Frame {`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`// along with this program. If not, see <http://www.gnu.org/licenses/>.`
`16`	`16`	`export interface snackBarMessage {`
`17`	`17`	`message: string;`
	`18`	`+ detailedErrorMsg?: string;`
`18`	`19`	`type: "message" \| "error";`
`19`	`20`	`}`
`20`	`21`
Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ func prepareError(err ...error) *models.Error {`
`166`	`166`	`errorMessage = err[0].Error()`
`167`	`167`	`}`
`168`	`168`	`}`
`169`		`- return &models.Error{Code: errorCode, Message: swag.String(errorMessage)}`
	`169`	`+ return &models.Error{Code: errorCode, Message: swag.String(errorMessage), DetailedMessage: swag.String(err[0].Error())}`
`170`	`170`	`}`
`171`	`171`
`172`	`172`	`func getFrame(skipFrames int) runtime.Frame {`