Deleted reducers for short URL tags and short URL meta

test/short-urls/reducers/shortUrlEdition.test.ts

@@ -7,16 +7,17 @@ import reducer, {
   ShortUrlEditedAction,
 } from '../../../src/short-urls/reducers/shortUrlEdition';
 import { ShlinkState } from '../../../src/container/types';
+import { ShortUrl } from '../../../src/short-urls/data';
+import { ReachableServer, SelectedServer } from '../../../src/servers/data';
 
 describe('shortUrlEditionReducer', () => {
   const longUrl = 'https://shlink.io';
   const shortCode = 'abc123';
+  const shortUrl = Mock.of<ShortUrl>({ longUrl, shortCode });
 
   describe('reducer', () => {
     it('returns loading on EDIT_SHORT_URL_START', () => {
       expect(reducer(undefined, Mock.of<ShortUrlEditedAction>({ type: EDIT_SHORT_URL_START }))).toEqual({
-        longUrl: null,
-        shortCode: null,
         saving: true,
         error: false,
       });
@@ -24,17 +25,14 @@ describe('shortUrlEditionReducer', () => {
 
     it('returns error on EDIT_SHORT_URL_ERROR', () => {
       expect(reducer(undefined, Mock.of<ShortUrlEditedAction>({ type: EDIT_SHORT_URL_ERROR }))).toEqual({
-        longUrl: null,
-        shortCode: null,
         saving: false,
         error: true,
       });
     });
 
     it('returns provided tags and shortCode on SHORT_URL_EDITED', () => {
-      expect(reducer(undefined, { type: SHORT_URL_EDITED, longUrl, shortCode, domain: null })).toEqual({
-        longUrl,
-        shortCode,
+      expect(reducer(undefined, { type: SHORT_URL_EDITED, shortUrl })).toEqual({
+        shortUrl,
         saving: false,
         error: false,
       });
@@ -42,31 +40,51 @@ describe('shortUrlEditionReducer', () => {
   });
 
   describe('editShortUrl', () => {
-    const updateShortUrl = jest.fn().mockResolvedValue({ longUrl });
-    const buildShlinkApiClient = jest.fn().mockReturnValue({ updateShortUrl });
+    const updateShortUrl = jest.fn().mockResolvedValue(shortUrl);
+    const updateShortUrlTags = jest.fn().mockResolvedValue([]);
+    const buildShlinkApiClient = jest.fn().mockReturnValue({ updateShortUrl, updateShortUrlTags });
     const dispatch = jest.fn();
-    const getState = () => Mock.of<ShlinkState>();
+    const createGetState = (selectedServer: SelectedServer = null) => () => Mock.of<ShlinkState>({ selectedServer });
 
     afterEach(jest.clearAllMocks);
 
-    it.each([[ undefined ], [ null ], [ 'example.com' ]])('dispatches long URL on success', async (domain) => {
-      await editShortUrl(buildShlinkApiClient)(shortCode, domain, { longUrl })(dispatch, getState);
+    it.each([[ undefined ], [ null ], [ 'example.com' ]])('dispatches short URL on success', async (domain) => {
+      await editShortUrl(buildShlinkApiClient)(shortCode, domain, { longUrl })(dispatch, createGetState());
 
       expect(buildShlinkApiClient).toHaveBeenCalledTimes(1);
       expect(updateShortUrl).toHaveBeenCalledTimes(1);
       expect(updateShortUrl).toHaveBeenCalledWith(shortCode, domain, { longUrl });
       expect(dispatch).toHaveBeenCalledTimes(2);
       expect(dispatch).toHaveBeenNthCalledWith(1, { type: EDIT_SHORT_URL_START });
-      expect(dispatch).toHaveBeenNthCalledWith(2, { type: SHORT_URL_EDITED, longUrl, shortCode, domain });
+      expect(dispatch).toHaveBeenNthCalledWith(2, { type: SHORT_URL_EDITED, shortUrl });
     });
 
+    it.each([
+      [ null, { tags: [ 'foo', 'bar' ] }, 1 ],
+      [ null, {}, 0 ],
+      [ Mock.of<ReachableServer>({ version: '2.6.0' }), {}, 0 ],
+      [ Mock.of<ReachableServer>({ version: '2.6.0' }), { tags: [ 'foo', 'bar' ] }, 0 ],
+      [ Mock.of<ReachableServer>({ version: '2.5.0' }), {}, 0 ],
+      [ Mock.of<ReachableServer>({ version: '2.5.0' }), { tags: [ 'foo', 'bar' ] }, 1 ],
+    ])(
+      'sends tags separately when appropriate, based on selected server and the payload',
+      async (server, payload, expectedTagsCalls) => {
+        const getState = createGetState(server);
+
+        await editShortUrl(buildShlinkApiClient)(shortCode, null, payload)(dispatch, getState);
+
+        expect(updateShortUrl).toHaveBeenCalled();
+        expect(updateShortUrlTags).toHaveBeenCalledTimes(expectedTagsCalls);
+      },
+    );
+
     it('dispatches error on failure', async () => {
       const error = new Error();
 
       updateShortUrl.mockRejectedValue(error);
 
       try {
-        await editShortUrl(buildShlinkApiClient)(shortCode, undefined, { longUrl })(dispatch, getState);
+        await editShortUrl(buildShlinkApiClient)(shortCode, undefined, { longUrl })(dispatch, createGetState());
       } catch (e) {
         expect(e).toBe(error);
       }

test/short-urls/reducers/shortUrlMeta.test.ts

@@ -1,100 +0,0 @@
-import moment from 'moment';
-import { Mock } from 'ts-mockery';
-import reducer, {
-  EDIT_SHORT_URL_META_START,
-  EDIT_SHORT_URL_META_ERROR,
-  SHORT_URL_META_EDITED,
-  RESET_EDIT_SHORT_URL_META,
-  editShortUrlMeta,
-  resetShortUrlMeta,
-} from '../../../src/short-urls/reducers/shortUrlMeta';
-import { ShlinkState } from '../../../src/container/types';
-
-describe('shortUrlMetaReducer', () => {
-  const meta = {
-    maxVisits: 50,
-    startDate: moment('2020-01-01').format(),
-  };
-  const shortCode = 'abc123';
-
-  describe('reducer', () => {
-    it('returns loading on EDIT_SHORT_URL_META_START', () => {
-      expect(reducer(undefined, { type: EDIT_SHORT_URL_META_START } as any)).toEqual({
-        meta: {},
-        shortCode: null,
-        saving: true,
-        error: false,
-      });
-    });
-
-    it('returns error on EDIT_SHORT_URL_META_ERROR', () => {
-      expect(reducer(undefined, { type: EDIT_SHORT_URL_META_ERROR } as any)).toEqual({
-        meta: {},
-        shortCode: null,
-        saving: false,
-        error: true,
-      });
-    });
-
-    it('returns provided tags and shortCode on SHORT_URL_META_EDITED', () => {
-      expect(reducer(undefined, { type: SHORT_URL_META_EDITED, meta, shortCode } as any)).toEqual({
-        meta,
-        shortCode,
-        saving: false,
-        error: false,
-      });
-    });
-
-    it('goes back to initial state on RESET_EDIT_SHORT_URL_META', () => {
-      expect(reducer(undefined, { type: RESET_EDIT_SHORT_URL_META } as any)).toEqual({
-        meta: {},
-        shortCode: null,
-        saving: false,
-        error: false,
-      });
-    });
-  });
-
-  describe('editShortUrlMeta', () => {
-    const updateShortUrl = jest.fn().mockResolvedValue({});
-    const buildShlinkApiClient = jest.fn().mockReturnValue({ updateShortUrl });
-    const dispatch = jest.fn();
-    const getState = () => Mock.all<ShlinkState>();
-
-    afterEach(jest.clearAllMocks);
-
-    it.each([[ undefined ], [ null ], [ 'example.com' ]])('dispatches metadata on success', async (domain) => {
-      await editShortUrlMeta(buildShlinkApiClient)(shortCode, domain, meta)(dispatch, getState);
-
-      expect(buildShlinkApiClient).toHaveBeenCalledTimes(1);
-      expect(updateShortUrl).toHaveBeenCalledTimes(1);
-      expect(updateShortUrl).toHaveBeenCalledWith(shortCode, domain, meta);
-      expect(dispatch).toHaveBeenCalledTimes(2);
-      expect(dispatch).toHaveBeenNthCalledWith(1, { type: EDIT_SHORT_URL_META_START });
-      expect(dispatch).toHaveBeenNthCalledWith(2, { type: SHORT_URL_META_EDITED, meta, shortCode, domain });
-    });
-
-    it('dispatches error on failure', async () => {
-      const error = new Error();
-
-      updateShortUrl.mockRejectedValue(error);
-
-      try {
-        await editShortUrlMeta(buildShlinkApiClient)(shortCode, undefined, meta)(dispatch, getState);
-      } catch (e) {
-        expect(e).toBe(error);
-      }
-
-      expect(buildShlinkApiClient).toHaveBeenCalledTimes(1);
-      expect(updateShortUrl).toHaveBeenCalledTimes(1);
-      expect(updateShortUrl).toHaveBeenCalledWith(shortCode, undefined, meta);
-      expect(dispatch).toHaveBeenCalledTimes(2);
-      expect(dispatch).toHaveBeenNthCalledWith(1, { type: EDIT_SHORT_URL_META_START });
-      expect(dispatch).toHaveBeenNthCalledWith(2, { type: EDIT_SHORT_URL_META_ERROR });
-    });
-  });
-
-  describe('resetShortUrlMeta', () => {
-    it('creates expected action', () => expect(resetShortUrlMeta()).toEqual({ type: RESET_EDIT_SHORT_URL_META }));
-  });
-});

test/short-urls/reducers/shortUrlTags.test.ts

@@ -1,131 +0,0 @@
-import { Mock } from 'ts-mockery';
-import reducer, {
-  EDIT_SHORT_URL_TAGS_ERROR,
-  EDIT_SHORT_URL_TAGS_START,
-  RESET_EDIT_SHORT_URL_TAGS,
-  resetShortUrlsTags,
-  SHORT_URL_TAGS_EDITED,
-  editShortUrlTags,
-  EditShortUrlTagsAction,
-} from '../../../src/short-urls/reducers/shortUrlTags';
-import { ShlinkState } from '../../../src/container/types';
-import { ReachableServer, SelectedServer } from '../../../src/servers/data';
-
-describe('shortUrlTagsReducer', () => {
-  const tags = [ 'foo', 'bar', 'baz' ];
-  const shortCode = 'abc123';
-
-  describe('reducer', () => {
-    const action = (type: string) => Mock.of<EditShortUrlTagsAction>({ type });
-
-    it('returns loading on EDIT_SHORT_URL_TAGS_START', () => {
-      expect(reducer(undefined, action(EDIT_SHORT_URL_TAGS_START))).toEqual({
-        tags: [],
-        shortCode: null,
-        saving: true,
-        error: false,
-      });
-    });
-
-    it('returns error on EDIT_SHORT_URL_TAGS_ERROR', () => {
-      expect(reducer(undefined, action(EDIT_SHORT_URL_TAGS_ERROR))).toEqual({
-        tags: [],
-        shortCode: null,
-        saving: false,
-        error: true,
-      });
-    });
-
-    it('returns provided tags and shortCode on SHORT_URL_TAGS_EDITED', () => {
-      expect(reducer(undefined, { type: SHORT_URL_TAGS_EDITED, tags, shortCode, domain: null })).toEqual({
-        tags,
-        shortCode,
-        saving: false,
-        error: false,
-      });
-    });
-
-    it('goes back to initial state on RESET_EDIT_SHORT_URL_TAGS', () => {
-      expect(reducer(undefined, action(RESET_EDIT_SHORT_URL_TAGS))).toEqual({
-        tags: [],
-        shortCode: null,
-        saving: false,
-        error: false,
-      });
-    });
-  });
-
-  describe('resetShortUrlsTags', () => {
-    it('creates expected action', () => expect(resetShortUrlsTags()).toEqual({ type: RESET_EDIT_SHORT_URL_TAGS }));
-  });
-
-  describe('editShortUrlTags', () => {
-    const updateShortUrlTags = jest.fn();
-    const updateShortUrl = jest.fn();
-    const buildShlinkApiClient = jest.fn().mockReturnValue({ updateShortUrlTags, updateShortUrl });
-    const dispatch = jest.fn();
-    const buildGetState = (selectedServer?: SelectedServer) => () => Mock.of<ShlinkState>({ selectedServer });
-
-    afterEach(jest.clearAllMocks);
-
-    it.each([[ undefined ], [ null ], [ 'example.com' ]])('dispatches normalized tags on success', async (domain) => {
-      const normalizedTags = [ 'bar', 'foo' ];
-
-      updateShortUrlTags.mockResolvedValue(normalizedTags);
-
-      await editShortUrlTags(buildShlinkApiClient)(shortCode, domain, tags)(dispatch, buildGetState());
-
-      expect(buildShlinkApiClient).toHaveBeenCalledTimes(1);
-      expect(updateShortUrlTags).toHaveBeenCalledTimes(1);
-      expect(updateShortUrlTags).toHaveBeenCalledWith(shortCode, domain, tags);
-      expect(updateShortUrl).not.toHaveBeenCalled();
-      expect(dispatch).toHaveBeenCalledTimes(2);
-      expect(dispatch).toHaveBeenNthCalledWith(1, { type: EDIT_SHORT_URL_TAGS_START });
-      expect(dispatch).toHaveBeenNthCalledWith(
-        2,
-        { type: SHORT_URL_TAGS_EDITED, tags: normalizedTags, shortCode, domain },
-      );
-    });
-
-    it('calls updateShortUrl when server is version 2.6.0 or above', async () => {
-      const normalizedTags = [ 'bar', 'foo' ];
-
-      updateShortUrl.mockResolvedValue({ tags: normalizedTags });
-
-      await editShortUrlTags(buildShlinkApiClient)(shortCode, undefined, tags)(
-        dispatch,
-        buildGetState(Mock.of<ReachableServer>({ printableVersion: '', version: '2.6.0' })),
-      );
-
-      expect(buildShlinkApiClient).toHaveBeenCalledTimes(1);
-      expect(updateShortUrl).toHaveBeenCalledTimes(1);
-      expect(updateShortUrl).toHaveBeenCalledWith(shortCode, undefined, { tags });
-      expect(updateShortUrlTags).not.toHaveBeenCalled();
-      expect(dispatch).toHaveBeenCalledTimes(2);
-      expect(dispatch).toHaveBeenNthCalledWith(1, { type: EDIT_SHORT_URL_TAGS_START });
-      expect(dispatch).toHaveBeenNthCalledWith(
-        2,
-        { type: SHORT_URL_TAGS_EDITED, tags: normalizedTags, shortCode },
-      );
-    });
-
-    it('dispatches error on failure', async () => {
-      const error = new Error();
-
-      updateShortUrlTags.mockRejectedValue(error);
-
-      try {
-        await editShortUrlTags(buildShlinkApiClient)(shortCode, undefined, tags)(dispatch, buildGetState());
-      } catch (e) {
-        expect(e).toBe(error);
-      }
-
-      expect(buildShlinkApiClient).toHaveBeenCalledTimes(1);
-      expect(updateShortUrlTags).toHaveBeenCalledTimes(1);
-      expect(updateShortUrlTags).toHaveBeenCalledWith(shortCode, undefined, tags);
-      expect(dispatch).toHaveBeenCalledTimes(2);
-      expect(dispatch).toHaveBeenNthCalledWith(1, { type: EDIT_SHORT_URL_TAGS_START });
-      expect(dispatch).toHaveBeenNthCalledWith(2, { type: EDIT_SHORT_URL_TAGS_ERROR });
-    });
-  });
-});

test/short-urls/reducers/shortUrlsList.test.ts

@@ -5,15 +5,12 @@ import reducer, {
   LIST_SHORT_URLS_START,
   listShortUrls,
 } from '../../../src/short-urls/reducers/shortUrlsList';
-import { SHORT_URL_TAGS_EDITED } from '../../../src/short-urls/reducers/shortUrlTags';
 import { SHORT_URL_DELETED } from '../../../src/short-urls/reducers/shortUrlDeletion';
-import { SHORT_URL_META_EDITED } from '../../../src/short-urls/reducers/shortUrlMeta';
 import { CREATE_VISITS } from '../../../src/visits/reducers/visitCreation';
 import { ShortUrl } from '../../../src/short-urls/data';
 import ShlinkApiClient from '../../../src/api/services/ShlinkApiClient';
 import { ShlinkPaginator, ShlinkShortUrlsResponse } from '../../../src/api/types';
 import { CREATE_SHORT_URL } from '../../../src/short-urls/reducers/shortUrlCreation';
-import { SHORT_URL_EDITED } from '../../../src/short-urls/reducers/shortUrlEdition';
 
 describe('shortUrlsListReducer', () => {
   describe('reducer', () => {
@@ -36,66 +33,6 @@ describe('shortUrlsListReducer', () => {
         error: true,
       }));
 
-    it('updates tags on matching URL on SHORT_URL_TAGS_EDITED', () => {
-      const shortCode = 'abc123';
-      const tags = [ 'foo', 'bar', 'baz' ];
-      const state = {
-        shortUrls: Mock.of<ShlinkShortUrlsResponse>({
-          data: [
-            Mock.of<ShortUrl>({ shortCode, tags: [] }),
-            Mock.of<ShortUrl>({ shortCode, tags: [], domain: 'example.com' }),
-            Mock.of<ShortUrl>({ shortCode: 'foo', tags: [] }),
-          ],
-        }),
-        loading: false,
-        error: false,
-      };
-
-      expect(reducer(state, { type: SHORT_URL_TAGS_EDITED, shortCode, tags, domain: null } as any)).toEqual({
-        shortUrls: {
-          data: [
-            { shortCode, tags },
-            { shortCode, tags: [], domain: 'example.com' },
-            { shortCode: 'foo', tags: [] },
-          ],
-        },
-        loading: false,
-        error: false,
-      });
-    });
-
-    it('updates meta on matching URL on SHORT_URL_META_EDITED', () => {
-      const shortCode = 'abc123';
-      const domain = 'example.com';
-      const meta = {
-        maxVisits: 5,
-        validSince: '2020-05-05',
-      };
-      const state = {
-        shortUrls: Mock.of<ShlinkShortUrlsResponse>({
-          data: [
-            Mock.of<ShortUrl>({ shortCode, meta: { maxVisits: 10 }, domain }),
-            Mock.of<ShortUrl>({ shortCode, meta: { maxVisits: 50 } }),
-            Mock.of<ShortUrl>({ shortCode: 'foo', meta: {} }),
-          ],
-        }),
-        loading: false,
-        error: false,
-      };
-
-      expect(reducer(state, { type: SHORT_URL_META_EDITED, shortCode, meta, domain } as any)).toEqual({
-        shortUrls: {
-          data: [
-            { shortCode, meta, domain: 'example.com' },
-            { shortCode, meta: { maxVisits: 50 } },
-            { shortCode: 'foo', meta: {} },
-          ],
-        },
-        loading: false,
-        error: false,
-      });
-    });
-
     it('removes matching URL and reduces total on SHORT_URL_DELETED', () => {
       const shortCode = 'abc123';
       const state = {
@@ -123,33 +60,6 @@ describe('shortUrlsListReducer', () => {
       });
     });
 
-    it('updates edited short URL on SHORT_URL_EDITED', () => {
-      const shortCode = 'abc123';
-      const state = {
-        shortUrls: Mock.of<ShlinkShortUrlsResponse>({
-          data: [
-            Mock.of<ShortUrl>({ shortCode, longUrl: 'old' }),
-            Mock.of<ShortUrl>({ shortCode, domain: 'example.com', longUrl: 'foo' }),
-            Mock.of<ShortUrl>({ shortCode: 'foo', longUrl: 'bar' }),
-          ],
-        }),
-        loading: false,
-        error: false,
-      };
-
-      expect(reducer(state, { type: SHORT_URL_EDITED, shortCode, longUrl: 'newValue' } as any)).toEqual({
-        shortUrls: {
-          data: [
-            { shortCode, longUrl: 'newValue' },
-            { shortCode, longUrl: 'foo', domain: 'example.com' },
-            { shortCode: 'foo', longUrl: 'bar' },
-          ],
-        },
-        loading: false,
-        error: false,
-      });
-    });
-
     const createNewShortUrlVisit = (visitsCount: number) => ({
       shortUrl: { shortCode: 'abc123', visitsCount },
     });