From 8caa3f0deaeb8eb9efff40f5b1f8fb489a1f5907 Mon Sep 17 00:00:00 2001
From: DianaXWiki <diana.voineag@xwiki.com>
Date: Tue, 4 Aug 2026 14:11:08 +0200
Subject: [PATCH] Implement review changes

---
 www/teams/inner.js | 46 +++++++++++++++++++++-------------------------
 1 file changed, 21 insertions(+), 25 deletions(-)

diff --git a/www/teams/inner.js b/www/teams/inner.js
index 171865d16..b048f8372 100644
--- a/www/teams/inner.js
+++ b/www/teams/inner.js
@@ -139,6 +139,7 @@ define([
                 APP.teamEdPublic = null;
                 APP.drive = null;
                 APP.cryptor = null;
+                delete APP.refreshTeamAvatarBlock;
                 APP.toolbar.$bottomR.empty();
                 APP.toolbar.$bottomM.empty();
                 APP.toolbar.$bottomL.empty();
@@ -458,6 +459,7 @@ define([
                 var secret = Hash.getSecrets('team', team.hash || team.roHash, team.password);
                 APP.cryptor = UserObject.createCryptor(secret.keys.secondaryKey);
                 // Load data
+                delete APP.refreshTeamAvatarBlock;
                 APP.team = id;
                 APP.teamEdPublic = Util.find(team, ['keys', 'drive', 'edPublic']);
                 buildUI(common, true, team.owner);
@@ -691,7 +693,9 @@ define([
                 common.displayAvatar($headerAvatar, obj?.avatar, obj?.name);
                 if ($name.length) { $headerAvatar.append($name); }
             }
-            APP.refreshTeamAvatarBlock(obj);
+            if (typeof APP.refreshTeamAvatarBlock === 'function') {
+                APP.refreshTeamAvatarBlock(obj);
+            }
         });
     };
 
@@ -1189,6 +1193,20 @@ define([
     makeBlock('avatar', function (common, cb) { // Msg.team_avatarHint, .team_avatarTitle
         const block = h('div#cp-team-avatar-preview');
         const $avatar = $(h('span.cp-avatar')).appendTo($(block));
+        const setAvatar = (url) => {
+            APP.module.execCommand('GET_TEAM_METADATA', {
+                teamId: APP.team
+            }, (meta) => {
+                if (meta?.error) { return void UI.warn(Messages.error); }
+                meta.avatar = url;
+                APP.module.execCommand('SET_TEAM_METADATA', {
+                    teamId: APP.team,
+                    metadata: meta
+                }, () => {
+                    refreshTeamMetadataDisplay(common);
+                });
+            });
+        };
 
         const refreshAvatar = (obj) => {
             $avatar.empty();
@@ -1203,36 +1221,14 @@ define([
                 }, Icons.get('close'));
                 $avatar.append(delButton);
                 $(delButton).click(() => {
-                    APP.module.execCommand('GET_TEAM_METADATA', {
-                        teamId: APP.team
-                    }, (meta) => {
-                        if (meta?.error) { return void UI.warn(Messages.error); }
-                        meta.avatar = '';
-                        APP.module.execCommand('SET_TEAM_METADATA', {
-                            teamId: APP.team,
-                            metadata: meta
-                        }, () => {
-                            refreshTeamMetadataDisplay(common);
-                        });
-                    });
+                    setAvatar('');
                 });
             });
         };
         APP.refreshTeamAvatarBlock = refreshAvatar;
         const data = MT.addAvatar(common, (ev, upload) => {
             if (!upload.url) { return void UI.warn(Messages.error); }
-            APP.module.execCommand('GET_TEAM_METADATA', {
-                teamId: APP.team
-            }, (obj) => {
-                if (obj?.error) { return void UI.warn(Messages.error); }
-                obj.avatar = upload.url;
-                APP.module.execCommand('SET_TEAM_METADATA', {
-                    teamId: APP.team,
-                    metadata: obj
-                }, () => {
-                    refreshTeamMetadataDisplay(common);
-                });
-            });
+            setAvatar(upload.url);
         });
         const $upButton = common.createButton('upload', false, data);
         $upButton.addClass('cp-online');