From 68ac57480588649b9d2cee1fa75cc0ab8224aae2 Mon Sep 17 00:00:00 2001
From: Stefan Hauke <s.hauke@intershop.de>
Date: Fri, 11 Feb 2022 16:49:16 +0100
Subject: [PATCH] fix: hybrid mapping table adaptions and additions

---
 src/hybrid/default-url-mapping-table.ts | 34 +++++++++++++++++++++----
 1 file changed, 29 insertions(+), 5 deletions(-)

diff --git a/src/hybrid/default-url-mapping-table.ts b/src/hybrid/default-url-mapping-table.ts
index 11ffde9eba9..5eb87f1b89f 100644
--- a/src/hybrid/default-url-mapping-table.ts
+++ b/src/hybrid/default-url-mapping-table.ts
@@ -49,16 +49,16 @@ export const HYBRID_MAPPING_TABLE: HybridMappingEntry[] = [
     id: 'Product Detail Page',
     icm: `${ICM_CONFIG_MATCH}/ViewProduct-Start.*(\\?|&)SKU=(?<sku>[\\w-]+).*$`,
     pwaBuild: `product/$<sku>${PWA_CONFIG_BUILD}`,
-    pwa: `^.*/product/([\\w-]+).*$`,
-    icmBuild: `ViewProduct-Start?SKU=$1`,
+    pwa: `/(?!cat)((?!.*-cat.*-sku).*-)?sku(.*?)(-cat(.*))?$`,
+    icmBuild: `ViewProduct-Start?SKU=$2`,
     handledBy: 'pwa',
   },
   {
     id: 'Category Page',
     icm: `${ICM_CONFIG_MATCH}/ViewStandardCatalog-Browse.*(\\?|&)CatalogID=(?<catalog>[\\w-]+).*$`,
     pwaBuild: `category/$<catalog>${PWA_CONFIG_BUILD}`,
-    pwa: `^.*/category/([\\w-]+).*$`,
-    icmBuild: `ViewStandardCatalog?CatalogID=$1&CategoryName=$1`,
+    pwa: `^/(?!category|categoryref/.*$)(.*-)?cat([^?]*)`,
+    icmBuild: `ViewStandardCatalog-Browse?CatalogID=$2&CategoryName=$2`,
     handledBy: 'pwa',
   },
   {
@@ -67,7 +67,7 @@ export const HYBRID_MAPPING_TABLE: HybridMappingEntry[] = [
     pwaBuild: `basket${PWA_CONFIG_BUILD}`,
     pwa: '^/basket.*$',
     icmBuild: 'ViewCart-View',
-    handledBy: 'pwa',
+    handledBy: 'icm',
   },
   {
     id: 'Login',
@@ -101,4 +101,28 @@ export const HYBRID_MAPPING_TABLE: HybridMappingEntry[] = [
     icmBuild: 'ViewUserAccount-Start',
     handledBy: 'icm',
   },
+  {
+    id: 'Register',
+    icm: `${ICM_CONFIG_MATCH}/ViewUserAccount-ShowRegister.*$`,
+    pwaBuild: `register${PWA_CONFIG_BUILD}`,
+    pwa: '^/register.*$',
+    icmBuild: 'ViewUserAccount-ShowRegister',
+    handledBy: 'pwa',
+  },
+  {
+    id: 'Product Compare',
+    icm: `${ICM_CONFIG_MATCH}/ViewProductCompare-Show.*$`,
+    pwaBuild: `compare${PWA_CONFIG_BUILD}`,
+    pwa: '^/compare.*$',
+    icmBuild: 'ViewProductCompare-Show',
+    handledBy: 'pwa',
+  },
+  {
+    id: 'Quick Order',
+    icm: `${ICM_CONFIG_MATCH}/ViewQuickorder-Start.*$`,
+    pwaBuild: `quick-order${PWA_CONFIG_BUILD}`,
+    pwa: '^/quick-order.*$',
+    icmBuild: 'ViewQuickorder-Start',
+    handledBy: 'icm',
+  },
 ];