mirror of
https://github.com/shlinkio/shlink-web-client.git
synced 2025-01-10 02:07:26 +03:00
Ensured edited short URLs are reflected in redux state when needed
This commit is contained in:
parent
2952ac8892
commit
fa4664e583
2 changed files with 46 additions and 0 deletions
|
@ -9,6 +9,7 @@ import { ShlinkShortUrlsResponse } from '../../api/types';
|
||||||
import { DeleteShortUrlAction, SHORT_URL_DELETED } from './shortUrlDeletion';
|
import { DeleteShortUrlAction, SHORT_URL_DELETED } from './shortUrlDeletion';
|
||||||
import { ShortUrlsListParams } from './shortUrlsListParams';
|
import { ShortUrlsListParams } from './shortUrlsListParams';
|
||||||
import { CREATE_SHORT_URL, CreateShortUrlAction } from './shortUrlCreation';
|
import { CREATE_SHORT_URL, CreateShortUrlAction } from './shortUrlCreation';
|
||||||
|
import { SHORT_URL_EDITED, ShortUrlEditedAction } from './shortUrlEdition';
|
||||||
|
|
||||||
/* eslint-disable padding-line-between-statements */
|
/* eslint-disable padding-line-between-statements */
|
||||||
export const LIST_SHORT_URLS_START = 'shlink/shortUrlsList/LIST_SHORT_URLS_START';
|
export const LIST_SHORT_URLS_START = 'shlink/shortUrlsList/LIST_SHORT_URLS_START';
|
||||||
|
@ -32,6 +33,7 @@ export type ListShortUrlsCombinedAction = (
|
||||||
& CreateVisitsAction
|
& CreateVisitsAction
|
||||||
& CreateShortUrlAction
|
& CreateShortUrlAction
|
||||||
& DeleteShortUrlAction
|
& DeleteShortUrlAction
|
||||||
|
& ShortUrlEditedAction
|
||||||
);
|
);
|
||||||
|
|
||||||
const initialState: ShortUrlsList = {
|
const initialState: ShortUrlsList = {
|
||||||
|
@ -87,6 +89,15 @@ export default buildReducer<ShortUrlsList, ListShortUrlsCombinedAction>({
|
||||||
state,
|
state,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
[SHORT_URL_EDITED]: (state, { shortUrl: editedShortUrl }) => !state.shortUrls ? state : assocPath(
|
||||||
|
[ 'shortUrls', 'data' ],
|
||||||
|
state.shortUrls.data.map((shortUrl) => {
|
||||||
|
const { shortCode, domain } = editedShortUrl;
|
||||||
|
|
||||||
|
return shortUrlMatches(shortUrl, shortCode, domain) ? editedShortUrl : shortUrl;
|
||||||
|
}),
|
||||||
|
state,
|
||||||
|
),
|
||||||
}, initialState);
|
}, initialState);
|
||||||
|
|
||||||
export const listShortUrls = (buildShlinkApiClient: ShlinkApiClientBuilder) => (
|
export const listShortUrls = (buildShlinkApiClient: ShlinkApiClientBuilder) => (
|
||||||
|
|
|
@ -11,6 +11,7 @@ import { ShortUrl } from '../../../src/short-urls/data';
|
||||||
import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient';
|
import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient';
|
||||||
import { ShlinkPaginator, ShlinkShortUrlsResponse } from '../../../src/api/types';
|
import { ShlinkPaginator, ShlinkShortUrlsResponse } from '../../../src/api/types';
|
||||||
import { CREATE_SHORT_URL } from '../../../src/short-urls/reducers/shortUrlCreation';
|
import { CREATE_SHORT_URL } from '../../../src/short-urls/reducers/shortUrlCreation';
|
||||||
|
import { SHORT_URL_EDITED } from '../../../src/short-urls/reducers/shortUrlEdition';
|
||||||
|
|
||||||
describe('shortUrlsListReducer', () => {
|
describe('shortUrlsListReducer', () => {
|
||||||
describe('reducer', () => {
|
describe('reducer', () => {
|
||||||
|
@ -124,6 +125,40 @@ describe('shortUrlsListReducer', () => {
|
||||||
error: false,
|
error: false,
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it.each([
|
||||||
|
((): [ShortUrl, ShortUrl[], ShortUrl[]] => {
|
||||||
|
const editedShortUrl = Mock.of<ShortUrl>({ shortCode: 'notMatching' });
|
||||||
|
const list = [ Mock.of<ShortUrl>({ shortCode: 'foo' }), Mock.of<ShortUrl>({ shortCode: 'bar' }) ];
|
||||||
|
|
||||||
|
return [ editedShortUrl, list, list ];
|
||||||
|
})(),
|
||||||
|
((): [ShortUrl, ShortUrl[], ShortUrl[]] => {
|
||||||
|
const editedShortUrl = Mock.of<ShortUrl>({ shortCode: 'matching', longUrl: 'new_one' });
|
||||||
|
const list = [
|
||||||
|
Mock.of<ShortUrl>({ shortCode: 'matching', longUrl: 'old_one' }),
|
||||||
|
Mock.of<ShortUrl>({ shortCode: 'bar' }),
|
||||||
|
];
|
||||||
|
const expectedList = [ editedShortUrl, list[1] ];
|
||||||
|
|
||||||
|
return [ editedShortUrl, list, expectedList ];
|
||||||
|
})(),
|
||||||
|
])('updates matching short URL on SHORT_URL_EDITED', (editedShortUrl, initialList, expectedList) => {
|
||||||
|
const state = {
|
||||||
|
shortUrls: Mock.of<ShlinkShortUrlsResponse>({
|
||||||
|
data: initialList,
|
||||||
|
pagination: Mock.of<ShlinkPaginator>({
|
||||||
|
totalItems: 15,
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
loading: false,
|
||||||
|
error: false,
|
||||||
|
};
|
||||||
|
|
||||||
|
const result = reducer(state, { type: SHORT_URL_EDITED, shortUrl: editedShortUrl } as any);
|
||||||
|
|
||||||
|
expect(result.shortUrls?.data).toEqual(expectedList);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
describe('listShortUrls', () => {
|
describe('listShortUrls', () => {
|
||||||
|
|
Loading…
Reference in a new issue