mirror of
https://github.com/shlinkio/shlink-web-client.git
synced 2024-12-23 09:30:31 +03:00
commit
58ddec6aff
7 changed files with 99 additions and 102 deletions
17
CHANGELOG.md
17
CHANGELOG.md
|
@ -4,6 +4,23 @@ All notable changes to this project will be documented in this file.
|
|||
|
||||
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org).
|
||||
|
||||
## [Unreleased]
|
||||
### Added
|
||||
* [#671](https://github.com/shlinkio/shlink-web-client/pull/671) Added proper color-scheme in root element based on selected theme.
|
||||
|
||||
### Changed
|
||||
* *Nothing*
|
||||
|
||||
### Deprecated
|
||||
* *Nothing*
|
||||
|
||||
### Removed
|
||||
* *Nothing*
|
||||
|
||||
### Fixed
|
||||
* *Nothing*
|
||||
|
||||
|
||||
## [3.7.1] - 2022-05-25
|
||||
### Added
|
||||
* *Nothing*
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
|
||||
:root {
|
||||
scroll-behavior: auto;
|
||||
color-scheme: var(--color-scheme);
|
||||
}
|
||||
|
||||
html,
|
||||
|
|
|
@ -5,7 +5,7 @@ import { faArrowLeft } from '@fortawesome/free-solid-svg-icons';
|
|||
import { ExternalLink } from 'react-external-link';
|
||||
import { useLocation, useParams } from 'react-router-dom';
|
||||
import { SelectedServer } from '../servers/data';
|
||||
import { Settings, ShortUrlCreationSettings } from '../settings/reducers/settings';
|
||||
import { Settings } from '../settings/reducers/settings';
|
||||
import { OptionalString } from '../utils/utils';
|
||||
import { parseQuery } from '../utils/helpers/query';
|
||||
import { Message } from '../utils/Message';
|
||||
|
@ -14,8 +14,9 @@ import { ShlinkApiError } from '../api/ShlinkApiError';
|
|||
import { useGoBack, useToggle } from '../utils/helpers/hooks';
|
||||
import { ShortUrlFormProps } from './ShortUrlForm';
|
||||
import { ShortUrlDetail } from './reducers/shortUrlDetail';
|
||||
import { EditShortUrlData, ShortUrl, ShortUrlData } from './data';
|
||||
import { EditShortUrlData } from './data';
|
||||
import { ShortUrlEdition } from './reducers/shortUrlEdition';
|
||||
import { shortUrlDataFromShortUrl } from './helpers';
|
||||
|
||||
interface EditShortUrlConnectProps {
|
||||
settings: Settings;
|
||||
|
@ -26,27 +27,6 @@ interface EditShortUrlConnectProps {
|
|||
editShortUrl: (shortUrl: string, domain: OptionalString, data: EditShortUrlData) => Promise<void>;
|
||||
}
|
||||
|
||||
const getInitialState = (shortUrl?: ShortUrl, settings?: ShortUrlCreationSettings): ShortUrlData => {
|
||||
const validateUrl = settings?.validateUrls ?? false;
|
||||
|
||||
if (!shortUrl) {
|
||||
return { longUrl: '', validateUrl };
|
||||
}
|
||||
|
||||
return {
|
||||
longUrl: shortUrl.longUrl,
|
||||
tags: shortUrl.tags,
|
||||
title: shortUrl.title ?? undefined,
|
||||
domain: shortUrl.domain ?? undefined,
|
||||
validSince: shortUrl.meta.validSince ?? undefined,
|
||||
validUntil: shortUrl.meta.validUntil ?? undefined,
|
||||
maxVisits: shortUrl.meta.maxVisits ?? undefined,
|
||||
crawlable: shortUrl.crawlable,
|
||||
forwardQuery: shortUrl.forwardQuery,
|
||||
validateUrl,
|
||||
};
|
||||
};
|
||||
|
||||
export const EditShortUrl = (ShortUrlForm: FC<ShortUrlFormProps>) => ({
|
||||
settings: { shortUrlCreation: shortUrlCreationSettings },
|
||||
selectedServer,
|
||||
|
@ -62,7 +42,7 @@ export const EditShortUrl = (ShortUrlForm: FC<ShortUrlFormProps>) => ({
|
|||
const { saving, error: savingError, errorData: savingErrorData } = shortUrlEdition;
|
||||
const { domain } = parseQuery<{ domain?: string }>(search);
|
||||
const initialState = useMemo(
|
||||
() => getInitialState(shortUrl, shortUrlCreationSettings),
|
||||
() => shortUrlDataFromShortUrl(shortUrl, shortUrlCreationSettings),
|
||||
[shortUrl, shortUrlCreationSettings],
|
||||
);
|
||||
const [savingSucceeded,, isSuccessful, isNotSuccessful] = useToggle();
|
||||
|
|
|
@ -1,7 +1,8 @@
|
|||
import { isNil } from 'ramda';
|
||||
import { ShortUrl } from '../data';
|
||||
import { ShortUrl, ShortUrlData } from '../data';
|
||||
import { OptionalString } from '../../utils/utils';
|
||||
import { DEFAULT_DOMAIN } from '../../visits/reducers/domainVisits';
|
||||
import { ShortUrlCreationSettings } from '../../settings/reducers/settings';
|
||||
|
||||
export const shortUrlMatches = (shortUrl: ShortUrl, shortCode: string, domain: OptionalString): boolean => {
|
||||
if (isNil(domain)) {
|
||||
|
@ -18,3 +19,24 @@ export const domainMatches = (shortUrl: ShortUrl, domain: string): boolean => {
|
|||
|
||||
return shortUrl.domain === domain;
|
||||
};
|
||||
|
||||
export const shortUrlDataFromShortUrl = (shortUrl?: ShortUrl, settings?: ShortUrlCreationSettings): ShortUrlData => {
|
||||
const validateUrl = settings?.validateUrls ?? false;
|
||||
|
||||
if (!shortUrl) {
|
||||
return { longUrl: '', validateUrl };
|
||||
}
|
||||
|
||||
return {
|
||||
longUrl: shortUrl.longUrl,
|
||||
tags: shortUrl.tags,
|
||||
title: shortUrl.title ?? undefined,
|
||||
domain: shortUrl.domain ?? undefined,
|
||||
validSince: shortUrl.meta.validSince ?? undefined,
|
||||
validUntil: shortUrl.meta.validUntil ?? undefined,
|
||||
maxVisits: shortUrl.meta.maxVisits ?? undefined,
|
||||
crawlable: shortUrl.crawlable,
|
||||
forwardQuery: shortUrl.forwardQuery,
|
||||
validateUrl,
|
||||
};
|
||||
};
|
||||
|
|
|
@ -31,6 +31,7 @@ $darkBorderInputColor: $darkBorderColor;
|
|||
$darkTableHighlightColor: $darkBorderColor;
|
||||
|
||||
html:not([data-theme='dark']) {
|
||||
--color-scheme: initial;
|
||||
--primary-color: #{$lightPrimaryColor};
|
||||
--primary-color-alfa: #{$lightPrimaryColorAlfa};
|
||||
--secondary-color: #{$lightSecondaryColor};
|
||||
|
@ -48,6 +49,7 @@ html:not([data-theme='dark']) {
|
|||
}
|
||||
|
||||
html[data-theme='dark'] {
|
||||
--color-scheme: dark;
|
||||
--primary-color: #{$darkPrimaryColor};
|
||||
--primary-color-alfa: #{$darkPrimaryColorAlfa};
|
||||
--secondary-color: #{$darkSecondaryColor};
|
||||
|
|
|
@ -1,107 +1,54 @@
|
|||
import { shallow, ShallowWrapper } from 'enzyme';
|
||||
import { render, screen } from '@testing-library/react';
|
||||
import { MemoryRouter } from 'react-router-dom';
|
||||
import { Mock } from 'ts-mockery';
|
||||
import { useLocation, useParams } from 'react-router-dom';
|
||||
import { EditShortUrl as createEditShortUrl } from '../../src/short-urls/EditShortUrl';
|
||||
import { Settings } from '../../src/settings/reducers/settings';
|
||||
import { ShortUrlDetail } from '../../src/short-urls/reducers/shortUrlDetail';
|
||||
import { ShortUrlEdition } from '../../src/short-urls/reducers/shortUrlEdition';
|
||||
import { ShlinkApiError } from '../../src/api/ShlinkApiError';
|
||||
import { ShortUrl } from '../../src/short-urls/data';
|
||||
|
||||
jest.mock('react-router-dom', () => ({
|
||||
...jest.requireActual('react-router-dom'),
|
||||
useNavigate: jest.fn().mockReturnValue(jest.fn()),
|
||||
useParams: jest.fn().mockReturnValue({}),
|
||||
useLocation: jest.fn().mockReturnValue({}),
|
||||
}));
|
||||
|
||||
describe('<EditShortUrl />', () => {
|
||||
let wrapper: ShallowWrapper;
|
||||
const ShortUrlForm = () => null;
|
||||
const getShortUrlDetail = jest.fn();
|
||||
const editShortUrl = jest.fn(async () => Promise.resolve());
|
||||
const shortUrlCreation = { validateUrls: true };
|
||||
const EditShortUrl = createEditShortUrl(ShortUrlForm);
|
||||
const createWrapper = (detail: Partial<ShortUrlDetail> = {}, edition: Partial<ShortUrlEdition> = {}) => {
|
||||
(useParams as any).mockReturnValue({ shortCode: 'the_base_url' });
|
||||
(useLocation as any).mockReturnValue({ search: '' });
|
||||
|
||||
wrapper = shallow(
|
||||
const EditShortUrl = createEditShortUrl(() => <span>ShortUrlForm</span>);
|
||||
const setUp = (detail: Partial<ShortUrlDetail> = {}, edition: Partial<ShortUrlEdition> = {}) => render(
|
||||
<MemoryRouter>
|
||||
<EditShortUrl
|
||||
settings={Mock.of<Settings>({ shortUrlCreation })}
|
||||
selectedServer={null}
|
||||
shortUrlDetail={Mock.of<ShortUrlDetail>(detail)}
|
||||
shortUrlEdition={Mock.of<ShortUrlEdition>(edition)}
|
||||
getShortUrlDetail={getShortUrlDetail}
|
||||
editShortUrl={editShortUrl}
|
||||
/>,
|
||||
);
|
||||
|
||||
return wrapper;
|
||||
};
|
||||
|
||||
beforeEach(jest.clearAllMocks);
|
||||
afterEach(() => wrapper?.unmount());
|
||||
getShortUrlDetail={jest.fn()}
|
||||
editShortUrl={jest.fn(async () => Promise.resolve())}
|
||||
/>
|
||||
</MemoryRouter>,
|
||||
);
|
||||
|
||||
it('renders loading message while loading detail', () => {
|
||||
const wrapper = createWrapper({ loading: true });
|
||||
setUp({ loading: true });
|
||||
|
||||
expect(wrapper.prop('loading')).toEqual(true);
|
||||
expect(screen.getByText('Loading...')).toBeInTheDocument();
|
||||
expect(screen.queryByText('ShortUrlForm')).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('renders error when loading detail fails', () => {
|
||||
const wrapper = createWrapper({ error: true });
|
||||
const form = wrapper.find(ShortUrlForm);
|
||||
const apiError = wrapper.find(ShlinkApiError);
|
||||
setUp({ error: true });
|
||||
|
||||
expect(form).toHaveLength(0);
|
||||
expect(apiError).toHaveLength(1);
|
||||
expect(apiError.prop('fallbackMessage')).toEqual('An error occurred while loading short URL detail :(');
|
||||
expect(screen.getByText('An error occurred while loading short URL detail :(')).toBeInTheDocument();
|
||||
expect(screen.queryByText('ShortUrlForm')).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it.each([
|
||||
[undefined, { longUrl: '', validateUrl: true }, true],
|
||||
[
|
||||
Mock.of<ShortUrl>({ meta: {} }),
|
||||
{
|
||||
longUrl: undefined,
|
||||
tags: undefined,
|
||||
title: undefined,
|
||||
domain: undefined,
|
||||
validSince: undefined,
|
||||
validUntil: undefined,
|
||||
maxVisits: undefined,
|
||||
validateUrl: true,
|
||||
},
|
||||
false,
|
||||
],
|
||||
])('renders form when detail properly loads', (shortUrl, expectedInitialState, saving) => {
|
||||
const wrapper = createWrapper({ shortUrl }, { saving });
|
||||
const form = wrapper.find(ShortUrlForm);
|
||||
const apiError = wrapper.find(ShlinkApiError);
|
||||
it('renders form when detail properly loads', () => {
|
||||
setUp({ shortUrl: Mock.of<ShortUrl>({ meta: {} }) });
|
||||
|
||||
expect(form).toHaveLength(1);
|
||||
expect(apiError).toHaveLength(0);
|
||||
expect(form.prop('initialState')).toEqual(expectedInitialState);
|
||||
expect(form.prop('saving')).toEqual(saving);
|
||||
expect(editShortUrl).not.toHaveBeenCalled();
|
||||
|
||||
form.simulate('save', {});
|
||||
|
||||
if (shortUrl) {
|
||||
expect(editShortUrl).toHaveBeenCalledWith(shortUrl.shortCode, shortUrl.domain, {});
|
||||
} else {
|
||||
expect(editShortUrl).not.toHaveBeenCalled();
|
||||
}
|
||||
expect(screen.getByText('ShortUrlForm')).toBeInTheDocument();
|
||||
expect(screen.queryByText('Loading...')).not.toBeInTheDocument();
|
||||
expect(screen.queryByText('An error occurred while loading short URL detail :(')).not.toBeInTheDocument();
|
||||
});
|
||||
|
||||
it('shows error when saving data has failed', () => {
|
||||
const wrapper = createWrapper({}, { error: true });
|
||||
const form = wrapper.find(ShortUrlForm);
|
||||
const apiError = wrapper.find(ShlinkApiError);
|
||||
setUp({}, { error: true });
|
||||
|
||||
expect(form).toHaveLength(1);
|
||||
expect(apiError).toHaveLength(1);
|
||||
expect(apiError.prop('fallbackMessage')).toEqual('An error occurred while updating short URL :(');
|
||||
expect(screen.getByText('An error occurred while updating short URL :(')).toBeInTheDocument();
|
||||
expect(screen.getByText('ShortUrlForm')).toBeInTheDocument();
|
||||
});
|
||||
});
|
||||
|
|
28
test/short-urls/helpers/index.test.ts
Normal file
28
test/short-urls/helpers/index.test.ts
Normal file
|
@ -0,0 +1,28 @@
|
|||
import { Mock } from 'ts-mockery';
|
||||
import { ShortUrl } from '../../../src/short-urls/data';
|
||||
import { shortUrlDataFromShortUrl } from '../../../src/short-urls/helpers';
|
||||
|
||||
describe('helpers', () => {
|
||||
describe('shortUrlDataFromShortUrl', () => {
|
||||
it.each([
|
||||
[undefined, { validateUrls: true }, { longUrl: '', validateUrl: true }],
|
||||
[undefined, undefined, { longUrl: '', validateUrl: false }],
|
||||
[
|
||||
Mock.of<ShortUrl>({ meta: {} }),
|
||||
{ validateUrls: false },
|
||||
{
|
||||
longUrl: undefined,
|
||||
tags: undefined,
|
||||
title: undefined,
|
||||
domain: undefined,
|
||||
validSince: undefined,
|
||||
validUntil: undefined,
|
||||
maxVisits: undefined,
|
||||
validateUrl: false,
|
||||
},
|
||||
],
|
||||
])('returns expected data', (shortUrl, settings, expectedInitialState) => {
|
||||
expect(shortUrlDataFromShortUrl(shortUrl, settings)).toEqual(expectedInitialState);
|
||||
});
|
||||
});
|
||||
});
|
Loading…
Reference in a new issue