Skip to content

fix: some bugs for scope config #7443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
klesh merged 1 commit into from
May 8, 2024
Merged

fix: some bugs for scope config #7443

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions config-ui/src/plugins/components/scope-config-select/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down Expand Up @@ -103,6 +105,7 @@ export const ScopeConfigSelect = ({ plugin, connectionId, scopeConfigId, onCance
<ScopeConfigForm
plugin={plugin}
connectionId={connectionId}
defaultName={defaultName}
onCancel={handleHideDialog}
onSubmit={handleSubmit}
/>
Expand Down
8 changes: 7 additions & 1 deletion config-ui/src/routes/connection/connection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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
Expand Down