Chore: Preview.js cleanup and slight refactor #24
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
tonyjin
commented
Mar 28, 2017
tonyjin
commented
- Update show() to only take file IDs since we are not planning on accepting file objects
- Cleaned up some logic and comments concerning cached file metadata
tonyjin
commented
Mar 28, 2017
| @@ -621,12 +608,9 @@ class Preview extends EventEmitter { | |||
| // Update navigation | |||
| showNavigation(this.file.id, this.collection); | |||
|
|
|||
| // Cache the file | |||
| cacheFile(this.file); | |||
There was a problem hiding this comment.
@priyajeet not sure why we had this extra caching here - we already cache when needed after loading from the server in handleLoadResponse(). We shouldn't have to cache anything here right?
There was a problem hiding this comment.
It could have been there to prevent prefetch() from trying to prefetch something that was loading...Dunno if its still needed after all the prefetch refactoring.
|
For a bit of context, I started down this path while investigating a very intermittent bug where a preview can get stuck in the 'Generating Preview...' state without the loading download button link ever showing up (my one tab has been in this state for 5 hours now).
In the stuck state, the static assets for the document viewer are not loaded - this implies we have not yet picked an appropriate viewer for the file and that we also haven't yet reached |
jeremypress
approved these changes
Mar 28, 2017
priyajeet
reviewed
Mar 28, 2017
src/lib/Preview.js
Outdated
| @@ -770,19 +754,26 @@ class Preview extends EventEmitter { | |||
| // Keep reference to previously cached file version | |||
| const cached = cache.get(file.id); | |||
There was a problem hiding this comment.
prolly rename to cachedFile ^
priyajeet
reviewed
Mar 28, 2017
src/lib/Preview.js
Outdated
| const isWatermarked = file.watermark_info && file.watermark_info.is_watermarked; | ||
| const isStale = !cached || !cached.file_version || cached.file_version.sha1 !== file.file_version.sha1; | ||
|
|
||
| // Don't cache watermarked files, update cache otherwise | ||
| if (isWatermarked) { | ||
| cache.unset(file.id); |
priyajeet
reviewed
Mar 28, 2017
src/lib/Preview.js
Outdated
| cached.file_version.sha1 !== file.file_version.sha1 || | ||
| isWatermarked; | ||
|
|
||
| if (shouldLoadViewer) { |
There was a problem hiding this comment.
Not necessarily reload - this is also the flow for a viewer to be loaded the first time
priyajeet
approved these changes
Mar 28, 2017
- Update show() to only take file IDs since we are not planning on accepting file objects - Cleaned up some logic and comments concerning cached file metadata
tonyjin
pushed a commit
to tonyjin/box-content-preview
that referenced
this pull request
Aug 22, 2017
- Partially reverts changes from box#24. - Adds 'id' to FILE_FIELDS since we use that to validate the file object passed in
tonyjin
added a commit
that referenced
this pull request
Aug 22, 2017
- Partially reverts changes from #24. - Adds 'id' to FILE_FIELDS since we use that to validate the file object passed in
pramodsum
added a commit
to pramodsum/box-content-preview
that referenced
this pull request
Nov 14, 2017
https://github.com/box/box-annotations/releases # 0.3.0 (2017-11-14) * Chore: Add conventional-changelog-releaser (box#34) ([624e0bd](box/box-annotations@624e0bd)) * Chore: Do not clear out node_modules on when publishing npm package (box#30) ([08c180d](box/box-annotations@08c180d)) * Fix: Do not select drawings when creating a point annotation on top (box#28) ([07fc4c1](box/box-annotations@07fc4c1)) * Fix: Drawing CSS (box#23) ([0493fcd](box/box-annotations@0493fcd)) * Fix: fix highlight selection and typos (box#21) ([ca54d5e](box/box-annotations@ca54d5e)), closes [box#21](box/box-annotations#21) * Fix: Hide createHighlightDialog on page re-render (box#31) ([0b74717](box/box-annotations@0b74717)) * Fix: Match width of reply textarea with comments (box#33) ([5f0f29b](box/box-annotations@5f0f29b)) * Fix: Only registering thread with controller on save (box#22) ([ff75bf1](box/box-annotations@ff75bf1)) * Fix: Only show create dialog when creating new point annotations (box#29) ([4822ece](box/box-annotations@4822ece)) * Fix: only show newly created annotation dialog on hover (box#25) ([0ba1965](box/box-annotations@0ba1965)) * Fix: Position create dialog properly near page edges (box#32) ([968efb3](box/box-annotations@968efb3)) * Fix: release script should use correct remote branch (box#20) ([8bd12a5](box/box-annotations@8bd12a5)) * Fix: Scrolling on highlight dialogs in powerpoints (box#24) ([b21ed0e](box/box-annotations@b21ed0e)) * Fix: Validation message fails to get displayed when user clicks on 'Post' without entering any comme ([d90e72c](box/box-annotations@d90e72c)) * Fix: Hide mobile dialog on first outside click (box#26) ([01ec48b](box/box-annotations@01ec48b))
pramodsum
added a commit
that referenced
this pull request
Nov 14, 2017
https://github.com/box/box-annotations/releases # 0.3.0 (2017-11-14) * Chore: Add conventional-changelog-releaser (#34) ([624e0bd](box/box-annotations@624e0bd)) * Chore: Do not clear out node_modules on when publishing npm package (#30) ([08c180d](box/box-annotations@08c180d)) * Fix: Do not select drawings when creating a point annotation on top (#28) ([07fc4c1](box/box-annotations@07fc4c1)) * Fix: Drawing CSS (#23) ([0493fcd](box/box-annotations@0493fcd)) * Fix: fix highlight selection and typos (#21) ([ca54d5e](box/box-annotations@ca54d5e)), closes [#21](box/box-annotations#21) * Fix: Hide createHighlightDialog on page re-render (#31) ([0b74717](box/box-annotations@0b74717)) * Fix: Match width of reply textarea with comments (#33) ([5f0f29b](box/box-annotations@5f0f29b)) * Fix: Only registering thread with controller on save (#22) ([ff75bf1](box/box-annotations@ff75bf1)) * Fix: Only show create dialog when creating new point annotations (#29) ([4822ece](box/box-annotations@4822ece)) * Fix: only show newly created annotation dialog on hover (#25) ([0ba1965](box/box-annotations@0ba1965)) * Fix: Position create dialog properly near page edges (#32) ([968efb3](box/box-annotations@968efb3)) * Fix: release script should use correct remote branch (#20) ([8bd12a5](box/box-annotations@8bd12a5)) * Fix: Scrolling on highlight dialogs in powerpoints (#24) ([b21ed0e](box/box-annotations@b21ed0e)) * Fix: Validation message fails to get displayed when user clicks on 'Post' without entering any comme ([d90e72c](box/box-annotations@d90e72c)) * Fix: Hide mobile dialog on first outside click (#26) ([01ec48b](box/box-annotations@01ec48b))
pramodsum
added a commit
to pramodsum/box-content-preview
that referenced
this pull request
Nov 16, 2017
https://github.com/box/box-annotations/releases # 0.3.0 (2017-11-14) * Chore: Add conventional-changelog-releaser (box#34) ([624e0bd](box/box-annotations@624e0bd)) * Chore: Do not clear out node_modules on when publishing npm package (box#30) ([08c180d](box/box-annotations@08c180d)) * Fix: Do not select drawings when creating a point annotation on top (box#28) ([07fc4c1](box/box-annotations@07fc4c1)) * Fix: Drawing CSS (box#23) ([0493fcd](box/box-annotations@0493fcd)) * Fix: fix highlight selection and typos (box#21) ([ca54d5e](box/box-annotations@ca54d5e)), closes [box#21](box/box-annotations#21) * Fix: Hide createHighlightDialog on page re-render (box#31) ([0b74717](box/box-annotations@0b74717)) * Fix: Match width of reply textarea with comments (box#33) ([5f0f29b](box/box-annotations@5f0f29b)) * Fix: Only registering thread with controller on save (box#22) ([ff75bf1](box/box-annotations@ff75bf1)) * Fix: Only show create dialog when creating new point annotations (box#29) ([4822ece](box/box-annotations@4822ece)) * Fix: only show newly created annotation dialog on hover (box#25) ([0ba1965](box/box-annotations@0ba1965)) * Fix: Position create dialog properly near page edges (box#32) ([968efb3](box/box-annotations@968efb3)) * Fix: release script should use correct remote branch (box#20) ([8bd12a5](box/box-annotations@8bd12a5)) * Fix: Scrolling on highlight dialogs in powerpoints (box#24) ([b21ed0e](box/box-annotations@b21ed0e)) * Fix: Validation message fails to get displayed when user clicks on 'Post' without entering any comme ([d90e72c](box/box-annotations@d90e72c)) * Fix: Hide mobile dialog on first outside click (box#26) ([01ec48b](box/box-annotations@01ec48b))
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.