feat: switch to the new headless REST application type applications d…

…emo content (#302) - adapt references to changed system manged dialogs and pages BREAKING CHANGE: The PWA now uses the ICM CMS demo content of the new headless 'rest' application (requires ICM version 7.10.21.0).
intershop · Jul 28, 2020 · 741454c · 741454c
1 parent 50dc72e
commit 741454c
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 23 deletions.
diff --git a/src/app/pages/account-order-history/account-order-history-page.component.html b/src/app/pages/account-order-history/account-order-history-page.component.html
@@ -8,6 +8,6 @@ <h4 class="form-text">{{ 'account.order.questions.title' | translate }}</h4>
   class="form-text"
   [ishServerHtml]="
     'account.order.questions.note'
-      | translate: { '0': 'route://page/systempage.helpdesk.index.pagelet2-Page', '1': 'route://contact' }
+      | translate: { '0': 'route://page/page.helpdesk.pagelet2-Page', '1': 'route://contact' }
   "
 ></p>
diff --git a/src/app/pages/account-overview/account-overview/account-overview.component.html b/src/app/pages/account-overview/account-overview/account-overview.component.html
@@ -55,8 +55,6 @@
 <p class="form-text">
   {{ 'account.overview.note.heading' | translate }}:
   <span
-    [ishServerHtml]="
-      'account.overview.note.text' | translate: { '0': 'route://page/systempage.privacyPolicy.pagelet2-Page' }
-    "
+    [ishServerHtml]="'account.overview.note.text' | translate: { '0': 'route://page/page.privacyPolicy.pagelet2-Page' }"
   ></span>
 </p>
diff --git a/src/app/pages/account-profile/account-profile/account-profile.component.html b/src/app/pages/account-profile/account-profile/account-profile.component.html
@@ -161,8 +161,6 @@ <h3>{{'account.newsletter.label' | translate}}</h3>
 <p class="form-text">
   {{ 'account.overview.note.heading' | translate }}:
   <span
-    [ishServerHtml]="
-      'account.overview.note.text' | translate: { '0': 'route://page/systempage.privacyPolicy.pagelet2-Page' }
-    "
+    [ishServerHtml]="'account.overview.note.text' | translate: { '0': 'route://page/page.privacyPolicy.pagelet2-Page' }"
   ></span>
 </p>
diff --git a/src/app/pages/basket/shopping-basket/shopping-basket.component.html b/src/app/pages/basket/shopping-basket/shopping-basket.component.html
@@ -9,7 +9,7 @@ <h1 class="d-flex flex-wrap align-items-baseline">
           [options]="{ titleText: 'checkout.safeandsecure.details.title' | translate, size: 'lg' }"
           class="details-link"
         >
-          <ish-content-include includeId="systeminclude.dialog.safeAndSecure.pagelet2-Include"></ish-content-include>
+          <ish-content-include includeId="include.dialog.safeAndSecure.pagelet2-Include"></ish-content-include>
         </ish-modal-dialog-link>
       </span>
     </h1>

diff --git a/src/app/pages/checkout-address/checkout-address/checkout-address.component.html b/src/app/pages/checkout-address/checkout-address/checkout-address.component.html
@@ -48,7 +48,7 @@ <h2>{{ 'checkout.order_details.heading' | translate }}</h2>
     <span
       [ishServerHtml]="
         'checkout.widget.security_privacy_policy.link'
-          | translate: { '0': 'route://page/systempage.privacyPolicy.pagelet2-Page' }
+          | translate: { '0': 'route://page/page.privacyPolicy.pagelet2-Page' }
       "
     ></span>
   </div>

diff --git a/src/app/pages/checkout-payment/checkout-payment/checkout-payment.component.html b/src/app/pages/checkout-payment/checkout-payment/checkout-payment.component.html
@@ -185,7 +185,7 @@ <h2>{{ 'checkout.order_details.heading' | translate }}</h2>
     <span
       [ishServerHtml]="
         'checkout.widget.security_privacy_policy.link'
-          | translate: { '0': 'route://page/systempage.privacyPolicy.pagelet2-Page' }
+          | translate: { '0': 'route://page/page.privacyPolicy.pagelet2-Page' }
       "
     ></span>
   </div>

diff --git a/src/app/pages/checkout-receipt/checkout-receipt/checkout-receipt.component.html b/src/app/pages/checkout-receipt/checkout-receipt/checkout-receipt.component.html
@@ -8,7 +8,7 @@ <h1 class="d-flex flex-wrap align-items-baseline">
         [options]="{ titleText: 'checkout.safeandsecure.details.title' | translate, size: 'lg' }"
         [ngClass]="'text-nowrap'"
       >
-        <ish-content-include includeId="systeminclude.dialog.safeAndSecure.pagelet2-Include"></ish-content-include>
+        <ish-content-include includeId="include.dialog.safeAndSecure.pagelet2-Include"></ish-content-include>
       </ish-modal-dialog-link>
     </span>
   </h1>

diff --git a/src/app/pages/checkout-review/checkout-review/checkout-review.component.html b/src/app/pages/checkout-review/checkout-review/checkout-review.component.html
@@ -8,7 +8,7 @@ <h1 class="d-flex flex-wrap align-items-baseline">
         [options]="{ titleText: 'checkout.safeandsecure.details.title' | translate, size: 'lg' }"
         [ngClass]="'text-nowrap'"
       >
-        <ish-content-include includeId="systeminclude.dialog.safeAndSecure.pagelet2-Include"></ish-content-include>
+        <ish-content-include includeId="include.dialog.safeAndSecure.pagelet2-Include"></ish-content-include>
       </ish-modal-dialog-link>
     </span>
   </h1>
@@ -95,9 +95,7 @@ <h2>{{ 'checkout.order_details.heading' | translate }}</h2>
           [errorMessages]="{ pattern: 'checkout.tac.error.tip' }"
         >
           <span
-            [ishServerHtml]="
-              'checkout.tac.text' | translate: { '0': '/page/systempage.termsAndConditions.pagelet2-Page' }
-            "
+            [ishServerHtml]="'checkout.tac.text' | translate: { '0': '/page/page.termsAndConditions.pagelet2-Page' }"
           ></span>
         </ish-checkbox>
       </form>

diff --git a/src/app/pages/checkout-shipping/checkout-shipping/checkout-shipping.component.html b/src/app/pages/checkout-shipping/checkout-shipping/checkout-shipping.component.html
@@ -79,7 +79,7 @@ <h2>{{ 'checkout.order_details.heading' | translate }}</h2>
     <span
       [ishServerHtml]="
         'checkout.widget.security_privacy_policy.link'
-          | translate: { '0': 'route://page/systempage.privacyPolicy.pagelet2-Page' }
+          | translate: { '0': 'route://page/page.privacyPolicy.pagelet2-Page' }
       "
     ></span>
   </div>

diff --git a/src/app/pages/registration/registration-form/registration-form.component.html b/src/app/pages/registration/registration-form/registration-form.component.html
@@ -59,8 +59,8 @@ <h2>
                     'registration.tac_privacy_policy.text'
                       | translate
                         : {
-                            '0': '/page/systempage.termsAndConditions.pagelet2-Page',
-                            '1': '/page/systempage.privacyPolicy.pagelet2-Page'
+                            '0': '/page/page.termsAndConditions.pagelet2-Page',
+                            '1': '/page/page.privacyPolicy.pagelet2-Page'
                           }
                   "
                 ></span>

diff --git a/src/app/shared/components/common/modal-dialog-link/modal-dialog-link.component.ts b/src/app/shared/components/common/modal-dialog-link/modal-dialog-link.component.ts
@@ -13,7 +13,7 @@ import { ModalOptions } from 'ish-shared/components/common/modal-dialog/modal-di
     linkText="checkout.tac.link"
     [options]="{ titleText: 'checkout.termsandconditions.details.title' | translate, size: 'lg' }"
   >
-    <ish-content-include includeId="systeminclude.dialog.privacyPolicy.pagelet2-Include"></ish-content-include>
+    <ish-content-include includeId="include.dialog.privacyPolicy.pagelet2-Include"></ish-content-include>
   </ish-modal-dialog-link>
  */
 @Component({

diff --git a/src/app/shared/components/product/product-shipment/product-shipment.component.html b/src/app/shared/components/product/product-shipment/product-shipment.component.html
@@ -21,6 +21,6 @@
     [options]="{ titleText: 'shopping.product.readyforshipment.details.title' | translate, size: 'lg' }"
     [ngClass]="'details-link'"
   >
-    <ish-content-include includeId="systeminclude.dialog.readyForShipment.pagelet2-Include"></ish-content-include>
+    <ish-content-include includeId="include.dialog.readyForShipment.pagelet2-Include"></ish-content-include>
   </ish-modal-dialog-link>
 </div>
diff --git a/src/assets/i18n/de_DE.json b/src/assets/i18n/de_DE.json
@@ -1765,7 +1765,7 @@
   "gifting.packslipmessage.tooltip_text.standard": "Ermöglicht die Eingabe einer Packzettel-Nachricht.",
   "header.wishlists.text": "Wunschlisten",
   "header.wishlists_count.text": "Wunschliste",
-  "footer.content": "<div class=\"footer\"><div class=\"container\"><div class=\"row\"><p class=\"disclaimer\"><strong>Disclaimer: </strong>Wir weisen daraufhin, dass dieser inSPIRED Demo Shop ein reiner Demonstrationsshop ist und s&auml;mtliche Inhalte lediglich beispielhaften Charakter zum Zwecke der Demonstration und Illustration haben. F&uuml;r die Richtigkeit, Vollst&auml;ndigkeit und Aktualit&auml;t der enthaltenen Inhalte &uuml;bernimmt Intershop Communications AG keine Haftung. Die Inhalte des Demo-Shops d&uuml;rfen nicht in Ihren Shop &uuml;bernommen oder anderweitig von Ihnen genutzt werden.</p></div><div class=\"row\"><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[0] = !collapsed[0]\"><span style=\"text-transform: none;\">in</span> SPIRED<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\"><span style=\"text-transform: none;\">in</span>SPIRED</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[0]\"><ul><li><a href=\"page://page.aboutus\">&Uuml;ber uns</a></li><li><a href=\"page://systempage.termsAndConditions.pagelet2-Page\">Allgemeine Gesch&auml;ftsbedingungen</a></li><li><a href=\"page://systempage.privacyPolicy.pagelet2-Page\">Datenschutzhinweise</a></li><li><a href=\"page://systempage.helpdesk.index.pagelet2-Page\">Hilfe</a></li><li><a href=\"route://contact\">Kontakt</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[1] = !collapsed[1]\">SERVICE<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">SERVICE</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[1]\"><ul><li><a href=\"page://page.helpdesk.faq\">H&auml;ufige Fragen</a></li><li><a href=\"page://page.helpdesk.orderingShippingPayment\">Bestellung, Versand und Bezahlung</a></li><li><a href=\"page://page.returnpolicy\">R&uuml;ckgaberegelung</a></li><li><a href=\"page://page.helpdesk.giftServices\">Geschenk-Services</a></li><li><a href=\"page://page.helpdesk.safetySecurityPrivacy\">Sicherheit, Schutz &amp; Privatsph&auml;re</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[2] = !collapsed[2]\">MEIN KONTO<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">MEIN KONTO</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[2]\"><ul><li><a rel=\"nofollow\" href=\"route://account/orders\">Bestellhistorie</a></li><li><a rel=\"nofollow\" href=\"\">Geschenkkarten und -gutscheine</a></li><li><a rel=\"nofollow\" href=\"\">Geschenkkarten-Guthaben</a></li><li><a rel=\"nofollow\" href=\"\">Gespeicherte Zahlungsdaten</a></li><li><a rel=\"nofollow\" href=\"route://account/addresses\">Gespeicherte Adressen</a></li><li><a rel=\"nofollow\" href=\"route://account/profile\">Profileinstellungen</a></li><li><a rel=\"nofollow\" href=\"\">Produktbenachrichtigungen</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[3] = !collapsed[3]\">BELIEBTE KATEGORIEN<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">BELIEBTE KATEGORIEN</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[3]\"><ul><li><a href=\"category://Cameras-Camcorders.832\">Action-Kameras</a></li><li><a href=\"category://Home-Entertainment.220\">TVs &amp; Projektoren</a></li><li><a href=\"category://Computers.3001\">Monitore</a></li><li><a href=\"category://Home-Entertainment.1058.1082\">Heimkino-Systeme</a></li><li><a href=\"category://Computers.897\">Tablets</a></li><li><a href=\"category://Computers.1835.151\">Notebooks</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[4] = !collapsed[4]\">BELIEBTE PRODUKTE<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">BELIEBTE PRODUKTE</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[4]\"><ul><li><a href=\"product://8182790134362\">GoPro Hero 4 Silver</a></li><li><a href=\"product://8806086011815\">Samsung Full HD 3D Smart TV</a></li><li><a href=\"product://3953312\">Canon LEGRIA HF R16</a></li><li><a href=\"product://8806086070188\">Samsung Galaxy NotePRO 4G </a></li><li><a href=\"product://689796\">Wrist Rest Fellowes</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[5] = !collapsed[5]\">DEMO CONTENT<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">DEMO CONTENT</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[5]\"><ul><li><a href=\"https://icecat.biz/\"target=\"_blank\"title=\"Demo Content provided by Icecat\"class=\"cms-footer-longLinks\">Icecat Content</a></li><li><a href=\"page://page.democontent\" title=\"Demo Content Disclaimer\">Demo Disclaimer</a></li><li><a href=\"route://error\" title=\"Error Page\">Fehler</a></li><li><a href=\"route://home\" title=\"Root Route\">Hauptseite</a></li><li><a href=\"route://basket\"title=\"Basket Page\">Warenkorb</a></li></ul></div></div></div><div class=\"row text-center\"><p class=\"copyright\">Intershop Progressive Web App {{ appVersion }} <br />&copy; 2020 INTERSHOP Communications AG. Alle Rechte vorbehalten.</p></div></div></div>",
+  "footer.content": "<div class=\"footer\"><div class=\"container\"><div class=\"row\"><p class=\"disclaimer\"><strong>Disclaimer: </strong>Wir weisen daraufhin, dass dieser inSPIRED Demo Shop ein reiner Demonstrationsshop ist und s&auml;mtliche Inhalte lediglich beispielhaften Charakter zum Zwecke der Demonstration und Illustration haben. F&uuml;r die Richtigkeit, Vollst&auml;ndigkeit und Aktualit&auml;t der enthaltenen Inhalte &uuml;bernimmt Intershop Communications AG keine Haftung. Die Inhalte des Demo-Shops d&uuml;rfen nicht in Ihren Shop &uuml;bernommen oder anderweitig von Ihnen genutzt werden.</p></div><div class=\"row\"><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[0] = !collapsed[0]\"><span style=\"text-transform: none;\">in</span> SPIRED<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\"><span style=\"text-transform: none;\">in</span>SPIRED</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[0]\"><ul><li><a href=\"page://page.aboutus\">&Uuml;ber uns</a></li><li><a href=\"page://page.termsAndConditions.pagelet2-Page\">Allgemeine Gesch&auml;ftsbedingungen</a></li><li><a href=\"page://page.privacyPolicy.pagelet2-Page\">Datenschutzhinweise</a></li><li><a href=\"page://page.helpdesk.pagelet2-Page\">Hilfe</a></li><li><a href=\"route://contact\">Kontakt</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[1] = !collapsed[1]\">SERVICE<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">SERVICE</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[1]\"><ul><li><a href=\"page://page.helpdesk.faq\">H&auml;ufige Fragen</a></li><li><a href=\"page://page.helpdesk.orderingShippingPayment\">Bestellung, Versand und Bezahlung</a></li><li><a href=\"page://page.returnpolicy\">R&uuml;ckgaberegelung</a></li><li><a href=\"page://page.helpdesk.giftServices\">Geschenk-Services</a></li><li><a href=\"page://page.helpdesk.safetySecurityPrivacy\">Sicherheit, Schutz &amp; Privatsph&auml;re</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[2] = !collapsed[2]\">MEIN KONTO<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">MEIN KONTO</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[2]\"><ul><li><a rel=\"nofollow\" href=\"route://account/orders\">Bestellhistorie</a></li><li><a rel=\"nofollow\" href=\"\">Geschenkkarten und -gutscheine</a></li><li><a rel=\"nofollow\" href=\"\">Geschenkkarten-Guthaben</a></li><li><a rel=\"nofollow\" href=\"\">Gespeicherte Zahlungsdaten</a></li><li><a rel=\"nofollow\" href=\"route://account/addresses\">Gespeicherte Adressen</a></li><li><a rel=\"nofollow\" href=\"route://account/profile\">Profileinstellungen</a></li><li><a rel=\"nofollow\" href=\"\">Produktbenachrichtigungen</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[3] = !collapsed[3]\">BELIEBTE KATEGORIEN<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">BELIEBTE KATEGORIEN</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[3]\"><ul><li><a href=\"category://Cameras-Camcorders.832\">Action-Kameras</a></li><li><a href=\"category://Home-Entertainment.220\">TVs &amp; Projektoren</a></li><li><a href=\"category://Computers.3001\">Monitore</a></li><li><a href=\"category://Home-Entertainment.1058.1082\">Heimkino-Systeme</a></li><li><a href=\"category://Computers.897\">Tablets</a></li><li><a href=\"category://Computers.1835.151\">Notebooks</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[4] = !collapsed[4]\">BELIEBTE PRODUKTE<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">BELIEBTE PRODUKTE</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[4]\"><ul><li><a href=\"product://8182790134362\">GoPro Hero 4 Silver</a></li><li><a href=\"product://8806086011815\">Samsung Full HD 3D Smart TV</a></li><li><a href=\"product://3953312\">Canon LEGRIA HF R16</a></li><li><a href=\"product://8806086070188\">Samsung Galaxy NotePRO 4G </a></li><li><a href=\"product://689796\">Wrist Rest Fellowes</a></li></ul></div></div><div class=\"col-md-4 col-lg-2\"><h4 class=\"d-md-none link-group-title\" (click)=\"collapsed[5] = !collapsed[5]\">DEMO CONTENT<fa-icon class=\"link-group-icon\" [icon]=\"['fas', 'angle-down']\"></fa-icon></h4><h4 class=\"d-none d-md-block\">DEMO CONTENT</h4><div class=\"link-group\" [ngbCollapse]=\"collapsed[5]\"><ul><li><a href=\"https://icecat.biz/\"target=\"_blank\"title=\"Demo Content provided by Icecat\"class=\"cms-footer-longLinks\">Icecat Content</a></li><li><a href=\"page://page.democontent\" title=\"Demo Content Disclaimer\">Demo Disclaimer</a></li><li><a href=\"route://error\" title=\"Error Page\">Fehler</a></li><li><a href=\"route://home\" title=\"Root Route\">Hauptseite</a></li><li><a href=\"route://basket\"title=\"Basket Page\">Warenkorb</a></li></ul></div></div></div><div class=\"row text-center\"><p class=\"copyright\">Intershop Progressive Web App {{ appVersion }} <br />&copy; 2020 INTERSHOP Communications AG. Alle Rechte vorbehalten.</p></div></div></div>",
   "helpdesk.contact_us.heading": "Kontakt",
   "helpdesk.contact_us.link": "Kontakt",
   "helpdesk.contactus.comments.error": "Geben Sie Ihre Fragen und Anmerkungen ein.",