implemented paging for repository overview

This commit is contained in:
Sebastian Sdorra
2018-08-01 14:56:24 +02:00
parent b1c65a3a3c
commit 2953c805f9
4 changed files with 155 additions and 20 deletions

View File

@@ -15,10 +15,32 @@ const REPOS_URL = "repositories";
const SORT_BY = "sortBy=namespaceAndName";
export function fetchRepos() {
return fetchReposByLink(REPOS_URL);
}
export function fetchReposByPage(page: number) {
return fetchReposByLink(`${REPOS_URL}?page=${page - 1}`);
}
function appendSortByLink(url: string) {
if (url.includes(SORT_BY)) {
return url;
}
let urlWithSortBy = url;
if (url.includes("?")) {
urlWithSortBy += "&";
} else {
urlWithSortBy += "?";
}
return urlWithSortBy + SORT_BY;
}
export function fetchReposByLink(link: string) {
const url = appendSortByLink(link);
return function(dispatch: any) {
dispatch(fetchReposPending());
return apiClient
.get(`${REPOS_URL}?${SORT_BY}`)
.get(url)
.then(response => response.json())
.then(repositories => {
dispatch(fetchReposSuccess(repositories));
@@ -76,16 +98,15 @@ export default function reducer(
state: Object = {},
action: Action = { type: "UNKNOWN" }
): Object {
switch (action.type) {
case FETCH_REPOS_SUCCESS:
if (action.payload) {
return normalizeByNamespaceAndName(action.payload);
} else {
// TODO ???
return state;
}
default:
if (action.type === FETCH_REPOS_SUCCESS) {
if (action.payload) {
return normalizeByNamespaceAndName(action.payload);
} else {
// TODO ???
return state;
}
} else {
return state;
}
}

View File

@@ -8,7 +8,12 @@ import reducer, {
fetchRepos,
FETCH_REPOS_FAILURE,
fetchReposSuccess,
getRepositoryCollection, FETCH_REPOS, isFetchReposPending, getFetchReposFailure
getRepositoryCollection,
FETCH_REPOS,
isFetchReposPending,
getFetchReposFailure,
fetchReposByLink,
fetchReposByPage
} from "./repos";
import type { Repository, RepositoryCollection } from "../types/Repositories";
@@ -203,7 +208,26 @@ describe("repos fetch", () => {
});
it("should successfully fetch repos", () => {
fetchMock.getOnce(REPOS_URL, repositoryCollection);
const url = REPOS_URL + "&page=42";
fetchMock.getOnce(url, repositoryCollection);
const expectedActions = [
{ type: FETCH_REPOS_PENDING },
{
type: FETCH_REPOS_SUCCESS,
payload: repositoryCollection
}
];
const store = mockStore({});
return store.dispatch(fetchRepos()).then(() => {
expect(store.getActions()).toEqual(expectedActions);
});
});
it("should successfully fetch page 42", () => {
const url = REPOS_URL + "&page=42";
fetchMock.getOnce(url, repositoryCollection);
const expectedActions = [
{ type: FETCH_REPOS_PENDING },
@@ -215,7 +239,49 @@ describe("repos fetch", () => {
const store = mockStore({});
return store.dispatch(fetchRepos()).then(() => {
return store.dispatch(fetchReposByPage(43)).then(() => {
expect(store.getActions()).toEqual(expectedActions);
});
});
it("should successfully fetch repos from link", () => {
fetchMock.getOnce(REPOS_URL, repositoryCollection);
const expectedActions = [
{ type: FETCH_REPOS_PENDING },
{
type: FETCH_REPOS_SUCCESS,
payload: repositoryCollection
}
];
const store = mockStore({});
return store
.dispatch(
fetchReposByLink("/repositories?sortBy=namespaceAndName&page=42")
)
.then(() => {
expect(store.getActions()).toEqual(expectedActions);
});
});
it("should append sortby parameter and successfully fetch repos from link", () => {
fetchMock.getOnce(
"/scm/api/rest/v2/repositories?one=1&sortBy=namespaceAndName",
repositoryCollection
);
const expectedActions = [
{ type: FETCH_REPOS_PENDING },
{
type: FETCH_REPOS_SUCCESS,
payload: repositoryCollection
}
];
const store = mockStore({});
return store.dispatch(fetchReposByLink("/repositories?one=1")).then(() => {
expect(store.getActions()).toEqual(expectedActions);
});
});
@@ -267,7 +333,6 @@ describe("repos reducer", () => {
});
describe("repos selectors", () => {
const error = new Error("something goes wrong");
it("should return the repositories collection", () => {