@openeuropa/bcl-subscription 0.23.0 → 0.24.0

package/__snapshots__/subscription.test.js.snap

@@ -641,12 +641,12 @@ exports[`OE - Subscription renders correctly 1`] = `
                 class="card-body pt-4 pt-md-0 px-0 px-md-3 pb-0"
               >
                 <h1
-                  class="mb-0 card-title bcl-heading"
+                  class="fs-1 card-title bcl-heading"
                 >
                   This is the title of this page
                 </h1>
                 <div
-                  class="mb-4 mt-4"
+                  class="my-3"
                 >
                   <span
                     class="text-muted me-3"
@@ -720,17 +720,17 @@ exports[`OE - Subscription renders correctly 1`] = `
         class="row"
       >
         <div
-          class="col-12 col-lg-3"
+          class="col-12 bcl-sidebar col-lg-3"
         >
           <nav
-            class="d-none d-lg-block bcl-inpage-navigation position-sticky"
+            class="bcl-inpage-navigation position-sticky"
             id="bcl-inpage-navigation"
           >
-            <h3
-              class="mb-4 bcl-heading"
+            <h2
+              class="mb-0 bcl-heading"
             >
               Page content
-            </h3>
+            </h2>
             <ul
               class="nav nav-pills flex-column"
             >
@@ -840,11 +840,11 @@ exports[`OE - Subscription renders correctly 1`] = `
                 <div
                   class="modal-header"
                 >
-                  <h5
-                    class="modal-title"
+                  <div
+                    class="modal-title fs-5 fw-medium"
                   >
                     Subscribe
-                  </h5>
+                  </div>
                   <button
                     aria-label="Close"
                     class="btn-close"
@@ -866,11 +866,11 @@ exports[`OE - Subscription renders correctly 1`] = `
                   <div
                     class="alert-content flex-grow-1"
                   >
-                    <h4
-                      class="alert-heading"
+                    <div
+                      class="alert-heading h4"
                     >
                       Thank you!
-                    </h4>
+                    </div>
                     Your subscription has been successfully registered. You can now close this dialog.
                   </div>
                 </div>
@@ -888,11 +888,11 @@ exports[`OE - Subscription renders correctly 1`] = `
                   <div
                     class="alert-content flex-grow-1"
                   >
-                    <h4
-                      class="alert-heading"
+                    <div
+                      class="alert-heading h4"
                     >
                       Sorry!
-                    </h4>
+                    </div>
                     There was an error!
                     <hr
                       class="d-none d-md-block"

package/data/data--modal.js

@@ -3,7 +3,7 @@ const drupalAttribute = require("drupal-attribute");
 module.exports = {
   id: "subscribeModal",
   header:
-    '<h5 class="modal-title">Subscribe</h5><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>',
+    '<div class="modal-title fs-5 fw-medium">Subscribe</div><button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>',
   footer:
     '<div class="text-align-end">' +
     '<button class="btn btn-light" data-bs-dismiss="modal">Close</button>' +

package/data/data.js

@@ -1,5 +1,45 @@
-module.exports = `
-  <div class="d-flex justify-content-end mt-2 align-items-center">
-    <button class="me-3 btn btn-outline-primary btn-md" type="button"><svg class="me-2-5 bi icon--fluid"><use xlink:href="/icons.svg#printer-fill"></use></svg>Print</button>
-    <button data-bs-toggle="modal" data-bs-target="#subscribeModal" class="btn btn-outline-primary btn-md" type="button"><svg class="me-2-5 bi icon--fluid"><use xlink:href="/icons.svg#envelope-fill"></use></svg>Subscribe</button>
-  </div>`;
+import layout from "@openeuropa/bcl-base-templates/data/layout";
+import {
+  banner,
+  sidebar,
+} from "@openeuropa/bcl-base-templates/data/content-page";
+import isChromatic from "chromatic/isChromatic";
+
+import content from "@openeuropa/bcl-news/data/data--content";
+import blockData from "@openeuropa/bcl-subscription-block/data";
+import modalData from "@openeuropa/bcl-subscription/data/data--modal";
+
+const chromatic = process.env.STORYBOOK_ENV;
+
+const header =
+  layout[`header_${process.env.STORYBOOK_THEME}`] || layout.headerSimple;
+
+if (isChromatic() || chromatic) {
+  banner.image.classes = banner.image.classes
+    ? `${banner.image.classes} chromatic-ignore`
+    : "chromatic-ignore";
+}
+
+const demoData = {
+  content_type: "subscription",
+  title: "Subscription",
+  header,
+  footer: layout.footer,
+  with_banner: true,
+  with_header: true,
+  with_footer: true,
+  sidebar,
+  subscription: blockData,
+  modal: modalData,
+  banner: {
+    ...banner,
+    action_bar: `
+    <div class="d-flex justify-content-end mt-2 align-items-center">
+      <button class="me-3 btn btn-outline-primary btn-md" type="button"><svg class="me-2-5 bi icon--fluid"><use xlink:href="/icons.svg#printer-fill"></use></svg>Print</button>
+      <button data-bs-toggle="modal" data-bs-target="#subscribeModal" class="btn btn-outline-primary btn-md" type="button"><svg class="me-2-5 bi icon--fluid"><use xlink:href="/icons.svg#envelope-fill"></use></svg>Subscribe</button>
+    </div>`,
+  },
+  content,
+};
+
+export default demoData;

package/package.json

@@ -2,13 +2,13 @@
   "name": "@openeuropa/bcl-subscription",
   "author": "European Commission",
   "license": "EUPL-1.2",
-  "version": "0.23.0",
+  "version": "0.24.0",
   "publishConfig": {
     "access": "public"
   },
   "description": "OE - BCL subscription",
   "dependencies": {
-    "@openeuropa/bcl-subscription-block": "^0.23.0"
+    "@openeuropa/bcl-subscription-block": "^0.24.0"
   },
   "repository": {
     "type": "git",
@@ -24,5 +24,5 @@
     "design-system",
     "twig"
   ],
-  "gitHead": "fa2097e14024989cddf6f9cd7a9115bed5886aeb"
+  "gitHead": "a46bb6bc12771da4667516dc7b0665b00504ade2"
 }

package/subscription.story.js

@@ -3,49 +3,12 @@ import withCode from "@openeuropa/storybook-addon-code";
 import { within, userEvent } from "@storybook/testing-library";
 import isChromatic from "chromatic/isChromatic";
 import { correctPaths, initScrollspy } from "@openeuropa/bcl-story-utils";
-import layout from "@openeuropa/bcl-base-templates/data/layout";
-import {
-  banner,
-  sidebar,
-} from "@openeuropa/bcl-base-templates/data/content-page";
-
-import content from "@openeuropa/bcl-news/data/data--content";
-import blockData from "@openeuropa/bcl-subscription-block/data";
-import drupalAttribute from "drupal-attribute";
+import demoData from "@openeuropa/bcl-subscription/data/data";
 
 import subscriptionPage from "@openeuropa/bcl-subscription/subscription.html.twig";
-import subscriptionPageData from "@openeuropa/bcl-subscription/data/data";
-import modalData from "@openeuropa/bcl-subscription/data/data--modal";
 
 const chromatic = process.env.STORYBOOK_ENV;
 
-const header =
-  layout[`header_${process.env.STORYBOOK_THEME}`] || layout.headerSimple;
-
-if (isChromatic() || chromatic) {
-  banner.image.classes = banner.image.classes
-    ? `${banner.image.classes} chromatic-ignore`
-    : "chromatic-ignore";
-}
-
-const demoData = {
-  content_type: "subscription",
-  title: "Subscription",
-  header: header,
-  footer: layout.footer,
-  with_banner: true,
-  with_header: true,
-  with_footer: true,
-  sidebar: sidebar,
-  subscription: blockData,
-  modal: modalData,
-  banner: {
-    ...banner,
-    action_bar: subscriptionPageData,
-  },
-  content: content,
-};
-
 const clientValidation = (story) => {
   const demo = story();
   return `<script>
@@ -130,11 +93,6 @@ export default {
     layout: "fullscreen",
     controls: { disable: true },
     badges: ["stable"],
-    badgesConfig: {
-      stable: {
-        title: "v1",
-      },
-    },
     design: [
       {
         name: "Mockup",

package/subscription.test.js

@@ -1,33 +1,6 @@
 import { renderTwigFileAsNode } from "@openeuropa/bcl-test-utils";
-import layout from "@openeuropa/bcl-base-templates/data/layout";
-import {
-  banner,
-  sidebar,
-} from "@openeuropa/bcl-base-templates/data/content-page";
 
-import content from "@openeuropa/bcl-news/data/data--content";
-import blockData from "@openeuropa/bcl-subscription-block/data";
-
-import subscriptionPageData from "@openeuropa/bcl-subscription/data/data";
-import modalData from "@openeuropa/bcl-subscription/data/data--modal";
-
-const demoData = {
-  content_type: "subscription",
-  title: "Subscription",
-  header: layout.headerSimple,
-  footer: layout.footer,
-  with_banner: true,
-  with_header: true,
-  with_footer: true,
-  sidebar: sidebar,
-  subscription: blockData,
-  modal: modalData,
-  banner: {
-    ...banner,
-    action_bar: subscriptionPageData,
-  },
-  content: content,
-};
+import demoData from "@openeuropa/bcl-subscription/data/data";
 
 const template = "@oe-bcl/bcl-subscription/subscription.html.twig";