forked/shlink-web-client
1
0
Fork 0
mirror of https://github.com/shlinkio/shlink-web-client.git synced 2026-04-19 21:16:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge conflicts

Browse Source
This commit is contained in:
Alejandro Celaya
2021-09-01 10:53:45 +02:00
parent fa64c950ca
commit b61d863356
4 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/short-urls/ShortUrlsList.tsx
View File

@@ -70,7 +70,7 @@ const ShortUrlsList = (ShortUrlsTable: FC<ShortUrlsTableProps>) => boundToMercur
useEffect(() => {
const { tag } = parseQuery<{ tag?: string }>(location.search);
const tags = tag ? [ tag ] : shortUrlsListParams.tags;
const tags = tag ? [ decodeURIComponent(tag) ] : shortUrlsListParams.tags;
refreshList({ page: match.params.page, tags, itemsPerPage: undefined });

2
src/tags/TagCard.tsx
View File

@@ -30,7 +30,7 @@ const TagCard = (
const [ isEditModalOpen, toggleEdit ] = useToggle();
const serverId = isServerWithId(selectedServer) ? selectedServer.id : '';
const shortUrlsLink = `/server/${serverId}/list-short-urls/1?tag=${tag}`;
const shortUrlsLink = `/server/${serverId}/list-short-urls/1?tag=${encodeURIComponent(tag)}`;
return (
<Card className="tag-card">