scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-21 23:46:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
6072 commits 70 branches 179 tags 165 MiB
Commit graph

426 commits

Author SHA1 Message Date
Oleksii Kriuchykhin c7a707f9db Fix task clonning with TinyMCE images [SCI-3266] 2019-04-23 15:16:40 +02:00
Anton Ignatov aa2dab2014 Merge branch 'features/note-section' into master-with-note-section 2019-04-23 10:31:37 +02:00
aignatov-bio 6ac620feb3
Migration for old tinymce assets [SCI-3176] (#1663) 
* adding rake task

* Addign test for update images

* Adding tests for tiny mce model
 2019-04-19 15:24:54 +02:00
aignatov-bio a75c4c2f91
Update Result API for new tiny mce image format (#1674) 2019-04-19 14:44:16 +02:00
Mojca Lorber 208b7c9939 Fix hound 2019-04-19 13:56:21 +02:00
Mojca Lorber 36e7cfe5c4 Change failing tests 2019-04-19 13:37:52 +02:00
Mojca Lorber b00cf07684 Add activity for importing inventory items 2019-04-18 15:18:10 +02:00
Oleksii Kriuchykhin 96cf7b4de2 Fix failing tests [SCI-3177] 2019-04-17 12:58:47 +02:00
Urban Rotnik 22af36dd2d Fix for exports_left, fix for some edge cases 2019-04-16 09:59:02 +02:00
Urban Rotnik caccf8d9f0 Reset counter for export in last 24 hours 
Fix for check if user has avaiable exports, bit refactored increas_counter method.
 2019-04-10 10:56:33 +02:00
Anton Ignatov 94efd2e649 Fix tests 2019-04-02 16:04:50 +02:00
Urban Rotnik 86ddbc68b6 fixup! Show date actual value without link 2019-04-02 14:21:06 +02:00
Anton Ignatov c9f9523210 Remove src when save description and rename token tag 2019-04-02 13:41:32 +02:00
Urban Rotnik 8eaeeee9f8 Show date actual value without link 2019-04-02 13:15:34 +02:00
aignatov-bio e6102c72c7
Adding missed activities [SCI-3253] (#1614) 
* Adding missed activties

* Adding test for activities
 2019-04-02 11:50:37 +02:00
Urban Rotnik b91f08fe99 Add activity for copying Inventory and Invetory item 2019-04-01 15:40:00 +02:00
Jure Grabnar e165459ef5
Merge pull request #1574 from jbargu/jg_sci_3149_3163 
Valid smart annotation links of smart annotation imported within protocol [SCI-3149, 3163]
 2019-04-01 14:32:54 +02:00
Jure Grabnar ebc2d8ee75 Fix experiment_spec test using the old variable 
Closes SCI-3244
 2019-04-01 12:50:35 +02:00
Mojca Lorber f06358b2ae Implement missing tests for global activities (task and protocol activities) 2019-03-27 11:24:44 +01:00
Miha Mencin 4a87216a3d
Merge branch 'master' into features/global-activities 2019-03-25 14:35:24 +01:00
Jure Grabnar f3e6a35121 Update PermissionEval tests with team check 2019-03-21 10:45:21 +01:00
Mojca Lorber c55e314ed5 Refactor upon the review requests 2019-03-20 21:34:47 +01:00
Anton Ignatov 5d6f009ee8 fix error for delay deleting 2019-03-20 15:20:31 +01:00
Anton Ignatov 55c93922ea markup fixes 2019-03-20 14:46:54 +01:00
Anton Ignatov 07c2819163 refactoring tinymce image uploading 2019-03-20 14:46:54 +01:00
Jure Grabnar 5de51f9c58 Prevent smart annotations accessing other teams when importing protocol 
Closes SCI-3163
 2019-03-20 12:58:22 +01:00
Mojca Lorber 4f9814b884 Merge branch 'features/global-activities' of github.com:biosistemika/scinote-web into ml-sci-3021 2019-03-20 11:03:00 +01:00
Mojca Lorber 7757096693 Results activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber 1418abc8d7 Reports activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber d1e38e5bc9 Project activities refactoring 2019-03-19 15:33:57 +01:00
Mojca Lorber 70eebca5ee experiment activities refactoring 2019-03-19 15:33:57 +01:00
Urban Rotnik fe35c805b7 Add model breadcrumbs, update activities_helper 2019-03-19 14:01:06 +01:00
Urban Rotnik c65d1af18d Fix failing tests 2019-03-13 09:53:34 +01:00
Urban Rotnik b6a8556601 Add activities for exporting Projects, Inventory items 2019-03-12 09:15:06 +01:00
Urban Rotnik e7b57aa4f7 Add creating activities for Team actions 2019-03-12 09:15:06 +01:00
Urban Rotnik 3f18166320 Add Task and TaskTags activities 2019-03-12 09:15:06 +01:00
Urban Rotnik 7a05e817ef Add new Protocol steps activities 2019-03-12 09:15:06 +01:00
Urban Rotnik b33e95e18a New Protocols actions logging 2019-03-12 09:14:53 +01:00
Urban Rotnik cfe2888bea Repository columns actions loggin 2019-03-12 09:11:00 +01:00
Urban Rotnik 32422c00eb RepositoryRows actions loggin 2019-03-12 09:11:00 +01:00
Urban Rotnik 2a7bbac733 Repository actions logging 2019-03-12 09:11:00 +01:00
Urban Rotnik 976831e7d3 Edit and Archive experiment activity logging 2019-03-12 09:11:00 +01:00
Urban Rotnik b8e84b5685 Add logic for saving message items values and types 2019-03-11 08:37:22 +01:00
Urban Rotnik 9ed3313f0f Create project activity refactored 2019-03-11 08:36:15 +01:00
Urban Rotnik 117944117b Add service for activity creation 2019-03-11 08:36:15 +01:00
Miha Mencin 51b3aea49a added uniquness validator and index on user_projects and user_teams relations 
finxing typo, fixied failing test

fixing mistakenly commited file

fixing schema to include bigint migration
 2019-02-27 15:09:47 +01:00
Urban Rotnik 5a123d26ac Activity model update 2019-02-26 07:15:05 +01:00
Urban Rotnik 3ad6cee766 Fix tests, remove nullable field 2019-02-25 16:50:38 +01:00
Urban Rotnik 5b5c6c7122 Changes to Activity model 2019-02-25 16:49:55 +01:00
Miha Mencin bcd0b433b6
Merge pull request #1514 from biosistemika/features/system-notifications 
Features/system notifications
 2019-02-21 16:38:58 +01:00
aignatov-bio 5f78d83f9c
Changing status from unread to read system notification is not correct one [SCI-3077 and SCI-3075] (#1513) 
* fix dropdown apperance

* Remove search and fix duplicate bug

* Fix specs for new method
 2019-02-21 16:15:13 +01:00
aignatov-bio 5fdba554d2
Merge pull request #1510 from biosistemika/features/system-notifications 
Features/system notifications
 2019-02-20 17:22:57 +01:00
Urban Rotnik 82ea31e275 Add validation limits for system notification fields 2019-02-20 16:05:15 +01:00
Urban Rotnik 7b6c6c414d Merge branch 'master' into features/templates 2019-02-19 14:46:15 +01:00
aignatov-bio fcdb4e7a92
Merge pull request #1500 from biosistemika/features/system-notifications 
Features/system notifications
 2019-02-19 13:51:18 +01:00
Urban Rotnik f7c7335bf0 Change test to pass on Travis 2019-02-19 11:23:01 +01:00
Urban Rotnik f63eaaefe7 Add user_system_notification records when syncing notifications, update email sending 2019-02-19 11:22:58 +01:00
Urban Rotnik 29d77ca81d Add system_notification sending email feature 2019-02-19 11:20:25 +01:00
aignatov-bio 8e905b67b2
System notification navbar menu drop down [SCI 2955] (#1498) 
* Add dropdown menu and icon for system notifications
* Finish system notification dropdown menu and add tests
 2019-02-19 11:08:59 +01:00
Alex Kriuchykhin 185e3b4832
Merge pull request #1495 from okriuchykhin/ok_SCI_3039 
Create templates project when syncing templates if team doesn't have it [SCI-3039]
 2019-02-14 17:40:01 +01:00
Urban Rotnik 5b55860dea Add scheduler 2019-02-13 15:48:15 +01:00
Urban Rotnik 9f3187abdf Add service for sync system notifications 2019-02-13 15:48:15 +01:00
Oleksii Kriuchykhin da30d187a6 Create templates project when syncing templates if team doesn't have it [SCI-3039] 2019-02-13 15:17:33 +01:00
mlorb 71e4cc4dbd
Merge branch 'master' into ml-sci-2940 2019-02-13 14:35:03 +01:00
Mojca Lorber 0adb8b2b61 Fix failing tests 2019-02-13 14:31:26 +01:00
Mojca Lorber 5825c7120d fix falling test 2019-02-13 11:49:01 +01:00
Alex Kriuchykhin b71c9d96a2
Merge pull request #1476 from okriuchykhin/ok_SCI_2944 
Add test for templates service [SCI-2944]
 2019-02-12 09:39:03 +01:00
Oleksii Kriuchykhin acbbc1a9f8 Add comment [SCI-2944] 2019-02-11 13:40:25 +01:00
Oleksii Kriuchykhin 92b47a3034 Remove unneeded ordering [SCI-2967] 2019-02-07 11:23:40 +01:00
Jure Grabnar c5780927a8 Change a test to work with multiple tests run at the same time 2019-02-06 22:07:54 +01:00
Jure Grabnar 6ae82401f3 Add test experiment.json file 2019-02-06 21:06:56 +01:00
Jure Grabnar 0fa403d6b0 Refactor tests fro experiment import 
Closes [SCI-2946]
 2019-02-06 14:27:43 +01:00
Jure Grabnar 55fdd201b2 Add additional checks 2019-02-05 14:27:42 +01:00
Jure Grabnar 0a3146fbe6 Add checking of experiment basics 2019-02-05 14:27:42 +01:00
Jure Grabnar e180d5e100 Add test skeleton for importing 2019-02-05 14:27:42 +01:00
Oleksii Kriuchykhin 79c7bbbfb0 Fix failing tests with local file storage [SCI-2944] 2019-02-04 13:50:38 +01:00
Oleksii Kriuchykhin 19f1585352 Add test for templates service [SCI-2944] 2019-02-01 18:06:36 +01:00
Urban Rotnik 8ebb7561d9 Add last_time_changed_at columnd to SystemNotifications 2019-01-31 16:44:20 +01:00
Urban Rotnik 6f7fcb0831 Refactor method clone_experiment_as_template into service object 
[SCI-2925]
 2019-01-31 07:13:40 +01:00
Oleksii Kriuchykhin cc92de3726 Merge latest features/templates [SCI-2939] 2019-01-30 10:43:54 +01:00
Urban Rotnik 3e2c9934d0 Add SystemNotification model 
- SystemNotifiction model with spec
- UserSystemNotification model for many-many association
 2019-01-29 11:40:26 +01:00
Urban Rotnik 4cf12d12d1 Refactor 'move_experiment' method into service object 
Jira Ticket: SCI-2926
 2019-01-28 11:45:36 +01:00
Oleksii Kriuchykhin 05edfae766 Fix failing tests [SCI-2939] 2019-01-25 14:13:00 +01:00
Urban Rotnik 247bae8a9f Refactor export_all_counter increasing/reseting logic 
- Remove daily task
- Add method to user Model
 2019-01-25 11:16:31 +01:00
Oleksii Kriuchykhin bd2efa55ac Add templates business logic [SCI-2939] 2019-01-25 10:55:08 +01:00
Urban Rotnik f1d59e65f3 Add module and rename service object 2019-01-18 16:56:33 +01:00
Urban Rotnik b41dc0a4d5 Specs for workflow_image_fenerator 
fix SCI-2924
 2019-01-18 16:56:33 +01:00
Urban Rotnik d738169120 Refactor FactoryBot factories 2019-01-18 16:56:33 +01:00
Urban Rotnik 47cc6a9d10 Refactor workflow_image_generation and move to service class 2019-01-18 16:56:33 +01:00
Alex Kriuchykhin c2b38af91e
Merge pull request #1439 from okriuchykhin/ok_SCI_2888 
Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888]
 2019-01-10 11:05:07 +01:00
Oleksii Kriuchykhin 6a64b23f90 Rename CORE_API_V1_PREVIEW env. variable to CORE_API_V1_ENABLED [SCI-2888] 2019-01-04 10:44:38 +01:00
Oleksii Kriuchykhin 311189a2e9 Replace reports materialized view with normal queries and re-enable fragment caching [SCI-2894] 2018-12-13 11:18:09 +01:00
Jure Grabnar 13bc664902
Merge pull request #1367 from jbargu/jg_2746_health_unit_tests 
Add unit tests for status/health API endpoints
 2018-11-19 13:14:38 +01:00
Luka Murn e9c0b34662 Merge branch 'core-api' into 'master' 
Conflicts:
	Gemfile
	app/services/api.rb
	config/initializers/api.rb
	config/initializers/extends.rb
	config/routes.rb
	db/schema.rb
	spec/controllers/api/api_controller_spec.rb
 2018-11-14 16:59:04 +01:00
Jure Grabnar 7a320ae031 Update formating according to Hound 2018-11-12 17:51:23 +01:00
Jure Grabnar 1c08aa6a8b Add unit tests for status/health API endpoints 
Closes [SCI-2746].
 2018-11-12 17:17:47 +01:00
Oleksii Kriuchykhin 23ee4760ae Fix failing tests [SCI-2773] 2018-11-07 16:39:00 +01:00
Oleksii Kriuchykhin 30885e060d Merge latest core-api branch [SCI-2773] 2018-11-07 15:53:21 +01:00
Matej Zrimšek 2f6a6072e1 Fix repository ZIP export test to work with enabled workers [SCI-2646] 2018-11-07 06:14:40 +01:00
Matej Zrimšek 8fe0249f45 Fix test for repository ZIP export & return path for ZIP exports [SCI-2646] 2018-11-07 05:04:29 +01:00
Alex Kriuchykhin b2f87561fe
Merge pull request #1335 from okriuchykhin/ok_SCI_2749 
Add tests for CREATE Result endpoint [SCI-2749]
 2018-10-30 09:43:45 +01:00
Alex Kriuchykhin 2f466383a5
Merge pull request #1333 from okriuchykhin/ok_SCI_2742 
RESTful API for Object Querying (READ) - unit tests [SCI-2742]
 2018-10-29 16:26:58 +01:00
Oleksii Kriuchykhin 04ff5870af Rename user_id to sub in JWT [SCI-2814] 2018-10-28 14:34:51 +01:00
Matej Zrimšek 4bb05040d6 Fix tests for project controller to work with changed code [SCI-2732] 2018-10-23 22:24:57 +02:00
Matej Zrimšek 17712f5142 Minor tests refactoring [SCI-2732] 2018-10-23 22:24:57 +02:00
Matej Zrimšek 98009939d1 Fix tests for project services to work with changed code [SCI-2732] 2018-10-23 22:24:57 +02:00
Matej Zrimšek 1c43077a5e Add visibility check to tests (redundant in most cases, but safer) [SCI-2732] 2018-10-23 19:51:50 +02:00
Matej Zrimšek 173ebdcf87 Fix some tests wich falsely passed locally; Some description refactoring [SCI-2732] 2018-10-23 19:51:50 +02:00
Matej Zrimšek 1be952fdbb Fix context block for ProjectsOverviewService#projects_datatable test with { filter: 'archived' } parameter 2018-10-23 19:51:50 +02:00
Matej Zrimšek 4bf1d904b7 Add project controller unit tests [SCI-2732] 2018-10-23 19:51:50 +02:00
Matej Zrimšek e5129160fe Use the previous way of handling request params in rspec [SCI-2732] 2018-10-23 19:51:50 +02:00
Matej Zrimšek d9281b66d5 Add test for sorting by column and order for ProjectsOverviewService#projects_datatable 2018-10-23 19:51:50 +02:00
Matej Zrimšek 5ea4a2ced3 Refactor ProjectsOverviewService tests to be request parameter friendly and hence more readable 2018-10-23 19:51:50 +02:00
Matej Zrimšek b982ffe7c8 Improve & refactor #project_cards, add #projects_datatable tests for ProjectsOverviewService 2018-10-23 19:51:50 +02:00
Matej Zrimšek 2794f75215 Add ProjectsOverviewService#project_cards unit tests 2018-10-23 19:50:06 +02:00
Oleksii Kriuchykhin b53f2c8347 Improve error messages in API [SCI-2773] 2018-10-23 17:52:48 +02:00
Oleksii Kriuchykhin 95cb6db4df Fix test [SCI-2733] 2018-10-19 10:47:55 +02:00
Oleksii Kriuchykhin c2e36580ce Add tests for CREATE Result endpoint [SCI-2749] 2018-10-17 14:17:16 +02:00
Alex Kriuchykhin 18b1cad8a4
Merge pull request #1334 from okriuchykhin/ok_SCI_2772 
Implement inventory column data type name mappings [SCI-2772]
 2018-10-17 10:37:23 +02:00
Oleksii Kriuchykhin b833ff6616 Rename MyModule serializer in tests [SCI-2742] 2018-10-16 17:45:29 +02:00
Oleksii Kriuchykhin e4e66d3e5d Merge branch 'core-api' into ok_SCI_2742 2018-10-16 17:38:30 +02:00
Oleksii Kriuchykhin 02f536cd08 Merge latest features/export-all [SCI-2733] 2018-10-16 17:20:19 +02:00
Oleksii Kriuchykhin ed46115b3f Implement inventory column data type name mappings [SCI-2772] 2018-10-16 15:35:02 +02:00
Oleksii Kriuchykhin f6b039d54e Merge latest core-api branch [SCI-2765] 2018-10-16 12:07:47 +02:00
Jure Grabnar d50f56e319 Disable/enable export proejct button 
Fix filesystem saving
 2018-10-16 11:01:58 +02:00
Oleksii Kriuchykhin 0db9ef44e2 Add experiment, task, result READ endpoints tests [SCI-2742] 2018-10-15 16:27:22 +02:00
Luka Murn 1093ea11f4 Merge branch 'lm-api-fixes' of https://github.com/Ducz0r/scinote-web into Ducz0r-lm-api-fixes 
Conflicts:
	app/serializers/api/v1/activity_serializer.rb
	app/serializers/api/v1/inventory_column_serializer.rb
	app/serializers/api/v1/project_serializer.rb
 2018-10-15 15:20:26 +02:00
Oleksii Kriuchykhin dd17f1d5ad Add project READ endpoints [SCI-2742] 2018-10-12 17:43:36 +02:00
Luka Murn 2b7a94025e
Merge pull request #1320 from biosistemika/lm-mc-sci-2697 
UPDATE Inventory item endpoint - unit tests [SCI-2697] (v2)
 2018-10-11 15:20:37 +02:00
Luka Murn 028c0c6832 Remove 2 obsolete unit tests 2018-10-11 14:41:13 +02:00
Luka Murn 33b9c65c29 Fix Hound 2018-10-11 14:27:52 +02:00
Luka Murn 1e46631c02
Merge pull request #1316 from czbiohub/mc-SCI-2700 
close sci-2700; add unit tests for inventory column update [SCI-2700]
 2018-10-11 10:20:15 +02:00
Oleksii Kriuchykhin af02f29fb5 Implement user state saving for projects overview [SCI-2733] 2018-10-10 16:15:31 +02:00
Oleksii Kriuchykhin 77e2371091 Add tests for inventory cell endpoints [SCI-2765] 2018-10-08 13:25:03 +02:00
Luka Murn a8d56d32e2 Hound is love, Hound is life 2018-10-07 13:28:29 +02:00
Luka Murn 0bd3c81e39 Fix /users, /users/:id/identities endpoints 2018-10-07 13:07:27 +02:00
Luka Murn d235dd7807 Update GET /inventory_items, GET /inventory_items/:id endpoints 2018-10-06 18:37:40 +02:00
Luka Murn 6625b4019e Update GET /inventory_columns, GET /inventory_columns/:id endpts 2018-10-06 13:47:41 +02:00
Luka Murn 7b5a65416a Update status endpoint 2018-10-06 11:47:23 +02:00
Oleksii Kriuchykhin ed7c88f94d Improve tests [SCI-2741] 2018-10-04 12:00:50 +02:00
Oleksii Kriuchykhin 363c1e4a34 Add endpoints for managing inventory list items [SCI-2741] 2018-10-03 13:54:52 +02:00
Luka Murn 2dc09f080d Revert "Revert "Merge branch 'mc-SC-2697' of https://github.com/czbiohub/scinote-web-1 into core-api"" 
This reverts commit 7ef85a9b60.
 2018-10-01 14:59:06 +02:00
Luka Murn 7ef85a9b60 Revert "Merge branch 'mc-SC-2697' of https://github.com/czbiohub/scinote-web-1 into core-api" 
This reverts commit 870dda255c, reversing
changes made to 2ac6563730.
 2018-10-01 14:41:18 +02:00
Luka Murn 548cfb65e1 Merge branch 'mc-SCI-2704' of https://github.com/czbiohub/scinote-web-1 into czbiohub-mc-SCI-2704 
Conflicts:
	spec/requests/api/v1/inventories_controller_spec.rb
 2018-10-01 11:53:47 +02:00
Luka Murn bf59276afd Merge branch 'mc-SC-2703' of https://github.com/czbiohub/scinote-web-1 into czbiohub-mc-SC-2703 
Conflicts:
	spec/requests/api/v1/inventories_controller_spec.rb
 2018-10-01 11:41:29 +02:00
Luka Murn 870dda255c Merge branch 'mc-SC-2697' of https://github.com/czbiohub/scinote-web-1 into core-api 
Conflicts:
	spec/requests/api/v1/inventory_items_controller_spec.rb
 2018-10-01 09:20:58 +02:00
Luka Murn 2ac6563730
Merge pull request #1295 from czbiohub/mc-SCI-2702 
close SCI-2702; unit tests for create inventory [SCI-2702]
 2018-10-01 09:08:39 +02:00
Michael 2f99904000 merge core-api and handle merge issues 2018-09-27 10:43:52 -07:00
Michael 088e06cae7 fix check to inventory 2018-09-26 10:47:13 -07:00
Luka Murn 07c8c448d5 Fix codestyle 2018-09-26 18:30:07 +02:00