@jetshop/core 5.13.2 → 5.13.10-0

package/components/Filters/utils/replaceInSearch.d.ts

@@ -1,14 +1,14 @@
-import { routeType } from '@jetshop/ui/ScrollRestorationHandler/ScrollRestorationHandler';
-import { History, Location } from 'history';
-interface ReplaceInSearch {
-    history: History;
-    location: Location;
-    queryString: string;
-    replaceType?: boolean;
-    routeType?: routeType;
-}
-export declare function replaceInSearch({ history, location, queryString, replaceType, routeType }: ReplaceInSearch): {
-    [key: string]: any;
-    page?: string;
-};
-export {};
+import { routeType } from '@jetshop/ui/ScrollRestorationHandler/ScrollRestorationHandler';
+import { History, Location } from 'history';
+interface ReplaceInSearch {
+    history: History;
+    location: Location;
+    queryString: string;
+    replaceType?: boolean;
+    routeType?: routeType;
+}
+export declare function replaceInSearch({ history, location, queryString, replaceType, routeType }: ReplaceInSearch): {
+    [key: string]: any;
+    page?: string;
+};
+export {};

package/components/Filters/utils/replaceInSearch.js

@@ -1,23 +1,23 @@
-import { pushHistory } from '@jetshop/core/components/Filters/utils/updateHistory';
-import qs from 'qs';
-export function replaceInSearch({ history, location, queryString, replaceType, routeType }) {
-    const { pathname, hash } = location;
-    const currentSearch = qs.parse(location.search, { ignoreQueryPrefix: true });
-    const parsedString = qs.parse(queryString);
-    const [filterType, filterValues] = Object.entries(parsedString)[0];
-    const newSearch = Object.assign(Object.assign({}, currentSearch), { [filterType]: replaceType
-            ? filterValues
-            : Object.assign(Object.assign({}, currentSearch[filterType]), filterValues) });
-    if (filterValues === '' && replaceType) {
-        delete newSearch[filterType];
-    }
-    return pushHistory({
-        history,
-        pathname,
-        hash,
-        search: newSearch,
-        resetPage: true,
-        routeType
-    });
-}
+import { pushHistory } from '@jetshop/core/components/Filters/utils/updateHistory';
+import qs from 'qs';
+export function replaceInSearch({ history, location, queryString, replaceType, routeType }) {
+    const { pathname, hash } = location;
+    const currentSearch = qs.parse(location.search, { ignoreQueryPrefix: true });
+    const parsedString = qs.parse(queryString);
+    const [filterType, filterValues] = Object.entries(parsedString)[0];
+    const newSearch = Object.assign(Object.assign({}, currentSearch), { [filterType]: replaceType
+            ? filterValues
+            : Object.assign(Object.assign({}, currentSearch[filterType]), filterValues) });
+    if (filterValues === '' && replaceType) {
+        delete newSearch[filterType];
+    }
+    return pushHistory({
+        history,
+        pathname,
+        hash,
+        search: newSearch,
+        resetPage: true,
+        routeType
+    });
+}
 //# sourceMappingURL=replaceInSearch.js.map

package/components/Filters/utils/replaceInSearch.test.js

@@ -1,184 +1,184 @@
-import { replaceInSearch } from './replaceInSearch';
-
-const baseSearchString =
-  '?list[subname][0]=Blue&list[subname][1]=Red&list[somethingElse][0]=Neat&boolean[happy]=true&multiList[lotsOfLevels][0]=first&range[counter][0]=1&range[counter][1]=10&page=20';
-
-describe('replaceInSearch', () => {
-  let historyProp, mockHistoryPush;
-  beforeEach(() => {
-    mockHistoryPush = jest.fn().mockImplementation(val => val);
-
-    historyProp = {
-      history: { push: mockHistoryPush },
-      location: {
-        pathname: '/random-products',
-        hash: '',
-        search: baseSearchString,
-        key: '8q0q0c'
-      }
-    };
-  });
-
-  it('merges boolean query strings together', () => {
-    const result = replaceInSearch({
-      history: historyProp.history,
-      location: historyProp.location,
-      queryString: 'boolean[buyable]=true'
-    });
-
-    expect(result.boolean).toEqual(
-      expect.objectContaining({
-        // Original value in base string
-        happy: 'true',
-        // Merged value
-        buyable: 'true'
-      })
-    );
-  });
-
-  it('merges list filter query strings together', () => {
-    const result = replaceInSearch({
-      history: historyProp.history,
-      location: historyProp.location,
-      queryString: 'list[thing][]=Purple'
-    });
-
-    expect(result.list).toEqual(
-      expect.objectContaining({
-        // Original values
-        subname: ['Blue', 'Red'],
-        somethingElse: ['Neat'],
-        //Merged value
-        thing: ['Purple']
-      })
-    );
-  });
-
-  it('replaces existing list filter array if the id matches', () => {
-    // We already have an id of 'subname' in the original string, so this should
-    // replace it
-    const result = replaceInSearch({
-      history: historyProp.history,
-      location: historyProp.location,
-      queryString: 'list[subname][]=Purple'
-    });
-
-    expect(result.list).toEqual(
-      expect.objectContaining({
-        // Original value
-        somethingElse: ['Neat'],
-        //Merged value
-        subname: ['Purple']
-      })
-    );
-  });
-
-  it('merges multi list filter query strings together', () => {
-    const result = replaceInSearch({
-      history: historyProp.history,
-      location: historyProp.location,
-      queryString:
-        'multiList[multi-level][]=Level%201&multiList[multi-level][]=Level%201.1&multiList[multi-level][]=Level%201.2'
-    });
-
-    expect(result.multiList).toEqual(
-      expect.objectContaining({
-        // Original value
-        lotsOfLevels: ['first'],
-        //Merged value
-        'multi-level': ['Level 1', 'Level 1.1', 'Level 1.2']
-      })
-    );
-  });
-
-  it('replaces existing multiList filter array if the id matches', () => {
-    const result = replaceInSearch({
-      history: historyProp.history,
-      location: historyProp.location,
-      queryString: 'multiList[lotsOfLevels][]=10&multiList[lotsOfLevels][]=11'
-    });
-
-    expect(result.multiList).toEqual(
-      expect.objectContaining({
-        //Merged value
-        lotsOfLevels: ['10', '11']
-      })
-    );
-  });
-
-  it('merges range filter query strings together', () => {
-    const result = replaceInSearch({
-      history: historyProp.history,
-      location: historyProp.location,
-      queryString: 'range[price][0]=2780&range[price][1]=12014'
-    });
-
-    expect(result.range).toEqual(
-      expect.objectContaining({
-        // Original value
-        counter: ['1', '10'],
-        //Merged value
-        price: ['2780', '12014']
-      })
-    );
-  });
-
-  it('calls pushHistory with `resetPage` as true', () => {
-    // resetPage removes the ?page=n param
-    const result = replaceInSearch({
-      history: historyProp.history,
-      location: historyProp.location,
-      queryString: 'range[price][0]=2780&range[price][1]=12014'
-    });
-    expect(result).toEqual(
-      expect.not.objectContaining({
-        page: '20'
-      })
-    );
-  });
-
-  it('replaces by type if replaceType is passed', () => {
-    const result = replaceInSearch({
-      history: historyProp.history,
-      location: historyProp.location,
-      queryString: 'list[subname][0]=Orange',
-      replaceType: true
-    });
-
-    expect(result.list).toEqual(
-      expect.objectContaining({
-        subname: ['Orange']
-      })
-    );
-    expect(result.list).toEqual(
-      expect.not.objectContaining({
-        subname: ['Blue', 'Red']
-      })
-    );
-  });
-
-  describe('removes the type if there are no filters of type to apply', () => {
-    it('when replaceType is true', () => {
-      const result = replaceInSearch({
-        history: historyProp.history,
-        location: historyProp.location,
-        queryString: 'list=',
-        replaceType: true
-      });
-
-      const keys = Object.keys(result);
-      expect(keys).not.toContain('list');
-    });
-    it('but not when replaceType is false', () => {
-      const result = replaceInSearch({
-        history: historyProp.history,
-        location: historyProp.location,
-        queryString: 'list=',
-        replaceType: false
-      });
-
-      const keys = Object.keys(result);
-      expect(keys).toContain('list');
-    });
-  });
-});
+import { replaceInSearch } from './replaceInSearch';
+
+const baseSearchString =
+  '?list[subname][0]=Blue&list[subname][1]=Red&list[somethingElse][0]=Neat&boolean[happy]=true&multiList[lotsOfLevels][0]=first&range[counter][0]=1&range[counter][1]=10&page=20';
+
+describe('replaceInSearch', () => {
+  let historyProp, mockHistoryPush;
+  beforeEach(() => {
+    mockHistoryPush = jest.fn().mockImplementation(val => val);
+
+    historyProp = {
+      history: { push: mockHistoryPush },
+      location: {
+        pathname: '/random-products',
+        hash: '',
+        search: baseSearchString,
+        key: '8q0q0c'
+      }
+    };
+  });
+
+  it('merges boolean query strings together', () => {
+    const result = replaceInSearch({
+      history: historyProp.history,
+      location: historyProp.location,
+      queryString: 'boolean[buyable]=true'
+    });
+
+    expect(result.boolean).toEqual(
+      expect.objectContaining({
+        // Original value in base string
+        happy: 'true',
+        // Merged value
+        buyable: 'true'
+      })
+    );
+  });
+
+  it('merges list filter query strings together', () => {
+    const result = replaceInSearch({
+      history: historyProp.history,
+      location: historyProp.location,
+      queryString: 'list[thing][]=Purple'
+    });
+
+    expect(result.list).toEqual(
+      expect.objectContaining({
+        // Original values
+        subname: ['Blue', 'Red'],
+        somethingElse: ['Neat'],
+        //Merged value
+        thing: ['Purple']
+      })
+    );
+  });
+
+  it('replaces existing list filter array if the id matches', () => {
+    // We already have an id of 'subname' in the original string, so this should
+    // replace it
+    const result = replaceInSearch({
+      history: historyProp.history,
+      location: historyProp.location,
+      queryString: 'list[subname][]=Purple'
+    });
+
+    expect(result.list).toEqual(
+      expect.objectContaining({
+        // Original value
+        somethingElse: ['Neat'],
+        //Merged value
+        subname: ['Purple']
+      })
+    );
+  });
+
+  it('merges multi list filter query strings together', () => {
+    const result = replaceInSearch({
+      history: historyProp.history,
+      location: historyProp.location,
+      queryString:
+        'multiList[multi-level][]=Level%201&multiList[multi-level][]=Level%201.1&multiList[multi-level][]=Level%201.2'
+    });
+
+    expect(result.multiList).toEqual(
+      expect.objectContaining({
+        // Original value
+        lotsOfLevels: ['first'],
+        //Merged value
+        'multi-level': ['Level 1', 'Level 1.1', 'Level 1.2']
+      })
+    );
+  });
+
+  it('replaces existing multiList filter array if the id matches', () => {
+    const result = replaceInSearch({
+      history: historyProp.history,
+      location: historyProp.location,
+      queryString: 'multiList[lotsOfLevels][]=10&multiList[lotsOfLevels][]=11'
+    });
+
+    expect(result.multiList).toEqual(
+      expect.objectContaining({
+        //Merged value
+        lotsOfLevels: ['10', '11']
+      })
+    );
+  });
+
+  it('merges range filter query strings together', () => {
+    const result = replaceInSearch({
+      history: historyProp.history,
+      location: historyProp.location,
+      queryString: 'range[price][0]=2780&range[price][1]=12014'
+    });
+
+    expect(result.range).toEqual(
+      expect.objectContaining({
+        // Original value
+        counter: ['1', '10'],
+        //Merged value
+        price: ['2780', '12014']
+      })
+    );
+  });
+
+  it('calls pushHistory with `resetPage` as true', () => {
+    // resetPage removes the ?page=n param
+    const result = replaceInSearch({
+      history: historyProp.history,
+      location: historyProp.location,
+      queryString: 'range[price][0]=2780&range[price][1]=12014'
+    });
+    expect(result).toEqual(
+      expect.not.objectContaining({
+        page: '20'
+      })
+    );
+  });
+
+  it('replaces by type if replaceType is passed', () => {
+    const result = replaceInSearch({
+      history: historyProp.history,
+      location: historyProp.location,
+      queryString: 'list[subname][0]=Orange',
+      replaceType: true
+    });
+
+    expect(result.list).toEqual(
+      expect.objectContaining({
+        subname: ['Orange']
+      })
+    );
+    expect(result.list).toEqual(
+      expect.not.objectContaining({
+        subname: ['Blue', 'Red']
+      })
+    );
+  });
+
+  describe('removes the type if there are no filters of type to apply', () => {
+    it('when replaceType is true', () => {
+      const result = replaceInSearch({
+        history: historyProp.history,
+        location: historyProp.location,
+        queryString: 'list=',
+        replaceType: true
+      });
+
+      const keys = Object.keys(result);
+      expect(keys).not.toContain('list');
+    });
+    it('but not when replaceType is false', () => {
+      const result = replaceInSearch({
+        history: historyProp.history,
+        location: historyProp.location,
+        queryString: 'list=',
+        replaceType: false
+      });
+
+      const keys = Object.keys(result);
+      expect(keys).toContain('list');
+    });
+  });
+});

package/components/Filters/utils/updateHistory.d.ts

@@ -1,25 +1,25 @@
-import { History } from 'history';
-interface UpdateHistory {
-    history: History;
-    pathname: string;
-    hash: string;
-    search: {
-        page?: string;
-        [key: string]: any;
-    };
-    resetPage?: boolean;
-    /**
-     * A string representing the type of route. May be useful for creating
-     * different behaviour when routing to certain route types
-     */
-    routeType?: string;
-}
-export declare function pushHistory(args: UpdateHistory): {
-    [key: string]: any;
-    page?: string;
-};
-export declare function replaceHistory(args: UpdateHistory): {
-    [key: string]: any;
-    page?: string;
-};
-export {};
+import { History } from 'history';
+interface UpdateHistory {
+    history: History;
+    pathname: string;
+    hash: string;
+    search: {
+        page?: string;
+        [key: string]: any;
+    };
+    resetPage?: boolean;
+    /**
+     * A string representing the type of route. May be useful for creating
+     * different behaviour when routing to certain route types
+     */
+    routeType?: string;
+}
+export declare function pushHistory(args: UpdateHistory): {
+    [key: string]: any;
+    page?: string;
+};
+export declare function replaceHistory(args: UpdateHistory): {
+    [key: string]: any;
+    page?: string;
+};
+export {};

package/components/Filters/utils/updateHistory.js

@@ -1,30 +1,30 @@
-import qs from 'qs';
-function getNewLocation({ pathname, hash, search, resetPage, routeType }) {
-    if (resetPage && search) {
-        // Delete the page if there is one, so pagination gets reset
-        delete search.page;
-    }
-    const stringifiedSearch = qs.stringify(search, {
-        encodeValuesOnly: true,
-        skipNulls: true
-    });
-    return {
-        pathname,
-        hash,
-        search: stringifiedSearch,
-        state: {
-            type: routeType
-        }
-    };
-}
-export function pushHistory(args) {
-    const { history } = args;
-    history.push(getNewLocation(args));
-    return args.search;
-}
-export function replaceHistory(args) {
-    const { history } = args;
-    history.replace(getNewLocation(args));
-    return args.search;
-}
+import qs from 'qs';
+function getNewLocation({ pathname, hash, search, resetPage, routeType }) {
+    if (resetPage && search) {
+        // Delete the page if there is one, so pagination gets reset
+        delete search.page;
+    }
+    const stringifiedSearch = qs.stringify(search, {
+        encodeValuesOnly: true,
+        skipNulls: true
+    });
+    return {
+        pathname,
+        hash,
+        search: stringifiedSearch,
+        state: {
+            type: routeType
+        }
+    };
+}
+export function pushHistory(args) {
+    const { history } = args;
+    history.push(getNewLocation(args));
+    return args.search;
+}
+export function replaceHistory(args) {
+    const { history } = args;
+    history.replace(getNewLocation(args));
+    return args.search;
+}
 //# sourceMappingURL=updateHistory.js.map