Merge remote-tracking branch 'origin/MC-41351' into 2.4-develop-pr142

Author: zakdma

app/code/Magento/Customer/Model/Metadata/Form/File.php

@@ -320,7 +320,10 @@ public function compactValue($value)
         }
 
         // Remove outdated file (in the case of file uploader UI component)
-        if (!empty($this->_value) && !empty($value['delete'])) {
+        if (!empty($this->_value)
+            && (!empty($value['delete'])
+                || ($this->_entityTypeCode == 'customer' && empty($value)))
+        ) {
             $this->fileProcessor->removeUploadedFile($this->_value);
             return $value;
         }

app/code/Magento/Customer/Test/Unit/Model/Metadata/Form/FileTest.php

@@ -393,7 +393,7 @@ public function testCompactValueNoDelete()
             ->with('value')
             ->willReturnSelf();
 
-        $this->assertSame('value', $model->compactValue([]));
+        $this->assertSame([], $model->compactValue([]));
     }
 
     public function testCompactValueDelete()
@@ -625,7 +625,7 @@ public function testCompactValueRemoveUiComponentValue()
             ->with($value)
             ->willReturnSelf();
 
-        $this->assertEquals($value, $model->compactValue([]));
+        $this->assertEquals([], $model->compactValue([]));
     }
 
     public function testCompactValueNoAction()