From 5416c9f8654bc4e3f37d8c04eeda7768f0c8167b Mon Sep 17 00:00:00 2001
From: Jakub Majorek <majorek.jakub@gmail.com>
Date: Tue, 30 Mar 2021 16:31:38 +0200
Subject: [PATCH] Ignore EditorJS errors (#1036)

* Ignore EditorJS error

* Update messages
---
 locale/defaultMessages.json                   | 37 -------------------
 package-lock.json                             |  6 +--
 package.json                                  |  2 +-
 src/services/errorTracking/adapters/Sentry.ts |  3 +-
 4 files changed, 6 insertions(+), 42 deletions(-)

diff --git a/locale/defaultMessages.json b/locale/defaultMessages.json
index abeb680a9..25702c5a5 100644
--- a/locale/defaultMessages.json
+++ b/locale/defaultMessages.json
@@ -436,10 +436,6 @@
     "context": "autocomplete select label",
     "string": "Warehouse"
   },
-  "siteSettingsMailingHelperText": {
-    "context": "helper text",
-    "string": "Mailing Configuration"
-  },
   "src_dot_accept": {
     "context": "button",
     "string": "Accept"
@@ -6021,32 +6017,6 @@
   "src_dot_siteSettings_dot_components_dot_SiteSettingsDetails_dot_529433178": {
     "string": "Store description is shown on taskbar after your store name"
   },
-  "src_dot_siteSettings_dot_components_dot_SiteSettingsMailing_dot_1124962330": {
-    "string": "Mailing email address"
-  },
-  "src_dot_siteSettings_dot_components_dot_SiteSettingsMailing_dot_1672275992": {
-    "context": "email sender",
-    "string": "This will be visible as \"from\" name"
-  },
-  "src_dot_siteSettings_dot_components_dot_SiteSettingsMailing_dot_280712237": {
-    "context": "section header",
-    "string": "Mailing Configuration"
-  },
-  "src_dot_siteSettings_dot_components_dot_SiteSettingsMailing_dot_297689661": {
-    "string": "Configurate your email address from which all automatic emails will be sent to your customers."
-  },
-  "src_dot_siteSettings_dot_components_dot_SiteSettingsMailing_dot_3211348653": {
-    "string": "Customer password reset URL"
-  },
-  "src_dot_siteSettings_dot_components_dot_SiteSettingsMailing_dot_3447841451": {
-    "string": "This URL will be used as a main URL for password resets. It will be sent via email."
-  },
-  "src_dot_siteSettings_dot_components_dot_SiteSettingsMailing_dot_50742153": {
-    "string": "URL address"
-  },
-  "src_dot_siteSettings_dot_components_dot_SiteSettingsMailing_dot_70179174": {
-    "string": "Mailing email sender"
-  },
   "src_dot_siteSettings_dot_components_dot_SiteSettingsPage_dot_1004240342": {
     "string": "This adress will be used to generate invoices and calculate shipping rates."
   },
@@ -6058,19 +6028,12 @@
     "context": "section header",
     "string": "Company Information"
   },
-  "src_dot_siteSettings_dot_components_dot_SiteSettingsPage_dot_280712237": {
-    "context": "section header",
-    "string": "Mailing Configuration"
-  },
   "src_dot_siteSettings_dot_components_dot_SiteSettingsPage_dot_3657173399": {
     "string": "Email adress you provide here will be used as a contact adress for your customers."
   },
   "src_dot_siteSettings_dot_components_dot_SiteSettingsPage_dot_3799756739": {
     "string": "These are general information about your store. They define what is the URL of your store and what is shown in browsers taskbar."
   },
-  "src_dot_siteSettings_dot_components_dot_SiteSettingsPage_dot_866304242": {
-    "string": "This where you will find all of the settings determining your stores e-mails. You can determine main email address and some of the contents of your emails."
-  },
   "src_dot_somethingWentWrong": {
     "string": "Saleor ran into an unexpected problem"
   },
diff --git a/package-lock.json b/package-lock.json
index 772389562..ea30c5819 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1836,9 +1836,9 @@
       }
     },
     "@editorjs/editorjs": {
-      "version": "2.19.1",
-      "resolved": "https://registry.npmjs.org/@editorjs/editorjs/-/editorjs-2.19.1.tgz",
-      "integrity": "sha512-5lN7r5B2NCE8VJdsS3poX3Qg9rNwzpxZ+6Jjif3hAVZTYpQwg5wXEpAHFNbuavS0T5Ji+0ID31DQFotVI4PosA==",
+      "version": "2.19.3",
+      "resolved": "https://registry.npmjs.org/@editorjs/editorjs/-/editorjs-2.19.3.tgz",
+      "integrity": "sha512-2IdR164W1csszDZmtCu91q0q7iQ39BBl82bGlNGaXTEiVLr0sySPcmM7v/3DITldEjE+Uovupclba8YAi40KKQ==",
       "requires": {
         "codex-notifier": "^1.1.2",
         "codex-tooltip": "^1.0.1"
diff --git a/package.json b/package.json
index 4dd8543a3..a6fb905a7 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "npm": ">=6.11.0 <7"
   },
   "dependencies": {
-    "@editorjs/editorjs": "^2.19.1",
+    "@editorjs/editorjs": "^2.19.3",
     "@editorjs/header": "^2.6.1",
     "@editorjs/image": "^2.6.0",
     "@editorjs/list": "^1.6.1",
diff --git a/src/services/errorTracking/adapters/Sentry.ts b/src/services/errorTracking/adapters/Sentry.ts
index 42a3955a4..4609c5f30 100644
--- a/src/services/errorTracking/adapters/Sentry.ts
+++ b/src/services/errorTracking/adapters/Sentry.ts
@@ -12,7 +12,8 @@ export const SentryAdapter = (config: Config): TrackerMethods => {
     if (config?.dsn) {
       Sentry.init({
         dsn: config.dsn,
-        environment: config.environment
+        environment: config.environment,
+        ignoreErrors: ["Editor's content can not be saved in read-only mode"]
       });
       return true;
     }