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

Enhanced edit tags action so that it calls PATCH endpoint

Browse Source
This commit is contained in:
Alejandro Celaya
2021-02-27 09:49:56 +01:00
parent f653739d50
commit d0825089d0
7 changed files with 56 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/services/ShlinkApiClient.ts
View File

@@ -63,6 +63,7 @@ export default class ShlinkApiClient {
this.performRequest(`/short-urls/${shortCode}`, 'DELETE', { domain })
.then(() => {});
/* @deprecated. If using Shlink 2.6.0 or greater, use updateShortUrlMeta instead */
public readonly updateShortUrlTags = async (
shortCode: string,
domain: OptionalString,
@@ -75,9 +76,9 @@ export default class ShlinkApiClient {
shortCode: string,
domain: OptionalString,
meta: ShlinkShortUrlMeta,
): Promise<ShlinkShortUrlMeta> =>
this.performRequest(`/short-urls/${shortCode}`, 'PATCH', { domain }, meta)
.then(() => meta);
): Promise<ShortUrl> =>
this.performRequest<ShortUrl>(`/short-urls/${shortCode}`, 'PATCH', { domain }, meta)
.then(({ data }) => data);
public readonly listTags = async (): Promise<ShlinkTags> =>
this.performRequest<{ tags: ShlinkTagsResponse }>('/tags', 'GET', { withStats: 'true' })

1
src/api/types/index.ts
View File

@@ -59,6 +59,7 @@ export interface ShlinkVisitsParams {
export interface ShlinkShortUrlMeta extends ShortUrlMeta {
longUrl?: string;
tags?: string[];
}
export interface ShlinkDomain {

16
src/short-urls/reducers/shortUrlTags.ts
View File

@@ -1,4 +1,5 @@
import { Action, Dispatch } from 'redux';
import { prop } from 'ramda';
import { buildActionCreator, buildReducer } from '../../utils/helpers/redux';
import { GetState } from '../../container/types';
import { OptionalString } from '../../utils/utils';
@@ -6,6 +7,8 @@ import { ShortUrlIdentifier } from '../data';
import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
import { ProblemDetailsError } from '../../api/types';
import { parseApiError } from '../../api/utils';
import { isReachableServer } from '../../servers/data';
import { versionMatch } from '../../utils/helpers/version';
/* eslint-disable padding-line-between-statements */
export const EDIT_SHORT_URL_TAGS_START = 'shlink/shortUrlTags/EDIT_SHORT_URL_TAGS_START';
@@ -50,10 +53,19 @@ export const editShortUrlTags = (buildShlinkApiClient: ShlinkApiClientBuilder) =
tags: string[],
) => async (dispatch: Dispatch, getState: GetState) => {
dispatch({ type: EDIT_SHORT_URL_TAGS_START });
const { updateShortUrlTags } = buildShlinkApiClient(getState);
const { selectedServer } = getState();
const supportsTagsInPatch = isReachableServer(selectedServer) && versionMatch(
selectedServer.version,
{ minVersion: '2.6.0' },
);
const { updateShortUrlTags, updateShortUrlMeta } = buildShlinkApiClient(getState);
try {
const normalizedTags = await updateShortUrlTags(shortCode, domain, tags);
const normalizedTags = await (
supportsTagsInPatch
? updateShortUrlMeta(shortCode, domain, { tags }).then(prop('tags'))
: updateShortUrlTags(shortCode, domain, tags)
);
dispatch<EditShortUrlTagsAction>({ tags: normalizedTags, shortCode, domain, type: SHORT_URL_TAGS_EDITED });
} catch (e) {