hr-design-system-handlebars 1.101.0 → 1.101.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/CHANGELOG.md +24 -0
  2. package/dist/assets/index.css +3 -3
  3. package/dist/assets/js/components/dataPolicySettings/dataPolicySettingsDs.feature.js +26 -47
  4. package/package.json +1 -1
  5. package/src/stories/views/components/dataPolicySettings/dataPolicySettingsDs.feature.js +26 -47
package/CHANGELOG.md CHANGED
@@ -1,3 +1,27 @@
1
+ # v1.101.2 (Mon Sep 23 2024)
2
+
3
+ #### 🐛 Bug Fix
4
+
5
+ - Dpe 3178 b [#1073](https://github.com/mumprod/hr-design-system-handlebars/pull/1073) ([@Paul-Atreidis](https://github.com/Paul-Atreidis))
6
+
7
+ #### Authors: 1
8
+
9
+ - [@Paul-Atreidis](https://github.com/Paul-Atreidis)
10
+
11
+ ---
12
+
13
+ # v1.101.1 (Mon Sep 23 2024)
14
+
15
+ #### 🐛 Bug Fix
16
+
17
+ - Removing old cookie handling [#1072](https://github.com/mumprod/hr-design-system-handlebars/pull/1072) ([@Paul-Atreidis](https://github.com/Paul-Atreidis))
18
+
19
+ #### Authors: 1
20
+
21
+ - [@Paul-Atreidis](https://github.com/Paul-Atreidis)
22
+
23
+ ---
24
+
1
25
  # v1.101.0 (Thu Sep 19 2024)
2
26
 
3
27
  #### 🚀 Enhancement
package/dist/assets/index.css CHANGED
@@ -3454,7 +3454,7 @@ article.indexTextDS .indexTextHighlighted .link {
3454
3454
  border-bottom-color: var(--color-secondary-ds);
3455
3455
  }
3456
3456
  .counter-reset {
3457
- counter-reset: cnt1726756869388;
3457
+ counter-reset: cnt1727102904220;
3458
3458
  }
3459
3459
  .hyphens-auto {
3460
3460
  -webkit-hyphens: auto;
@@ -3862,7 +3862,7 @@ article.indexTextDS .indexTextHighlighted .link {
3862
3862
  --tw-ring-color: rgba(255, 255, 255, 0.5);
3863
3863
  }
3864
3864
  .-ordered {
3865
- counter-increment: cnt1726756869388 1;
3865
+ counter-increment: cnt1727102904220 1;
3866
3866
  }
3867
3867
  .-ordered::before {
3868
3868
  position: absolute;
@@ -3878,7 +3878,7 @@ article.indexTextDS .indexTextHighlighted .link {
3878
3878
  letter-spacing: .0125em;
3879
3879
  --tw-text-opacity: 1;
3880
3880
  color: rgba(0, 0, 0, var(--tw-text-opacity));
3881
- content: counter(cnt1726756869388);
3881
+ content: counter(cnt1727102904220);
3882
3882
  }
3883
3883
  /*! ****************************/
3884
3884
  /*! DataPolicy stuff */
package/dist/assets/js/components/dataPolicySettings/dataPolicySettingsDs.feature.js CHANGED
@@ -19,57 +19,31 @@ const DataPolicySettings = function (context) {
19
19
 
20
20
  let isWebview = window.parent.document.documentElement.classList.contains('webview'),
21
21
  appSettingsCookie = {},
22
- dataDataPolicyCookie = {},
23
- dataTrackingCookie = {},
24
22
  dataSettingsCookie = {}
25
23
 
26
24
  //Überprüfung ob die alten Cookies zusammengeführt werden müssen
27
25
  const checkForExistingCookies = function () {
28
- //TODO: Kann nach einer gewissen Zeit rausgeworfen werden? Die alten Cookies sind mittlerweile rausgewachsen?
29
- if (getJSONCookie('datapolicy') || getJSONCookie('tracking')) {
30
- deleteOldCookiesandTransferData()
26
+
27
+ if (getJSONCookie('hrSettings')) {
28
+ getAllToggleValuesFromSettings()
31
29
  }
32
30
  else {
33
- if (getJSONCookie('hrSettings')) {
34
- getAllToggleValuesFromSettings()
35
- }
36
- else {
37
- console.log("hessenschau neu => wenn kein hrSettings erzeugt wurde")
38
- //Wenn kein Cookie vorhanden wird diese initial über die Checkbox "Externer Dienst initial deaktiviert, DSGVO wird geprüft"
39
- //im Konfig-Dokument bestückt.
40
- for (let i = 0; i < toggleSwitches.length; ++i) {
41
- if (toggleSwitches[i].getAttribute('data-whitelist') == "true") {
42
- setCookieForSettings(toggleSwitches[i].id, true)
43
- }
44
- else {
45
- setCookieForSettings(toggleSwitches[i].id, false)
46
- }
47
- }
48
- setAllToggleValuesFromSettings()
49
- changeProviderTitle()
31
+ console.log("hessenschau neu => wenn kein hrSettings erzeugt wurde")
32
+ //Wenn kein Cookie vorhanden wird diese initial über die Checkbox "Dienst ist initial immer aktiviert (Whitelist)"
33
+ //im Konfig-Dokument bestückt.
34
+ for (let i = 0; i < toggleSwitches.length; ++i) {
35
+ if (toggleSwitches[i].getAttribute('data-whitelist') == "true") {
36
+ setCookieForSettings(toggleSwitches[i].id, true)
37
+ }
38
+ else {
39
+ setCookieForSettings(toggleSwitches[i].id, false)
40
+ }
50
41
  }
42
+ setAllToggleValuesFromSettings()
43
+ changeProviderTitle()
51
44
  }
52
45
  }
53
46
 
54
- const deleteOldCookiesandTransferData = function () {
55
- dataDataPolicyCookie = getJSONCookie('datapolicy') || {}
56
- dataTrackingCookie = getJSONCookie('tracking') || {}
57
- let objMerge
58
- // Beide bestehenden JSONs aus Tracking und Service werden zusammengeführt.
59
- objMerge = JSON.stringify(dataTrackingCookie) + JSON.stringify(dataDataPolicyCookie);
60
- objMerge = objMerge.replace(/\}\{/, ",");
61
- objMerge = JSON.parse(objMerge);
62
- let objArray = Object.entries(objMerge);
63
- objArray.forEach(([key, value]) => {
64
- //hrSettingsCookie wird geschrieben
65
- setCookieForSettings(key, value)
66
- });
67
- setAllToggleValuesFromSettings()
68
- changeProviderTitle()
69
- deleteCookie('datapolicy')
70
- deleteCookie('tracking')
71
- }
72
-
73
47
  const setCookieForSettings = function (key, value) {
74
48
  settingsCookie.setCookieForOptions(key, value)
75
49
  if (value) {
@@ -101,17 +75,22 @@ const DataPolicySettings = function (context) {
101
75
 
102
76
  if (isCookieSetForSettings(toggleSwitches[i].id)) {
103
77
  toggleSwitches[i].checked = true
104
- } else if (
105
- !isCookieExistForSettings(toggleSwitches[i].id) &&
106
- toggleSwitches[i].getAttribute('initial') == 'checked'
107
- ) {
78
+ }
79
+ }
80
+ checkWhiteListAttribute()
81
+ toggleAllSwitch.checked = allTogglesExternalServiceChecked()
82
+ }
83
+ const checkWhiteListAttribute = function() {
84
+ for (let i = 0; i < toggleSwitches.length; ++i) {
85
+ if (toggleSwitches[i].getAttribute('data-whitelist') == 'true') {
108
86
  toggleSwitches[i].checked = true
109
87
  setCookieForSettings(toggleSwitches[i].id, toggleSwitches[i].checked)
88
+ } else {
89
+ toggleSwitches[i].checked = false;
90
+ setCookieForSettings(toggleSwitches[i].id, toggleSwitches[i].checked);
110
91
  }
111
92
  }
112
- toggleAllSwitch.checked = allTogglesExternalServiceChecked()
113
93
  }
114
-
115
94
  const isCookieSetForSettings = function (externalService) {
116
95
  return settingsCookie.isSettingsCookieAccepted(externalService)
117
96
  }
package/package.json CHANGED
@@ -6,7 +6,7 @@
6
6
  "license": "MIT",
7
7
  "main": "dist/index.js",
8
8
  "repository": "https://github.com/szuelch/hr-design-system-handlebars",
9
- "version": "1.101.0",
9
+ "version": "1.101.2",
10
10
  "scripts": {
11
11
  "test": "echo \"Error: no test specified\" && exit 1",
12
12
  "storybook": "storybook dev -p 6006 public",
package/src/stories/views/components/dataPolicySettings/dataPolicySettingsDs.feature.js CHANGED
@@ -19,57 +19,31 @@ const DataPolicySettings = function (context) {
19
19
 
20
20
  let isWebview = window.parent.document.documentElement.classList.contains('webview'),
21
21
  appSettingsCookie = {},
22
- dataDataPolicyCookie = {},
23
- dataTrackingCookie = {},
24
22
  dataSettingsCookie = {}
25
23
 
26
24
  //Überprüfung ob die alten Cookies zusammengeführt werden müssen
27
25
  const checkForExistingCookies = function () {
28
- //TODO: Kann nach einer gewissen Zeit rausgeworfen werden? Die alten Cookies sind mittlerweile rausgewachsen?
29
- if (getJSONCookie('datapolicy') || getJSONCookie('tracking')) {
30
- deleteOldCookiesandTransferData()
26
+
27
+ if (getJSONCookie('hrSettings')) {
28
+ getAllToggleValuesFromSettings()
31
29
  }
32
30
  else {
33
- if (getJSONCookie('hrSettings')) {
34
- getAllToggleValuesFromSettings()
35
- }
36
- else {
37
- console.log("hessenschau neu => wenn kein hrSettings erzeugt wurde")
38
- //Wenn kein Cookie vorhanden wird diese initial über die Checkbox "Externer Dienst initial deaktiviert, DSGVO wird geprüft"
39
- //im Konfig-Dokument bestückt.
40
- for (let i = 0; i < toggleSwitches.length; ++i) {
41
- if (toggleSwitches[i].getAttribute('data-whitelist') == "true") {
42
- setCookieForSettings(toggleSwitches[i].id, true)
43
- }
44
- else {
45
- setCookieForSettings(toggleSwitches[i].id, false)
46
- }
47
- }
48
- setAllToggleValuesFromSettings()
49
- changeProviderTitle()
31
+ console.log("hessenschau neu => wenn kein hrSettings erzeugt wurde")
32
+ //Wenn kein Cookie vorhanden wird diese initial über die Checkbox "Dienst ist initial immer aktiviert (Whitelist)"
33
+ //im Konfig-Dokument bestückt.
34
+ for (let i = 0; i < toggleSwitches.length; ++i) {
35
+ if (toggleSwitches[i].getAttribute('data-whitelist') == "true") {
36
+ setCookieForSettings(toggleSwitches[i].id, true)
37
+ }
38
+ else {
39
+ setCookieForSettings(toggleSwitches[i].id, false)
40
+ }
50
41
  }
42
+ setAllToggleValuesFromSettings()
43
+ changeProviderTitle()
51
44
  }
52
45
  }
53
46
 
54
- const deleteOldCookiesandTransferData = function () {
55
- dataDataPolicyCookie = getJSONCookie('datapolicy') || {}
56
- dataTrackingCookie = getJSONCookie('tracking') || {}
57
- let objMerge
58
- // Beide bestehenden JSONs aus Tracking und Service werden zusammengeführt.
59
- objMerge = JSON.stringify(dataTrackingCookie) + JSON.stringify(dataDataPolicyCookie);
60
- objMerge = objMerge.replace(/\}\{/, ",");
61
- objMerge = JSON.parse(objMerge);
62
- let objArray = Object.entries(objMerge);
63
- objArray.forEach(([key, value]) => {
64
- //hrSettingsCookie wird geschrieben
65
- setCookieForSettings(key, value)
66
- });
67
- setAllToggleValuesFromSettings()
68
- changeProviderTitle()
69
- deleteCookie('datapolicy')
70
- deleteCookie('tracking')
71
- }
72
-
73
47
  const setCookieForSettings = function (key, value) {
74
48
  settingsCookie.setCookieForOptions(key, value)
75
49
  if (value) {
@@ -101,17 +75,22 @@ const DataPolicySettings = function (context) {
101
75
 
102
76
  if (isCookieSetForSettings(toggleSwitches[i].id)) {
103
77
  toggleSwitches[i].checked = true
104
- } else if (
105
- !isCookieExistForSettings(toggleSwitches[i].id) &&
106
- toggleSwitches[i].getAttribute('initial') == 'checked'
107
- ) {
78
+ }
79
+ }
80
+ checkWhiteListAttribute()
81
+ toggleAllSwitch.checked = allTogglesExternalServiceChecked()
82
+ }
83
+ const checkWhiteListAttribute = function() {
84
+ for (let i = 0; i < toggleSwitches.length; ++i) {
85
+ if (toggleSwitches[i].getAttribute('data-whitelist') == 'true') {
108
86
  toggleSwitches[i].checked = true
109
87
  setCookieForSettings(toggleSwitches[i].id, toggleSwitches[i].checked)
88
+ } else {
89
+ toggleSwitches[i].checked = false;
90
+ setCookieForSettings(toggleSwitches[i].id, toggleSwitches[i].checked);
110
91
  }
111
92
  }
112
- toggleAllSwitch.checked = allTogglesExternalServiceChecked()
113
93
  }
114
-
115
94
  const isCookieSetForSettings = function (externalService) {
116
95
  return settingsCookie.isSettingsCookieAccepted(externalService)
117
96
  }