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/client/client.jsx | 71 ++++++++++++++++++++++++++++++++++++------------ 1 file changed, 53 insertions(+), 18 deletions(-) (limited to 'webapp/client') diff --git a/webapp/client/client.jsx b/webapp/client/client.jsx index 439d41f78..334f8374d 100644 --- a/webapp/client/client.jsx +++ b/webapp/client/client.jsx @@ -113,10 +113,14 @@ export default class Client { return `${this.url}${this.urlVersion}/users`; } - getFilesRoute() { + getTeamFilesRoute() { return `${this.url}${this.urlVersion}/teams/${this.getTeamId()}/files`; } + getFileRoute(fileId) { + return `${this.url}${this.urlVersion}/files/${fileId}`; + } + getOAuthRoute() { return `${this.url}${this.urlVersion}/oauth`; } @@ -1520,40 +1524,71 @@ export default class Client { end(this.handleResponse.bind(this, 'getFlaggedPosts', success, error)); } + getFileInfosForPost(channelId, postId, success, error) { + request. + get(`${this.getChannelNeededRoute(channelId)}/posts/${postId}/get_file_infos`). + set(this.defaultHeaders). + type('application/json'). + accept('application/json'). + end(this.handleResponse.bind(this, 'getFileInfosForPost', success, error)); + } + // Routes for Files - getFileInfo(filename, success, error) { + uploadFile(file, filename, channelId, clientId, success, error) { + return request. + post(`${this.getTeamFilesRoute()}/upload`). + set(this.defaultHeaders). + attach('files', file, filename). + field('channel_id', channelId). + field('client_ids', clientId). + accept('application/json'). + end(this.handleResponse.bind(this, 'uploadFile', success, error)); + } + + getFile(fileId, success, error) { request. - get(`${this.getFilesRoute()}/get_info${filename}`). + get(`${this.getFileRoute(fileId)}/get`). set(this.defaultHeaders). type('application/json'). accept('application/json'). - end(this.handleResponse.bind(this, 'getFileInfo', success, error)); + end(this.handleResponse.bind(this, 'getFile', success, error)); } - getPublicLink(filename, success, error) { - const data = { - filename - }; + getFileThumbnail(fileId, success, error) { + request. + get(`${this.getFileRoute(fileId)}/get_thumbnail`). + set(this.defaultHeaders). + type('application/json'). + accept('application/json'). + end(this.handleResponse.bind(this, 'getFileThumbnail', success, error)); + } + getFilePreview(fileId, success, error) { request. - post(`${this.getFilesRoute()}/get_public_link`). + get(`${this.getFileRoute(fileId)}/get`). set(this.defaultHeaders). type('application/json'). accept('application/json'). - send(data). - end(this.handleResponse.bind(this, 'getPublicLink', success, error)); + end(this.handleResponse.bind(this, 'getFilePreview', success, error)); } - uploadFile(file, filename, channelId, clientId, success, error) { - return request. - post(`${this.getFilesRoute()}/upload`). + getFileInfo(fileId, success, error) { + request. + get(`${this.getFileRoute(fileId)}/get_info`). set(this.defaultHeaders). - attach('files', file, filename). - field('channel_id', channelId). - field('client_ids', clientId). + type('application/json'). accept('application/json'). - end(this.handleResponse.bind(this, 'uploadFile', success, error)); + end(this.handleResponse.bind(this, 'getFileInfo', success, error)); + } + + getPublicLink(fileId, success, error) { + request. + get(`${this.getFileRoute(fileId)}/get_public_link`). + set(this.defaultHeaders). + type('application/json'). + accept('application/json'). + end(this.handleResponse.bind(this, 'getPublicLink', success, error)); } // Routes for OAuth -- cgit v1.2.3-1-g7c22