Merge remote-tracking branch 'origin/develop' into feature/GH-3075

SAP · Jun 16, 2021 · 4d05687 · 4d05687
2 parents 6222a53 + 8af89f6
commit 4d05687
Show file tree

Hide file tree

Showing 37 changed files with 301 additions and 316 deletions.
diff --git a/docs/migration/4_0.md b/docs/migration/4_0.md
@@ -792,6 +792,10 @@ The following properties where removed in 4.0:
 
 `AuthRedirectService` is a new, required constructor dependency.
 
+### RoutingService
+`RoutingService.go` - Removed 2nd argument `query`. Use `extras.queryParams` instead.
+`RoutingService.navigate` - Removed 2nd argument `query`. Use `extras.queryParams` instead.
+
 ### AuthRedirectService
 
 - `#reportNotAuthGuard` - method not needed anymore. Every visited URL is now remembered automatically as redirect URL on `NavigationEnd` event.

diff --git a/...rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.spec.ts b/...rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.spec.ts
@@ -31,7 +31,6 @@ const navParamsOverview: any = {
   params: { ownerType: 'cartEntry', entityKey: CART_ENTRY_KEY },
 };
 
-const attributes = {};
 const mockOwner = mockProductConfiguration.owner;
 
 const mockRouterData: ConfiguratorRouter.Data = {
@@ -249,10 +248,7 @@ describe('ConfigAddToCartButtonComponent', () => {
     it('should navigate to OV in case configuration is cart bound and we are on product config page', () => {
       mockRouterData.pageType = ConfiguratorRouter.PageType.CONFIGURATION;
       performUpdateCart();
-      expect(routingService.go).toHaveBeenCalledWith(
-        navParamsOverview,
-        attributes
-      );
+      expect(routingService.go).toHaveBeenCalledWith(navParamsOverview);
 
       expect(
         configuratorGroupsService.setGroupStatusVisited
@@ -298,10 +294,7 @@ describe('ConfigAddToCartButtonComponent', () => {
     it('should navigate to overview in case configuration has not been added yet and we are on configuration page', () => {
       ensureProductBound();
       component.onAddToCart(mockProductConfiguration, mockRouterData);
-      expect(routingService.go).toHaveBeenCalledWith(
-        navParamsOverview,
-        attributes
-      );
+      expect(routingService.go).toHaveBeenCalledWith(navParamsOverview);
     });
 
     it('should remove one configuration (cart bound) in case configuration has not yet been added and we are on configuration page', () => {

diff --git a/...ator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.ts b/...ator/rulebased/components/add-to-cart-button/configurator-add-to-cart-button.component.ts
@@ -65,13 +65,10 @@ export class ConfiguratorAddToCartButtonComponent {
     configuratorType: string,
     owner: CommonConfigurator.Owner
   ): void {
-    this.routingService.go(
-      {
-        cxRoute: 'configureOverview' + configuratorType,
-        params: { ownerType: 'cartEntry', entityKey: owner.id },
-      },
-      {}
-    );
+    this.routingService.go({
+      cxRoute: 'configureOverview' + configuratorType,
+      params: { ownerType: 'cartEntry', entityKey: owner.id },
+    });
   }
 
   protected displayConfirmationMessage(key: string): void {

diff --git a/...ure-libs/product-configurator/rulebased/styles/_configurator-attribute-checkbox-list.scss b/...ure-libs/product-configurator/rulebased/styles/_configurator-attribute-checkbox-list.scss
@@ -1,13 +1,11 @@
 %cx-configurator-attribute-checkbox-list {
   @include cx-configurator-attribute-type();
 
-  @include forVersion(3.3) {
-    .cx-quantity {
-      padding-block-end: 1rem;
-    }
+  .cx-quantity {
+    padding-block-end: 1rem;
+  }
 
-    .form-check input:disabled + .form-check-label {
-      color: var(--cx-color-text);
-    }
+  .form-check input:disabled + .form-check-label {
+    color: var(--cx-color-text);
   }
 }
diff --git a/feature-libs/product-configurator/rulebased/styles/_configurator-attribute-drop-down.scss b/feature-libs/product-configurator/rulebased/styles/_configurator-attribute-drop-down.scss
@@ -2,9 +2,7 @@
   @include cx-configurator-attribute-type();
   @include cx-configurator-form-group();
 
-  @include forVersion(3.3) {
-    cx-configurator-attribute-quantity {
-      padding-block-start: 1rem;
-    }
+  cx-configurator-attribute-quantity {
+    padding-block-start: 1rem;
   }
 }
diff --git a/feature-libs/product-configurator/rulebased/styles/_configurator-attribute-header.scss b/feature-libs/product-configurator/rulebased/styles/_configurator-attribute-header.scss
@@ -4,9 +4,7 @@
   margin-inline-start: 17px;
   margin-inline-end: 17px;
 
-  @include forVersion(3.3) {
-    margin-block-end: 17px;
-  }
+  margin-block-end: 17px;
 
   label {
     @include type('5');

diff --git a/feature-libs/product-configurator/rulebased/styles/_configurator-attribute-radio-button.scss b/feature-libs/product-configurator/rulebased/styles/_configurator-attribute-radio-button.scss
@@ -7,9 +7,7 @@
     }
   }
 
-  @include forVersion(3.3) {
-    .cx-quantity {
-      padding-block-end: 1rem;
-    }
+  .cx-quantity {
+    padding-block-end: 1rem;
   }
 }
diff --git a/feature-libs/product-configurator/rulebased/styles/_configurator-form.scss b/feature-libs/product-configurator/rulebased/styles/_configurator-form.scss
@@ -1,16 +1,9 @@
 %cx-configurator-form {
-  @include forVersion(3.3) {
-    width: 100%;
-  }
+  width: 100%;
 
   .cx-group-attribute {
-    padding-inline-start: 20px;
-    padding-inline-end: 20px;
-
-    @include forVersion(3.3) {
-      padding-inline-start: 16px;
-      padding-inline-end: 16px;
-    }
+    padding-inline-start: 16px;
+    padding-inline-end: 16px;
 
     padding-block-start: 12px;
     padding-block-end: 12px;
@@ -27,14 +20,12 @@
     }
   }
 
-  @include forVersion(3.3) {
-    cx-item-counter {
-      &.readonly {
-        input {
-          border: solid 1px var(--cx-color-light);
-          min-height: 48px;
-          width: 10rem;
-        }
+  cx-item-counter {
+    &.readonly {
+      input {
+        border: solid 1px var(--cx-color-light);
+        min-height: 48px;
+        width: 10rem;
       }
     }
   }

diff --git a/feature-libs/product-configurator/rulebased/styles/_configurator-group-menu.scss b/feature-libs/product-configurator/rulebased/styles/_configurator-group-menu.scss
@@ -67,9 +67,7 @@
         overflow: hidden;
         line-break: anywhere;
 
-        @include forVersion(3.3) {
-          @include cx-configurator-truncate-content();
-        }
+        @include cx-configurator-truncate-content();
       }
 
       .groupIndicators {

diff --git a/feature-libs/product-configurator/rulebased/styles/_configurator-overview-attribute.scss b/feature-libs/product-configurator/rulebased/styles/_configurator-overview-attribute.scss
@@ -9,11 +9,7 @@
     font-weight: 600;
 
     @include media-breakpoint-up(md) {
-      width: 41.6666666667%;
-
-      @include forVersion(3.3) {
-        width: 40%;
-      }
+      width: 40%;
     }
   }
 
@@ -22,11 +18,7 @@
     width: 100%;
 
     @include media-breakpoint-up(md) {
-      width: 58.3333333333%;
-
-      @include forVersion(3.3) {
-        width: 60%;
-      }
+      width: 60%;
     }
   }
 }