Api refactor, return object for getRepository

Signed-off-by: Erik Engervall <erik.engervall@gmail.com>
This commit is contained in:
Erik Engervall
2021-04-30 13:21:41 +02:00
parent e812cc9492
commit 992a3a2024
3 changed files with 25 additions and 17 deletions
@@ -195,9 +195,11 @@ export class GitReleaseApiClient implements GitReleaseApi {
});
return {
pushPermissions: repository.permissions?.push,
defaultBranch: repository.default_branch,
name: repository.name,
repository: {
pushPermissions: repository.permissions?.push,
defaultBranch: repository.default_branch,
name: repository.name,
},
};
};
@@ -552,9 +554,11 @@ export interface GitReleaseApi {
getRepository: (
args: OwnerRepo,
) => Promise<{
pushPermissions: boolean | undefined;
defaultBranch: string;
name: string;
repository: {
pushPermissions: boolean | undefined;
defaultBranch: string;
name: string;
};
}>;
getCommit: (
@@ -31,7 +31,7 @@ export const useGetGitBatchInfo = ({
refetchTrigger,
}: GetGitBatchInfo) => {
const gitBatchInfo = useAsync(async () => {
const [repository, { latestRelease }] = await Promise.all([
const [{ repository }, { latestRelease }] = await Promise.all([
pluginApiClient.getRepository({
owner: project.owner,
repo: project.repo,
@@ -97,14 +97,16 @@ const createMockRelease = ({
prerelease = false,
...rest
}: Partial<
NonNullable<GetLatestReleaseResult>
NonNullable<GetLatestReleaseResult['latestRelease']>
> = {}): NonNullable<GetLatestReleaseResult> => ({
id: 1,
htmlUrl: 'mock_release_html_url',
prerelease,
tagName: MOCK_RELEASE_CANDIDATE_TAG_NAME_CALVER,
targetCommitish: MOCK_RELEASE_BRANCH_NAME_CALVER,
...rest,
latestRelease: {
id,
htmlUrl: 'mock_release_html_url',
prerelease,
tagName: MOCK_RELEASE_CANDIDATE_TAG_NAME_CALVER,
targetCommitish: MOCK_RELEASE_BRANCH_NAME_CALVER,
...rest,
},
});
export const mockReleaseCandidateCalver = createMockRelease({
@@ -208,9 +210,11 @@ export const mockApiClient: GitReleaseApi = {
getLatestRelease: jest.fn(async () => createMockRelease()),
getRepository: jest.fn(async () => ({
pushPermissions: true,
defaultBranch: mockDefaultBranch,
name: mockRepo,
repository: {
pushPermissions: true,
defaultBranch: mockDefaultBranch,
name: mockRepo,
},
})),
getCommit: jest.fn(async () => ({