@bonlineza/luxity-lib 2.37.0 → 2.37.2

package/AddProductInterest.js

@@ -1,13 +1,11 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('react'), require('styled-components'), require('axios'), require('js-cookie'), require('react-notify-toast'), require('stylis-rule-sheet'), require('react-dom'), require('prop-types'), require('raf'), require('react-input-autosize'), require('react-transition-group')) :
-  typeof define === 'function' && define.amd ? define(['react', 'styled-components', 'axios', 'js-cookie', 'react-notify-toast', 'stylis-rule-sheet', 'react-dom', 'prop-types', 'raf', 'react-input-autosize', 'react-transition-group'], factory) :
-  (global = global || self, global.AddProductInterest = factory(global.React, global.styled, global.axios, global.Cookies, global['react-notify-toast'], global['stylis-rule-sheet'], global.reactDom, global.PropTypes, global.raf, global['react-input-autosize'], global['react-transition-group']));
-}(this, (function (React, styled, axios, Cookies, Notifications, stylisRuleSheet, reactDom, PropTypes, raf, AutosizeInput, reactTransitionGroup) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('react'), require('styled-components'), require('react-notify-toast'), require('stylis-rule-sheet'), require('react-dom'), require('prop-types'), require('raf'), require('react-input-autosize'), require('react-transition-group')) :
+  typeof define === 'function' && define.amd ? define(['react', 'styled-components', 'react-notify-toast', 'stylis-rule-sheet', 'react-dom', 'prop-types', 'raf', 'react-input-autosize', 'react-transition-group'], factory) :
+  (global = global || self, global.AddProductInterest = factory(global.React, global.styled, global['react-notify-toast'], global['stylis-rule-sheet'], global.reactDom, global.PropTypes, global.raf, global['react-input-autosize'], global['react-transition-group']));
+}(this, (function (React, styled, Notifications, stylisRuleSheet, reactDom, PropTypes, raf, AutosizeInput, reactTransitionGroup) { 'use strict';
 
   var React__default = 'default' in React ? React['default'] : React;
   var styled__default = 'default' in styled ? styled['default'] : styled;
-  axios = axios && Object.prototype.hasOwnProperty.call(axios, 'default') ? axios['default'] : axios;
-  Cookies = Cookies && Object.prototype.hasOwnProperty.call(Cookies, 'default') ? Cookies['default'] : Cookies;
   var Notifications__default = 'default' in Notifications ? Notifications['default'] : Notifications;
   stylisRuleSheet = stylisRuleSheet && Object.prototype.hasOwnProperty.call(stylisRuleSheet, 'default') ? stylisRuleSheet['default'] : stylisRuleSheet;
   PropTypes = PropTypes && Object.prototype.hasOwnProperty.call(PropTypes, 'default') ? PropTypes['default'] : PropTypes;
@@ -560,127 +558,6 @@
     throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
   }
 
-  function getToken() {
-    var _Cookies$get;
-
-    return (_Cookies$get = Cookies.get('_tk')) === null || _Cookies$get === void 0 ? void 0 : _Cookies$get.replace('*', 'Bearer ');
-  }
-  function setToken(value) {
-    Cookies.set('_tk', value, 30);
-  }
-
-  /** @format */
-
-  function getEncodedSearch(currentUrl) {
-    var splitUrl = currentUrl.split('?');
-    var baseUrl = splitUrl[0];
-    var nextUrlSegments = splitUrl[1].split('&');
-    var nextQueryString = splitUrl[1];
-
-    if (nextUrlSegments.length > 0) {
-      nextQueryString = nextUrlSegments.map(function (v) {
-        var nextValue = v;
-
-        if (v.includes('search=')) {
-          var temp = v.split('=');
-          nextValue = "".concat(temp[0], "=").concat(encodeURIComponent(temp[1]));
-        }
-
-        return nextValue;
-      }).join('&');
-    }
-
-    return "".concat(baseUrl, "?").concat(nextQueryString);
-  }
-  /**
-   * Gets an instance of Axios that is configured with the custom failure handlers
-   * @param {Function} onAuthFailed - callback triggers when auth fails - ie, server error is one of ['token_invalid', 'token_not_provided', 'user_not_found', 'token_expired'] or http status is one of [401, 503, 400]
-   * @param {Function} onForbidden - callback triggers when http status = 403
-   */
-
-
-  var axiosInstance = function axiosInstance(onAuthFailed, onForbidden) {
-    var instance = axios.create({
-      validateStatus: function validateStatus(status) {
-        return status >= 200 && status < 300;
-      }
-    });
-    var token = getToken();
-
-    if (token !== '') {
-      instance.defaults.headers.common.Authorization = token;
-    }
-
-    instance.defaults.headers.common['Content-Type'] = 'application/json;charset=UTF-8'; // Add a request interceptor
-
-    instance.interceptors.request.use(function (request, error) {
-      if (error) {
-        return Promise.reject(error.response);
-      }
-
-      if (request.url.includes('search') && request.url.includes('?')) {
-        // do some uri manipulation for ie
-        // https://stackoverflow.com/questions/18220057
-        // eslint-disable-next-line no-param-reassign
-        request.url = getEncodedSearch(request.url);
-      } // eslint-disable-next-line no-param-reassign
-
-
-      request.headers.common['Content-Type'] = 'application/json; charset=utf-8';
-
-      if (typeof request.body === 'undefined') {
-        request.body = {};
-      }
-
-      token = getToken();
-
-      if (token !== '') {
-        // eslint-disable-next-line no-param-reassign
-        request.headers.common.Authorization = token;
-      }
-
-      return request;
-    }, function (error) {
-      return Promise.reject(error.message);
-    }); // Add a response interceptor
-
-    instance.interceptors.response.use(function (response, error) {
-      if (error) {
-        return Promise.reject(error.response);
-      }
-
-      if (response.headers.authorization) {
-        setToken(response.headers.authorization);
-      }
-
-      return response;
-    }, function (error) {
-      if (error.response) {
-        // network error
-        if (error.response.data && error.response.data.error && (error.response.data.error === 'token_invalid' || error.response.data.error === 'token_not_provided' || error.response.data.error === 'user_not_found' || error.response.data.error === 'token_expired') || error.response.status === 401 || error.response.status === 503 || error.response.status === 400) {
-          onAuthFailed();
-        } // if (error.response.status === 500) {
-        //   // INTERNAL SERVER ERROR
-        //   store.dispatch({
-        //     type: AppConstants.OVERLAY.SERVER_ERROR,
-        //   });
-        //   return Promise.reject(error.response);
-        // }
-
-
-        if (error.response.status === 403) {
-          // FORBIDDEN
-          onForbidden();
-        }
-
-        return Promise.reject(error.response);
-      }
-
-      return Promise.reject(error);
-    });
-    return instance;
-  }; // NOTE: this to be instanciated with params: onAuthFailed, onForbidden
-
   var defaultNotifyTime = 5000;
   var error = function error(message) {
     Notifications.notify.show(message, 'error', defaultNotifyTime);
@@ -7626,7 +7503,7 @@
             case 0:
               _context.prev = 0;
               _context.next = 3;
-              return axiosInstance.post("".concat(baseGraphApi, "?id=getBrands"), {
+              return requestInstance.post("".concat(baseGraphApi, "?id=getBrands"), {
                 query: getBrandsGraphQuery(1000, 1, 'id|desc')
               });
 
@@ -7657,7 +7534,7 @@
           }
         }
       }, _callee, null, [[0, 7]]);
-    })), [baseGraphApi, getBrandsGraphQuery]);
+    })), [baseGraphApi, getBrandsGraphQuery, requestInstance]);
     var fetchModels = React.useCallback( /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(brandId) {
         var _response$data2, _response$data2$data, _response$data2$data$, response, formattedModels;
@@ -7668,7 +7545,7 @@
               case 0:
                 _context2.prev = 0;
                 _context2.next = 3;
-                return axiosInstance.post("".concat(baseGraphApi, "?id=getModels"), {
+                return requestInstance.post("".concat(baseGraphApi, "?id=getModels"), {
                   query: getModelsGraphQuery(brandId)
                 });
 
@@ -7704,7 +7581,7 @@
       return function (_x) {
         return _ref3.apply(this, arguments);
       };
-    }(), [baseGraphApi, getModelsGraphQuery]);
+    }(), [baseGraphApi, getModelsGraphQuery, requestInstance]);
     var fetchMaterials = React.useCallback( /*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(brandId) {
         var _response$data3, _response$data3$data, _response$data3$data$, response, formattedMaterials;
@@ -7715,7 +7592,7 @@
               case 0:
                 _context3.prev = 0;
                 _context3.next = 3;
-                return axiosInstance.post("".concat(baseGraphApi, "?id=getMaterials"), {
+                return requestInstance.post("".concat(baseGraphApi, "?id=getMaterials"), {
                   query: getMaterialsGraphQuery(brandId)
                 });
 
@@ -7751,7 +7628,7 @@
       return function (_x2) {
         return _ref4.apply(this, arguments);
       };
-    }(), [baseGraphApi, getMaterialsGraphQuery]);
+    }(), [baseGraphApi, getMaterialsGraphQuery, requestInstance]);
     React.useEffect(function () {
       fetchBrands();
     }, [fetchBrands]);

package/GraphQLDropdownSelector.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('react'), require('styled-components'), require('@bonlineza/b-lib/EllipsisLoader'), require('@bonlineza/b-lib/PageReady'), require('react-animate-height'), require('numeral'), require('stylis-rule-sheet'), require('react-dom'), require('prop-types'), require('raf'), require('react-input-autosize'), require('react-transition-group'), require('@bonlineza/b-lib/functions'), require('rc-slider'), require('react-notify-toast'), require('axios'), require('js-cookie')) :
-  typeof define === 'function' && define.amd ? define(['react', 'styled-components', '@bonlineza/b-lib/EllipsisLoader', '@bonlineza/b-lib/PageReady', 'react-animate-height', 'numeral', 'stylis-rule-sheet', 'react-dom', 'prop-types', 'raf', 'react-input-autosize', 'react-transition-group', '@bonlineza/b-lib/functions', 'rc-slider', 'react-notify-toast', 'axios', 'js-cookie'], factory) :
-  (global = global || self, global.GraphQLDropdownSelector = factory(global.React, global.styled, global.EllipsisLoader, global.PageReady, global.AnimateHeight, global.numeral, global['stylis-rule-sheet'], global.reactDom, global.PropTypes, global.raf, global['react-input-autosize'], global['react-transition-group'], global.function, global.rcSlider, global['react-notify-toast'], global.axios, global.Cookies));
-}(this, (function (React, styled, EllipsisLoader, PageReady, AnimateHeight, numeral, stylisRuleSheet, reactDom, PropTypes, raf, AutosizeInput, reactTransitionGroup, functions, rcSlider, Notifications, axios, Cookies) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('react'), require('styled-components'), require('@bonlineza/b-lib/EllipsisLoader'), require('@bonlineza/b-lib/PageReady'), require('react-animate-height'), require('numeral'), require('stylis-rule-sheet'), require('react-dom'), require('prop-types'), require('raf'), require('react-input-autosize'), require('react-transition-group'), require('@bonlineza/b-lib/functions'), require('rc-slider'), require('react-notify-toast'), require('axios')) :
+  typeof define === 'function' && define.amd ? define(['react', 'styled-components', '@bonlineza/b-lib/EllipsisLoader', '@bonlineza/b-lib/PageReady', 'react-animate-height', 'numeral', 'stylis-rule-sheet', 'react-dom', 'prop-types', 'raf', 'react-input-autosize', 'react-transition-group', '@bonlineza/b-lib/functions', 'rc-slider', 'react-notify-toast', 'axios'], factory) :
+  (global = global || self, global.GraphQLDropdownSelector = factory(global.React, global.styled, global.EllipsisLoader, global.PageReady, global.AnimateHeight, global.numeral, global['stylis-rule-sheet'], global.reactDom, global.PropTypes, global.raf, global['react-input-autosize'], global['react-transition-group'], global.function, global.rcSlider, global['react-notify-toast'], global.axios));
+}(this, (function (React, styled, EllipsisLoader, PageReady, AnimateHeight, numeral, stylisRuleSheet, reactDom, PropTypes, raf, AutosizeInput, reactTransitionGroup, functions, rcSlider, Notifications, axios) { 'use strict';
 
   var React__default = 'default' in React ? React['default'] : React;
   var styled__default = 'default' in styled ? styled['default'] : styled;
@@ -16,7 +16,6 @@
   AutosizeInput = AutosizeInput && Object.prototype.hasOwnProperty.call(AutosizeInput, 'default') ? AutosizeInput['default'] : AutosizeInput;
   var Notifications__default = 'default' in Notifications ? Notifications['default'] : Notifications;
   axios = axios && Object.prototype.hasOwnProperty.call(axios, 'default') ? axios['default'] : axios;
-  Cookies = Cookies && Object.prototype.hasOwnProperty.call(Cookies, 'default') ? Cookies['default'] : Cookies;
 
   function ownKeys(object, enumerableOnly) {
     var keys = Object.keys(object);
@@ -11010,127 +11009,6 @@
     }));
   });
 
-  function getToken() {
-    var _Cookies$get;
-
-    return (_Cookies$get = Cookies.get('_tk')) === null || _Cookies$get === void 0 ? void 0 : _Cookies$get.replace('*', 'Bearer ');
-  }
-  function setToken(value) {
-    Cookies.set('_tk', value, 30);
-  }
-
-  /** @format */
-
-  function getEncodedSearch(currentUrl) {
-    var splitUrl = currentUrl.split('?');
-    var baseUrl = splitUrl[0];
-    var nextUrlSegments = splitUrl[1].split('&');
-    var nextQueryString = splitUrl[1];
-
-    if (nextUrlSegments.length > 0) {
-      nextQueryString = nextUrlSegments.map(function (v) {
-        var nextValue = v;
-
-        if (v.includes('search=')) {
-          var temp = v.split('=');
-          nextValue = "".concat(temp[0], "=").concat(encodeURIComponent(temp[1]));
-        }
-
-        return nextValue;
-      }).join('&');
-    }
-
-    return "".concat(baseUrl, "?").concat(nextQueryString);
-  }
-  /**
-   * Gets an instance of Axios that is configured with the custom failure handlers
-   * @param {Function} onAuthFailed - callback triggers when auth fails - ie, server error is one of ['token_invalid', 'token_not_provided', 'user_not_found', 'token_expired'] or http status is one of [401, 503, 400]
-   * @param {Function} onForbidden - callback triggers when http status = 403
-   */
-
-
-  var axiosInstance = function axiosInstance(onAuthFailed, onForbidden) {
-    var instance = axios.create({
-      validateStatus: function validateStatus(status) {
-        return status >= 200 && status < 300;
-      }
-    });
-    var token = getToken();
-
-    if (token !== '') {
-      instance.defaults.headers.common.Authorization = token;
-    }
-
-    instance.defaults.headers.common['Content-Type'] = 'application/json;charset=UTF-8'; // Add a request interceptor
-
-    instance.interceptors.request.use(function (request, error) {
-      if (error) {
-        return Promise.reject(error.response);
-      }
-
-      if (request.url.includes('search') && request.url.includes('?')) {
-        // do some uri manipulation for ie
-        // https://stackoverflow.com/questions/18220057
-        // eslint-disable-next-line no-param-reassign
-        request.url = getEncodedSearch(request.url);
-      } // eslint-disable-next-line no-param-reassign
-
-
-      request.headers.common['Content-Type'] = 'application/json; charset=utf-8';
-
-      if (typeof request.body === 'undefined') {
-        request.body = {};
-      }
-
-      token = getToken();
-
-      if (token !== '') {
-        // eslint-disable-next-line no-param-reassign
-        request.headers.common.Authorization = token;
-      }
-
-      return request;
-    }, function (error) {
-      return Promise.reject(error.message);
-    }); // Add a response interceptor
-
-    instance.interceptors.response.use(function (response, error) {
-      if (error) {
-        return Promise.reject(error.response);
-      }
-
-      if (response.headers.authorization) {
-        setToken(response.headers.authorization);
-      }
-
-      return response;
-    }, function (error) {
-      if (error.response) {
-        // network error
-        if (error.response.data && error.response.data.error && (error.response.data.error === 'token_invalid' || error.response.data.error === 'token_not_provided' || error.response.data.error === 'user_not_found' || error.response.data.error === 'token_expired') || error.response.status === 401 || error.response.status === 503 || error.response.status === 400) {
-          onAuthFailed();
-        } // if (error.response.status === 500) {
-        //   // INTERNAL SERVER ERROR
-        //   store.dispatch({
-        //     type: AppConstants.OVERLAY.SERVER_ERROR,
-        //   });
-        //   return Promise.reject(error.response);
-        // }
-
-
-        if (error.response.status === 403) {
-          // FORBIDDEN
-          onForbidden();
-        }
-
-        return Promise.reject(error.response);
-      }
-
-      return Promise.reject(error);
-    });
-    return instance;
-  }; // NOTE: this to be instanciated with params: onAuthFailed, onForbidden
-
   var _excluded$8 = ["children"];
 
   var DropdownSelector = function DropdownSelector(_ref) {
@@ -11352,7 +11230,7 @@
             case 0:
               _context.prev = 0;
               _context.next = 3;
-              return axiosInstance.post("".concat(baseGraphApi, "?id=getBrands"), {
+              return requestInstance.post("".concat(baseGraphApi, "?id=getBrands"), {
                 query: getBrandsGraphQuery(1000, 1, 'id|desc')
               });
 
@@ -11383,7 +11261,7 @@
           }
         }
       }, _callee, null, [[0, 7]]);
-    })), [baseGraphApi, getBrandsGraphQuery]);
+    })), [baseGraphApi, getBrandsGraphQuery, requestInstance]);
     var fetchModels = React.useCallback( /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(brandId) {
         var _response$data2, _response$data2$data, _response$data2$data$, response, formattedModels;
@@ -11394,7 +11272,7 @@
               case 0:
                 _context2.prev = 0;
                 _context2.next = 3;
-                return axiosInstance.post("".concat(baseGraphApi, "?id=getModels"), {
+                return requestInstance.post("".concat(baseGraphApi, "?id=getModels"), {
                   query: getModelsGraphQuery(brandId)
                 });
 
@@ -11430,7 +11308,7 @@
       return function (_x) {
         return _ref3.apply(this, arguments);
       };
-    }(), [baseGraphApi, getModelsGraphQuery]);
+    }(), [baseGraphApi, getModelsGraphQuery, requestInstance]);
     var fetchMaterials = React.useCallback( /*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(brandId) {
         var _response$data3, _response$data3$data, _response$data3$data$, response, formattedMaterials;
@@ -11441,7 +11319,7 @@
               case 0:
                 _context3.prev = 0;
                 _context3.next = 3;
-                return axiosInstance.post("".concat(baseGraphApi, "?id=getMaterials"), {
+                return requestInstance.post("".concat(baseGraphApi, "?id=getMaterials"), {
                   query: getMaterialsGraphQuery(brandId)
                 });
 
@@ -11477,7 +11355,7 @@
       return function (_x2) {
         return _ref4.apply(this, arguments);
       };
-    }(), [baseGraphApi, getMaterialsGraphQuery]);
+    }(), [baseGraphApi, getMaterialsGraphQuery, requestInstance]);
     React.useEffect(function () {
       fetchBrands();
     }, [fetchBrands]);

package/Interests.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('react'), require('styled-components'), require('react-notify-toast'), require('@bonlineza/b-lib/EllipsisLoader'), require('@bonlineza/b-lib/PageReady'), require('stylis-rule-sheet'), require('react-dom'), require('prop-types'), require('raf'), require('react-input-autosize'), require('react-transition-group'), require('@bonlineza/b-lib/functions'), require('rc-slider'), require('numeral'), require('axios'), require('js-cookie')) :
-  typeof define === 'function' && define.amd ? define(['react', 'styled-components', 'react-notify-toast', '@bonlineza/b-lib/EllipsisLoader', '@bonlineza/b-lib/PageReady', 'stylis-rule-sheet', 'react-dom', 'prop-types', 'raf', 'react-input-autosize', 'react-transition-group', '@bonlineza/b-lib/functions', 'rc-slider', 'numeral', 'axios', 'js-cookie'], factory) :
-  (global = global || self, global.Interests = factory(global.React, global.styled, global['react-notify-toast'], global.EllipsisLoader, global.PageReady, global['stylis-rule-sheet'], global.reactDom, global.PropTypes, global.raf, global['react-input-autosize'], global['react-transition-group'], global.function, global.rcSlider, global.numeral, global.axios, global.Cookies));
-}(this, (function (React, styled, Notifications, EllipsisLoader, PageReady, stylisRuleSheet, reactDom, PropTypes, raf, AutosizeInput, reactTransitionGroup, functions, rcSlider, numeral, axios, Cookies) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('react'), require('styled-components'), require('react-notify-toast'), require('@bonlineza/b-lib/EllipsisLoader'), require('@bonlineza/b-lib/PageReady'), require('stylis-rule-sheet'), require('react-dom'), require('prop-types'), require('raf'), require('react-input-autosize'), require('react-transition-group'), require('@bonlineza/b-lib/functions'), require('rc-slider'), require('numeral')) :
+  typeof define === 'function' && define.amd ? define(['react', 'styled-components', 'react-notify-toast', '@bonlineza/b-lib/EllipsisLoader', '@bonlineza/b-lib/PageReady', 'stylis-rule-sheet', 'react-dom', 'prop-types', 'raf', 'react-input-autosize', 'react-transition-group', '@bonlineza/b-lib/functions', 'rc-slider', 'numeral'], factory) :
+  (global = global || self, global.Interests = factory(global.React, global.styled, global['react-notify-toast'], global.EllipsisLoader, global.PageReady, global['stylis-rule-sheet'], global.reactDom, global.PropTypes, global.raf, global['react-input-autosize'], global['react-transition-group'], global.function, global.rcSlider, global.numeral));
+}(this, (function (React, styled, Notifications, EllipsisLoader, PageReady, stylisRuleSheet, reactDom, PropTypes, raf, AutosizeInput, reactTransitionGroup, functions, rcSlider, numeral) { 'use strict';
 
   var React__default = 'default' in React ? React['default'] : React;
   var styled__default = 'default' in styled ? styled['default'] : styled;
@@ -14,8 +14,6 @@
   raf = raf && Object.prototype.hasOwnProperty.call(raf, 'default') ? raf['default'] : raf;
   AutosizeInput = AutosizeInput && Object.prototype.hasOwnProperty.call(AutosizeInput, 'default') ? AutosizeInput['default'] : AutosizeInput;
   numeral = numeral && Object.prototype.hasOwnProperty.call(numeral, 'default') ? numeral['default'] : numeral;
-  axios = axios && Object.prototype.hasOwnProperty.call(axios, 'default') ? axios['default'] : axios;
-  Cookies = Cookies && Object.prototype.hasOwnProperty.call(Cookies, 'default') ? Cookies['default'] : Cookies;
 
   function ownKeys(object, enumerableOnly) {
     var keys = Object.keys(object);
@@ -10874,127 +10872,6 @@
     }));
   });
 
-  function getToken() {
-    var _Cookies$get;
-
-    return (_Cookies$get = Cookies.get('_tk')) === null || _Cookies$get === void 0 ? void 0 : _Cookies$get.replace('*', 'Bearer ');
-  }
-  function setToken(value) {
-    Cookies.set('_tk', value, 30);
-  }
-
-  /** @format */
-
-  function getEncodedSearch(currentUrl) {
-    var splitUrl = currentUrl.split('?');
-    var baseUrl = splitUrl[0];
-    var nextUrlSegments = splitUrl[1].split('&');
-    var nextQueryString = splitUrl[1];
-
-    if (nextUrlSegments.length > 0) {
-      nextQueryString = nextUrlSegments.map(function (v) {
-        var nextValue = v;
-
-        if (v.includes('search=')) {
-          var temp = v.split('=');
-          nextValue = "".concat(temp[0], "=").concat(encodeURIComponent(temp[1]));
-        }
-
-        return nextValue;
-      }).join('&');
-    }
-
-    return "".concat(baseUrl, "?").concat(nextQueryString);
-  }
-  /**
-   * Gets an instance of Axios that is configured with the custom failure handlers
-   * @param {Function} onAuthFailed - callback triggers when auth fails - ie, server error is one of ['token_invalid', 'token_not_provided', 'user_not_found', 'token_expired'] or http status is one of [401, 503, 400]
-   * @param {Function} onForbidden - callback triggers when http status = 403
-   */
-
-
-  var axiosInstance = function axiosInstance(onAuthFailed, onForbidden) {
-    var instance = axios.create({
-      validateStatus: function validateStatus(status) {
-        return status >= 200 && status < 300;
-      }
-    });
-    var token = getToken();
-
-    if (token !== '') {
-      instance.defaults.headers.common.Authorization = token;
-    }
-
-    instance.defaults.headers.common['Content-Type'] = 'application/json;charset=UTF-8'; // Add a request interceptor
-
-    instance.interceptors.request.use(function (request, error) {
-      if (error) {
-        return Promise.reject(error.response);
-      }
-
-      if (request.url.includes('search') && request.url.includes('?')) {
-        // do some uri manipulation for ie
-        // https://stackoverflow.com/questions/18220057
-        // eslint-disable-next-line no-param-reassign
-        request.url = getEncodedSearch(request.url);
-      } // eslint-disable-next-line no-param-reassign
-
-
-      request.headers.common['Content-Type'] = 'application/json; charset=utf-8';
-
-      if (typeof request.body === 'undefined') {
-        request.body = {};
-      }
-
-      token = getToken();
-
-      if (token !== '') {
-        // eslint-disable-next-line no-param-reassign
-        request.headers.common.Authorization = token;
-      }
-
-      return request;
-    }, function (error) {
-      return Promise.reject(error.message);
-    }); // Add a response interceptor
-
-    instance.interceptors.response.use(function (response, error) {
-      if (error) {
-        return Promise.reject(error.response);
-      }
-
-      if (response.headers.authorization) {
-        setToken(response.headers.authorization);
-      }
-
-      return response;
-    }, function (error) {
-      if (error.response) {
-        // network error
-        if (error.response.data && error.response.data.error && (error.response.data.error === 'token_invalid' || error.response.data.error === 'token_not_provided' || error.response.data.error === 'user_not_found' || error.response.data.error === 'token_expired') || error.response.status === 401 || error.response.status === 503 || error.response.status === 400) {
-          onAuthFailed();
-        } // if (error.response.status === 500) {
-        //   // INTERNAL SERVER ERROR
-        //   store.dispatch({
-        //     type: AppConstants.OVERLAY.SERVER_ERROR,
-        //   });
-        //   return Promise.reject(error.response);
-        // }
-
-
-        if (error.response.status === 403) {
-          // FORBIDDEN
-          onForbidden();
-        }
-
-        return Promise.reject(error.response);
-      }
-
-      return Promise.reject(error);
-    });
-    return instance;
-  }; // NOTE: this to be instanciated with params: onAuthFailed, onForbidden
-
   var _excluded$8 = ["children"];
 
   var DropdownSelector = function DropdownSelector(_ref) {
@@ -11216,7 +11093,7 @@
             case 0:
               _context.prev = 0;
               _context.next = 3;
-              return axiosInstance.post("".concat(baseGraphApi, "?id=getBrands"), {
+              return requestInstance.post("".concat(baseGraphApi, "?id=getBrands"), {
                 query: getBrandsGraphQuery(1000, 1, 'id|desc')
               });
 
@@ -11247,7 +11124,7 @@
           }
         }
       }, _callee, null, [[0, 7]]);
-    })), [baseGraphApi, getBrandsGraphQuery]);
+    })), [baseGraphApi, getBrandsGraphQuery, requestInstance]);
     var fetchModels = React.useCallback( /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(brandId) {
         var _response$data2, _response$data2$data, _response$data2$data$, response, formattedModels;
@@ -11258,7 +11135,7 @@
               case 0:
                 _context2.prev = 0;
                 _context2.next = 3;
-                return axiosInstance.post("".concat(baseGraphApi, "?id=getModels"), {
+                return requestInstance.post("".concat(baseGraphApi, "?id=getModels"), {
                   query: getModelsGraphQuery(brandId)
                 });
 
@@ -11294,7 +11171,7 @@
       return function (_x) {
         return _ref3.apply(this, arguments);
       };
-    }(), [baseGraphApi, getModelsGraphQuery]);
+    }(), [baseGraphApi, getModelsGraphQuery, requestInstance]);
     var fetchMaterials = React.useCallback( /*#__PURE__*/function () {
       var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(brandId) {
         var _response$data3, _response$data3$data, _response$data3$data$, response, formattedMaterials;
@@ -11305,7 +11182,7 @@
               case 0:
                 _context3.prev = 0;
                 _context3.next = 3;
-                return axiosInstance.post("".concat(baseGraphApi, "?id=getMaterials"), {
+                return requestInstance.post("".concat(baseGraphApi, "?id=getMaterials"), {
                   query: getMaterialsGraphQuery(brandId)
                 });
 
@@ -11341,7 +11218,7 @@
       return function (_x2) {
         return _ref4.apply(this, arguments);
       };
-    }(), [baseGraphApi, getMaterialsGraphQuery]);
+    }(), [baseGraphApi, getMaterialsGraphQuery, requestInstance]);
     React.useEffect(function () {
       fetchBrands();
     }, [fetchBrands]);