Skip to content

adds translated user friendly string for files with no name#3602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bjester merged 3 commits into from
Sep 7, 2022
Merged

adds translated user friendly string for files with no name #3602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4783389
adds translated user friendly string for files with no name
akolson Sep 2, 2022
c491ac0
Adds tests for changes made on FileUploadItem.vue
akolson Sep 6, 2022
b9f89e9
adds pr review comments
akolson Sep 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion contentcuration/contentcuration/frontend/channelEdit/views/files/FileUploadItem.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,8 @@
<ActionLink
v-if="fileDisplay"
class="notranslate"
:text="fileDisplay.original_filename"
:text="formattedFileDisplay"
data-test="file-link"
@click="openFileDialog"
/>
<ActionLink
Expand DownExpand Up@@ -133,6 +134,13 @@
}
return this.file;
},
formattedFileDisplay() {
const fileName = this.fileDisplay.original_filename;
if (fileName === 'file' || !fileName) {
return this.$tr('unknownFile');
}
return fileName;
},
erroredFile() {
if (this.fileUpload && this.fileUpload.error) {
return this.fileUpload;
Expand DownExpand Up@@ -166,6 +174,7 @@
/* eslint-disable kolibri/vue-no-unused-translations */
retryUpload: 'Retry upload',
uploadFailed: 'Upload failed',
unknownFile: 'Unknown filename',
/* eslint-enable kolibri/vue-no-unused-translations */
},
};
Expand Down
22 changes: 22 additions & 0 deletions ...uration/contentcuration/frontend/channelEdit/views/files/__tests__/fileUploadItem.spec.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,6 +29,28 @@ function makeWrapper(props = {}, file = {}) {

describe('fileUploadItem', () => {
describe('render', () => {
it("'Unknown filename' should be displayed if original_filename is 'file'", () => {
let file = {
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',
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);
Expand Down