From 47833892e66bdd37121b832662544dcf3069bc92 Mon Sep 17 00:00:00 2001
From: Samson Akol <akolson2010@gmail.com>
Date: Fri, 2 Sep 2022 19:27:16 +0300
Subject: [PATCH 1/3] adds translated user friendly string for files with no
 name

---
 .../channelEdit/views/files/FileUploadItem.vue         | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/files/FileUploadItem.vue b/contentcuration/contentcuration/frontend/channelEdit/views/files/FileUploadItem.vue
index 4fc6fc8373..24ca6187ab 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/files/FileUploadItem.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/files/FileUploadItem.vue
@@ -28,7 +28,7 @@
               <ActionLink
                 v-if="fileDisplay"
                 class="notranslate"
-                :text="fileDisplay.original_filename"
+                :text="formattedFileDisplay"
                 @click="openFileDialog"
               />
               <ActionLink
@@ -133,6 +133,13 @@
         }
         return this.file;
       },
+      formattedFileDisplay() {
+        const fileName = this.fileDisplay.original_filename;
+        if (fileName === 'file' || (fileName && !fileName.length)) {
+          return this.$tr('unknownFile');
+        }
+        return fileName;
+      },
       erroredFile() {
         if (this.fileUpload && this.fileUpload.error) {
           return this.fileUpload;
@@ -166,6 +173,7 @@
       /* eslint-disable kolibri/vue-no-unused-translations */
       retryUpload: 'Retry upload',
       uploadFailed: 'Upload failed',
+      unknownFile: 'Unknown filename',
       /* eslint-enable kolibri/vue-no-unused-translations */
     },
   };

From c491ac0c00e7956d8e7aa530c9b8adae3e67d20f Mon Sep 17 00:00:00 2001
From: Samson Akol <akolson2010@gmail.com>
Date: Tue, 6 Sep 2022 21:20:19 +0300
Subject: [PATCH 2/3] Adds tests for changes made on FileUploadItem.vue

---
 .../channelEdit/views/files/FileUploadItem.vue   |  1 +
 .../views/files/__tests__/fileUploadItem.spec.js | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/files/FileUploadItem.vue b/contentcuration/contentcuration/frontend/channelEdit/views/files/FileUploadItem.vue
index 24ca6187ab..490d01fdd4 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/files/FileUploadItem.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/files/FileUploadItem.vue
@@ -29,6 +29,7 @@
                 v-if="fileDisplay"
                 class="notranslate"
                 :text="formattedFileDisplay"
+                data-test="file-link"
                 @click="openFileDialog"
               />
               <ActionLink
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/files/__tests__/fileUploadItem.spec.js b/contentcuration/contentcuration/frontend/channelEdit/views/files/__tests__/fileUploadItem.spec.js
index b9b5dd1540..b21d947b19 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/files/__tests__/fileUploadItem.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/files/__tests__/fileUploadItem.spec.js
@@ -29,6 +29,22 @@ function makeWrapper(props = {}, file = {}) {
 
 describe('fileUploadItem', () => {
   describe('render', () => {
+    it("'Unknown filename' should be displayed if original_filename is 'file'", () => {
+      let file = {
+        id: 'file-1',
+        original_filename: 'file',
+      };
+      let wrapper = makeWrapper({}, file);
+      expect(wrapper.find('[data-test="file-link"]').text()).toBe('Unknown filename');
+    });
+    it("original_filename should be displayed if its value is not 'file'", () => {
+      let file = {
+        id: 'file-1',
+        original_filename: 'SomeFileName',
+      };
+      let wrapper = makeWrapper({}, file);
+      expect(wrapper.find('[data-test="file-link"]').text()).toBe('SomeFileName');
+    });
     it('should show a status error if the file has an error', () => {
       let wrapper = makeWrapper({}, { error: true });
       expect(wrapper.find('[data-test="status"]').exists()).toBe(true);

From b9f89e93f6b6e02aaf720469debcf317b9a1102b Mon Sep 17 00:00:00 2001
From: Samson Akol <akolson2010@gmail.com>
Date: Wed, 7 Sep 2022 21:55:13 +0300
Subject: [PATCH 3/3] adds pr review comments

---
 .../frontend/channelEdit/views/files/FileUploadItem.vue   | 2 +-
 .../views/files/__tests__/fileUploadItem.spec.js          | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/files/FileUploadItem.vue b/contentcuration/contentcuration/frontend/channelEdit/views/files/FileUploadItem.vue
index 490d01fdd4..c83f68cd4f 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/files/FileUploadItem.vue
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/files/FileUploadItem.vue
@@ -136,7 +136,7 @@
       },
       formattedFileDisplay() {
         const fileName = this.fileDisplay.original_filename;
-        if (fileName === 'file' || (fileName && !fileName.length)) {
+        if (fileName === 'file' || !fileName) {
           return this.$tr('unknownFile');
         }
         return fileName;
diff --git a/contentcuration/contentcuration/frontend/channelEdit/views/files/__tests__/fileUploadItem.spec.js b/contentcuration/contentcuration/frontend/channelEdit/views/files/__tests__/fileUploadItem.spec.js
index b21d947b19..59e8fe2f9a 100644
--- a/contentcuration/contentcuration/frontend/channelEdit/views/files/__tests__/fileUploadItem.spec.js
+++ b/contentcuration/contentcuration/frontend/channelEdit/views/files/__tests__/fileUploadItem.spec.js
@@ -31,12 +31,18 @@ describe('fileUploadItem', () => {
   describe('render', () => {
     it("'Unknown filename' should be displayed if original_filename is 'file'", () => {
       let file = {
-        id: 'file-1',
         original_filename: 'file',
       };
       let wrapper = makeWrapper({}, file);
       expect(wrapper.find('[data-test="file-link"]').text()).toBe('Unknown filename');
     });
+    it("'Unknown filename' should be displayed if original_filename is ''", () => {
+      let file = {
+        original_filename: '',
+      };
+      let wrapper = makeWrapper({}, file);
+      expect(wrapper.find('[data-test="file-link"]').text()).toBe('Unknown filename');
+    });
     it("original_filename should be displayed if its value is not 'file'", () => {
       let file = {
         id: 'file-1',