Display MySQL user defined error in API Key UI

pkg/app/server/grpcapi/grpcapi.go

@@ -166,18 +166,22 @@ func getEncriptionKey(se *model.Piped_SecretEncryption) ([]byte, error) {
 }
 
 func gRPCStoreError(err error, msg string) error {
-	switch err {
-	case nil:
+	if err == nil {
 		return nil
-	case datastore.ErrNotFound, filestore.ErrNotFound, stagelogstore.ErrNotFound:
+	}
+	if errors.Is(err, datastore.ErrNotFound) || errors.Is(err, filestore.ErrNotFound) || errors.Is(err, stagelogstore.ErrNotFound) {
 		return status.Error(codes.NotFound, fmt.Sprintf("Entity was not found to %s", msg))
-	case datastore.ErrInvalidArgument:
+	}
+	if errors.Is(err, datastore.ErrInvalidArgument) {
 		return status.Error(codes.InvalidArgument, fmt.Sprintf("Invalid argument to %s", msg))
-	case datastore.ErrAlreadyExists:
+	}
+	if errors.Is(err, datastore.ErrAlreadyExists) {
 		return status.Error(codes.AlreadyExists, fmt.Sprintf("Entity already exists to %s", msg))
-	default:
-		return status.Error(codes.Internal, fmt.Sprintf("Failed to %s", msg))
 	}
+	if errors.Is(err, datastore.ErrUserDefined) {
+		return status.Error(codes.FailedPrecondition, err.Error())
+	}
+	return status.Error(codes.Internal, fmt.Sprintf("Failed to %s", msg))
 }
 
 func makeUnregisteredAppsCacheKey(projectID string) string {

pkg/datastore/datastore.go

@@ -67,6 +67,7 @@ var (
 	ErrInternal        = errors.New("internal")
 	ErrUnimplemented   = errors.New("unimplemented")
 	ErrUnsupported     = errors.New("unsupported")
+	ErrUserDefined     = errors.New("user defined error")
 )
 
 type Commander string

pkg/datastore/mysql/mysql.go

@@ -30,6 +30,7 @@ import (
 )
 
 const mysqlErrorCodeDuplicateEntry = 1062
+const mysqlErrorCodeUserDefined = 1644
 
 // MySQL client wrapper
 type MySQL struct {
@@ -164,8 +165,13 @@ func (m *MySQL) Create(ctx context.Context, col datastore.Collection, id string,
 	}
 
 	_, err = stmt.ExecContext(ctx, makeRowID(id), data)
-	if mysqlErr, ok := err.(*mysql.MySQLError); ok && mysqlErr.Number == mysqlErrorCodeDuplicateEntry {
-		return datastore.ErrAlreadyExists
+	if mysqlErr, ok := err.(*mysql.MySQLError); ok {
+		if mysqlErr.Number == mysqlErrorCodeDuplicateEntry {
+			return datastore.ErrAlreadyExists
+		}
+		if mysqlErr.Number == mysqlErrorCodeUserDefined {
+			return fmt.Errorf("%w: %s", datastore.ErrUserDefined, mysqlErr.Message)
+		}
 	}
 	if err != nil {
 		m.logger.Error("failed to create entity",

web/src/components/settings-page/api-key/index.tsx

@@ -26,7 +26,7 @@ import {
   DISABLE_API_KEY_SUCCESS,
   GENERATE_API_KEY_SUCCESS,
 } from "~/constants/toast-text";
-import { useAppDispatch, useAppSelector } from "~/hooks/redux";
+import { unwrapResult, useAppDispatch, useAppSelector } from "~/hooks/redux";
 import {
   APIKey,
   disableAPIKey,
@@ -96,10 +96,16 @@ export const APIKeyPage: FC = memo(function APIKeyPage() {
 
   const handleSubmit = useCallback(
     (values: { name: string; role: APIKey.Role }) => {
-      dispatch(generateAPIKey(values)).then(() => {
-        dispatch(fetchAPIKeys({ enabled: true }));
-        dispatch(addToast({ message: GENERATE_API_KEY_SUCCESS }));
-      });
+      dispatch(generateAPIKey(values))
+        .then(unwrapResult)
+        .then(() => {
+          console.log("handleSubmit.then");
+          dispatch(fetchAPIKeys({ enabled: true }));
+          dispatch(
+            addToast({ message: GENERATE_API_KEY_SUCCESS, severity: "success" })
+          );
+        })
+        .catch(() => undefined);
     },
     [dispatch]
   );

web/src/hooks/redux.ts

@@ -1,4 +1,5 @@
 // @see https://redux-toolkit.js.org/tutorials/typescript#define-typed-hooks
+import { unwrapResult } from "@reduxjs/toolkit";
 import {
   shallowEqual,
   TypedUseSelectorHook,
@@ -15,3 +16,4 @@ export const useShallowEqualSelector: TypedUseSelectorHook<AppState> = (
 ) => {
   return useSelector(selector, shallowEqual);
 };
+export { unwrapResult };