Commit graph

49 commits

Author SHA1 Message Date
James Allen
aa6c16593e Add renamingToName override name for instant apparent renames 2018-01-31 09:42:41 +00:00
James Allen
9721dffbb6 Add missing state reset to error handler 2018-01-31 09:41:58 +00:00
Brian Gough
1c6dc66ed1 prevent double calls to rename 2018-01-29 16:45:59 +00:00
Brian Gough
6ed181d52c fix check for name in filetree move 2018-01-29 15:27:52 +00:00
Brian Gough
63fa024d98 client-side duplicate check for move/rename/create 2018-01-29 15:24:51 +00:00
Brian Gough
8e239e0c64 only update client filetree on success 2018-01-25 17:09:31 +00:00
James Allen
662122bb1c CI and local dev environment improvements
The need for this became very noticeable due to the slowness of filesystem access in docker-in-mac, with a full compile taking over a minute for me in docker. Using make to introduce incremental compile makes this near instantaneous outside of docker (if only a few files have changed), and quick enough inside docker.

With incremental compile via make, it compiles quickly enough that re-compiling and restarting the web service automatically when backend files change is quick enough now. This is how the service is run via docker-compose in https://github.com/sharelatex/sharelatex-dev-environment, so it shouldn't be necessary to manually restart the container each time a coffee file changes.

At the moment Jenkins pull web modules in via the GitSCM plugin, but I believe this is creating a dependency in Jenkins, where any commits to any of the modules causes all of the web branches to rebuild. By doing it via our own scripts we can hopefully avoid this. It also creates a build process which is reproducible locally.

**Note that at the moment in this PR all modules pull from `ja-dockerize-dev` branches, but these should be merged first, and this PR updated to point to the master branches before merging**. This is necessary for other changes to build process/docker-compose workflow.

As well as a Makefile for web, there is now a `Makefile.module`. This is copied into each module directory by the top-level Makefile, and is written in a way to be flexible and support unit tests, acceptance tests, front-end js for the ide and main, and the modules `app/coffee` directory, while allowing modules to have some of these missing (not all modules have e.g. acceptance tests, or front-end JS). This will allows us to refine the build process in future, without needing to update the Makefile in each module repo separately (I found this to be a painful part of this development).

This makes web compatible with the docker-compose workflow at https://github.com/sharelatex/sharelatex-dev-environment, where each service is running in its own docker container, with networking managed by docker.

Previously the Makefile was set up to run unit tests in docker with `make unit_tests`. This now just runs them natively. In the CI, they are run in docker anyway (all steps in Jenkins are), and locally, they run fine natively with `npm run test:unit`, or can be run in docker via https://github.com/sharelatex/sharelatex-dev-environment with `bin/run web_sl npm run test:unit`.

Previously we did a lot of juggling with only mounting source files (coffee, less, etc) into the docker container for acceptance tests. This was to avoid creating root owned files if the whole directory was mounted. Now instead the whole web directory is mounted read-only, with the compilation step done outside of the container before running the tests.

This allows the host and container to share the `node_modules` folder as well, which avoids needing to `npm install` twice on the CI box, and should speed up the build by a few minutes.

On macOS, this would cause a problem with compiled modules if you tried to use the same `node_modules` to run the app natively. However, if running via docker-compose in https://github.com/sharelatex/sharelatex-dev-environment, this is no longer a problem.
2018-01-15 09:36:41 +00:00
Nate Stemen
2f03bb6015 adding file completer 2017-11-21 11:26:44 -05:00
Paulo Reis
669c705d32 Also refactor signatures from methods wrapping the HTTP service. 2017-06-20 16:27:05 +01:00
Paulo Reis
155f515a50 Use standard promises with the http service. 2017-06-20 11:50:23 +01:00
Shane Kilkelly
965a46291b Only fetch labels for uploaded docs, not files 2017-06-08 15:55:17 +01:00
Shane Kilkelly
ff7955dfdb Update labels when docs are uploaded or removed 2017-06-08 15:12:18 +01:00
Shane Kilkelly
15d0a40f85 When error occurs, unset state.inflight 2017-03-31 10:30:28 +01:00
Shane Kilkelly
49446afb82 Remove duplicate line 2017-03-31 10:30:10 +01:00
Henry Oswald
9a8ee112a5 null check path.split
https://sentry.io/sharelatex-1/sl-web-client-prod/issues/202702369/
2017-03-17 10:35:07 +00:00
James Allen
0a6a6c3c28 Keep files ordered in overview panel in the same was as the file tree 2016-12-09 16:17:28 +00:00
James Allen
21f88bb20e Use ide.validFileRegex, not hard coded regex 2016-09-22 14:57:59 +01:00
James Allen
4386ab1225 Don't allow files to be created with / or * characters
Requires the following translations:

  "files_cannot_include_invalid_characters": "Files cannot include '*' or '/' characters",
  "invalid_file_name": "Invalid File Name"
2016-09-21 16:31:55 +01:00
Shane Kilkelly
10f64004fc Show a book icon for *.bib files. 2016-05-18 15:58:24 +01:00
James Allen
d813f45d28 Cherry-pick 0e70320 (Select icon based on file extension) from datajoy 2016-05-18 15:58:01 +01:00
Henry Oswald
3fc357a343 Merge branch 'master' into projectsizelimit 2016-03-14 10:31:07 +00:00
Henry Oswald
8f0d1dc73e add in the calls to block large projects 2016-02-29 13:05:17 +00:00
James Allen
71ca358e0e Show confirmation if upload will overwrite files 2016-02-24 16:37:03 +00:00
James Allen
938b042f8c Include selected entity in multi selection on first click 2016-02-10 15:59:51 +00:00
James Allen
8359029503 Improve drop zones and feel of dragging in file tree 2016-02-10 15:54:25 +00:00
James Allen
d47f6801c2 Don't trigger delete event on move to avoid switching to root document 2016-02-10 15:26:26 +00:00
James Allen
506d2224aa Allow Cmd+Clicking to multi select entries in the file tree 2016-02-09 15:13:58 +00:00
Henry Oswald
156f646613 increase number of files that can be uploaded & limit 1 concurent 2015-12-07 16:50:09 +00:00
Henry Oswald
25411189a7 redirect to login if session expired in file upload 2015-12-02 15:40:14 +00:00
Henry Oswald
8590af3e49 added rate limit on server side for file uploads 2015-12-01 13:08:49 +00:00
Henry Oswald
a6aea41fb1 added max of 20 files which can be uploaded at same time to client 2015-12-01 12:55:35 +00:00
Shane Kilkelly
c05c5ac7c8 Clear drag/drop highlight explicitly after the drop has completed.
Solves a problem where sometimes the Jquery drag/drop plugin
fails to remove the highlight class from drop target.
2015-10-28 12:17:50 +00:00
Henry Oswald
52f3248869 null check entity in filetree for orderByFoldersFirst 2015-04-14 17:05:13 +01:00
Henry Oswald
69806c02d0 improve behaviour of trying to rename a file to empty 2015-03-04 14:19:47 +00:00
Henry Oswald
fe3b9bf07a clients can not rename docs/files/folders to blank name.
Client and server side checks added
2015-03-04 11:10:59 +00:00
Henry Oswald
4f11974c85 added null check when looking for deletedByExternalDataSource 2015-02-23 17:33:05 +00:00
Henry Oswald
67f4929e49 null check on loadRootFolder 2015-02-18 22:31:45 +00:00
Henry Oswald
2c3b19e43d null check on deleting entry from scope 2015-02-18 22:28:02 +00:00
James Allen
7dd1ab84d5 Wrap calls to localStorage in an exception handler 2015-02-12 11:32:27 +00:00
James Allen
753a80ada5 Navigate away from deleted docs. Closes #141 2015-02-03 13:51:56 +00:00
Henry Oswald
28b1e6bfe5 added client side checks on how long project or entity names can be
150 chars should be safely under the 1024 bytes mongo index limit
2014-10-07 11:08:08 +01:00
James Allen
894024ba29 Don't allow folders to be moved into their child folders 2014-08-22 14:38:52 +01:00
James Allen
f886f19429 Keep root doc list in sync with file tree updates 2014-07-31 13:04:55 +01:00
Henry Oswald
bf56e083cf removed a load of console.logs 2014-07-25 13:14:19 +01:00
James Allen
2b85ebf8ec Allow root doc to be set 2014-07-21 15:09:19 +01:00
James Allen
36f48cf772 Fix drag and drop 2014-07-21 11:36:03 +01:00
James Allen
c93902345a Remove all console.log debug statements 2014-07-09 16:18:09 +01:00
James Allen
d9c8e5c1c2 Deleted docs null check 2014-07-09 15:01:33 +01:00
James Allen
8ed03694c3 Add missing files 2014-07-08 12:02:26 +01:00