Fix issue with too many cookies in admin

Port MC-19247 for adminhtml in order to not use jQuery.localStorage plugin Move translation directory definition to base theme Add deprecation notice to block and view files
magento · Aug 4, 2020 · 72567f6 · 72567f6
1 parent d3adb7a
commit 72567f6
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 64 deletions.
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
@@ -70,7 +70,6 @@
                             <argument name="bugreport_url" xsi:type="string">https://github.com/magento/magento2/issues</argument>
                         </arguments>
                     </block>
-
                 </container>
             </container>
         </referenceContainer>

diff --git a/app/code/Magento/Backend/view/adminhtml/requirejs-config.js b/app/code/Magento/Backend/view/adminhtml/requirejs-config.js
@@ -6,8 +6,7 @@
 var config = {
     map: {
         '*': {
-            'mediaUploader':  'Magento_Backend/js/media-uploader',
-            'mage/translate': 'Magento_Backend/js/translate'
+            'mediaUploader':  'Magento_Backend/js/media-uploader'
         }
     }
 };
diff --git a/app/code/Magento/Translation/Block/Js.php b/app/code/Magento/Translation/Block/Js.php
@@ -14,6 +14,10 @@
  *
  * @api
  * @since 100.0.2
+ * @deprecated logic was refactored in order to not use localstorage at all.
+ *
+ * You can see details in app/code/Magento/Translation/view/base/web/js/mage-translation-dictionary.js
+ * These block and view file were left in order to keep backward compatibility
  */
 class Js extends Template
 {

diff --git a/app/code/Magento/Translation/view/base/requirejs-config.js b/app/code/Magento/Translation/view/base/requirejs-config.js
@@ -0,0 +1,15 @@
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+var config = {
+    map: {
+        '*': {
+            mageTranslationDictionary: 'Magento_Translation/js/mage-translation-dictionary'
+        }
+    },
+    deps: [
+        'mageTranslationDictionary'
+    ]
+};
diff --git a/app/code/Magento/Translation/view/base/templates/translate.phtml b/app/code/Magento/Translation/view/base/templates/translate.phtml
@@ -7,61 +7,8 @@
 /**
  * @var \Magento\Translation\Block\Js $block
  * @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
+ * @deprecated logic was refactored in order to not use localstorage at all.
+ *
+ * You can see details in app/code/Magento/Translation/view/base/web/js/mage-translation-dictionary.js
+ * These block and view file were left in order to keep backward compatibility
  */
-?>
-<!--
-For frontend area dictionary file is inserted into html head in Magento/Translation/view/base/templates/dictionary.phtml
-Same translation mechanism should be introduced for admin area in 2.4 version.
--->
-<?php
-if ($block->dictionaryEnabled()) {
-    $version = $block->getTranslationFileVersion();
-    $escapedVersion = $block->escapeJs($version);
-    $dictionaryFileName = /* @noEscape */ Magento\Translation\Model\Js\Config::DICTIONARY_FILE_NAME;
-
-    $scriptString = <<<script
-        require.config({
-            deps: [
-                'jquery',
-                'mage/translate',
-                'jquery/jquery-storageapi'
-            ],
-            callback: function ($) {
-                'use strict';
-
-                var dependencies = [],
-                    versionObj;
-
-                $.initNamespaceStorage('mage-translation-storage');
-                $.initNamespaceStorage('mage-translation-file-version');
-                versionObj = $.localStorage.get('mage-translation-file-version');
-
-                if (versionObj.version !== '{$escapedVersion}') {
-                    dependencies.push(
-                        'text!{$dictionaryFileName}'
-                    );
-
-                }
-
-                require.config({
-                    deps: dependencies,
-                    callback: function (string) {
-                        if (typeof string === 'string') {
-                            $.mage.translate.add(JSON.parse(string));
-                            $.localStorage.set('mage-translation-storage', string);
-                            $.localStorage.set(
-                                'mage-translation-file-version',
-                                {
-                                    version: '{$escapedVersion}'
-                                }
-                            );
-                        } else {
-                            $.mage.translate.add($.localStorage.get('mage-translation-storage'));
-                        }
-                    }
-                });
-            }
-        });
-script;
-    echo /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false);
-}
diff --git a/app/code/Magento/Translation/view/frontend/requirejs-config.js b/app/code/Magento/Translation/view/frontend/requirejs-config.js
@@ -8,12 +8,10 @@ var config = {
         '*': {
             editTrigger: 'mage/edit-trigger',
             addClass: 'Magento_Translation/js/add-class',
-            'Magento_Translation/add-class': 'Magento_Translation/js/add-class',
-            mageTranslationDictionary: 'Magento_Translation/js/mage-translation-dictionary'
+            'Magento_Translation/add-class': 'Magento_Translation/js/add-class'
         }
     },
     deps: [
-        'mage/translate-inline',
-        'mageTranslationDictionary'
+        'mage/translate-inline'
     ]
 };