@riosst100/pwa-marketplace 3.3.3 → 3.3.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@riosst100/pwa-marketplace",
   "author": "riosst100@gmail.com",
-  "version": "3.3.3",
+  "version": "3.3.4",
   "main": "src/index.js",
   "pwa-studio": {
     "targets": {

package/src/overwrites/venia-ui/lib/components/Adapter/adapter.js

@@ -70,62 +70,6 @@ const Adapter = props => {
     const currentWebsiteCode = storage && storage.getItem('website_code') || process.env.WEBSITE_CODE;
 
     useEffect(() => {
-        if (!websiteCodeInUrl) {
-            // history.replace(location.pathname + location.search)
-        } else if (websiteCodeInUrl && websiteCodeInUrl !== currentWebsiteCode) {
-            const storeCodeInUrl = websiteStores[websiteCodeInUrl];
-
-
-
-            // const search = location.search;
-            
-            // const query = new URLSearchParams(search);
-            // const isAccessBaseWebsite = query.get('access_base_website') || (
-            //     storage.getItem('access_base_website') || null
-            // );
-
-            // routerProps.basename = websiteCodeInUrl != process.env.WEBSITE_CODE && !isAccessBaseWebsite ? '/'+websiteCodeInUrl : '/';
-
-            // setNewRouterProps(routerProps);
-
-            // await removeCart();
-
-            // alert(storeCodeInUrl)
-
-            // update store/website saat url berubah, misal /id ke /sg
-
-            // issue store view code gk berubah, klo di graphql aman
-
-            // ini update di graphql dan di cookie, tapi di cookie beda klo ga di hardcode
-
-            // ini oke, store di graphql dari sini
-            // storeCodeInUrl = 'id_id_store_view';
-            // console.log('storeCodeInUrl',storeCodeInUrl)
-
-            // await apolloClient.clearCacheData(apolloClient, 'cart');
-            // await removeCart();
-
-            // klo enabled jd redirect tros
-            // storage.removeItem('cartId');
-
-            // storage.setItem('store_view_code', storeCodeInUrl);
-            // storage.setItem('website_code', websiteCodeInUrl);
-            // storage.setItem(
-            //     'store_view_currency',
-            //     storeCurrencies[storeCodeInUrl]
-            // );
-            // storage.setItem(
-            //     'store_view_secure_base_media_url',
-            //     storeSecureBaseMediaUrl[storeCodeInUrl]
-            // );
-
-            // We're required to reload the page as the basename doesn't
-            // change entirely without a full page reload.
-            // history.go(0);
-        }
-
-        // console.log('currentWebsiteCode',currentWebsiteCode)
-
         if (!websiteCodeInUrl) {
             const websiteCode = process.env.WEBSITE_CODE;
             // if (websiteCode != storage.getItem('website_code')) {
@@ -168,7 +112,7 @@ const Adapter = props => {
                 }
             // }
         }
-    }, [websiteCodeInUrl, currentWebsiteCode]);
+    }, [websiteCodeInUrl]);
 
     // TODO: Replace with app skeleton. See PWA-547.
     if (!initialized) {

package/src/overwrites/venia-ui/lib/components/StoreCodeRoute/storeCodeRoute.js

@@ -39,7 +39,18 @@ const StoreCodeRoute = () => {
     // the storage value and refresh so that we start using the new code.
     useEffect(() => {
         if (websiteCodeInUrl) {
-            let prefix = '';
+            const websiteCodes = [];
+
+            AVAILABLE_WEBSITES.forEach(store => {
+                websiteCodes.push(store.website_code);
+            });
+
+            const { location } = globalThis;
+            const match = location && location.pathname.split("/")[1];
+            const websiteCodeInUrl = websiteCodes.find((str) => str === match);
+
+            const prefix = websiteCodeInUrl ? websiteCodeInUrl + '_' : '';
+            
             let storeCodeInUrl = websiteStores[websiteCodeInUrl];
 
             storage.setItem(prefix + 'store_view_code', storeCodeInUrl);