From 46161e8fd902087c408766a48d66d9b31ac9ca32 Mon Sep 17 00:00:00 2001
From: Junyi <mytharcher@users.noreply.github.com>
Date: Mon, 14 Nov 2022 23:26:44 +0800
Subject: [PATCH] fix(plugin-workflow): fix schema name conflict (#1087)

---
 .../plugins/workflow/src/client/WorkflowCanvas.tsx  | 13 +++----------
 .../workflow/src/client/schemas/executions.tsx      |  1 +
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/packages/plugins/workflow/src/client/WorkflowCanvas.tsx b/packages/plugins/workflow/src/client/WorkflowCanvas.tsx
index 7e81c71168..c97ca56ff3 100644
--- a/packages/plugins/workflow/src/client/WorkflowCanvas.tsx
+++ b/packages/plugins/workflow/src/client/WorkflowCanvas.tsx
@@ -3,7 +3,6 @@ import { Link, useHistory } from 'react-router-dom';
 import { Dropdown, Menu, Button, Tag, Switch, message, Breadcrumb } from 'antd';
 import { DownOutlined, RightOutlined, EllipsisOutlined } from '@ant-design/icons';
 import { cx } from '@emotion/css';
-import { useTranslation } from 'react-i18next';
 import classnames from 'classnames';
 
 import {
@@ -18,11 +17,10 @@ import { FlowContext } from './FlowContext';
 import { branchBlockClass, nodeCardClass, nodeMetaClass, workflowVersionDropdownClass } from './style';
 import { TriggerConfig } from './triggers';
 import { Branch } from './Branch';
-import { executionCollection, executionSchema } from './schemas/executions';
+import { executionSchema } from './schemas/executions';
 import { ExecutionLink } from './ExecutionLink';
 import { ExecutionResourceProvider } from './ExecutionResourceProvider';
-
-import { lang, NAMESPACE } from './locale';
+import { lang } from './locale';
 
 
 
@@ -174,12 +172,7 @@ export function WorkflowCanvas() {
           </Dropdown>
           <ActionContext.Provider value={{ visible, setVisible }}>
             <SchemaComponent
-              schema={{
-                type: 'void',
-                properties: {
-                  drawer: executionSchema
-                }
-              }}
+              schema={executionSchema}
               components={{
                 ExecutionResourceProvider,
                 ExecutionLink
diff --git a/packages/plugins/workflow/src/client/schemas/executions.tsx b/packages/plugins/workflow/src/client/schemas/executions.tsx
index 8d2bb7d06a..cd38163caf 100644
--- a/packages/plugins/workflow/src/client/schemas/executions.tsx
+++ b/packages/plugins/workflow/src/client/schemas/executions.tsx
@@ -51,6 +51,7 @@ export const executionCollection = {
 
 export const executionSchema = {
   type: 'void',
+  name: 'executionHistoryDrawer',
   title: `{{t("Execution history", { ns: "${NAMESPACE}" })}}`,
   'x-component': 'Action.Drawer',
   properties: {