Deleted reducers for short URL tags and short URL meta

src/short-urls/reducers/shortUrlEdition.ts

@@ -2,10 +2,11 @@ import { Action, Dispatch } from 'redux';
 import { buildReducer } from '../../utils/helpers/redux';
 import { GetState } from '../../container/types';
 import { OptionalString } from '../../utils/utils';
-import { EditShortUrlData, ShortUrlIdentifier } from '../data';
+import { EditShortUrlData, ShortUrl } from '../data';
 import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
 import { ProblemDetailsError } from '../../api/types';
 import { parseApiError } from '../../api/utils';
+import { supportsTagsInPatch } from '../../utils/helpers/features';
 
 /* eslint-disable padding-line-between-statements */
 export const EDIT_SHORT_URL_START = 'shlink/shortUrlEdition/EDIT_SHORT_URL_START';
@@ -14,15 +15,14 @@ export const SHORT_URL_EDITED = 'shlink/shortUrlEdition/SHORT_URL_EDITED';
 /* eslint-enable padding-line-between-statements */
 
 export interface ShortUrlEdition {
-  shortCode: string | null;
-  longUrl: string | null;
+  shortUrl?: ShortUrl;
   saving: boolean;
   error: boolean;
   errorData?: ProblemDetailsError;
 }
 
-export interface ShortUrlEditedAction extends Action<string>, ShortUrlIdentifier {
-  longUrl: string;
+export interface ShortUrlEditedAction extends Action<string> {
+  shortUrl: ShortUrl;
 }
 
 export interface ShortUrlEditionFailedAction extends Action<string> {
@@ -30,8 +30,6 @@ export interface ShortUrlEditionFailedAction extends Action<string> {
 }
 
 const initialState: ShortUrlEdition = {
-  shortCode: null,
-  longUrl: null,
   saving: false,
   error: false,
 };
@@ -39,7 +37,7 @@ const initialState: ShortUrlEdition = {
 export default buildReducer<ShortUrlEdition, ShortUrlEditedAction & ShortUrlEditionFailedAction>({
   [EDIT_SHORT_URL_START]: (state) => ({ ...state, saving: true, error: false }),
   [EDIT_SHORT_URL_ERROR]: (state, { errorData }) => ({ ...state, saving: false, error: true, errorData }),
-  [SHORT_URL_EDITED]: (_, { shortCode, longUrl }) => ({ shortCode, longUrl, saving: false, error: false }),
+  [SHORT_URL_EDITED]: (_, { shortUrl }) => ({ shortUrl, saving: false, error: false }),
 }, initialState);
 
 export const editShortUrl = (buildShlinkApiClient: ShlinkApiClientBuilder) => (
@@ -49,13 +47,17 @@ export const editShortUrl = (buildShlinkApiClient: ShlinkApiClientBuilder) => (
 ) => async (dispatch: Dispatch, getState: GetState) => {
   dispatch({ type: EDIT_SHORT_URL_START });
 
-  // TODO Pass tags to the updateTags function if server version is lower than 2.6
-  const { updateShortUrl } = buildShlinkApiClient(getState);
+  const { selectedServer } = getState();
+  const sendTagsSeparately = !supportsTagsInPatch(selectedServer);
+  const { updateShortUrl, updateShortUrlTags } = buildShlinkApiClient(getState);
 
   try {
-    const { longUrl } = await updateShortUrl(shortCode, domain, data as any); // FIXME Parse dates
+    const [ shortUrl ] = await Promise.all([
+      updateShortUrl(shortCode, domain, data as any), // FIXME Parse dates
+      sendTagsSeparately && data.tags ? updateShortUrlTags(shortCode, domain, data.tags) : undefined,
+    ]);
 
-    dispatch<ShortUrlEditedAction>({ shortCode, longUrl, domain, type: SHORT_URL_EDITED });
+    dispatch<ShortUrlEditedAction>({ shortUrl, type: SHORT_URL_EDITED });
   } catch (e) {
     dispatch<ShortUrlEditionFailedAction>({ type: EDIT_SHORT_URL_ERROR, errorData: parseApiError(e) });
 

src/short-urls/reducers/shortUrlMeta.ts

@@ -1,65 +0,0 @@
-import { Dispatch, Action } from 'redux';
-import { ShortUrlIdentifier, ShortUrlMeta } from '../data';
-import { GetState } from '../../container/types';
-import { buildActionCreator, buildReducer } from '../../utils/helpers/redux';
-import { OptionalString } from '../../utils/utils';
-import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
-import { ProblemDetailsError } from '../../api/types';
-import { parseApiError } from '../../api/utils';
-
-/* eslint-disable padding-line-between-statements */
-export const EDIT_SHORT_URL_META_START = 'shlink/shortUrlMeta/EDIT_SHORT_URL_META_START';
-export const EDIT_SHORT_URL_META_ERROR = 'shlink/shortUrlMeta/EDIT_SHORT_URL_META_ERROR';
-export const SHORT_URL_META_EDITED = 'shlink/shortUrlMeta/SHORT_URL_META_EDITED';
-export const RESET_EDIT_SHORT_URL_META = 'shlink/shortUrlMeta/RESET_EDIT_SHORT_URL_META';
-/* eslint-enable padding-line-between-statements */
-
-export interface ShortUrlMetaEdition {
-  shortCode: string | null;
-  meta: ShortUrlMeta;
-  saving: boolean;
-  error: boolean;
-  errorData?: ProblemDetailsError;
-}
-
-export interface ShortUrlMetaEditedAction extends Action<string>, ShortUrlIdentifier {
-  meta: ShortUrlMeta;
-}
-
-export interface ShortUrlMetaEditionFailedAction extends Action<string> {
-  errorData?: ProblemDetailsError;
-}
-
-const initialState: ShortUrlMetaEdition = {
-  shortCode: null,
-  meta: {},
-  saving: false,
-  error: false,
-};
-
-export default buildReducer<ShortUrlMetaEdition, ShortUrlMetaEditedAction & ShortUrlMetaEditionFailedAction>({
-  [EDIT_SHORT_URL_META_START]: (state) => ({ ...state, saving: true, error: false }),
-  [EDIT_SHORT_URL_META_ERROR]: (state, { errorData }) => ({ ...state, saving: false, error: true, errorData }),
-  [SHORT_URL_META_EDITED]: (_, { shortCode, meta }) => ({ shortCode, meta, saving: false, error: false }),
-  [RESET_EDIT_SHORT_URL_META]: () => initialState,
-}, initialState);
-
-export const editShortUrlMeta = (buildShlinkApiClient: ShlinkApiClientBuilder) => (
-  shortCode: string,
-  domain: OptionalString,
-  meta: ShortUrlMeta,
-) => async (dispatch: Dispatch, getState: GetState) => {
-  dispatch({ type: EDIT_SHORT_URL_META_START });
-  const { updateShortUrl } = buildShlinkApiClient(getState);
-
-  try {
-    await updateShortUrl(shortCode, domain, meta);
-    dispatch<ShortUrlMetaEditedAction>({ shortCode, meta, domain, type: SHORT_URL_META_EDITED });
-  } catch (e) {
-    dispatch<ShortUrlMetaEditionFailedAction>({ type: EDIT_SHORT_URL_META_ERROR, errorData: parseApiError(e) });
-
-    throw e;
-  }
-};
-
-export const resetShortUrlMeta = buildActionCreator(RESET_EDIT_SHORT_URL_META);

src/short-urls/reducers/shortUrlTags.ts

@@ -1,74 +0,0 @@
-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';
-import { ShortUrlIdentifier } from '../data';
-import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
-import { ProblemDetailsError } from '../../api/types';
-import { parseApiError } from '../../api/utils';
-import { supportsTagsInPatch } from '../../utils/helpers/features';
-
-/* eslint-disable padding-line-between-statements */
-export const EDIT_SHORT_URL_TAGS_START = 'shlink/shortUrlTags/EDIT_SHORT_URL_TAGS_START';
-export const EDIT_SHORT_URL_TAGS_ERROR = 'shlink/shortUrlTags/EDIT_SHORT_URL_TAGS_ERROR';
-export const SHORT_URL_TAGS_EDITED = 'shlink/shortUrlTags/SHORT_URL_TAGS_EDITED';
-export const RESET_EDIT_SHORT_URL_TAGS = 'shlink/shortUrlTags/RESET_EDIT_SHORT_URL_TAGS';
-/* eslint-enable padding-line-between-statements */
-
-export interface ShortUrlTags {
-  shortCode: string | null;
-  tags: string[];
-  saving: boolean;
-  error: boolean;
-  errorData?: ProblemDetailsError;
-}
-
-export interface EditShortUrlTagsAction extends Action<string>, ShortUrlIdentifier {
-  tags: string[];
-}
-
-export interface EditShortUrlTagsFailedAction extends Action<string> {
-  errorData?: ProblemDetailsError;
-}
-
-const initialState: ShortUrlTags = {
-  shortCode: null,
-  tags: [],
-  saving: false,
-  error: false,
-};
-
-export default buildReducer<ShortUrlTags, EditShortUrlTagsAction & EditShortUrlTagsFailedAction>({
-  [EDIT_SHORT_URL_TAGS_START]: (state) => ({ ...state, saving: true, error: false }),
-  [EDIT_SHORT_URL_TAGS_ERROR]: (state, { errorData }) => ({ ...state, saving: false, error: true, errorData }),
-  [SHORT_URL_TAGS_EDITED]: (_, { shortCode, tags }) => ({ shortCode, tags, saving: false, error: false }),
-  [RESET_EDIT_SHORT_URL_TAGS]: () => initialState,
-}, initialState);
-
-export const editShortUrlTags = (buildShlinkApiClient: ShlinkApiClientBuilder) => (
-  shortCode: string,
-  domain: OptionalString,
-  tags: string[],
-) => async (dispatch: Dispatch, getState: GetState) => {
-  dispatch({ type: EDIT_SHORT_URL_TAGS_START });
-  const { selectedServer } = getState();
-  const tagsInPatch = supportsTagsInPatch(selectedServer);
-  const { updateShortUrlTags, updateShortUrl } = buildShlinkApiClient(getState);
-
-  try {
-    const normalizedTags = await (
-      tagsInPatch
-        ? updateShortUrl(shortCode, domain, { tags }).then(prop('tags'))
-        : updateShortUrlTags(shortCode, domain, tags)
-    );
-
-    dispatch<EditShortUrlTagsAction>({ tags: normalizedTags, shortCode, domain, type: SHORT_URL_TAGS_EDITED });
-  } catch (e) {
-    dispatch<EditShortUrlTagsFailedAction>({ type: EDIT_SHORT_URL_TAGS_ERROR, errorData: parseApiError(e) });
-
-    throw e;
-  }
-};
-
-export const resetShortUrlsTags = buildActionCreator(RESET_EDIT_SHORT_URL_TAGS);

src/short-urls/reducers/shortUrlsList.ts

@@ -2,15 +2,11 @@ import { assoc, assocPath, init, last, pipe, reject } from 'ramda';
 import { Action, Dispatch } from 'redux';
 import { shortUrlMatches } from '../helpers';
 import { CREATE_VISITS, CreateVisitsAction } from '../../visits/reducers/visitCreation';
-import { ShortUrl, ShortUrlIdentifier } from '../data';
 import { buildReducer } from '../../utils/helpers/redux';
 import { GetState } from '../../container/types';
 import { ShlinkApiClientBuilder } from '../../api/services/ShlinkApiClientBuilder';
 import { ShlinkShortUrlsResponse } from '../../api/types';
-import { EditShortUrlTagsAction, SHORT_URL_TAGS_EDITED } from './shortUrlTags';
 import { DeleteShortUrlAction, SHORT_URL_DELETED } from './shortUrlDeletion';
-import { SHORT_URL_META_EDITED, ShortUrlMetaEditedAction } from './shortUrlMeta';
-import { SHORT_URL_EDITED, ShortUrlEditedAction } from './shortUrlEdition';
 import { ShortUrlsListParams } from './shortUrlsListParams';
 import { CREATE_SHORT_URL, CreateShortUrlAction } from './shortUrlCreation';
 
@@ -33,9 +29,6 @@ export interface ListShortUrlsAction extends Action<string> {
 
 export type ListShortUrlsCombinedAction = (
   ListShortUrlsAction
-  & EditShortUrlTagsAction
-  & ShortUrlEditedAction
-  & ShortUrlMetaEditedAction
   & CreateVisitsAction
   & CreateShortUrlAction
   & DeleteShortUrlAction
@@ -46,18 +39,6 @@ const initialState: ShortUrlsList = {
   error: false,
 };
 
-const setPropFromActionOnMatchingShortUrl = <T extends ShortUrlIdentifier>(prop: keyof T) => (
-  state: ShortUrlsList,
-  { shortCode, domain, [prop]: propValue }: T,
-): ShortUrlsList => !state.shortUrls ? state : assocPath(
-  [ 'shortUrls', 'data' ],
-  state.shortUrls.data.map(
-    (shortUrl: ShortUrl) =>
-      shortUrlMatches(shortUrl, shortCode, domain) ? { ...shortUrl, [prop]: propValue } : shortUrl,
-  ),
-  state,
-);
-
 export default buildReducer<ShortUrlsList, ListShortUrlsCombinedAction>({
   [LIST_SHORT_URLS_START]: (state) => ({ ...state, loading: true, error: false }),
   [LIST_SHORT_URLS_ERROR]: () => ({ loading: false, error: true }),
@@ -74,9 +55,6 @@ export default buildReducer<ShortUrlsList, ListShortUrlsCombinedAction>({
       state,
     ),
   ),
-  [SHORT_URL_TAGS_EDITED]: setPropFromActionOnMatchingShortUrl<EditShortUrlTagsAction>('tags'),
-  [SHORT_URL_META_EDITED]: setPropFromActionOnMatchingShortUrl<ShortUrlMetaEditedAction>('meta'),
-  [SHORT_URL_EDITED]: setPropFromActionOnMatchingShortUrl<ShortUrlEditedAction>('longUrl'),
   [CREATE_VISITS]: (state, { createdVisits }) => assocPath(
     [ 'shortUrls', 'data' ],
     state.shortUrls?.data?.map(

src/short-urls/services/provideServices.ts

@@ -10,8 +10,6 @@ import CreateShortUrlResult from '../helpers/CreateShortUrlResult';
 import { listShortUrls } from '../reducers/shortUrlsList';
 import { createShortUrl, resetCreateShortUrl } from '../reducers/shortUrlCreation';
 import { deleteShortUrl, resetDeleteShortUrl } from '../reducers/shortUrlDeletion';
-import { editShortUrlTags, resetShortUrlsTags } from '../reducers/shortUrlTags';
-import { editShortUrlMeta, resetShortUrlMeta } from '../reducers/shortUrlMeta';
 import { resetShortUrlParams } from '../reducers/shortUrlsListParams';
 import { editShortUrl } from '../reducers/shortUrlEdition';
 import { ConnectDecorator } from '../../container/types';
@@ -61,9 +59,6 @@ const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
   bottle.decorator('SearchBar', connect([ 'shortUrlsListParams' ], [ 'listShortUrls' ]));
 
   // Actions
-  bottle.serviceFactory('editShortUrlTags', editShortUrlTags, 'buildShlinkApiClient');
-  bottle.serviceFactory('resetShortUrlsTags', () => resetShortUrlsTags);
-
   bottle.serviceFactory('listShortUrls', listShortUrls, 'buildShlinkApiClient');
   bottle.serviceFactory('resetShortUrlParams', () => resetShortUrlParams);
 
@@ -73,9 +68,6 @@ const provideServices = (bottle: Bottle, connect: ConnectDecorator) => {
   bottle.serviceFactory('deleteShortUrl', deleteShortUrl, 'buildShlinkApiClient');
   bottle.serviceFactory('resetDeleteShortUrl', () => resetDeleteShortUrl);
 
-  bottle.serviceFactory('editShortUrlMeta', editShortUrlMeta, 'buildShlinkApiClient');
-  bottle.serviceFactory('resetShortUrlMeta', () => resetShortUrlMeta);
-
   bottle.serviceFactory('getShortUrlDetail', getShortUrlDetail, 'buildShlinkApiClient');
 
   bottle.serviceFactory('editShortUrl', editShortUrl, 'buildShlinkApiClient');