LDBR-4.61: Починить загрузку аватара (#60)

* LDBR-4.61: Починить загрузку аватара * LDBR-4.61: Исправить не отображение аттачей при создании доски и выпилить SW из дебаг режима Co-authored-by: Georgiy <[email protected]>
frontend-park-mail-ru · Dec 24, 2021 · 7420205 · 7420205
1 parent 44c0ab3
commit 7420205
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/src/index.js b/src/index.js
@@ -77,7 +77,7 @@ window.addEventListener('resize', (() => {
 })(), false);
 
 
-if ('serviceWorker' in navigator) {
+if ('serviceWorker' in navigator && !DEBUG) {
     // eslint-disable-next-line no-unused-vars
     const serviceWorkerClient = new ServiceWorkerClient(navigator.serviceWorker);
     window.addEventListener('load', async () => {

diff --git a/src/stores/BoardStore/BoardStore.js b/src/stores/BoardStore/BoardStore.js
@@ -1005,6 +1005,7 @@ class BoardStore extends BaseStore {
                 tags: [],
                 check_lists: [],
                 access_path: payload.data.access_path,
+                attachments: [],
             });
             return;
 

diff --git a/src/stores/SettingsStore/SettingsStore.js b/src/stores/SettingsStore/SettingsStore.js
@@ -252,12 +252,11 @@ class SettingsStore extends BaseStore {
 
             this._storage.get('validation').avatar = validator.validateAvatar(data.avatar);
             if (this._storage.get('validation').avatar) {
-                this._storage.set('avatar', null);
                 return;
             }
-        }
 
-        this._storage.set('avatar', this.__setAvatar(data.avatar));
+            this._storage.set('avatar', this.__setAvatar(data.avatar));
+        }
 
         const formdata = new FormData();
 

diff --git a/webpack.config.js b/webpack.config.js
@@ -131,13 +131,6 @@ const config = {
                 },
             ],
         }),
-        new InjectManifest({
-            swSrc: './src/sw.js',
-            swDest: JSON.parse(confDefs.SW_FILE_NAME),
-            exclude: [
-                /\.m?js$/,
-            ],
-        }),
     ],
     mode: confConst.DEBUG ? 'development' : 'production',
     devtool: confConst.DEBUG ? 'source-map' : undefined,
@@ -146,6 +139,13 @@ const config = {
 
 if (!confConst.DEBUG) {
     config.optimization.minimizer.push(new TerserPlugin());
+    config.plugins.push(new InjectManifest({
+        swSrc: './src/sw.js',
+        swDest: JSON.parse(confDefs.SW_FILE_NAME),
+        exclude: [
+            /\.m?js$/,
+        ],
+    }));
 }
 
 module.exports = config;