Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Library Locking UI #3127

Merged
merged 191 commits into from
Jun 14, 2021
Merged
Changes from 1 commit
Commits
Show all changes
191 commits
Select commit Hold shift + click to select a range
9e9fbcd
file preparations for locking
magicznyleszek Mar 3, 2021
8bd6632
prepare mocks and tests
magicznyleszek Mar 4, 2021
cd53179
define test for lockingUtils and start passing some
magicznyleszek Mar 6, 2021
cfa4731
all tests passing
magicznyleszek Mar 8, 2021
26960f1
adapt code to lock_all
magicznyleszek Mar 10, 2021
4bd7d9c
card locking icons stub
magicznyleszek Mar 10, 2021
90dfae5
add more locking stubs and cleanup class name
magicznyleszek Mar 10, 2021
32b41ec
fix tests
magicznyleszek Mar 10, 2021
edb434c
update the test and props again and add formLockedMessage stub
magicznyleszek Mar 10, 2021
d4991f1
Merge branch 'beta' into 3032-library-locking-ui
magicznyleszek Mar 17, 2021
b5d780d
locked message and label
magicznyleszek Mar 18, 2021
02cc037
Add formpack library locking support
joshuaberetta Mar 18, 2021
03a724e
Merge branch 'beta' into 3005-library-locking-feature
joshuaberetta Mar 18, 2021
7e37b4d
Add method to revert locking profiles for export
joshuaberetta Mar 18, 2021
d39ebc5
improve message box and get into form builder row
magicznyleszek Mar 19, 2021
8ee9b0d
Merge branch 'beta' into 3032-library-locking-ui
magicznyleszek Mar 19, 2021
cde7c75
Merge branch 'beta' into 3005-library-locking-feature
joshuaberetta Mar 19, 2021
79faf74
Refactor and move method to formpack
joshuaberetta Mar 19, 2021
28b3492
change kobo--lock to kobo--locking-profile as for latest decisions
magicznyleszek Mar 19, 2021
43a224e
Merge branch 'beta' into 3032-library-locking-ui
magicznyleszek Mar 22, 2021
31fd86c
Add test for xls import with locking profiles
joshuaberetta Mar 22, 2021
d134733
Add tests for cloning to and from templates
joshuaberetta Mar 22, 2021
90401e0
Fix bug with deleting kobo sheets for data export
joshuaberetta Mar 22, 2021
8a4d514
Update formpack hash
joshuaberetta Mar 23, 2021
89922fa
Merge branch 'beta' into 3005-library-locking-feature-combined
joshuaberetta Mar 23, 2021
e5b7fd5
Merge branch 'beta' into 3005-library-locking-feature
joshuaberetta Mar 23, 2021
f0dfb18
Refactor formpack constants
joshuaberetta Mar 24, 2021
e800583
Merge branch 'beta' into 3005-library-locking-feature
joshuaberetta Mar 24, 2021
a13d086
Merge branch '3005-library-locking-feature' into 3005-library-locking…
joshuaberetta Mar 24, 2021
4c206f2
Update formpack hash
joshuaberetta Mar 24, 2021
6818493
Merge branch 'beta' into 3032-library-locking-ui
magicznyleszek Mar 25, 2021
b9ddfd0
move things around again
magicznyleszek Mar 25, 2021
737ae2a
Merge branch 'circular-dependency-fix' into 3032-library-locking-ui
magicznyleszek Mar 25, 2021
c4d6cd2
custom styles for hiding and disabling locked ui elements
magicznyleszek Mar 25, 2021
a91c5c3
isRowLocked with test
magicznyleszek Mar 30, 2021
762dc8c
Merge branch 'update-question-type-icons' into 3032-library-locking-ui
magicznyleszek Apr 1, 2021
5f182d5
Merge branch 'beta' into 3032-library-locking-ui
magicznyleszek Apr 1, 2021
6089dad
question type icons get padlock
magicznyleszek Apr 1, 2021
0af0f79
Merge branch 'update-question-type-icons' into 3032-library-locking-ui
magicznyleszek Apr 1, 2021
aee187e
new utility function getRowLockingProfile and applying profile color …
magicznyleszek Apr 2, 2021
69b30cc
locking row styles
magicznyleszek Apr 2, 2021
66eb3f8
most ui locking applied
magicznyleszek Apr 5, 2021
2701d31
disable grouping
magicznyleszek Apr 5, 2021
6ad4cf1
Merge branch 'update-question-type-icons' into 3032-library-locking-ui
magicznyleszek Apr 5, 2021
e348c9f
disable sortable instances for locking restrictions
magicznyleszek Apr 5, 2021
7f2428b
fix icons sizes in question creation form
magicznyleszek Apr 5, 2021
fc88179
update todo
magicznyleszek Apr 5, 2021
972eda3
disable ui only for surveys
magicznyleszek Apr 5, 2021
1cf766c
fix icons not changing properly
magicznyleszek Apr 5, 2021
30bc540
small styles tweaks
magicznyleszek Apr 5, 2021
e4c4a73
add row icon tooltips
magicznyleszek Apr 5, 2021
85770ec
finish up tooltips
magicznyleszek Apr 6, 2021
9c4cb0e
form builder locked asset type label
magicznyleszek Apr 6, 2021
178ddd0
fix test for undefined locking profile
magicznyleszek Apr 6, 2021
d29cdc6
locking features view
magicznyleszek Apr 7, 2021
84c51a7
update todo
magicznyleszek Apr 7, 2021
6035418
one more test
magicznyleszek Apr 7, 2021
7875f19
last locking added
magicznyleszek Apr 8, 2021
7123368
write missing tests
magicznyleszek Apr 8, 2021
0b62913
add missing messages
magicznyleszek Apr 8, 2021
28446fb
fix form builder content width
magicznyleszek Apr 8, 2021
c7f70e3
remove leftover file
magicznyleszek Apr 8, 2021
0bc1e73
Merge branch 'beta' into 3005-library-locking-feature
joshuaberetta Apr 8, 2021
c278a9c
Merge branch '3005-library-locking-feature' into 3005-library-locking…
joshuaberetta Apr 8, 2021
ee346e7
fix locked form and features utility function
magicznyleszek Apr 9, 2021
16295e0
dont display empty cans list
magicznyleszek Apr 12, 2021
970bea3
fix post duplicate import removal issue
magicznyleszek Apr 12, 2021
c99a503
remove unused randdelay
magicznyleszek Apr 12, 2021
93b905d
fix broken new form modal
magicznyleszek Apr 12, 2021
cb5f67f
Merge branch 'update-question-type-icons' into 3032-library-locking-ui
magicznyleszek Apr 13, 2021
3ea5b86
WIP strip kobo locks from non-surveys or templates
joshuaberetta Apr 13, 2021
0331894
Use formpack `strip_kobo_locking_profile` method
joshuaberetta Apr 13, 2021
74786f0
Fix up strip_kobo_locking_profile addition
joshuaberetta Apr 13, 2021
cdb257d
Update appending kobo locking profile to content
joshuaberetta Apr 13, 2021
c6f71a5
fix undefined name crash for nameless rows
magicznyleszek Apr 13, 2021
19f3831
more precise and safe selectors for locking features nodes
magicznyleszek Apr 13, 2021
cd3e094
Fix breaking test
joshuaberetta Apr 13, 2021
84853c0
fix xls upload modal crash
magicznyleszek Apr 14, 2021
6d6b5f7
Merge branch 'beta' into 3005-library-locking-feature
joshuaberetta Apr 14, 2021
9aeb687
add tests
joshuaberetta Apr 14, 2021
3341538
add `group_split` to tests
joshuaberetta Apr 14, 2021
f7678ac
remove unused import
joshuaberetta Apr 14, 2021
a0186da
Merge branch '3005-library-locking-feature' into 3005-library-locking…
joshuaberetta Apr 14, 2021
d6d4a21
update frompack hash
joshuaberetta Apr 14, 2021
7118b87
Merge branch 'update-question-type-icons' into 3032-library-locking-ui
magicznyleszek Apr 15, 2021
e50e54b
preserve locking profiles when saving a form
magicznyleszek Apr 15, 2021
8deee59
introduce group_split restrictions for the de facto current delete gr…
magicznyleszek Apr 15, 2021
dced975
split choice_edit restriction into label and value
magicznyleszek Apr 15, 2021
7566471
Merge branch 'beta' into 3032-library-locking-ui
magicznyleszek Apr 15, 2021
d629c86
Merge branch 'beta' into 3005-library-locking-feature
joshuaberetta Apr 15, 2021
40eae65
replace `choice_edit` with `choice_label_edit` and `choice_value_edit`
joshuaberetta Apr 15, 2021
f1181da
Merge branch '3005-library-locking-feature' into 3005-library-locking…
joshuaberetta Apr 15, 2021
cf6302d
update formpack hash
joshuaberetta Apr 15, 2021
8313832
fix translations_manage restriction name
magicznyleszek Apr 22, 2021
c018772
Merge branch 'beta' into 3005-library-locking-feature
joshuaberetta Apr 22, 2021
7cf3f72
Merge branch '3005-library-locking-feature' into 3005-library-locking…
joshuaberetta Apr 22, 2021
b966f5a
update formpack hash
joshuaberetta Apr 22, 2021
be3d1ef
fix locked features styles
magicznyleszek Apr 22, 2021
fe68d64
helpful restrictions comment
magicznyleszek Apr 22, 2021
368954d
Merge branch 'beta' into 3032-library-locking-ui
magicznyleszek Apr 23, 2021
5335160
Merge branch '3132-delete-entire-group' into 3032-library-locking-ui
magicznyleszek Apr 23, 2021
da489b1
group_split and group_delete locking
magicznyleszek Apr 23, 2021
33fb368
Merge branch 'beta' into 3032-library-locking-ui
duvld Apr 27, 2021
a0adf2f
remove leftover sortable activation call
magicznyleszek Apr 27, 2021
539829d
introduce form_appearance restriction
magicznyleszek Apr 28, 2021
f3827c3
better icon for cants list
magicznyleszek Apr 28, 2021
ac53d24
Merge branch '3132-delete-entire-group' into 3032-library-locking-ui
magicznyleszek Apr 28, 2021
d3cefb9
Merge branch '3132-delete-entire-group' into 3032-library-locking-ui
magicznyleszek Apr 28, 2021
eba6b74
fix multiConfirm disabling code
magicznyleszek Apr 28, 2021
566f1e9
Add `locked` boolean to asset summary
joshuaberetta Apr 28, 2021
290633f
Add test for `locked` boolean in asset.summary
joshuaberetta Apr 28, 2021
891fc09
Replace `translations_manage` with `translations_add` and add `form_m…
joshuaberetta Apr 28, 2021
a600cb5
Relace `locked` with `lock_all` and `lock_any` in asset summary, chan…
joshuaberetta Apr 28, 2021
9b3de33
Update tests with `lock_all` and `lock_any` and fix typos
joshuaberetta Apr 28, 2021
2138007
Merge branch 'beta' into 3005-library-locking-feature
joshuaberetta Apr 28, 2021
7073593
Merge branch '3005-library-locking-feature' into 3005-library-locking…
joshuaberetta Apr 28, 2021
6dbd711
update formpack hash
joshuaberetta Apr 28, 2021
498aa31
change translations_manage to translations_add
magicznyleszek Apr 28, 2021
ab40640
add form_meta_edit
magicznyleszek Apr 28, 2021
a5a43b2
fix project settings submit accidental bug
magicznyleszek Apr 28, 2021
57d9752
form and template locked icons
magicznyleszek Apr 28, 2021
115d5d4
select for desired asset type
magicznyleszek Apr 29, 2021
e85e506
set support url for library locking
magicznyleszek Apr 29, 2021
281c4b3
fix hmtl form submitting on random button click
magicznyleszek Apr 29, 2021
1181dbc
wip
magicznyleszek Apr 30, 2021
e7b8389
Merge branch 'beta' into 3032-library-locking-ui
magicznyleszek Apr 30, 2021
defc4b6
Merge branch 'beta' into 3142-library-upload-improvements
magicznyleszek Apr 30, 2021
34a2eed
wip
magicznyleszek Apr 30, 2021
f12caef
library upload submit button
magicznyleszek Apr 30, 2021
9bfe234
fix file name display
magicznyleszek Apr 30, 2021
ce9eb96
added backend support for templates
JacquelineMorrissette May 3, 2021
b47dac0
pass desired_type to import endpoint and open modal for single droppe…
magicznyleszek May 3, 2021
6f2d82a
back end desired_type fix
JacquelineMorrissette May 4, 2021
a18aecc
change modal children order
magicznyleszek May 4, 2021
c41630d
Merge branch '3142-library-upload-improvements' into 3032-library-loc…
magicznyleszek May 4, 2021
4584b07
Merge branch '3005-library-locking-feature' into 3142-library-upload-…
joshuaberetta May 6, 2021
1ff14c3
add support for importtask change to templates
joshuaberetta May 6, 2021
95c98be
Merge branch '3005-library-locking-feature' into 3005-library-locking…
joshuaberetta May 6, 2021
7ab63fa
Merge remote-tracking branch 'origin/3005-library-locking-feature-com…
duvld May 7, 2021
6ed6798
Merge remote-tracking branch 'origin/beta' into 3032-library-locking-ui
duvld May 7, 2021
8c1371f
update formpack hash
joshuaberetta May 7, 2021
5555d6a
Merge remote-tracking branch 'origin/3005-library-locking-feature-com…
duvld May 7, 2021
be2204b
Apply generic translation locking restriction
duvld May 11, 2021
90efdbf
WIP: locking translations based on labels working
duvld May 11, 2021
08f8121
disable language editing if template has locking
duvld May 12, 2021
decfed9
make original string grayed out if label is locked
duvld May 12, 2021
739cd68
changed comment, added TODO wrt newly added langs
duvld May 12, 2021
a431b0d
Merge branch 'beta' into 3032-library-locking-ui
duvld May 13, 2021
1815899
Merge branch '3032-library-locking-ui' into 3205-locking-translation-…
duvld May 13, 2021
e7a3665
remove language name change restrictions
duvld May 13, 2021
32c9c55
remove unused import
duvld May 13, 2021
a199334
Merge branch 'beta' into 3032-library-locking-ui
duvld May 17, 2021
55b9ef3
Merge branch '3032-library-locking-ui' into 3205-locking-translation-…
duvld May 17, 2021
74c31dd
Merge branch 'beta' into 3032-library-locking-ui
duvld May 18, 2021
6ffb9cc
Merge branch '3032-library-locking-ui' into 3205-locking-translation-…
duvld May 18, 2021
8009246
PR Changes: no for loop and change disabled class
duvld May 18, 2021
71a1679
PR changes: greyed out cell
duvld May 18, 2021
2cd11c4
apply new linting changes :)
duvld May 18, 2021
c9649d6
PR Changes: small grammar thing
duvld May 19, 2021
4a6f4ec
Merge branch 'beta' into 3032-library-locking-ui
duvld May 19, 2021
697972a
update `translations_add` to `language_edit`
joshuaberetta May 19, 2021
c1b52a1
Merge branch 'beta' into 3005-library-locking-feature
joshuaberetta May 19, 2021
3407cd4
merge and update hash
joshuaberetta May 20, 2021
e7e915d
Merge branch '3032-library-locking-ui' into 3205-locking-translation-…
duvld May 20, 2021
fddaf00
update locked message box text
magicznyleszek May 20, 2021
de18324
add comment about what to update when adding new question type
magicznyleszek May 20, 2021
e0ce1b4
code review fixes
magicznyleszek May 20, 2021
95e6c5d
update locked message box text
magicznyleszek May 20, 2021
1baa751
don't diverge locale commit from beta
duvld May 20, 2021
229050a
Merge branch '3032-library-locking-ui' of https://github.com/kobotool…
duvld May 20, 2021
d4e1f1f
Merge remote-tracking branch 'origin/3005-library-locking-feature-com…
duvld May 20, 2021
f6b42a2
Merge branch '3032-library-locking-ui' into 3205-locking-translation-…
duvld May 20, 2021
b68cdbe
translations_add to language_edit & block editing
May 21, 2021
3d558dc
apply linting to translationSettings
duvld May 21, 2021
ac5c64b
block editing in translation table too
duvld May 21, 2021
d9fdf09
Merge branch 'beta' into 3032-library-locking-ui
duvld May 21, 2021
bb905f6
Merge branch 'beta' into 3032-library-locking-ui
duvld May 22, 2021
33cbef4
Merge branch '3032-library-locking-ui' into 3205-locking-translation-…
duvld May 22, 2021
407518a
Merge branch '3032-library-locking-ui' into 3205-locking-translation-…
duvld May 22, 2021
50b5467
linting, add `k-icon` class to icons, change label
duvld May 22, 2021
a4b7bd8
use abs paths for imports
duvld May 22, 2021
42dd301
remove CHOICE_TYPE and introduce isChoiceLabelLocked
duvld May 22, 2021
e685f50
lock choices if a parent question has restriction
duvld May 22, 2021
a0812b7
Merge branch 'beta' into 3032-library-locking-ui
magicznyleszek May 24, 2021
60522b6
PR changes: fix styling on locked language modal
duvld May 24, 2021
a093500
Merge pull request #3209 from kobotoolbox/3205-locking-translation-modal
duvld May 24, 2021
2fdb2b5
Merge remote-tracking branch 'origin/beta' into 3032-library-locking-ui
duvld May 26, 2021
99abc3b
fix styling on translation modal
duvld May 26, 2021
c691db6
Merge branch 'beta' into 3032-library-locking-ui
duvld Jun 1, 2021
7847dd9
make requested changes and update formpack hash
joshuaberetta Jun 14, 2021
c126a4e
Merge remote-tracking branch 'origin/beta' into 3032-library-locking-ui
jnm Jun 14, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'beta' into 3032-library-locking-ui
magicznyleszek committed Mar 22, 2021
commit 43a224e0e92ed06ab51f1adcdd52ff3b0c284b31

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.