Skip to content
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

Jump to bottom

feat(preview-error): Display file icon based on extension for errors #1536

Merged
merged 2 commits into from
Oct 4, 2024
Merged

feat(preview-error): Display file icon based on extension for errors #1536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6076e76
feat(preview-error): Display file icon based on extension for errors
patlm Oct 3, 2024
0d41ce8
Merge branch 'master' into always-use-file-icon-for-errors
patlm Oct 4, 2024
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
3 changes: 1 addition & 2 deletions src/lib/viewers/error/PreviewErrorViewer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ class PreviewErrorViewer extends BaseViewer {

const { displayMessage, details, message } = error;
const { file } = this.options;
const { extension } = file || {};
const iconExtension = extension === 'flv' || extension === 'tgz' || extension === 'zip' ? extension : undefined;
const { extension: iconExtension } = file || {};
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what happens if iconExtension is undefined?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These scenarios will be handled by getIcon in box-ui-elements. In the case of undefined, it will return the same default item as it returned before when iconExtension was explicitly set to undefined.


// Display the default or file-specific error icon
this.errorIcon = new ErrorIcon({ containerEl: this.iconEl });
Expand Down
3 changes: 2 additions & 1 deletion src/lib/viewers/error/__tests__/PreviewErrorViewer-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ describe('lib/viewers/error/PreviewErrorViewer', () => {
['zip', 'zip'],
['tgz', 'tgz'],
['flv', 'flv'],
['blah', undefined],
['pdf', 'pdf'],
['pptx', 'pptx'],
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it still possible for [blah, undefined] to happen?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It will no longer be possible. If 'blah' is the extension, it will be passed into box-ui-elements getIcon function which in the case where it can not find it, it will return the default icon that was previous being used when iconExtension was passed in as undefined.

])('should set appropriate icon', (fileExtension, iconExtension) => {
const err = new PreviewError('some_code');
error.options.file.extension = fileExtension;
Expand Down