Skip to content

feat: Update MergeRequestDiscussions to use MergeRequestDiscussionSchema for type consistency #3845

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

Open
moh3n9595 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: Update MergeRequestDiscussions to use MergeRequestDiscussionSchema for type consistency #3845

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
16 changes: 10 additions & 6 deletions packages/core/src/resources/MergeRequestDiscussions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ export interface MergeRequestDiscussionNoteSchema extends DiscussionNoteSchema {
position?: DiscussionNotePositionSchema;
}

export interface MergeRequestDiscussionSchema extends DiscussionSchema {
notes?: MergeRequestDiscussionNoteSchema[];
}

export type MergeRequestDiscussionNotePositionOptions = {
lineRange?: {
start?: {
Expand All @@ -51,7 +55,7 @@ export interface MergeRequestDiscussions<C extends boolean = false> extends Reso
projectId: string | number,
mergerequestId: string | number,
options?: BaseRequestSearchParams & PaginationRequestOptions<P> & ShowExpanded<E> & Sudo,
): Promise<GitlabAPIResponse<DiscussionSchema[], C, E, P>>;
): Promise<GitlabAPIResponse<MergeRequestDiscussionSchema[], C, E, P>>;

create<E extends boolean = false>(
projectId: string | number,
Expand All @@ -63,7 +67,7 @@ export interface MergeRequestDiscussions<C extends boolean = false> extends Reso
createdAt?: string;
} & ShowExpanded<E> &
Sudo,
): Promise<GitlabAPIResponse<DiscussionSchema, C, E, void>>;
): Promise<GitlabAPIResponse<MergeRequestDiscussionSchema, C, E, void>>;

editNote<E extends boolean = false>(
projectId: string | number,
Expand All @@ -87,14 +91,14 @@ export interface MergeRequestDiscussions<C extends boolean = false> extends Reso
discussionId: string,
resolve: boolean,
options?: ShowExpanded<E> & Sudo,
): Promise<GitlabAPIResponse<DiscussionSchema, C, E, void>>;
): Promise<GitlabAPIResponse<MergeRequestDiscussionSchema, C, E, void>>;

show<E extends boolean = false>(
projectId: string | number,
mergerequestId: string | number,
discussionId: string,
options?: ShowExpanded<E> & Sudo,
): Promise<GitlabAPIResponse<DiscussionSchema, C, E, void>>;
): Promise<GitlabAPIResponse<MergeRequestDiscussionSchema, C, E, void>>;
}

export class MergeRequestDiscussions<C extends boolean = false> extends ResourceDiscussions<C> {
Expand All @@ -109,10 +113,10 @@ export class MergeRequestDiscussions<C extends boolean = false> extends Resource
discussionId: string,
resolved: boolean,
options?: ShowExpanded<E> & Sudo,
): Promise<GitlabAPIResponse<DiscussionSchema, C, E, void>> {
): Promise<GitlabAPIResponse<MergeRequestDiscussionSchema, C, E, void>> {
const { sudo, showExpanded } = options || {};

return RequestHelper.put<DiscussionSchema>()(
return RequestHelper.put<MergeRequestDiscussionSchema>()(
this,
endpoint`${projectId}/merge_requests/${mergerequestId}/discussions/${discussionId}`,
{
Expand Down