Removed location patch

namecheap · StyleT · Nov 30, 2020 · Sep 18, 2020 · Sep 21, 2020 · Sep 21, 2020
commit 51c4a072e30cd2d5b547ca46ae2f46149f70d591
diff --git a/ilc/client.js b/ilc/client.js
@@ -24,7 +24,7 @@ const registryConf = getIlcConfig();
 const state = initIlcState();
 
 const i18n = registryConf.settings.i18n ? new I18n(registryConf.settings.i18n, singleSpa) : null;
-const router = new Router(registryConf, state, singleSpa, window.ILC.window ? window.ILC.window.location : window.location);
+const router = new Router(registryConf, state, singleSpa, i18n.unlocalizeUrl);
 const asyncBootUp = new AsyncBootUp();
 
 // Here we expose window.ILC.define also as window.define to ensure that regular AMD/UMD bundles work correctly by default

diff --git a/ilc/client/ClientRouter.js b/ilc/client/ClientRouter.js
@@ -17,11 +17,20 @@ export default class ClientRouter {
     #currentRoute;
     #windowEventHandlers = {};
     #forceSpecialRoute = null;
-
-    constructor(registryConf, state, singleSpa, location = window.location, logger = window.console) {
+    #unlocalizeUrl;
+
+    constructor(
+        registryConf,
+        state,
+        singleSpa,
+        unlocalizeUrl = (v) => v,
+        location = window.location,
+        logger = window.console
+    ) {
         this.#singleSpa = singleSpa;
         this.#location = location;
         this.#logger = logger;
+        this.#unlocalizeUrl = unlocalizeUrl;
         this.#registryConf = registryConf;
         this.#router = new Router(registryConf);
         this.#currentUrl = this.#getCurrUrl();
@@ -170,5 +179,5 @@ export default class ClientRouter {
         this.#singleSpa.triggerAppChange(); //This call would immediately invoke "single-spa:before-routing-event" and start apps mount/unmount process
     };
 
-    #getCurrUrl = () => this.#location.pathname + this.#location.search;
+    #getCurrUrl = () => this.#unlocalizeUrl(this.#location.pathname + this.#location.search);
 }
diff --git a/ilc/client/i18n/index.js b/ilc/client/i18n/index.js
@@ -3,7 +3,8 @@ import {handleAsyncAction} from '../handlePageTransaction';
 
 export default class I18n {
     #prevUrl = null;
-    #systemSdk = null;
+    /** @type {IlcAppSdk} */
+    #systemSdk;
     #singleSpa;
     #intlAdapterSystem;
 
@@ -18,33 +19,23 @@ export default class I18n {
 
         this.#systemSdk = new IlcAppSdk({appId: 'ILC:System', intl: this.#intlAdapterSystem});
 
-        this.#initPatchedWindow(this.#systemSdk);
         window.addEventListener('single-spa:before-mount-routing-event', this.#onBeforeAppsMount);
     }
 
+    unlocalizeUrl = v => this.#systemSdk.intl.parseUrl(v).cleanUrl;
+
     getAdapter() {
-        return Object.assign({set: this.#setIntlSettings}, this.#intlAdapterSystem);
+        return Object.assign({set: this.#setIntl}, this.#intlAdapterSystem);
     }
 
-    #initPatchedWindow = (systemSdk) => {
-        const patchedLocation = new Proxy(window.location, { //TODO: fix issue with IE11, proxies are not supported there
-            get(target, name) {
-                if (typeof target[name] === 'function') {
-                    return target[name];
-                }
-
-                return systemSdk.intl.parseUrl(target).cleanUrl[name];
-            },
-        });
-
-        window.ILC.window = new Proxy(window, { //TODO: fix issue with IE11, proxies are not supported there
-            get(target, name) {
-                return name === 'location' ? patchedLocation : target[name];
-            },
-        });
-    };
-
-    #setIntlSettings = async (conf) => {
+    /**
+     *
+     * @param {object} conf
+     * @param {string} [conf.locale]
+     * @param {string} [conf.currency]
+     * @return void
+     */
+    #setIntl = (conf) => {
         if (!conf.locale) {
             return;
         }

diff --git a/ilc/config/default.json5 b/ilc/config/default.json5
@@ -21,7 +21,7 @@
             currency: 'USD'
         },
         supported: {
-            locale: ['en-US', 'en-GB', 'fr-FR', 'fr-CA', 'de-DE'],
+            locale: ['en-US', 'en-GB', 'fr-FR', 'fr-CA', 'de-DE', 'ua-UA'],
             currency: ['USD', 'EUR', 'GBP']
         },
     },