Skip to content

Commit cafd044

Browse files
jissereitsmajissereitsma
committed
Skip handling messages via cookies and localStorage under Hyva
1 parent ae2214d commit cafd044

3 files changed

Lines changed: 30 additions & 8 deletions

File tree

‎view/base/layout/hyva_loki_base.xml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0"?>
2+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3+
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
4+
<body>
5+
<referenceBlock name="loki.script.store.messages">
6+
<arguments>
7+
<argument name="skip_local_storage" xsi:type="boolean">true</argument>
8+
<argument name="skip_cookies" xsi:type="boolean">true</argument>
9+
</arguments>
10+
</referenceBlock>
11+
</body>
12+
</page>

‎view/base/templates/script/store/localstorage-store.phtml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ $sectionConfig = $block->getSectionConfig();
2121
this.data = storedData ? JSON.parse(storedData) : {};
2222

2323
if (!this.data) {
24-
console.log('Refreshing data');
2524
this.refresh();
2625
}
2726

‎view/base/templates/script/store/message-store.phtml‎

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,26 @@ use Magento\Framework\View\Element\Template;
55

66
/** @version 1.0.4 */
77
/** @var Template $block */
8+
9+
$fetchLocalStorage = !(bool)$block->getSkipLocalStorage();
10+
$fetchCookies = !(bool)$block->getSkipCookies();
811
?>
912
<script>
1013
document.addEventListener('alpine:init', () => {
1114
Alpine.store('LokiMessageStore', {
1215
messages: [],
16+
fetchLocalStorage: <?= /* @noEscape */ $fetchLocalStorage ? 'true' : 'false' ?>,
17+
fetchCookies: <?= /* @noEscape */ $fetchLocalStorage ? 'true' : 'false' ?>,
1318
init() {
14-
Alpine.effect(() => {
15-
const messageSection = Alpine.store('LokiLocalStorage').get('messages');
16-
if (messageSection && messageSection.messages) {
17-
this.messages = [...this.messages, ...messageSection.messages];
18-
this.reset();
19-
}
20-
});
19+
if (this.fetchLocalStorage) {
20+
Alpine.effect(() => {
21+
const messageSection = Alpine.store('LokiLocalStorage').get('messages');
22+
if (messageSection && messageSection.messages) {
23+
this.messages = [...this.messages, ...messageSection.messages];
24+
this.reset();
25+
}
26+
});
27+
}
2128
},
2229
getMessages() {
2330
const cookieMessages = this.getCookieMessages();
@@ -29,6 +36,10 @@ use Magento\Framework\View\Element\Template;
2936
return this.messages;
3037
},
3138
getCookieMessages() {
39+
if (!this.fetchCookies) {
40+
return [];
41+
}
42+
3243
const cookieMessages = LokiCookies.get('mage-messages') || [];
3344
if (!cookieMessages instanceof Array) {
3445
LokiCookies.remove('mage-messages');

0 commit comments

Comments
 (0)