From 8a0e649f989a824bb3bbfd1900a5b8e5383b47e1 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Fri, 30 Sep 2016 11:06:30 -0400 Subject: PLT-3105 Files table migration (#4068) * Implemented initial changes for files table * Removed *_benchmark_test.go files * Re-implemented GetPublicFile and added support for old path * Localization for files table * Moved file system code into utils package * Finished server-side changes and added initial upgrade script * Added getPostFiles api * Re-add Extension and HasPreviewImage fields to FileInfo * Removed unused translation * Fixed merge conflicts left over after permissions changes * Forced FileInfo.extension to be lower case * Changed FileUploadResponse to contain the FileInfos instead of FileIds * Fixed permissions on getFile* calls * Fixed notifications for file uploads * Added initial version of client code for files changes * Permanently added FileIds field to Post object and removed Post.HasFiles * Updated PostStore.Update to be usable in more circumstances * Re-added Filenames field and switched file migration to be entirely lazy-loaded * Increased max listener count for FileStore * Removed unused fileInfoCache * Moved file system code back into api * Removed duplicate test case * Fixed unit test running on ports other than 8065 * Renamed HasPermissionToPostContext to HasPermissionToChannelByPostContext * Refactored handleImages to make it more easily understandable * Renamed getPostFiles to getFileInfosForPost * Re-added pre-FileIds posts to analytics * Changed files to be saved as their ids as opposed to id/filename.ext * Renamed FileInfo.UserId to FileInfo.CreatorId * Fixed detection of language in CodePreview * Fixed switching between threads in the RHS not loading new files * Add serverside protection against a rare bug where the client sends the same file twice for a single post * Refactored the important parts of uploadFile api call into a function that can be called without a web context --- webapp/utils/async_client.jsx | 60 +++++++++++++++++------------------ webapp/utils/constants.jsx | 2 +- webapp/utils/syntax_hightlighting.jsx | 9 ++---- webapp/utils/utils.jsx | 17 ++-------- 4 files changed, 34 insertions(+), 54 deletions(-) (limited to 'webapp/utils') diff --git a/webapp/utils/async_client.jsx b/webapp/utils/async_client.jsx index 22b223bc5..5441f260c 100644 --- a/webapp/utils/async_client.jsx +++ b/webapp/utils/async_client.jsx @@ -715,6 +715,32 @@ export function getPostsAfter(postId, offset, numPost, isPost) { ); } +export function getFileInfosForPost(channelId, postId) { + const callName = 'getFileInfosForPost' + postId; + + if (isCallInProgress(callName)) { + return; + } + + Client.getFileInfosForPost( + channelId, + postId, + (data) => { + callTracker[callName] = 0; + + AppDispatcher.handleServerAction({ + type: ActionTypes.RECEIVED_FILE_INFOS, + postId, + infos: data + }); + }, + (err) => { + callTracker[callName] = 0; + dispatchError(err, 'getPostFile'); + } + ); +} + export function getMe() { if (isCallInProgress('getMe')) { return null; @@ -923,34 +949,6 @@ export function getSuggestedCommands(command, suggestionId, component) { ); } -export function getFileInfo(filename) { - const callName = 'getFileInfo' + filename; - - if (isCallInProgress(callName)) { - return; - } - - callTracker[callName] = utils.getTimestamp(); - - Client.getFileInfo( - filename, - (data) => { - callTracker[callName] = 0; - - AppDispatcher.handleServerAction({ - type: ActionTypes.RECEIVED_FILE_INFO, - filename, - info: data - }); - }, - (err) => { - callTracker[callName] = 0; - - dispatchError(err, 'getFileInfo'); - } - ); -} - export function getStandardAnalytics(teamId) { const callName = 'getStandardAnaytics' + teamId; @@ -1432,8 +1430,8 @@ export function regenCommandToken(id) { ); } -export function getPublicLink(filename, success, error) { - const callName = 'getPublicLink' + filename; +export function getPublicLink(fileId, success, error) { + const callName = 'getPublicLink' + fileId; if (isCallInProgress(callName)) { return; @@ -1442,7 +1440,7 @@ export function getPublicLink(filename, success, error) { callTracker[callName] = utils.getTimestamp(); Client.getPublicLink( - filename, + fileId, (link) => { callTracker[callName] = 0; diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx index 039d48aaa..2b6e110ce 100644 --- a/webapp/utils/constants.jsx +++ b/webapp/utils/constants.jsx @@ -95,7 +95,7 @@ export const ActionTypes = keyMirror({ RECEIVED_PREFERENCE: null, RECEIVED_PREFERENCES: null, DELETED_PREFERENCES: null, - RECEIVED_FILE_INFO: null, + RECEIVED_FILE_INFOS: null, RECEIVED_ANALYTICS: null, RECEIVED_INCOMING_WEBHOOKS: null, diff --git a/webapp/utils/syntax_hightlighting.jsx b/webapp/utils/syntax_hightlighting.jsx index 4db6d11e3..47ba5bd4e 100644 --- a/webapp/utils/syntax_hightlighting.jsx +++ b/webapp/utils/syntax_hightlighting.jsx @@ -136,14 +136,9 @@ export function highlight(lang, code) { return TextFormatting.sanitizeHtml(code); } -export function getLanguageFromFilename(filename) { - const fileSplit = filename.split('.'); - - let ext = fileSplit.length > 1 ? fileSplit[fileSplit.length - 1] : ''; - ext = ext.toLowerCase(); - +export function getLanguageFromFileExtension(extension) { for (var key in HighlightedLanguages) { - if (HighlightedLanguages[key].extensions.find((x) => x === ext)) { + if (HighlightedLanguages[key].extensions.find((x) => x === extension)) { return key; } } diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx index 25a9dfa7d..5a47b0a63 100644 --- a/webapp/utils/utils.jsx +++ b/webapp/utils/utils.jsx @@ -413,8 +413,8 @@ export function getFileType(extin) { return 'other'; } -export function getPreviewImagePathForFileType(fileTypeIn) { - var fileType = fileTypeIn.toLowerCase(); +export function getFileIconPath(fileInfo) { + const fileType = getFileType(fileInfo.extension); var icon; if (fileType in Constants.ICON_FROM_TYPE) { @@ -451,19 +451,6 @@ export function splitFileLocation(fileLocation) { return {ext, name: filename, path: filePath}; } -export function getPreviewImagePath(filename) { - // Returns the path to a preview image that can be used to represent a file. - const fileInfo = splitFileLocation(filename); - const fileType = getFileType(fileInfo.ext); - - if (fileType === 'image') { - return getFileUrl(fileInfo.path + '_preview.jpg'); - } - - // only images have proper previews, so just use a placeholder icon for non-images - return getPreviewImagePathForFileType(fileType); -} - export function toTitleCase(str) { function doTitleCase(txt) { return txt.charAt(0).toUpperCase() + txt.substr(1).toLowerCase(); -- cgit v1.2.3-1-g7c22