Api refactor, return object for createTagObject

Signed-off-by: Erik Engervall <erik.engervall@gmail.com>
This commit is contained in:
Erik Engervall
2021-04-30 14:14:14 +02:00
parent b0620a794f
commit ae0fede8fb
5 changed files with 21 additions and 15 deletions
@@ -342,8 +342,10 @@ export class GitReleaseApiClient implements GitReleaseApi {
});
return {
tagName: createdTagObject.tag,
tagSha: createdTagObject.sha,
tagObject: {
tagName: createdTagObject.tag,
tagSha: createdTagObject.sha,
},
};
};
@@ -651,8 +653,10 @@ export interface GitReleaseApi {
taggerName: string;
} & OwnerRepo,
) => Promise<{
tagName: string;
tagSha: string;
tagObject: {
tagName: string;
tagSha: string;
};
}>;
createCommit: (
@@ -130,7 +130,7 @@ export function useCreateReleaseCandidate({
abortIfError(releaseBranchRes.error);
if (!releaseBranchRes.value) return undefined;
const createdTagObject = await pluginApiClient
const { tagObject } = await pluginApiClient
.createTagObject({
owner: project.owner,
repo: project.repo,
@@ -144,11 +144,11 @@ export function useCreateReleaseCandidate({
addStepToResponseSteps({
message: 'Created Tag Object',
secondaryMessage: `with sha "${createdTagObject.tagSha}"`,
secondaryMessage: `with sha "${tagObject.tagSha}"`,
});
return {
...createdTagObject,
...tagObject,
};
}, [releaseBranchRes.value, releaseBranchRes.error]);
@@ -243,7 +243,7 @@ export function usePatch({
abortIfError(updatedRefRes.error);
if (!updatedRefRes.value) return undefined;
const createdTagObject = await pluginApiClient
const { tagObject } = await pluginApiClient
.createTagObject({
owner: project.owner,
repo: project.repo,
@@ -257,11 +257,11 @@ export function usePatch({
addStepToResponseSteps({
message: 'Created new tag object',
secondaryMessage: `with name "${createdTagObject.tagName}"`,
secondaryMessage: `with name "${tagObject.tagName}"`,
});
return {
...createdTagObject,
...tagObject,
};
}, [updatedRefRes.value, updatedRefRes.error]);
@@ -77,7 +77,7 @@ export function usePromoteRc({
abortIfError(latestReleaseBranchCommitSha.error);
if (!latestReleaseBranchCommitSha.value) return undefined;
const createdTagObject = await pluginApiClient
const { tagObject } = await pluginApiClient
.createTagObject({
owner: project.owner,
repo: project.repo,
@@ -91,11 +91,11 @@ export function usePromoteRc({
addStepToResponseSteps({
message: 'Created Tag Object',
secondaryMessage: `with sha "${createdTagObject.tagSha}"`,
secondaryMessage: `with sha "${tagObject.tagSha}"`,
});
return {
...createdTagObject,
...tagObject,
};
}, [latestReleaseBranchCommitSha.value, latestReleaseBranchCommitSha.error]);
@@ -253,8 +253,10 @@ export const mockApiClient: GitReleaseApi = {
})),
createTagObject: jest.fn(async () => ({
tagName: 'mock_tag_object_tag',
tagSha: 'mock_tag_object_sha',
tagObject: {
tagName: 'mock_tag_object_tag',
tagSha: 'mock_tag_object_sha',
},
})),
createCommit: jest.fn(async () => ({