fix: some bugs for scope config (#7443)

apache · May 8, 2024 · 653456f · 653456f
1 parent 1b1291f
commit 653456f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/config-ui/src/plugins/components/scope-config-select/index.tsx b/config-ui/src/plugins/components/scope-config-select/index.tsx
@@ -45,6 +45,8 @@ export const ScopeConfigSelect = ({ plugin, connectionId, scopeConfigId, onCance
     [data, scopeConfigId],
   );
 
+  const defaultName = useMemo(() => `shared-config-<${(data ?? []).length}>`, [data]);
+
   useEffect(() => {
     setTrId(scopeConfigId);
   }, [scopeConfigId]);
@@ -103,6 +105,7 @@ export const ScopeConfigSelect = ({ plugin, connectionId, scopeConfigId, onCance
         <ScopeConfigForm
           plugin={plugin}
           connectionId={connectionId}
+          defaultName={defaultName}
           onCancel={handleHideDialog}
           onSubmit={handleSubmit}
         />

diff --git a/config-ui/src/routes/connection/connection.tsx b/config-ui/src/routes/connection/connection.tsx
@@ -232,12 +232,18 @@ export const Connection = () => {
 
   const handleScopeConfigChange = async (scopeConfigId?: ID) => {
     if (!scopeConfigId) {
+      setVersion(version + 1);
       return;
     }
 
     const [success, res] = await operator(() => API.scopeConfig.check(plugin, scopeConfigId), { hideToast: true });
 
     if (success) {
+      if (!res.projects) {
+        setVersion(version + 1);
+        return;
+      }
+
       modal.success({
         closable: true,
         centered: true,
@@ -250,7 +256,7 @@ export const Connection = () => {
             </div>
             <ul>
               {res.projects.map((it: any) => (
-                <li style={{ marginBottom: 10 }}>
+                <li key={it.name} style={{ marginBottom: 10 }}>
                   <Space>
                     <span>{it.name}</span>
                     <Button