Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-07 22:15:45 +01:00
Code Issues Packages Projects Releases Activity

Refactoring

Browse Source
This commit is contained in:
Philipp Czora
2018-11-15 08:40:13 +01:00
parent e1a0a367b4
commit 2511ba4a4a
2 changed files with 34 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
scm-ui-components/packages/ui-components/src/Paginator.test.js
View File

@@ -18,7 +18,8 @@ describe("paginator rendering tests", () => {
const collection = { const collection = {
page: 10, page: 10,
pageTotal: 20, pageTotal: 20,
_links: {} _links: {},
_embedded: {}
}; };
const paginator = shallow( const paginator = shallow(
@@ -40,7 +41,8 @@ describe("paginator rendering tests", () => {
first: dummyLink, first: dummyLink,
next: dummyLink, next: dummyLink,
last: dummyLink last: dummyLink
} },
_embedded: {}
}; };
const paginator = shallow( const paginator = shallow(
@@ -79,7 +81,8 @@ describe("paginator rendering tests", () => {
prev: dummyLink, prev: dummyLink,
next: dummyLink, next: dummyLink,
last: dummyLink last: dummyLink
} },
_embedded: {}
}; };
const paginator = shallow( const paginator = shallow(
@@ -121,7 +124,8 @@ describe("paginator rendering tests", () => {
_links: { _links: {
first: dummyLink, first: dummyLink,
prev: dummyLink prev: dummyLink
} },
_embedded: {}
}; };
const paginator = shallow( const paginator = shallow(
@@ -160,7 +164,8 @@ describe("paginator rendering tests", () => {
prev: dummyLink, prev: dummyLink,
next: dummyLink, next: dummyLink,
last: dummyLink last: dummyLink
} },
_embedded: {}
}; };
const paginator = shallow( const paginator = shallow(
@@ -204,7 +209,8 @@ describe("paginator rendering tests", () => {
prev: dummyLink, prev: dummyLink,
next: dummyLink, next: dummyLink,
last: dummyLink last: dummyLink
} },
_embedded: {}
}; };
const paginator = shallow( const paginator = shallow(
@@ -256,7 +262,8 @@ describe("paginator rendering tests", () => {
}, },
next: dummyLink, next: dummyLink,
last: dummyLink last: dummyLink
} },
_embedded: {}
}; };
let urlToOpen; let urlToOpen;

44
scm-ui-components/packages/ui-components/src/apiclient.js
View File

@@ -11,38 +11,32 @@ const fetchOptions: RequestOptions = {
} }
}; };
// TODO: dedup
function handleStatusCode(response: Response) { function handleStatusCode(response: Response) {
if (!response.ok) { if (!response.ok) {
if (response.status === 401) { switch (response.status) {
return response.json().then( case 401:
json => { return throwErrorWithMessage(response, UNAUTHORIZED_ERROR.message);
throw Error(json.message); case 404:
}, return throwErrorWithMessage(response, NOT_FOUND_ERROR.message);
() => { default:
throw UNAUTHORIZED_ERROR; return throwErrorWithMessage(response, "server returned status code " + response.status);
} }
);
}
if (response.status === 404) {
return response.json().then(
json => {
throw Error(json.message);
},
() => {
throw NOT_FOUND_ERROR;
}
);
}
return response.json().then(json => {
throw Error(json.message);
}, () => {
throw new Error("server returned status code " + response.status);
});
} }
return response; return response;
} }
function throwErrorWithMessage(response: Response, message: string) {
return response.json().then(
json => {
throw Error(json.message);
},
() => {
throw Error(message);
}
);
}
export function createUrl(url: string) { export function createUrl(url: string) {
if (url.includes("://")) { if (url.includes("://")) {
return url; return url;