Merge pull request #8 from actiontech/fix/audit-rule-execution-failed-message

Fix/audit rule execution failed message

Author: LordofAvernus

webapp/packages/core-blocks/src/useErrorDetails.tsx

@@ -17,6 +17,7 @@ interface IErrorDetailsHook {
   name?: string;
   message?: string;
   error: Error | null;
+  executionFailedMessage?: string;
   details?: DetailsError;
   hasDetails: boolean;
   isOpen: boolean;
@@ -50,6 +51,7 @@ export function useErrorDetails(error: Error | null): HookType {
   };
   const name = error?.name;
   const message = error?.message;
+  const executionFailedMessage = (error as any)?.execution_failed_message as string;
 
   return {
     name,
@@ -60,5 +62,6 @@ export function useErrorDetails(error: Error | null): HookType {
     isOpen,
     open,
     refresh: loadingError?.refresh,
+    executionFailedMessage,
   };
 }

webapp/packages/core-localization/src/locales/en.ts

@@ -35,6 +35,7 @@ export default [
   ['ui_error', 'Error'],
   ['ui_error_message', 'Error:'],
   ['ui_error_close', 'Close'],
+  ['ui_audit_error_tips', '审核异常'],
   ['ui_clear', 'Clear'],
   ['ui_remove', 'Remove'],
   ['ui_close', 'Close'],

webapp/packages/core-localization/src/locales/it.ts

@@ -30,6 +30,7 @@ export default [
   ['ui_error', 'Errore'],
   ['ui_error_message', 'Errore:'],
   ['ui_error_close', 'Chiudi'],
+  ['ui_audit_error_tips', '审核异常'],
   ['ui_clear', 'Clear'],
   ['ui_remove', 'Remove'],
   ['ui_close', 'Chiudi'],

webapp/packages/core-localization/src/locales/ru.ts

@@ -29,6 +29,7 @@ export default [
   ['ui_error', 'Ошибка'],
   ['ui_error_message', 'Ошибка:'],
   ['ui_error_close', 'Закрыть'],
+  ['ui_audit_error_tips', '审核异常'],
   ['ui_clear', 'Очистить'],
   ['ui_remove', 'Убрать'],
   ['ui_close', 'Закрыть'],

webapp/packages/core-localization/src/locales/zh.ts

@@ -32,6 +32,7 @@ export default [
   ['ui_error', '错误'],
   ['ui_error_message', '错误：'],
   ['ui_error_close', '关闭'],
+  ['ui_audit_error_tips', '审核异常'],
   ['ui_clear', 'Clear'],
   ['ui_remove', 'Remove'],
   ['ui_close', '关闭'],

webapp/packages/core-sdk/src/ServerInternalError.ts

@@ -24,6 +24,7 @@ export class ServerInternalError extends DetailsError implements ServerError {
     this.errorCode = error.errorCode;
     this.errorType = error.errorType as ServerErrorType;
     this.causedBy = error.causedBy;
+    (this as any).execution_failed_message = (error as any).execution_failed_message;
   }
 
   hasDetails(): boolean {

webapp/packages/plugin-data-viewer/src/TableViewer/TableError.tsx

@@ -70,6 +70,11 @@ const style = css`
   error-message {
     white-space: pre-wrap;
   }
+  error-sub-message {
+    display: block;
+    font-size: 0.9em;
+    margin-top: 8px;
+  }
   IconOrImage {
     width: 40px;
     height: 40px;
@@ -174,7 +179,12 @@ export const TableError = observer<Props>(function TableError({ model, loading,
     <error {...use({ animated, collapsed: !errorInfo.display, errorHidden })} className={className}>
       <error-body>
         <IconOrImage icon={icon} title={error.message} onClick={() => errorInfo.show()} />
-        <error-message>{error.message}</error-message>
+        <div>
+          <error-message>{error.message}</error-message>
+          {error.executionFailedMessage && (
+            <error-sub-message>{`${translate('ui_audit_error_tips')}：${error.executionFailedMessage}`}</error-sub-message>
+          )}
+        </div>
       </error-body>
       <controls>
         <Button type="button" mod={['outlined']} onClick={() => errorInfo.hide()}>