hr-design-system-handlebars 1.124.10 → 1.125.0

package/dist/assets/js/components/external-service/externalServiceDs.feature.js

@@ -29,10 +29,7 @@ const ExternalService = function (context) {
     let embedCode = options.embedCode,
         iframe,
         settingsCookie = new SettingsCookie(),
-        noResponsiveIframe,
-        contentRefresher,
         gemeindewahlergebnis,
-        uniqueId,
         isExternalServiceLoaded = false,
         tiktokOnPage = []
 
@@ -74,61 +71,34 @@ const ExternalService = function (context) {
     }
 
     const insertExternalService = function () {
-        switch (embedType) {
-            case 'js':
-                switch (id) {
-                    case '23degrees':
-                        createTwentyThreeDegreesEmbed()
-                        break
-                    case 'facebook-post':
-                        createFacebookEmbed()
-                        break
-                    case 'instagram':
-                        createInstagramEmbed()
-                        break
-                    case 'tiktok':
-                        createTikTokEmbed()
-                        break
-                    case 'twitter':
-                        createTwitterEmbed()
-                        break
-                    case 'twitter-post':
-                        createTwitterPostEmbed()
-                        break
-                    case 'datawrapper_cdn':
-                        createDataWrapperEmbed()
-                        break
-                    case 'wahlmonitor':
-                        createWahlEmbed()
-                        break
-                    case 'wahlmonitor_v2':
-                        createWahlEmbed()
-                        break
-                    case 'wahlkreiskarte':
-                        createWahlEmbed()
-                        break
-                    case 'wahlkreiskarte_v2':
-                        createWahlEmbed()
-                        break
-                    case 'wahlomat-euwa':
-                        createWahlOMatEuwaEmbed()
-                        break
-                    case 'wahlomat-butawa':
-                        createWahlOMatButawaEmbed()
-                        break
-                    case 'wahl-gemeinde-ergebnis':
-                        createWahlGemeindeErgebnisEmbed()
-                        break
-                    case 'wer-waehlte-wen':
-                        werWaehlteWenEmbed()
-                        break
-                    default:
-                        console.error('No JS Config for external service ' + id)
-                        break
-                }
-                break
-            default:
-                loadIframe() //für alle Dienste die nicht der DSGVO Datapolicy unterliegen
+        if (embedType !== 'js') {
+            loadIframe() // Für alle Dienste, die nicht der DSGVO Datapolicy unterliegen
+            return
+        }
+
+        const externalServiceMap = {
+            '23degrees': createTwentyThreeDegreesEmbed,
+            'facebook-post': createFacebookEmbed,
+            'instagram': createInstagramEmbed,
+            'tiktok': createTikTokEmbed,
+            'twitter': createTwitterEmbed,
+            'twitter-post': createTwitterPostEmbed,
+            'datawrapper_cdn': createDataWrapperEmbed,
+            'wahlmonitor': createWahlEmbed,
+            'wahlmonitor_v2': createWahlEmbed,
+            'wahlkreiskarte': createWahlEmbed,
+            'wahlkreiskarte_v2': createWahlEmbed,
+            'wahlomat-euwa': createWahlOMatEuwaEmbed,
+            'wahlomat-butawa': createWahlOMatButawaEmbed,
+            'wahl-gemeinde-ergebnis': createWahlGemeindeErgebnisEmbed,
+            'wer-waehlte-wen': werWaehlteWenEmbed,
+        }
+
+        const service = externalServiceMap[id]
+        if (service) {
+            service()
+        } else {
+            console.error(`No JS Config for external service ${id}`)
         }
     }
 
@@ -206,14 +176,6 @@ const ExternalService = function (context) {
         })
     }
 
-    const createUniqueID = function () {
-        console.log('Erzeuge einzigartige ID')
-        uniqueId = Math.random()
-            .toString(36)
-            .replace(/[^a-z]+/g, '')
-            .substring(2, 10)
-    }
-
     const getAspectRatioClass = function () {
         switch (iFrameConfig.aspectRatio) {
             case '16x9':
@@ -237,96 +199,104 @@ const ExternalService = function (context) {
 
     const createDataWrapperEmbed = function () {
         removeDatapolicyBox()
-        createUniqueID()
-        console.log('UniqueID' + uniqueId)
-        if (iFrameConfig.noResponsiveIframe == 'true') {
+        const uniqueId = createUniqueID()
+        const {
+            isNoResponsiveIframe,
+            isWebcomponent,
+            refreshContent,
+            aspectRatio,
+            fixedHeight,
+            refreshIntervall,
+        } = iFrameConfig
+
+        const addContentRefresher = (isWebcomponent) => {
+            new DataWrapperContentRefresher({
+                rootElement,
+                id: uniqueId,
+                refreshIntervall,
+                isWebcomponent,
+            }).createRefresher()
+        }
+
+        if (isNoResponsiveIframe == 'true') {
             //Klassisches Iframe mit AR-Wrapper oder fester Höhe
-            noResponsiveIframe = new DataWrapperNoResponsiveIframe(
-                context,
-                iFrameConfig.aspectRatio,
-                iFrameConfig.fixedHeight,
-                uniqueId,
-                embedCode,
-                lazyLoad
-            )
-            noResponsiveIframe.createNoResponsiveIframe()
-
-            if (iFrameConfig.refreshContent == 'true') {
-                console.log('contentRefresher anfügen')
-                contentRefresher = new DataWrapperContentRefresher(
-                    context,
-                    uniqueId,
-                    iFrameConfig.refreshIntervall,
-                    false
-                )
-                contentRefresher.createRefresher()
+            new DataWrapperNoResponsiveIframe({
+                rootElement: rootElement,
+                aspectRatio: aspectRatio,
+                fixedHeight: fixedHeight,
+                id: uniqueId,
+                embedCode: embedCode,
+                lazyLoad: lazyLoad,
+            }).createNoResponsiveIframe()
+
+            if (refreshContent == 'true') {
+                addContentRefresher(false)
             }
-        } else {
-            if (iFrameConfig.webcomponent == 'true') {
-                // Webcomponent
-                const divTag = document.createElement('div')
-                divTag.id = 'datawrapper-chart-' + uniqueId
-                rootElement.insertBefore(divTag, null)
-                const scriptTag = document.createElement('script')
-                scriptTag.setAttribute('id', 'datawrapper-component-js')
-                scriptTag.setAttribute('type', 'text/javascript')
-                scriptTag.setAttribute('defer', 'defer')
-                scriptTag.setAttribute('src', embedCode + 'embed.js?v=1')
-                scriptTag.setAttribute('charset', 'utf-8')
-                const noScriptTag = document.createElement('noscript')
-                const imageTag = document.createElement('img')
-                imageTag.src = embedCode + 'full.png'
-                imageTag.alt = ''
-                noScriptTag.appendChild(imageTag)
-                divTag.appendChild(scriptTag)
-                divTag.appendChild(noScriptTag)
-
-                if (iFrameConfig.refreshContent == 'true') {
-                    console.log('contentRefresher anfügen')
-                    contentRefresher = new DataWrapperContentRefresher(
-                        context,
-                        uniqueId,
-                        iFrameConfig.refreshIntervall,
-                        true
-                    )
-                    contentRefresher.createRefresher()
-                }
-            } else {
-                //Responsives Iframe
-                var iframe = document.createElement('iframe')
-                //Auflösen nach Tailwind-Klassen //dataWrapper-embed
-                iframe.className = 'w-0 !min-w-full border-0'
-                iframe.setAttribute('webkitallowfullscreen', '')
-                iframe.setAttribute('mozallowfullscreen', '')
-                iframe.setAttribute('allowfullscreen', '')
-                iframe.setAttribute('scrolling', 'no')
-                iframe.setAttribute('frameborder', '0')
-                iframe.src = embedCode
-                iframe.id = 'datawrapper-chart-' + uniqueId
-                if (lazyLoad) {
-                    iframe.loading = 'lazy'
-                }
-                rootElement.insertBefore(iframe, null)
+            return
+        }
 
-                loadScript(
-                    'datawrapper-js',
-                    'https://static.hr.de/hessenschau/datawrapper/responsiveIframe.js',
-                    true
-                )
-                if (iFrameConfig.refreshContent == 'true') {
-                    console.log('contentRefresher anfügen')
-                    contentRefresher = new DataWrapperContentRefresher(
-                        context,
-                        uniqueId,
-                        iFrameConfig.refreshIntervall,
-                        false
-                    )
-                    contentRefresher.createRefresher()
-                }
+        if (isWebcomponent == 'true') {
+            // Webcomponent
+            const divTag = document.createElement('div')
+            divTag.id = `datawrapper-chart-${uniqueId}`
+            rootElement.appendChild(divTag)
+
+            const scriptTag = document.createElement('script')
+            Object.assign(scriptTag, {
+                id: 'datawrapper-component-js',
+                type: 'text/javascript',
+                defer: true,
+                src: `${embedCode}embed.js?v=1`,
+                charset: 'utf-8',
+            })
+
+            const noScriptTag = document.createElement('noscript')
+            const imageTag = document.createElement('img')
+            imageTag.src = `${embedCode}full.png`
+            imageTag.alt = ''
+            noScriptTag.appendChild(imageTag)
+
+            divTag.append(scriptTag, noScriptTag)
+
+            if (refreshContent == 'true') {
+                addContentRefresher(true)
             }
+            return
+        }
+        //Responsives Iframe
+        const iframe = document.createElement('iframe')
+        //Auflösen nach Tailwind-Klassen //dataWrapper-embed
+        iframe.className = 'w-0 !min-w-full border-0'
+        iframe.setAttribute('webkitallowfullscreen', '')
+        iframe.setAttribute('mozallowfullscreen', '')
+        iframe.setAttribute('allowfullscreen', '')
+        iframe.setAttribute('scrolling', 'no')
+        iframe.setAttribute('frameborder', '0')
+        iframe.src = embedCode
+        iframe.id = `datawrapper-chart-${uniqueId}`
+        if (lazyLoad) {
+            iframe.loading = 'lazy'
+        }
+        rootElement.appendChild(iframe)
+
+        loadScript(
+            'datawrapper-js',
+            'https://static.hr.de/hessenschau/datawrapper/responsiveIframe.js',
+            true
+        )
+        if (refreshContent == 'true') {
+            addContentRefresher(false)
         }
     }
 
+    const createUniqueID = function () {
+        console.log('Erzeuge einzigartige ID')
+        return Math.random()
+            .toString(36)
+            .replace(/[^a-z]+/g, '')
+            .substring(2, 10)
+    }
+
     const createTwentyThreeDegreesEmbed = function () {
         removeDatapolicyBox()
 

package/dist/views/components/external-service/external_service_with_datapolicy_check.hbs

@@ -3,7 +3,7 @@
         <div class="c-externalService c-externalService__{{this.externalServiceConfig.externalServiceId}}{{#unless
                 this.fixedHeight }} -noFixedHeight{{/unless}} js-load"
              data-hr-external-service-ds='{"id":"{{this.externalServiceConfig.externalServiceId}}","embedCode":"{{this.serviceUrl}}","embedType":"{{this.externalServiceConfig.externalServiceEmbedType}}","lazyLoad":{{defaultIfEmpty _lazyLoad false}},"dataPolicyCheck": true, "whiteList":{{this.externalServiceConfig.isWhitelisted}},"iFrameConfig": { {{~#if this.fixedHeight~}}
-                "fixedHeight":"{{this.fixedHeight}}"{{~else~}}{{~#if this.aspectRatio}}"aspectRatio":"{{this.aspectRatio}}"{{~else~}}"aspectRatio":"16x9"{{/if}}{{~/if}},"noResponsiveIframe":"{{{this.setResponsiveIframe}}}","webcomponent":"{{{this.setWebcomponent}}}"{{~#if this.setTimedReloadIframe}},"refreshContent":"{{{this.setTimedReloadIframe}}}","refreshIntervall":"{{this.setTimeForReload}}"{{~/if}} }}'>
+                "fixedHeight":"{{this.fixedHeight}}"{{~else~}}{{~#if this.aspectRatio}}"aspectRatio":"{{this.aspectRatio}}"{{~else~}}"aspectRatio":"16x9"{{/if}}{{~/if}},"isNoResponsiveIframe":"{{{this.setResponsiveIframe}}}","isWebcomponent":"{{{this.setWebcomponent}}}"{{~#if this.setTimedReloadIframe}},"refreshContent":"{{{this.setTimedReloadIframe}}}","refreshIntervall":"{{this.setTimeForReload}}"{{~/if}} }}'>
             {{~> components/external-service/components/external_service_data_policy ~}}
         </div>
         {{~> components/external-service/components/external_service_caption ~}}

package/dist/views_static/components/external-service/external_service_with_datapolicy_check.hbs

@@ -3,7 +3,7 @@
         <div class="c-externalService c-externalService__{{this.externalServiceConfig.externalServiceId}}{{#unless
                 this.fixedHeight }} -noFixedHeight{{/unless}} js-load"
              data-hr-external-service-ds='{"id":"{{this.externalServiceConfig.externalServiceId}}","embedCode":"{{this.serviceUrl}}","embedType":"{{this.externalServiceConfig.externalServiceEmbedType}}","lazyLoad":{{defaultIfEmpty _lazyLoad false}},"dataPolicyCheck": true, "whiteList":{{this.externalServiceConfig.isWhitelisted}},"iFrameConfig": { {{~#if this.fixedHeight~}}
-                "fixedHeight":"{{this.fixedHeight}}"{{~else~}}{{~#if this.aspectRatio}}"aspectRatio":"{{this.aspectRatio}}"{{~else~}}"aspectRatio":"16x9"{{/if}}{{~/if}},"noResponsiveIframe":"{{{this.setResponsiveIframe}}}","webcomponent":"{{{this.setWebcomponent}}}"{{~#if this.setTimedReloadIframe}},"refreshContent":"{{{this.setTimedReloadIframe}}}","refreshIntervall":"{{this.setTimeForReload}}"{{~/if}} }}'>
+                "fixedHeight":"{{this.fixedHeight}}"{{~else~}}{{~#if this.aspectRatio}}"aspectRatio":"{{this.aspectRatio}}"{{~else~}}"aspectRatio":"16x9"{{/if}}{{~/if}},"isNoResponsiveIframe":"{{{this.setResponsiveIframe}}}","isWebcomponent":"{{{this.setWebcomponent}}}"{{~#if this.setTimedReloadIframe}},"refreshContent":"{{{this.setTimedReloadIframe}}}","refreshIntervall":"{{this.setTimeForReload}}"{{~/if}} }}'>
             {{~> components/external-service/components/external_service_data_policy ~}}
         </div>
         {{~> components/external-service/components/external_service_caption ~}}

package/package.json

@@ -6,7 +6,7 @@
   "license": "MIT",
   "main": "dist/index.js",
   "repository": "https://github.com/szuelch/hr-design-system-handlebars",
-  "version": "1.124.10",
+  "version": "1.125.0",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "storybook": "storybook dev -p 6006 public",

package/src/stories/views/components/external-service/dataWrapperContentRefresher.subfeature.js

@@ -1,88 +1,95 @@
-        
-const DataWrapperContentRefresher = function (context, id, refreshIntervall, webcomponent, datapolicy) {
-    const { element: rootElement } = context
+const DataWrapperContentRefresher = function ({
+    rootElement,
+    id,
+    refreshIntervall,
+    isWebcomponent,
+    datapolicy,
+}) {
     let remainingTime
     let timer
-    let uniqueID = id
     let intervall = refreshIntervall
     let container
-    let script 
+    let script
     let iframeRefresh
-    
-    if (webcomponent) {
-    container = document.getElementById('datawrapper-chart-' + uniqueID)
-    script = document.getElementById('datawrapper-component-js')
-    }
-    else{
-    iframeRefresh = document.getElementById('datawrapper-chart-' + uniqueID)
+
+    if (isWebcomponent) {
+        container = document.getElementById(`datawrapper-chart-${id}`)
+        script = document.getElementById('datawrapper-component-js')
+    } else {
+        iframeRefresh = document.getElementById(`datawrapper-chart-${id}`)
     }
-    
+
     const createRefresher = function () {
-        console.log("Refresher bauen")
-        let divCounter = document.createElement('div')
+        console.log('Refresher bauen')
+        const divCounter = document.createElement('div')
+        divCounter.id = 'counter' + id
+        Object.assign(divCounter.style, {
+            backgroundColor: '#006dc1',
+            color: '#fff',
+            fontSize: '12px',
+            padding: '8px',
+            borderRadius: '0 0 4px 4px',
+        })
+
         let divOverlay = document.createElement('div')
+        divOverlay.id = 'overlay' + id
+        Object.assign(divOverlay.style, {
+            position: 'absolute',
+            top: '0',
+            display: 'none',
+            alignItems: 'center',
+            justifyContent: 'center',
+            backgroundColor: '#d8e9f6',
+            width: '100%',
+            height: 'calc(100% - 36px)',
+        })
+
         let divTextOverlay = document.createElement('div')
-        divOverlay.id = 'overlay' + uniqueID
-        divOverlay.style.position = 'absolute'
-        divOverlay.style.top = '0'
-        divOverlay.style.display = 'none'
-        divOverlay.style.alignItems = 'center'
-        divOverlay.style.justifyContent = 'center'
-        divOverlay.style.backgroundColor = '#fff'
-        divOverlay.style.width = '100%'
-        divOverlay.style.height = 'calc(100% - 36px)'
-        divOverlay.style.backgroundColor = '#d8e9f6'
         divTextOverlay.innerHTML = 'Lade Inhalt neu...'
-        divTextOverlay.style.backgroundColor = '#005293'
-        divTextOverlay.style.padding = '8px'
-        divTextOverlay.style.color = '#fff'
-        divTextOverlay.style.fontWeight = '800'
-        divTextOverlay.style.fontFamily = 'RobotoSlab'
-        divTextOverlay.style.borderRadius = '6px 6px 6px 6px'
+        Object.assign(divTextOverlay.style, {
+            backgroundColor: '#005293',
+            padding: '8px',
+            color: '#fff',
+            fontWeight: '800',
+            fontFamily: 'RobotoSlab',
+            borderRadius: '6px',
+        })
+
         divOverlay.appendChild(divTextOverlay)
-        divCounter.id = 'counter' + uniqueID
-        divCounter.style.backgroundColor = '#006dc1'
-        divCounter.style.color = '#fff'
-        divCounter.style.fontSize = '12px'
-        divCounter.style.padding = '8px'
-        divCounter.style.borderRadius = '0 0 4px 4px'
-        
+
         rootElement.style.position = 'relative'
-        if(!datapolicy) {
-        rootElement.appendChild(divCounter)
-        rootElement.appendChild(divOverlay)
-        startCountdown()
-        } 
-        else {
-        rootElement.removeChild(divCounter)
-        rootElement.removeChild(divOverlay)
-        stopCountdown()
+
+        if (!datapolicy) {
+            rootElement.appendChild(divCounter)
+            rootElement.appendChild(divOverlay)
+            startCountdown()
+        } else {
+            rootElement.removeChild(divCounter)
+            rootElement.removeChild(divOverlay)
+            stopCountdown()
         }
     }
 
     const refreshIframe = function () {
         console.log('Reload')
-        if(webcomponent) {
+        if (isWebcomponent) {
             container.style.opacity = '0'
             script.src = script.src.split('?')[0] + '?_=' + new Date().getTime()
-        }
-        else{
+        } else {
             iframeRefresh.style.opacity = '0'
-            iframeRefresh.src =
-                iframeRefresh.src.split('?')[0] + '?_=' + new Date().getTime()
+            iframeRefresh.src = iframeRefresh.src.split('?')[0] + '?_=' + new Date().getTime()
         }
         clearInterval(timer)
     }
     const startCountdown = function () {
         remainingTime = Number(intervall)
         setTimeout(function () {
-            if(webcomponent) {
-                container.style.opacity = '1'    
-            }
-            else{
+            if (isWebcomponent) {
+                container.style.opacity = '1'
+            } else {
                 iframeRefresh.style.opacity = '1'
             }
-            document.getElementById('overlay' + uniqueID).style.display = 'none'
+            document.getElementById('overlay' + id).style.display = 'none'
         }, 1000)
         timer = setInterval(function () {
             checkTimer()
@@ -92,33 +99,34 @@ const DataWrapperContentRefresher = function (context, id, refreshIntervall, web
         clearInterval(timer)
     }
     const checkTimer = function () {
-        if(document.getElementById('counter' + uniqueID) !== null) {
+        if (document.getElementById('counter' + id) !== null) {
             if (remainingTime >= 0) {
-                document.getElementById('counter' + uniqueID).innerHTML =
+                document.getElementById('counter' + id).innerHTML =
                     'Dieser Inhalt wird automatisch aktualisiert in ' +
                     secondsToTimeString(remainingTime) +
                     ' Min.'
                 remainingTime -= 1
                 if (remainingTime == -1) {
-                    document.getElementById('overlay' + uniqueID).style.display = 'flex'
-                    document.getElementById('counter' + uniqueID).innerHTML =
+                    document.getElementById('overlay' + id).style.display = 'flex'
+                    document.getElementById('counter' + id).innerHTML =
                         'Zeitintervall wird neu gestartet...'
                 }
             } else {
                 refreshIframe()
                 startCountdown()
             }
-        }else{
-            console.log("Element wurde entfernt")
+        } else {
+            console.log('Element wurde entfernt')
             clearInterval(timer)
         }
     }
+
     const secondsToTimeString = function (seconds) {
         return new Date(seconds * 1000).toISOString().substr(14, 5)
     }
     return {
-        createRefresher: createRefresher
+        createRefresher: createRefresher,
     }
 }
 
-export default DataWrapperContentRefresher            
+export default DataWrapperContentRefresher