From e5f5a2a0c58fdad7977156b56ff6f35ce5a6c6f1 Mon Sep 17 00:00:00 2001
From: Junyi <mytharcher@users.noreply.github.com>
Date: Sun, 4 Dec 2022 20:39:51 -0800
Subject: [PATCH] fix(plugin-cm): fix interfaces injection and getter (#1196)

---
 .../src/collection-manager/CollectionManagerProvider.tsx      | 2 +-
 .../src/collection-manager/Configuration/AddFieldAction.tsx   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/core/client/src/collection-manager/CollectionManagerProvider.tsx b/packages/core/client/src/collection-manager/CollectionManagerProvider.tsx
index a637825668..213d2ac2eb 100644
--- a/packages/core/client/src/collection-manager/CollectionManagerProvider.tsx
+++ b/packages/core/client/src/collection-manager/CollectionManagerProvider.tsx
@@ -17,7 +17,7 @@ export const CollectionManagerProvider: React.FC<CollectionManagerOptions> = (pr
       value={{
         ...ctx,
         service,
-        interfaces: { ...defaultInterfaces, ...interfaces },
+        interfaces: { ...defaultInterfaces, ...ctx.interfaces, ...interfaces },
         templates: { ...defaultTemplates, ...templates },
         collections,
         refreshCM,
diff --git a/packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx b/packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx
index 60c88c7c4b..482d4047bc 100644
--- a/packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx
+++ b/packages/core/client/src/collection-manager/Configuration/AddFieldAction.tsx
@@ -14,7 +14,7 @@ import { useCollectionManager } from '../hooks';
 import { IField } from '../interfaces/types';
 import { useResourceActionContext, useResourceContext } from '../ResourceActionProvider';
 import * as components from './components';
-import { options } from './interfaces';
+import { getOptions } from './interfaces';
 
 const getSchema = (schema: IField, record: any, compile) => {
   if (!schema) {
@@ -152,7 +152,7 @@ export const AddFieldAction = (props) => {
     const { availableFieldInterfaces } = getTemplate(record.template) || {};
     const { exclude, include } = availableFieldInterfaces || {};
     const optionArr = [];
-    options.forEach((v) => {
+    getOptions().forEach((v) => {
       if (v.key === 'systemInfo') {
         optionArr.push({
           ...v,