Commit graph

2995 commits

Author SHA1 Message Date
zmagod ee7c646b1d update user settings controllers to new permission system [fixes SCI-1960] 2018-01-22 16:42:26 +01:00
Adrian Oprea cb7f00c9ad
Merge pull request #948 from ZmagoD/zd_SCI_1950
fixes bug with navbar[SCI-1950]
2018-01-18 14:45:22 +02:00
zmagod 2857857c24 fixes bug with navbar[SCI-1950] 2018-01-18 13:29:47 +01:00
Zmago Devetak 7b28bfa6d4
Merge pull request #937 from ZmagoD/feat/external-components-loader
Enable loading of external React components
2018-01-18 11:13:40 +01:00
okriuchykhin aef80f86b5
Merge pull request #934 from okriuchykhin/ok_SCI_1931
Fix protocol import button [SCI-1931]
2018-01-18 10:30:19 +01:00
Adrian Oprea f2f624cfa6 Merge branch 'decoupling' of github.com:biosistemika/scinote-web into feat/external-components-loader
* 'decoupling' of github.com:biosistemika/scinote-web:
  fix(AboutScinoteModal): Enable react optimizations
  Fix addons display in info modal [SCI-1875]
  Set strict version for rubocop gem, because the new one is not compatible with the previously used one. Also updated it to the newest version.
2018-01-18 10:24:36 +02:00
Adrian Oprea 9fd1f81f20
Merge pull request #946 from okriuchykhin/ok_SCI_1875_v3
Fix addons display in info modal [SCI-1875]
2018-01-18 10:19:44 +02:00
Adrian Oprea 12fd630d0c fix(AboutScinoteModal): Enable react optimizations
Children generated within a loop or by an iterator need to be passed
a unique `key` property so React can properly watch their updates and
perform the necessary actions.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-18 09:59:37 +02:00
mz3944 d4bf933983
Merge pull request #939 from mz3944/mz-rubocop-update
rubocop gem update
2018-01-17 18:54:43 +01:00
Oleksii Kriuchykhin 91468faaf9 Fix addons display in info modal [SCI-1875] 2018-01-17 18:30:55 +01:00
Adrian Oprea 6d84790bdb Merge branch 'decoupling' of github.com:biosistemika/scinote-web into feat/external-components-loader
* 'decoupling' of github.com:biosistemika/scinote-web: (21 commits)
  fixes bug in the invitation_controller with full_name sanitization [fixes SCI-1944]
  Remove Addons info test from core [SCI-1875]
  Remove skip_on_import from repository_cell [SCI-1939]
  fixes bug with comment actions dropdown [fixes SCI-1938]
  fixes first element in global activities logs[fixes SCI-1866]
  Fix task repository row selector [SCI-1940]
  Fix repository item export [SCI-1945]
  Fix samples import [SCI-1946]
  adds first date to _list.html.erb view
  Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875]
  Fix repository records import [SCI-1939]
  Fix export samples button [SCI-1936]
  refactor
  adds additional tests for permissions controller
  fix HOC to recive objects
  fixes flow, and before_action in permissions_controller
  fixes per @duco 's request
  remove unneeded import
  add permissions endpoint on the API
  fix request
  ...
2018-01-17 18:14:41 +02:00
Zmago Devetak b4b6fddca3
Merge pull request #945 from ZmagoD/zd_SCI_1944
fixes bug in the invitation_controller with full_name sanitization [f…
2018-01-17 17:02:34 +01:00
Adrian Oprea 157969aa5e HACK: Comment out code which returns invalid data
It seems like the backend is returning a weird response when queried for
addons. Once the backend issue is identified and fixed this should be
uncommented.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-17 17:54:35 +02:00
Adrian Oprea cade0ae686 chore: Use latest version of react-hijack
The render hijacking library wash updated to use our own version of
react-traversal. The original library did not provide ES5 build so the
overall app build was failing.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-17 17:21:46 +02:00
okriuchykhin 8394055fba
Merge pull request #938 from okriuchykhin/ok_SCI_1875_v2
Remove Addons caption if no addons in info modal and fix linter packages
2018-01-17 15:33:43 +01:00
zmagod 488dba378e fixes bug in the invitation_controller with full_name sanitization [fixes SCI-1944] 2018-01-17 15:06:43 +01:00
Oleksii Kriuchykhin 30c05a06b9 Remove Addons info test from core [SCI-1875] 2018-01-17 14:20:11 +01:00
Zmago Devetak 26f7a94392
Merge pull request #943 from ZmagoD/zd_SCI_1866_v2
fixes first element both in Rails part an React part off the application
2018-01-17 14:12:52 +01:00
Zmago Devetak b9e56c49ef
Merge pull request #944 from ZmagoD/zd_SCI_1938
fixes bug with comment actions dropdown [fixes SCI-1938]
2018-01-17 13:42:36 +01:00
Adrian Oprea a0cb6c6bec chore: Update react-hijack to 2.0.0
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-17 14:41:10 +02:00
Adrian Oprea b559f3cbd4 refactor(Navigation): Use identifier instead of screenName
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-17 14:40:33 +02:00
Adrian Oprea 4b9013bcab refactor(massageConfiguration): Create response only when we have addons
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-17 14:39:42 +02:00
okriuchykhin 38aaaa011c
Merge pull request #936 from okriuchykhin/ok_SCI_1939
Fix repository records import [SCI-1939]
2018-01-17 12:55:11 +01:00
Oleksii Kriuchykhin 819febb05b Remove skip_on_import from repository_cell [SCI-1939] 2018-01-17 12:54:32 +01:00
zmagod 5371f5a139 fixes bug with comment actions dropdown [fixes SCI-1938] 2018-01-17 12:54:21 +01:00
okriuchykhin 8ccb361525
Merge pull request #940 from okriuchykhin/ok_SCI_1946
Fix samples import [SCI-1946]
2018-01-17 12:51:35 +01:00
okriuchykhin 1692bdade7
Merge pull request #941 from okriuchykhin/ok_SCI_1945
Fix repository item export [SCI-1945]
2018-01-17 12:50:22 +01:00
okriuchykhin 2c2914f691
Merge pull request #942 from okriuchykhin/ok_SCI_1940
Fix task repository row selector [SCI-1940]
2018-01-17 12:50:11 +01:00
zmagod 0922ee21a7 fixes first element in global activities logs[fixes SCI-1866] 2018-01-17 12:01:58 +01:00
Oleksii Kriuchykhin 74a62c41eb Fix task repository row selector [SCI-1940] 2018-01-17 11:21:41 +01:00
okriuchykhin 016ead607e
Merge pull request #935 from okriuchykhin/ok_SCI_1936
Fix export samples button [SCI-1936]
2018-01-17 10:43:09 +01:00
Oleksii Kriuchykhin 86853e8fc1 Fix repository item export [SCI-1945] 2018-01-17 10:39:01 +01:00
Oleksii Kriuchykhin 3c8d8e2fbb Fix samples import [SCI-1946] 2018-01-16 17:50:33 +01:00
Matej Zrimšek 9ef04a6a2b Set strict version for rubocop gem, because the new one is not compatible with the previously used one. Also updated it to the newest version. 2018-01-16 17:01:44 +01:00
Adrian Oprea d71f6161e4 feat(Navigation): Enhance navigation with addons
Use the withExtras HOC to add external functionality without embedding that knowledge in the core.
2018-01-16 17:24:11 +02:00
Adrian Oprea d7b63f5941 feat(massageConfiguration): Add data-transformation function
The meta-configuration structure imposes we change the way `react-hijack` parses and pulls its data. Because that work is both error-prone and also time-consuming, we chose to implement a function that would "massage" the data so it fits the current way react-hijack expects it.
2018-01-16 17:23:15 +02:00
Adrian Oprea a5ecc1a36e refactor(addons_loader): Extract paths to variables / build mega-config file
- Create variables for the paths the script impacts
- Create a file to host the configuration, import each add-on config and re-export them through a single object
2018-01-16 17:22:00 +02:00
Adrian Oprea 583efbc9c4 refactor(componentLoader): Add component path at module level
Instead of forcing this knowledge on the add-on, we inserted it here. The benefit is that we are able to point the core to whatever directory we choose, without modifying each addon in turn.
2018-01-16 17:19:56 +02:00
Adrian Oprea 350862b0cc feat: Re-export availableAddons
This will probably be removed and the config will be exported through the main entrypoint.
2018-01-16 17:18:46 +02:00
Adrian Oprea f6f2bc4c3d feat: Create availableAddons empty config
This configuration is populated on build-time with the available extras which expose a `client/` directory containing React code.
2018-01-16 17:17:39 +02:00
zmagod 3e95503017 adds(addon_loader) a generator that creates a js file with available addons
Signed-off-by: zmagod <zmago_devetak@yahoo.com>
2018-01-16 14:18:31 +01:00
zmagod a931a1bc15 adds first date to _list.html.erb view 2018-01-16 14:03:22 +01:00
Oleksii Kriuchykhin b59815c611 Remove Addons caption if no addons in info modal and fix linter packages [SCI-1875] 2018-01-16 11:11:50 +01:00
zmagod fc5daabb73 fix(addon_loader): make symlink to target addon/client
Signed-off-by: zmagod <zmago_devetak@yahoo.com>
2018-01-16 10:54:11 +01:00
Adrian Oprea b64b71f9eb chore: Ignore external components container dir
The components will not be committed nor will they need versioning. Code
for the components is kept separately and is brought in at build time.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-16 10:58:51 +02:00
Adrian Oprea 8d6cbd8351 chore: Update application dependencies
Add react-hijack module to project dependencies.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-16 10:56:01 +02:00
Adrian Oprea da4053552d chore: Ignore macOS-specific desktop config file
Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-16 10:17:14 +02:00
Adrian Oprea 894e0afd0a feat(componentLoader): Add external component loader module
For render hijacking to work, imports need to be peformed at core level.
This loader ensures that Webpack is able to resolve the paths to the
external components' code, without the need for extra loaders or custom
built plugins.

Signed-off-by: Adrian Oprea <adrian@oprea.rocks>
2018-01-16 10:14:35 +02:00
Oleksii Kriuchykhin a64012237e Fix repository records import [SCI-1939] 2018-01-15 18:01:35 +01:00
Oleksii Kriuchykhin 79e1eaf145 Fix export samples button [SCI-1936] 2018-01-15 13:54:08 +01:00