You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@devlake.apache.org by li...@apache.org on 2023/02/03 03:25:21 UTC
[incubator-devlake] branch release-v0.15 updated: fix(config-ui): gitlab scope id duplicate (#4307)
This is an automated email from the ASF dual-hosted git repository.
likyh pushed a commit to branch release-v0.15
in repository https://gitbox.apache.org/repos/asf/incubator-devlake.git
The following commit(s) were added to refs/heads/release-v0.15 by this push:
new 7a2584c63 fix(config-ui): gitlab scope id duplicate (#4307)
7a2584c63 is described below
commit 7a2584c6344aa231922e7cd02dc46df69b6995ab
Author: 青湛 <0x...@gmail.com>
AuthorDate: Fri Feb 3 11:25:17 2023 +0800
fix(config-ui): gitlab scope id duplicate (#4307)
---
config-ui/src/plugins/gitlab/api.ts | 12 ++++++++----
.../gitlab/components/miller-columns/use-miller-columns.ts | 4 ++--
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/config-ui/src/plugins/gitlab/api.ts b/config-ui/src/plugins/gitlab/api.ts
index bcc42d4d0..6be2d72a6 100644
--- a/config-ui/src/plugins/gitlab/api.ts
+++ b/config-ui/src/plugins/gitlab/api.ts
@@ -35,15 +35,19 @@ export const getUserProjects = (prefix: string, uid: ID, params: PaginationParam
data: params,
});
-export const getGroupSubgroups = (prefix: string, gid: ID, params: PaginationParams) =>
- request(`${prefix}/groups/${gid}/subgroups`, {
+export const getGroupSubgroups = (prefix: string, gid: ID, params: PaginationParams) => {
+ const id = (gid as string).split('-')[0];
+ return request(`${prefix}/groups/${id}/subgroups`, {
data: params,
});
+};
-export const getGroupProjects = (prefix: string, gid: ID, params: PaginationParams) =>
- request(`${prefix}/groups/${gid}/projects`, {
+export const getGroupProjects = (prefix: string, gid: ID, params: PaginationParams) => {
+ const id = (gid as string).split('-')[0];
+ return request(`${prefix}/groups/${id}/projects`, {
data: { with_shared: false, ...params },
});
+};
type SearchProjectParams = {
search: string;
diff --git a/config-ui/src/plugins/gitlab/components/miller-columns/use-miller-columns.ts b/config-ui/src/plugins/gitlab/components/miller-columns/use-miller-columns.ts
index ea2d4594a..dfc9ff366 100644
--- a/config-ui/src/plugins/gitlab/components/miller-columns/use-miller-columns.ts
+++ b/config-ui/src/plugins/gitlab/components/miller-columns/use-miller-columns.ts
@@ -61,7 +61,7 @@ export const useMillerColumns = ({ connectionId }: UseMillerColumnsProps) => {
const formatGroups = (arr: any, parentId: ID | null = null): GitLabItemType[] =>
arr.map((it: any) => ({
parentId,
- id: it.id,
+ id: `${it.id}-group`,
title: it.name,
type: 'group',
}));
@@ -69,7 +69,7 @@ export const useMillerColumns = ({ connectionId }: UseMillerColumnsProps) => {
const formatProjects = (arr: any, parentId: ID | null = null): GitLabItemType[] =>
arr.map((it: any) => ({
parentId,
- id: it.id,
+ id: `${it.id}-project`,
title: it.name,
type: 'project',
gitlabId: it.id,