Skip to content

feat(gitlab): add support for multiple group names with a single provider #1656

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
Siumauricio merged 3 commits into from
Apr 17, 2025
Merged

feat(gitlab): add support for multiple group names with a single provider #1656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e1f0b4
fix(gitlab): update group name label and enhance group name handling
lorenzomigliorero Apr 7, 2025
1279fac
[autofix.ci] apply automated fixes
autofix-ci[bot] Apr 7, 2025
33ab87f
fix(gitlab): enhance group name matching logic to support multiple names
Siumauricio Apr 17, 2025
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
4 changes: 3 additions & 1 deletion apps/dokploy/components/dashboard/settings/git/gitlab/add-gitlab-provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,9 @@ export const AddGitlabProvider = () => {
name="groupName"
render={({ field }) => (
<FormItem>
<FormLabel>Group Name (Optional)</FormLabel>
<FormLabel>
Group Name (Optional, Comma-Separated List)
</FormLabel>
<FormControl>
<Input
placeholder="For organization/group access use the slugish name of the group eg: my-org"
Expand Down
4 changes: 3 additions & 1 deletion apps/dokploy/components/dashboard/settings/git/gitlab/edit-gitlab-provider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,9 @@ export const EditGitlabProvider = ({ gitlabId }: Props) => {
name="groupName"
render={({ field }) => (
<FormItem>
<FormLabel>Group Name (Optional)</FormLabel>
<FormLabel>
Group Name (Optional, Comma-Separated List)
</FormLabel>
<FormControl>
<Input
placeholder="For organization/group access use the slugish name of the group eg: my-org"
Expand Down
8 changes: 6 additions & 2 deletions apps/dokploy/pages/dashboard/project/[projectId].tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,9 @@ const Project = (

switch (service.type) {
case "application":
await applicationActions.start.mutateAsync({ applicationId: serviceId });
await applicationActions.start.mutateAsync({
applicationId: serviceId,
});
break;
case "compose":
await composeActions.start.mutateAsync({ composeId: serviceId });
Expand Down Expand Up @@ -410,7 +412,9 @@ const Project = (

switch (service.type) {
case "application":
await applicationActions.stop.mutateAsync({ applicationId: serviceId });
await applicationActions.stop.mutateAsync({
applicationId: serviceId,
});
break;
case "compose":
await composeActions.stop.mutateAsync({ composeId: serviceId });
Expand Down
10 changes: 8 additions & 2 deletions packages/server/src/utils/providers/gitlab.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,11 @@ export const getGitlabRepositories = async (gitlabId?: string) => {
const groupName = gitlabProvider.groupName?.toLowerCase();

if (groupName) {
return full_path.toLowerCase().includes(groupName) && kind === "group";
const isIncluded = groupName
.split(",")
.some((name) => full_path.toLowerCase().includes(name));

return isIncluded && kind === "group";
}
return kind === "user";
});
Expand Down Expand Up @@ -431,7 +435,9 @@ export const testGitlabConnection = async (
const { full_path, kind } = repo.namespace;

if (groupName) {
return full_path.toLowerCase().includes(groupName) && kind === "group";
return groupName
.split(",")
.some((name) => full_path.toLowerCase().includes(name));
}
return kind === "user";
});
Expand Down