From c627e22d0a62aa31fc826af9dc66c443a125d392 Mon Sep 17 00:00:00 2001
From: Alfonso Salces <alfonso.salces@moodle.com>
Date: Fri, 20 Sep 2024 14:39:55 +0200
Subject: [PATCH] MOBILE-2256 privatefiles: Remove private files

---
 src/addons/privatefiles/components/file/file.html |  2 +-
 src/addons/privatefiles/components/file/file.ts   |  4 ----
 src/addons/privatefiles/pages/index/index.html    |  4 ++--
 src/addons/privatefiles/pages/index/index.ts      | 12 +++++++++++-
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/addons/privatefiles/components/file/file.html b/src/addons/privatefiles/components/file/file.html
index a21f68e8028..380b2971025 100644
--- a/src/addons/privatefiles/components/file/file.html
+++ b/src/addons/privatefiles/components/file/file.html
@@ -41,7 +41,7 @@
             }
 
             @if (canDelete) {
-            <ion-button (click)="openMenuClick()" fill="clear">
+            <ion-button (click)="onOpenMenuClick.emit()" fill="clear">
                 <ion-icon name="ellipsis-vertical" slot="icon-only" aria-hidden="true" />
             </ion-button>
             }
diff --git a/src/addons/privatefiles/components/file/file.ts b/src/addons/privatefiles/components/file/file.ts
index 6e5659c937a..905f2b20dfb 100644
--- a/src/addons/privatefiles/components/file/file.ts
+++ b/src/addons/privatefiles/components/file/file.ts
@@ -40,8 +40,4 @@ export class AddonPrivateFilesFileComponent extends CoreFileComponent implements
         this.onOpenMenuClick = new EventEmitter<CoreFileComponent>();
     }
 
-    openMenuClick(): void {
-        this.onOpenMenuClick.emit(this);
-    }
-
 }
diff --git a/src/addons/privatefiles/pages/index/index.html b/src/addons/privatefiles/pages/index/index.html
index dc6f18e8fc0..3abdd3d5d37 100644
--- a/src/addons/privatefiles/pages/index/index.html
+++ b/src/addons/privatefiles/pages/index/index.html
@@ -13,7 +13,7 @@
             <h1>{{ selectFilesEnabled() ? (selectedFiles.length + ' ' + title) : title }}</h1>
         </ion-title>
         <ion-buttons slot="end">
-            @if (selectFilesEnabled()) {
+            @if (selectFilesEnabled() && selectedFiles.length > 0) {
             <ion-button fill="clear" (click)="deleteSelectedFiles(true)" [ariaLabel]="'core.delete' | translate" color="danger">
                 <ion-icon slot="icon-only" name="fas-trash" aria-hidden="true" />
             </ion-button>
@@ -76,7 +76,7 @@ <h1>{{ selectFilesEnabled() ? (selectedFiles.length + ' ' + title) : title }}</h
     @if (showUpload && root !== 'site' && !path && !selectFilesEnabled()) {
     <ion-fab slot="fixed" core-fab vertical="bottom" horizontal="end">
         <ion-fab-button (click)="uploadFile()" [attr.aria-label]="'core.fileuploader.uploadafile' | translate">
-            <ion-icon name="fas-plus" aria-hidden="true" />
+            <ion-icon name="fas-arrow-up-from-bracket" aria-hidden="true" />
             <span class="sr-only">{{ 'core.fileuploader.uploadafile' | translate }}</span>
         </ion-fab-button>
     </ion-fab>
diff --git a/src/addons/privatefiles/pages/index/index.ts b/src/addons/privatefiles/pages/index/index.ts
index 2d2c3bc724c..8079da293cc 100644
--- a/src/addons/privatefiles/pages/index/index.ts
+++ b/src/addons/privatefiles/pages/index/index.ts
@@ -298,9 +298,18 @@ export class AddonPrivateFilesIndexPage implements OnInit, OnDestroy {
      * Delete private files.
      */
     async deleteSelectedFiles(showConfirmation = false): Promise<void> {
+        if (this.selectedFiles.length === 0) {
+            return;
+        }
+
         if (showConfirmation) {
             try {
-                await CoreDomUtils.showDeleteConfirm('core.confirmremoveselectedfiles');
+                this.selectedFiles.length === 1
+                ? await CoreDomUtils.showDeleteConfirm(
+                    'core.confirmremoveselectedfile',
+                    { filename: this.selectedFiles[0].filename },
+                )
+                : await CoreDomUtils.showDeleteConfirm('core.confirmremoveselectedfiles');
             } catch {
                 return;
             }
@@ -360,6 +369,7 @@ export class AddonPrivateFilesIndexPage implements OnInit, OnDestroy {
     cancelFileSelection(): void {
         this.selectFilesEnabled.set(false);
         this.selectedFiles = [];
+        this.files = this.files?.map(file => ({ ...file, selected: false }));
     }
 
     /**