Commit graph

704 commits

Author SHA1 Message Date
Anton
70fe27f31b Allow multiline in checklist items [SCI-7008] 2022-07-25 11:21:31 +02:00
artoscinote
5ec1002329
Simplify task locking logic on FE [SCI-6987] (#4278) 2022-07-21 15:49:03 +02:00
artoscinote
ac4e30d709
Fix reloading of attachments after saving MarvinJS [SCI-7015] (#4277) 2022-07-21 14:28:21 +02:00
artoscinote
28ca1aaec6
Disable checklist item drag for less than 2 items, fix base element controller [SCI-6997] (#4275) 2022-07-21 09:57:14 +02:00
artoscinote
d0cc3155f1
Only activate overlay when dragging files [SCI-6997] (#4272) 2022-07-20 13:39:04 +02:00
artoscinote
6367842e1e
Step table CSS fixes [SCI-6998] (#4270) 2022-07-20 12:07:25 +02:00
artoscinote
087ffb28c3
Step element header style fixes [SCI-6996] (#4268) 2022-07-20 10:14:23 +02:00
artoscinote
49dfa2c2aa
Fix multiline paste on windows [SCI-6960] (#4267) 2022-07-19 16:44:35 +02:00
Oleksii Kriuchykhin
b582b138f5 Fix protocol status bar reloading after step elements modifications [SCI-6986] 2022-07-19 14:27:03 +02:00
ajugo
ccf95fea24
Fix file block issues [SCI-6966] (#4244)
* Fix bugs for step attachments [SCI-6966]

* Fix flickering on fast drag over of file [SCI-6966]

* Fix flickering on fast drag over of file [SCI-6966]

* CSS fixes, rearrange steps button hiding [SCI-6940][SCI-6934] (#4234)

* Hide rearange steps button when less than 2 steps [SCI-6934]

* Task status buttons CSS fix [SCI-6940]

* Fix microinteraction for table editing [SCI-6957] (#4236)

* Fix protocol elements allignments [SCI-6932]

* DOCX layout improvements [SCI-6857] (#4160)

* Fix edit step button [SCI-6938] (#4232)

* Clean storage usage check [SCI-6966]

Co-authored-by: artoscinote <85488244+artoscinote@users.noreply.github.com>
Co-authored-by: Anton <anton@scinote.net>
2022-07-15 10:13:55 +02:00
Alex Kriuchykhin
7b158133cb
Merge pull request #4252 from okriuchykhin/ok_SCI_6973
Fix step elements interactions for technician role [SCI-6973]
2022-07-15 10:12:23 +02:00
aignatov-bio
63c54d9005
Merge pull request #4227 from aignatov-bio/ai-sci-6971-fix-step-comments
Fix step comments [SCI-6971]
2022-07-15 10:10:56 +02:00
Oleksii Kriuchykhin
a40b218f97 Fix step elements interactions for technician role [SCI-6973] 2022-07-15 10:09:38 +02:00
ajugo
c85612ee4e
Fix protocol template alignment and placeholders [SCI-6981] (#4253)
* Fix protocol template alignment and placeholders [SCI-6981]

* Add placeholder text [SCI-6981]
2022-07-15 10:00:50 +02:00
Anton
32fac2f9ab Fix merge issues for step [SCI-6949] 2022-07-14 12:50:06 +02:00
Alex Kriuchykhin
46cf62368d
Merge pull request #4229 from okriuchykhin/ok_SCI_6969
Fix file upload and edit interactions on steps page [SCI-6969]
2022-07-14 09:48:20 +02:00
ajugo
5d2d002a04
Fix text element opening tinymce [SCI-6938] (#4243)
* Fix edit step button [SCI-6938]

* Fix text element opening tinymce [SCI-6938]
2022-07-13 21:09:30 +02:00
aignatov-bio
186f892288
Merge branch 'develop' into ai-sci-6970-step-rearranging-fixes 2022-07-13 18:03:03 +02:00
artoscinote
c7ac9190c3
TinyMCE and styling fixes [SCI-6956][SCI-6952][SCI-6948] (#4241)
* Also validate char count on paste in TinyMCE [SCI-6952]

* Fix new text tinymce init [SCI-6956]

* Fix step head styling [SCI-6952]

* Fix step dropdown icon [SCI-6948]
2022-07-13 18:02:35 +02:00
artoscinote
a73fc8c0fd
Fix automatically adding new checklist item [SCI-6960] (#4238) 2022-07-13 17:58:58 +02:00
aignatov-bio
a845eec33e
Merge pull request #4240 from aignatov-bio/ai-sci-6958-fix-delete-modal
Fix delete modals size [SCI-6958]
2022-07-13 17:58:39 +02:00
ajugo
df84496381
Fix edit step button [SCI-6938] (#4232) 2022-07-13 16:13:42 +02:00
Anton
34ff261ddf Fix delete modals size [SCI-6958] 2022-07-13 15:53:08 +02:00
Anton
496ade309c Step rearranging fixes [SCI-6970] 2022-07-13 15:17:32 +02:00
artoscinote
a575487271
Fix microinteraction for table editing [SCI-6957] (#4236) 2022-07-13 12:21:41 +02:00
artoscinote
17eada574e
CSS fixes, rearrange steps button hiding [SCI-6940][SCI-6934] (#4234)
* Hide rearange steps button when less than 2 steps [SCI-6934]

* Task status buttons CSS fix [SCI-6940]
2022-07-13 10:47:12 +02:00
Oleksii Kriuchykhin
747e88fafc Fix file upload and edit interactions on steps page [SCI-6969] 2022-07-12 15:24:12 +02:00
Anton
8e8826d33c Fix step comments [SCI-6971] 2022-07-12 13:54:10 +02:00
artoscinote
765e5b99bd
Protocol editing CSS fixes [SCI-6940] (#4194) 2022-07-12 10:43:01 +02:00
artoscinote
c89968453e
Fix checklist issues [SCI-6960] (#4222) 2022-07-12 10:41:58 +02:00
aignatov-bio
33e3d0f3f0
Merge pull request #4226 from aignatov-bio/ai-sci-6965-fix-save-to-protocol
Fix save protocol repository [SCI-6965]
2022-07-12 10:40:54 +02:00
Anton
e8a0e7c7d4 Fix save protocol repository [SCI-6965] 2022-07-12 10:37:36 +02:00
Anton
b5d67d429b Fix elements step elements alignment [SCI-6959] 2022-07-11 13:53:16 +02:00
ajugo
045485ff45
Fix checklist item alignments and placeholder text [SCI-6961] (#4211) 2022-07-11 11:52:38 +02:00
aignatov-bio
cb86fe0e06
Merge pull request #4219 from aignatov-bio/ai-sci-6958-fix-steps-delete-modal
Fix delete steps modal size [SCI-6958]
2022-07-11 11:31:48 +02:00
Anton
d805a420b9 Fix delete steps modal size [SCI-6958] 2022-07-11 11:28:45 +02:00
artoscinote
d897a4f9a8
Fix missing error class on inline edit [SCI-6954] (#4218) 2022-07-11 11:23:54 +02:00
artoscinote
cb113c4bdb
Change reordering icons [SCI-6953] (#4208) 2022-07-11 10:54:18 +02:00
artoscinote
5cb53c774c
Step header fixes [SCI-6948] (#4217) 2022-07-11 10:45:25 +02:00
artoscinote
a51ce1c322
Fix text field error states [SCI-6952] (#4216) 2022-07-11 10:44:27 +02:00
Anton
a54cac44da Fixed smart annotations [SCI-6939] 2022-07-08 13:50:40 +02:00
Anton
972cc49389 Fix smart annotation for step editing [SCI-6939] 2022-07-08 12:51:43 +02:00
Anton
11b62cca7b Fix task page layout [SCI-6950] 2022-07-07 15:56:36 +02:00
Anton
4e2cb29f48 Fix step complete and name editing [SCI-6949] 2022-07-07 14:33:38 +02:00
artoscinote
102b72d413
Enable text edit mode when adding text block [SCI-6956] (#4206) 2022-07-07 13:43:29 +02:00
aignatov-bio
dce755b294
Merge pull request #4205 from aignatov-bio/ai-sci-6933-add-micro-interactions-to-step
Fix microinteractions for step editing [SCI-6933]
2022-07-07 09:15:19 +02:00
Anton
b3d7c3ff75 Fix microinteractions for step editing [SCI-6933] 2022-07-06 14:31:55 +02:00
artoscinote
be45aac93b
Implement table click-away and auto edit mode on add [SCI-6957] (#4202) 2022-07-06 14:18:11 +02:00
artoscinote
c9e7e68369
Insert element dropdown fixes [SCI-6925] (#4184)
* Insert element dropdown fixes [SCI-6925]

* Dropdown bugfix, rounder CSS size [SCI-6925]
2022-07-06 14:11:48 +02:00
artoscinote
7921a7276f
Fix removing non-saved checklist item [SCI-6964] (#4204) 2022-07-06 14:06:16 +02:00
ajugo
6f5646af59
Copy & paste image to "Add file" modal [SCI-6930] (#4199)
* Upload image attachments from copy paste [SCI-6930]

* Fix opening copy paste modals and handling paste event [SCI-6930]
2022-07-06 11:43:30 +02:00
aignatov-bio
5b37a96e79
Merge pull request #4174 from aignatov-bio/ai-sci-6759-load-save-protocol-from-repository
Fix load/save protocol to repository [SCI-6759]
2022-07-05 12:57:59 +02:00
Anton
7b0853d00a CSS fixes for steps [SCI-6932] 2022-07-05 12:49:12 +02:00
artoscinote
79b801121a
Fix protocol title, disable reordering of elements if less than 2 [SCI-6934] (#4187) 2022-07-04 13:55:26 +02:00
artoscinote
709c0b0b8a
Scroll to bottom when appending step [SCI-6927] (#4181) 2022-07-04 13:54:40 +02:00
ajugo
7d09882ec2
Fix edit button on stepText element [SCI-6938] (#4189) 2022-07-04 12:46:59 +02:00
Anton
bf13708e31 Fix load/save protocol to repository [SCI-6759] 2022-06-27 13:14:45 +02:00
aignatov-bio
3a5492f875
Merge pull request #4168 from aignatov-bio/ai-sci-6862-fix-css-step-editing
CSS fixes for step editing [SCI-6862]
2022-06-27 11:13:18 +02:00
Anton
5296b50c2f Add delete all steps button [SCI-6921] 2022-06-24 11:21:47 +02:00
Anton
a727fc0d68 Fix css for protocol repository [SCI-6862] 2022-06-21 18:20:52 +02:00
Anton
8d2154d653 CSS fixes for step editing [SCI-6862] 2022-06-21 11:32:27 +02:00
aignatov-bio
247a8f9a0b
Merge pull request #4159 from aignatov-bio/ai-sci-6887-add-collapse-extend-buttons
Add collapse/expand buttons to steps [SCI-6887]
2022-06-10 10:19:13 +02:00
artoscinote
5c051ef8c1
Implement V2 protocols exporter [SCI-6876] (#4142)
* Implement V2 protocols exporter [SCI-6876]

* Implement new importer [SCI-6877]
2022-06-10 10:18:55 +02:00
Anton
d62f712166 Add collapse/expand buttons to steps [SCI-6887] 2022-06-09 16:16:30 +02:00
Anton
66212fd703 Finalize inline edit field [SCI-6782] 2022-06-09 14:40:45 +02:00
Anton
46631a1f46 Finalize protocol repository [SCI-6870] 2022-06-07 12:10:10 +02:00
Anton
e86a0610b2 Add metadata block in protocol repository [SCI-6869] 2022-06-06 13:56:22 +02:00
Anton
2da1a380c3 Add view mode to protocol and step [SCI-6867] 2022-06-03 11:53:53 +02:00
Martin Artnik
8c78920927 Fixed checklist editing 2022-06-02 12:02:34 +02:00
Martin Artnik
ded23dc528 Fix checklist update issue 2022-06-02 11:53:24 +02:00
Martin Artnik
9abbe22c26 Merge branch 'develop' into features/step-editing-improvements 2022-06-02 11:26:39 +02:00
artoscinote
ab5cb19d6e
Add step activities, fix checklists [SCI-6852] (#4136)
* Add step activities, fix checklists [SCI-6852]

* Linter fix [SCI-6852]
2022-06-02 11:15:32 +02:00
Anton
61464b3780 Add new protocol view to repository [SCI-6858] 2022-06-02 11:05:25 +02:00
artoscinote
98d66a3276
Implement reordering activities [SCI-6851] (#4129)
* Implement reordering activities [SCI-6851]

* Added asset activity types [SCI-SCI-6853]
2022-06-01 12:30:09 +02:00
artoscinote
23872f519b
Implement step element sorting modal [SCI-6849] (#4124)
* Implement step element sorting modal [SCI-6849]

* Implement step reordering modal [SCI-6850]

* Refactor reorderable items a bit [SCI-6850]
2022-05-30 13:45:51 +02:00
aignatov-bio
57408e9f4f
Merge pull request #4121 from aignatov-bio/ai-sci-6835-display-user-free-space
Add the ability to show storage limit [SCI-6835]
2022-05-26 15:03:45 +02:00
Anton
3983d920e9 Fix localization [SCI-6835] 2022-05-26 15:01:52 +02:00
Anton
9e2c8bf25a Add ability to show storage limit [SCI-6835] 2022-05-26 14:48:57 +02:00
artoscinote
894eb8932d
Implement checklist item ordering [SCI-6847] (#4119) 2022-05-26 14:02:02 +02:00
aignatov-bio
45801950fd
Merge pull request #4116 from aignatov-bio/ai-sci-6814-add-dropable-area-to-step
Add dropable area to step [SCI-6814]
2022-05-26 12:57:51 +02:00
Anton
2ee5a31d3d Add dropable area to step [SCI-6814] 2022-05-26 12:57:12 +02:00
aignatov-bio
82a3a9de9a
Merge pull request #4090 from aignatov-bio/ai-sci-6810-add-tinymce-component-to-protocol-description
Add tinyMce field to protocol [SCI-6810]
2022-05-26 12:46:15 +02:00
aignatov-bio
5fe3613eb8
Merge pull request #4118 from aignatov-bio/ai-sci-6837-add-comments-section
Add comments to step [SCI-6837]
2022-05-25 22:01:48 +02:00
Anton
7bc5c622a7 Add comments to step [SCI-6837] 2022-05-25 15:06:12 +02:00
artoscinote
df0f001afa
Refactor step elements controllers [SCI-6848] (#4117) 2022-05-25 14:23:35 +02:00
ajugo
b77394a7b2
Responsive filter flyout [SCI-6494] (#4098)
* Responsive filter flyout [SCI-6494]

* Correct delimiter [SCI-6494]
2022-05-25 10:42:54 +02:00
artoscinote
c33b426c03
Add marvinJS integration [SCI-6831] (#4113) 2022-05-24 11:30:15 +02:00
artoscinote
6c797f5825
Integrate WOPI file modal with new steps [SCI-6830] (#4111) 2022-05-24 11:13:47 +02:00
Oleksii Kriuchykhin
6febad1b95 Update the exiting permissions helpers so they will check new permissions [SCI-6821] 2022-05-24 10:49:49 +02:00
Anton
a494051f61 Add placeholder for new files in step [SCI-6833] 2022-05-23 13:44:34 +02:00
Anton
5a275aaeae Move attachments to separate component 2022-05-19 11:16:50 +02:00
Anton
9cd0e010a6 Add file upload logic [SCI-6829] 2022-05-19 08:54:22 +02:00
Anton
134558355d Add file modal [SCI-6828] 2022-05-18 11:12:53 +02:00
Anton
9aaf4a136e Add menu to attachment cards [SCI-6816] 2022-05-17 10:41:34 +02:00
Anton
711bd77222 Add manage dropdown to attachments section [SCI-6815] 2022-05-16 11:05:18 +02:00
Anton
8f0789ec72 Add inline asset card [SCI-6811] 2022-05-13 13:09:01 +02:00
Anton
87450ea821 Add thumbnail and list view [SCI-6812] 2022-05-12 18:04:06 +02:00
Anton
940b0ea744 Add general layout for step attachments [SCI-6811] 2022-05-12 12:26:50 +02:00
Anton
6dce426db4 Add tinyMce field to protocol [SCI-6810] 2022-05-11 16:10:26 +02:00
artoscinote
b486f3fd31
Implement checklists [SCI-6789] (#4089) 2022-05-11 15:51:26 +02:00
Anton
c0660d0243 Small fixes [SCI-6808] 2022-05-11 11:32:27 +02:00
Anton
04e16cf6b5 Add text component [SCI-6808] 2022-05-11 09:51:47 +02:00
aignatov-bio
d07daa73cb
Merge pull request #4072 from aignatov-bio/ai-sci-6781-add-confirmation-modal-for-step-deletion
Add delete step modal [SCI-6781]
2022-05-10 13:28:47 +02:00
Anton
2f20109b0d Fix stock consumption rounding [SCI-6807] 2022-05-09 11:51:39 +02:00
Anton
252680f0a1 Add table component [SCI-6777] 2022-05-06 12:09:54 +02:00
artoscinote
b00968fd55
Implement basic checklist functionality [SCI-6786] (#4073)
* Implement protocol status bar functionality [SCI-6760]

* Inline edit interactions, checklist name edit improvements [SCI-6786]
2022-05-05 12:56:31 +02:00
Anton
277e202c90 Add delete step modal [SCI-6781] 2022-05-04 15:57:13 +02:00
artoscinote
5454aa26bc
Implement protocol status bar functionality [SCI-6760] (#4070) 2022-05-04 11:49:57 +02:00
Anton
3b60c62c79 Refactor modal loading [SCI-6780] 2022-05-04 10:36:13 +02:00
Anton
e06b398bb4 Add delete action for step components [SCI-6780] 2022-05-03 15:21:47 +02:00
artoscinote
6352a4dd04
Implement protocol options dropdown [SCI-6750, SCI-6751] (#4066)
* Implement protocol options dropdown [SCI-6750, SCI-6751]

* Implement simple API error handling for step status update [SCI-6354]
2022-05-03 15:18:48 +02:00
Anton
d71ba2f7a1 Fix serailizer [SCI-6758] 2022-05-03 13:55:08 +02:00
Anton
6a827022f6 Add insert step element dropdown [SCI-6758] 2022-05-03 13:22:26 +02:00
Anton
6dde945d61 Add step layout [SCI-6755] 2022-04-28 11:13:38 +02:00
artoscinote
8aaab73856
Add inline edit component, protocol name updates [SCI-6749] (#4057) 2022-04-26 14:13:17 +02:00
Anton
ba3c73439a Add step creation/deletion functionality [SCI-6754] 2022-04-25 12:40:14 +02:00
artoscinote
6ef190f353
Basic Vue setup for protocols [SCI-6749] (#4044) 2022-04-21 15:12:34 +02:00
aignatov-bio
ede5e958db
Fix filters loading for stock filter [SCI-6687] (#3975)
Co-authored-by: Anton <anton@scinote.net>
2022-03-31 14:40:17 +02:00
aignatov-bio
004aeda601
Add stock filters [SCI-6547] (#3938)
Co-authored-by: Anton <anton@scinote.net>
2022-03-23 10:05:07 +01:00
artoscinote
4e118d095d
Fix dropdown component for group select [SCI-6583] (#3905) 2022-02-28 13:21:17 +01:00
aignatov-bio
155b437d6a
Fix blank state for time filter [SCI-6590] (#3903)
Co-authored-by: Anton <anton@scinote.net>
2022-02-28 11:05:01 +01:00
artoscinote
3df030b29e
Fix date/time filter loading and overwriting [SCI-6582] (#3898)
* Fix filter overwrite [SCI-6582]

* Fix date/time filter loading [SCI-6582]

* Fix time/time range filter loading [SCI-6582]

* Code style fixes [SCI-6582]
2022-02-25 15:27:31 +01:00
aignatov-bio
899f2efbd6
Fix blank state for dates range [SCI-6576] (#3893)
Co-authored-by: Anton <anton@scinote.net>
2022-02-24 12:47:32 +01:00
aignatov-bio
f7cc20ebab
Update blank state for datetime filters [SCI-6571] (#3891)
Co-authored-by: Anton <anton@scinote.net>
2022-02-23 14:55:04 +01:00
aignatov-bio
d6c7305dfe
Move range filter logic to separate mixin (#3889)
Co-authored-by: Anton <anton@scinote.net>
2022-02-23 13:28:59 +01:00
aignatov-bio
cf200a23a7
Fix datetime switch between operators [SCI-6571] (#3888)
Co-authored-by: Anton <anton@scinote.net>
2022-02-23 11:40:37 +01:00
aignatov-bio
3ae683307d
Fix time filter [SCI-6575] (#3886)
Co-authored-by: Anton <anton@scinote.net>
2022-02-23 09:24:11 +01:00
Alex Kriuchykhin
dd5939e89d
Fix advanced filters for ID and Name columns [SCI-6496] (#3865) 2022-02-22 14:49:17 +01:00
artoscinote
463e1a8014
Fix date/time range filtering [SCI-6574] (#3882) 2022-02-22 13:29:50 +01:00
aignatov-bio
5a65b8689b
Fix blank state for between (#3883)
Co-authored-by: Anton <anton@scinote.net>
2022-02-22 12:55:40 +01:00
aignatov-bio
358ff50cc3
Update blank state for date filter [SCI-6541] (#3880)
Co-authored-by: Anton <anton@scinote.net>
2022-02-22 09:40:16 +01:00
aignatov-bio
4877455e9c
Change date operator order [SCI-6544] (#3876)
Co-authored-by: Anton <anton@scinote.net>
2022-02-21 11:25:12 +01:00
aignatov-bio
ed5b69c0ab
Add validation for date picker [SCI-6541] (#3875)
Co-authored-by: Anton <anton@scinote.net>
2022-02-21 11:10:50 +01:00
aignatov-bio
0267bade3c
Add prepopulated datetime filters [SCI-6541] (#3869)
Co-authored-by: Anton <anton@scinote.net>
2022-02-18 11:25:51 +01:00
aignatov-bio
10821edbba
Update datetime filters operators [SCI-6544] (#3873)
Co-authored-by: Anton <anton@scinote.net>
2022-02-18 11:16:53 +01:00
artoscinote
8c0279e948
Fix red dot after clear filters [SCI-6536] (#3868) 2022-02-17 14:30:20 +01:00
aignatov-bio
6cee35dfa5
Small ux fixes [SCI-6539][SCI-6516] (#3864)
Co-authored-by: Anton <anton@scinote.net>
2022-02-16 12:56:54 +01:00
artoscinote
39a014cfd4
Fix red dot for active filters [SCI-6536] (#3861) 2022-02-16 11:07:23 +01:00
aignatov-bio
f2e4c579af
Multiple UX fixes for filters [SCI-6525] (#3858)
Co-authored-by: Anton <anton@scinote.net>
2022-02-15 15:03:25 +01:00
Alex Kriuchykhin
6cc102cfd1
Fix advanced filters for list and status data types [SCI-6524][SCI-6521] (#3844) 2022-02-11 13:50:42 +01:00
aignatov-bio
97898fef7a
Add error handling for saving filters [SCI-6488] (#3835)
* Add error handling for saving filters [SCI-6488]

* Refactor and clean up filter element validations [SCI-6488]

Co-authored-by: Anton <anton@scinote.net>
Co-authored-by: Martin Artnik <martin@scinote.net>
2022-02-11 13:32:27 +01:00
aignatov-bio
afce0e34c4
Fix css for saved filters dropdown [SCI-6516] (#3843)
Co-authored-by: Anton <anton@scinote.net>
2022-02-11 12:44:22 +01:00
aignatov-bio
24127af83f
Fix dropdown behavior for repository filters [SCI-6491] (#3842)
Co-authored-by: Anton <anton@scinote.net>
2022-02-11 11:42:31 +01:00
Alex Kriuchykhin
b9204e1ce3
Add type specific indices for date time repository values [SCI-6485] (#3825) 2022-02-11 10:45:21 +01:00
aignatov-bio
ad5326011f
Fix validation for number field in filters [SCI-6510] (#3836)
Co-authored-by: Anton <anton@scinote.net>
2022-02-11 10:41:25 +01:00
artoscinote
bc5822de7b
Added error messges for missing search columns/values [SCI-6483] (#3824)
* Added error messges for missing search columns/values [SCI-6483]
2022-02-11 10:24:29 +01:00
artoscinote
553bde0bf5
Fix blank definition for user value filters [SCI-6509] (#3834) 2022-02-11 10:14:45 +01:00
artoscinote
85ad4a692a
Fix assigned task filter issues [SCI-6492] (#3837) 2022-02-11 09:20:52 +01:00
aignatov-bio
e59b18e25d
Add default selection for filters [SCI-6484] (#3826)
Co-authored-by: Anton <anton@scinote.net>
2022-02-10 20:58:44 +01:00
aignatov-bio
ec6886735c
Add archived on column [SCI-6482] (#3823)
Co-authored-by: Anton <anton@scinote.net>
2022-02-03 13:18:15 +01:00
aignatov-bio
5223ce13f3
Fix assets operator markup error [SCI-6462] (#3822)
Co-authored-by: Anton <anton@scinote.net>
2022-02-03 12:32:19 +01:00
artoscinote
dd8b38604f
Filter loading/saving fixes [SCI-6475] (#3803)
* Filter loading/saving fixes [SCI-6475]

* More bugfixes & code improvements [SCI-6475]

* Fix loading user filter [SCI-6475]
2022-02-01 14:37:13 +01:00
aignatov-bio
3fc5883172
Fix purple dots after applying empty filters [SCI-6458] (#3809)
Co-authored-by: Anton <anton@scinote.net>
2022-01-31 15:14:39 +01:00
aignatov-bio
c8784d1f66
Add advanced filters for date/datetime/time range [SCI-6462] (#3806)
Co-authored-by: Anton <anton@scinote.net>
2022-01-31 09:21:08 +01:00
aignatov-bio
60859fec4e
Fix filtering for checklists, dropdown and status [SCI-6465] (#3802)
Co-authored-by: Anton <anton@scinote.net>
2022-01-27 14:01:09 +01:00
Martin Artnik
5a1329f1df Fix loading of saved filters [SCI-6474] 2022-01-27 13:33:43 +01:00
Martin Artnik
8c8d26011d Fix bad merge of additionalDataFilter.vue 2022-01-26 11:05:09 +01:00
artoscinote
790451c96f
Various fixes for BMT search [SCI-6077] (#3673)
* Various fixes for BMT search [SCI-6077]

* Add vue linter support [SCI-6077]
2022-01-25 12:28:38 +01:00
aignatov-bio
86b26cfade
CSS fixes for bmt filters [SCI-6084] (#3764)
Co-authored-by: Anton <anton@scinote.net>
2022-01-25 10:22:11 +01:00
Alex Kriuchykhin
5b335139e5
Merge pull request #3761 from artoscinote/ma_SCI_6388
Fix added_on filter, add specs [SCI-6388]
2022-01-24 16:47:03 +01:00
Martin Artnik
5fcf2cd080 Fix rendering of bmt/repository filters [SCI-6447] 2022-01-21 13:14:04 +01:00
Martin Artnik
711005425f Merge branch 'features/bmt-search' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:30:33 +01:00
Martin Artnik
abac837cd4 Merge branch 'develop' of github.com:biosistemika/scinote-web into features/repository-filters 2022-01-20 13:26:08 +01:00
aignatov-bio
8fcf4e9aa2
Add styling for repository filters [SCI-6232] (#3779)
Co-authored-by: Anton <anton@scinote.net>
2022-01-17 10:24:57 +01:00
aignatov-bio
3e85cc0b4a
Add UI for saving filters [SCI-6231] (#3768)
* Add UI for saving filters [SCI-6231]

* Fix ajax for deleting filters [6231]

Co-authored-by: Anton <anton@scinote.net>
Co-authored-by: Martin Artnik <martin@scinote.net>
2022-01-12 14:39:42 +01:00
Anton
304727257e Fix status column emojis [SCI-6407] 2022-01-11 11:27:00 +01:00
artoscinote
3f87d250ce
Implement saving repository filters [SCI-6230] (#3748)
* Implement saving repository filters [SCI-6230]

* Remove unnecessary logging [SCI-6230]

* Refactor filter saving [SCI-6230]

* Remove unnecessary files, linter fixes [SCI_6230]
2022-01-05 15:02:09 +01:00
Martin Artnik
66081950f0 Fix added_on filter, add specs [SCI-6388] 2022-01-04 19:20:02 +01:00
Martin Artnik
ef0fec55df Filter fixes [SCI-6391] 2021-12-27 11:36:39 +01:00
Oleksii Kriuchykhin
738da6094f Add advanced filters to repository datatable service [SCI-6210] 2021-12-21 12:38:52 +01:00
Martin Artnik
55905310a6 Added filter parameter formatting [SCI-6229] 2021-12-16 14:40:36 +01:00
aignatov-bio
7bcf7a7943
Fix conflicts and update localizations [SCI-6227] (#3733)
Co-authored-by: Anton <anton@scinote.net>
2021-12-15 15:16:12 +01:00
artoscinote
49ec3edb49
Add apply filters functionality to FE [SCI-6229] (#3742) 2021-12-15 12:48:28 +01:00
aignatov-bio
ac8fdb95d6
Add filters for checklist and status [SCI-6225][SCI-6226] (#3732)
Co-authored-by: Anton <anton@scinote.net>
2021-12-15 12:31:32 +01:00
aignatov-bio
8ce321456e
Add time filter [SCI-6217] (#3738)
* Add time filter [SCI-6217]

* Add datetime filter for inventory [SCI-6220]

* Refactor components structure

Co-authored-by: Anton <anton@scinote.net>
2021-12-15 12:22:24 +01:00
artoscinote
e08857886a
Implement date type filter [SCI-6216] (#3729)
Co-authored-by: aignatov-bio <47317017+aignatov-bio@users.noreply.github.com>
2021-12-10 14:12:06 +01:00
aignatov-bio
c7af5b322b
Add drodown filter [SCI-6224] (#3728)
Co-authored-by: Anton <anton@scinote.net>
2021-12-07 20:49:48 +01:00
aignatov-bio
00f30b8d6c
Add assigned tasks filters [SCI-6221] (#3726)
* Add endpoint for repository tasks [SCI-6221]

* Add assigned tasks filter [SCI-6221]

Co-authored-by: Anton <anton@scinote.net>
2021-12-07 15:28:20 +01:00
aignatov-bio
e4606abf3e
Add basic structure for text filter [SCI-6213][SCI-6214] (#3710)
* Add basic structure for text filter [SCI-6213]

* Add actions for text filter [SCI-6213]

* Add mixins and i18n [SCI-6213]

* Add number filters [SCI-6214]

* Fix operator values

Co-authored-by: Anton <anton@scinote.net>
2021-12-03 14:50:27 +01:00
artoscinote
f1ede0f439
Add asset filter type [SCI-6215] (#3711) 2021-12-01 11:24:34 +01:00
aignatov-bio
12fadb9c25
Add basic structure for repository filters [SCI-6211] (#3698)
* Add container for inventory filters [SCI-6211]

* Add basic structure for filters [SCI-6211]

* Add i18n and css for filters dropdown [SCI-6211]

* Fix markup

Co-authored-by: Anton <anton@scinote.net>
2021-11-25 20:34:22 +01:00
Anton
c00a7b7b8f Update bmt filters default state [SCI-6090] 2021-11-16 15:14:00 +01:00
aignatov-bio
06788bfeb6
Update CSS for BMT filters [SCI-6084] (#3652)
* Update css for bmt filters [SCI-6084]

* Create shared component for dropdown [SCI-6084]

Co-authored-by: Anton <anton@scinote.net>
2021-11-16 14:46:08 +01:00
aignatov-bio
27d6453527
After clear filters not reload table [SCI-6101][SCI-6102] (#3661)
Co-authored-by: Anton <anton@scinote.net>
2021-11-16 14:12:57 +01:00
aignatov-bio
c8fd0dce51
Add permission checks for bmt filters [SCI-6099] (#3622)
Co-authored-by: Anton <anton@scinote.net>
2021-11-09 09:28:51 +01:00
Martin Artnik
2f56e25346 Close saved filters dropdown on outclick [SCI-6086] 2021-11-02 16:23:08 +01:00
Martin Artnik
206ba3d79c Reworked how search error works with repository table [SCI-5961] 2021-09-06 10:12:10 +02:00
Martin Artnik
5f21e3296e Added error message on search failure [SCI-5961] 2021-08-30 12:02:02 +02:00
Martin Artnik
e08b406185 Added additionalDataFilter [SCI-6026] 2021-08-30 10:49:15 +02:00
Martin Artnik
896f0ce1e3 Implemented applying BMT filters [SCI-5980] 2021-08-30 10:49:15 +02:00
aignatov-bio
b269f3f612 Add saved filters backend [SCI-5977] (#3509)
* Add saved filters backend [SCI-5977]

* Rework filter saving [SCI-5977]

Co-authored-by: Martin Artnik <martin@scinote.net>
2021-08-30 10:49:15 +02:00
artoscinote
ef0e45be04 Implemented frontend for BMT-type repository [SCI-5991] (#3503)
* Implemented frontend for BMT-type repository [SCI-5991]

* Refactor repository view, fix column reordering [SCI-5991]

* Remove type mapping for default columns in column management [SCI-5991]

* Repository table partial fix, remove non-relevant migration [SCI-5991]
2021-08-30 10:49:15 +02:00
aignatov-bio
90d4a5f7d1 Add save bmt filters front end [SCI-5962] (#3505) 2021-08-30 10:49:15 +02:00
Martin Artnik
a872ea8a47 CSS fixes [SCI-5956] 2021-08-30 10:49:15 +02:00
Martin Artnik
9a87bad740 Implement filters and JSON building [SCI-5956] 2021-08-30 10:49:15 +02:00
aignatov-bio
958ee92db7 Add BMT filters interactions [SCI-5955] (#3478)
* Add BMT filters interactions [SCI-5955]

* Small fixes [SCI-5955]
2021-08-30 10:49:14 +02:00
aignatov-bio
7621deeb2a
Small label printers fixes [SCI-6021][SCI-6024] (#3502) 2021-08-23 13:58:16 +02:00
Martin Artnik
57d5e6c2a7 Merge branch 'develop' into features/barcodes 2021-08-03 13:36:36 +02:00
aignatov-bio
be777a8919
Add barcodes to repository item card [SCI-5883][SCI-5884] (#3447)
* Add barcodes to repository item card [SCI-5883][SCI-5884]

* Fix markup [SCI-5883]
2021-07-21 21:32:42 +02:00
Martin Artnik
71aa418dc6 Fixed UX issues in user invites modal [SCI-5898] 2021-07-19 12:39:18 +02:00
aignatov-bio
b3faa170fb
PDF preview to file preview and inline view [SCI-5299][SCI-5298] (#3018)
* Add PDF Preview [SCI-5299]
2020-12-22 15:25:30 +01:00
Oleksii Kriuchykhin
aeba25cf09 Fix Hound warning 2020-10-01 11:56:33 +02:00
Oleksii Kriuchykhin
25a9f5c685 Add typeface-lato for shipping Lato fonts 2020-09-28 18:02:47 +02:00
aignatov-bio
be3a1994f8 Add basic UX to 2FA 2020-07-07 13:09:48 +02:00
Urban Rotnik
1ecea5216e Add webpack libs for emojis and assets 2020-01-21 11:43:04 +01:00
Urban Rotnik
7c71159303 Add Inputmask to webpack 2019-12-20 14:50:44 +01:00
Jure Grabnar
fc961b570c Comment out index.jsx
Closes SCI-3590
2019-07-02 18:07:12 +02:00
aignatov-bio
cd7460a4bd
Add croppie tool to avatar editing [SCI-3502] (#1801)
* Add croppie tool to avatar editing
2019-05-31 15:44:27 +02:00
Oleksii Kriuchykhin
88123f5ecd Fix paths for highlightjs-github-theme [SCI-3377] 2019-04-24 12:35:01 +02:00
Urban Rotnik
96fa620c4c Add fontawesome checkmark before dropdown item
SCI-3209
2019-03-26 12:35:17 +01:00
Oleksii Kriuchykhin
7315db73f1 Add missing semicolon [SCI-2856] 2019-03-11 15:13:08 +01:00
Oleksii Kriuchykhin
9bbdc8fc89 Include tui image editor with webpack [SCI-2856] 2019-03-11 15:12:38 +01:00
Oleksii Kriuchykhin
1c3f1a1a6c Fix fontawesome package paths [SCI-2253] 2018-07-31 13:52:21 +02:00
Oleksii Kriuchykhin
b2bd1cb849 Upgrade to Turbolinks 5 [SCI-2253] 2018-07-27 17:26:46 +02:00
Oleksii Kriuchykhin
6669beaf0e Change icons throughout the rest of application [SCI-2445] 2018-07-27 15:27:08 +02:00
mlorb
f972676f8d
Merge pull request #1158 from Ducz0r/lm-sci-2416-fix
Update software with new logo & new brand [SCI-2416]
2018-05-23 15:47:17 +02:00
mlorb
c4ecfc4d38 Change icons throughout sciNote - navigation, project, task cards 2018-05-22 16:55:58 +02:00
Luka Murn
cea18a44d5 Rename sciNote -> SciNote (app/javascript folder) 2018-05-21 15:18:30 +02:00
Oleksii Kriuchykhin
3b7977ee3b Merge latest changes from ux-release-1 [SCI-2217] 2018-04-04 14:20:34 +02:00
mlorb
e5e92eb215 fix the rest of the constants 2018-04-03 10:28:39 +02:00
Oleksii Kriuchykhin
f656ad1561 Fix fa icons [SCI-2217] 2018-03-30 17:03:44 +02:00
Oleksii Kriuchykhin
cc5d8550b1 Refactor file preview modal [SCI-2217] 2018-03-30 11:50:28 +02:00
mlorb
22afa61b11 refactor colors 2018-03-28 13:54:01 +02:00
Luka Murn
4ddc7dfa85 Comment react-hijack code 2018-02-06 08:00:29 +01:00
zmagod
88d7429041 1. fixes failing unit and integration tests
2. fixes gem dependencies issues
3. fixes failing migrations
4. updates depricated factory_girl => factory_bot and fixes related issues

Signed-off-by: zmagod <zmago_devetak@yahoo.com>
2018-01-23 14:54:15 +01:00
zmagod
2857857c24 fixes bug with navbar[SCI-1950] 2018-01-18 13:29:47 +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
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
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
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
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
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
zmagod
0922ee21a7 fixes first element in global activities logs[fixes SCI-1866] 2018-01-17 12:01:58 +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
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
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
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
zmagod
371491c259 refactor 2018-01-12 11:38:52 +01:00
zmagod
0d7c116de1 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854 2018-01-09 10:03:02 +01:00
zmagod
c5379896c0 fix HOC to recive objects 2018-01-08 16:28:20 +01:00
Zmago Devetak
0e6931b1f3
Merge pull request #908 from ZmagoD/zd_SCI_1866
Wrong date at activity
2018-01-08 14:20:26 +01:00
zmagod
c07f54a0c7 Merge branch 'decoupling-settings-page' of https://github.com/biosistemika/scinote-web into zd_SCI_1854 2018-01-08 08:38:14 +01:00
zmagod
455534ef9a fixes list keys 2018-01-05 17:11:38 +01:00
zmagod
eb8124ea5a follow @duco 's suggestions 2018-01-05 17:08:00 +01:00
mlorb
e76ec7f4a4
Merge pull request #911 from mlorb/ml-sci-1797
Permissions - refactor organization & team level permissions (core) [SCI-1797]
2018-01-05 16:03:55 +01:00
zmagod
be014000ab fixes flow-types 2018-01-05 09:59:08 +01:00