fix(config-ui): the jenkins scope id changed (apache#6222)

merico-dev · Oct 11, 2023 · d3cd816 · d3cd816
1 parent adf335f
commit d3cd816
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/config-ui/src/plugins/components/data-scope-remote/data-scope-remote.tsx b/config-ui/src/plugins/components/data-scope-remote/data-scope-remote.tsx
@@ -60,7 +60,7 @@ export const DataScopeRemote = ({ plugin, connectionId, disabledScope, onCancel,
       {config.render ? (
         config.render({
           connectionId,
-          disabledItems: disabledScope?.map((it) => ({ id: getPluginScopeId(plugin, it) })),
+          disabledItems: disabledScope?.map((it) => ({ id: it.id })),
           selectedItems: selectedScope,
           onChangeSelectedItems: setSelectedScope,
         })

diff --git a/config-ui/src/plugins/components/data-scope-remote/search-local.tsx b/config-ui/src/plugins/components/data-scope-remote/search-local.tsx
@@ -235,6 +235,7 @@ export const SearchLocal = ({ plugin, connectionId, config, disabledScope, selec
             )
           }
           renderLoading={() => <Loading size={20} style={{ padding: '4px 12px' }} />}
+          disabledIds={(disabledScope ?? []).map((it) => it.id)}
           selectedIds={selectedScope.map((it) => it.id)}
           onSelectItemIds={(selectedIds: ID[]) => onChange(miller.items.filter((it) => selectedIds.includes(it.id)))}
           expandedIds={miller.expandedIds}

diff --git a/config-ui/src/plugins/components/data-scope-remote/search-remote.tsx b/config-ui/src/plugins/components/data-scope-remote/search-remote.tsx
@@ -157,7 +157,7 @@ export const SearchRemote = ({ plugin, connectionId, config, disabledScope, sele
               )
             }
             renderLoading={() => <Loading size={20} style={{ padding: '4px 12px' }} />}
-            disabledIds={(disabledScope ?? []).map((it) => getPluginScopeId(plugin, it))}
+            disabledIds={(disabledScope ?? []).map((it) => it.id)}
             selectedIds={selectedScope.map((it) => it.id)}
             onSelectItemIds={(selectedIds: ID[]) => onChange(allItems.filter((it) => selectedIds.includes(it.id)))}
           />
@@ -170,7 +170,7 @@ export const SearchRemote = ({ plugin, connectionId, config, disabledScope, sele
             getHasMore={() => search.total === 0}
             onScroll={() => setSearch({ ...search, page: search.page + 1 })}
             renderLoading={() => <Loading size={20} style={{ padding: '4px 12px' }} />}
-            disabledIds={(disabledScope ?? []).map((it) => getPluginScopeId(plugin, it))}
+            disabledIds={(disabledScope ?? []).map((it) => it.id)}
             selectedIds={selectedScope.map((it) => it.id)}
             onSelectItemIds={(selectedIds: ID[]) => onChange(allItems.filter((it) => selectedIds.includes(it.id)))}
           />

diff --git a/config-ui/src/plugins/utils.ts b/config-ui/src/plugins/utils.ts
@@ -30,7 +30,7 @@ export const getPluginScopeId = (plugin: string, scope: any) => {
     case 'gitlab':
       return `${scope.gitlabId}`;
     case 'jenkins':
-      return `${scope.jobFullName}`;
+      return `${scope.fullName}`;
     case 'bitbucket':
       return `${scope.bitbucketId}`;
     case 'sonarqube':