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

feat: lock board #3955

Merged
merged 66 commits into from
Jul 19, 2024
Merged
Changes from 1 commit
Commits
Show all changes
66 commits
Select commit Hold shift + click to select a range
d57035c
Add simple component to lock the board in the quick menu
brandstetterm Mar 7, 2024
039baeb
Add allowEditing boolean to board type
brandstetterm Mar 7, 2024
7196dc1
Set toggle value of lock board component to current value of allow
brandstetterm Mar 7, 2024
78b36a4
Clicking on the lock board button dispatches api request
brandstetterm Mar 8, 2024
af1bc6f
Merge branch 'main' into mb/lock-board
brandstetterm Mar 8, 2024
d876b3b
Add board settings toggle to change the locking of a board
brandstetterm Mar 8, 2024
578785f
Add gap between different groups of board settings and change order
brandstetterm Mar 8, 2024
f68d9ed
Update snapshots of board settings and header menu
brandstetterm Mar 8, 2024
77d9dc7
Translate label of board settings toggle
brandstetterm Mar 8, 2024
b5c881f
Add translated labels to header menu toggle
brandstetterm Mar 8, 2024
c4689a9
Update snapshots of header menu and board settings
brandstetterm Mar 8, 2024
15e46ab
Change import order of lock board component
brandstetterm Mar 8, 2024
9fcd848
Grey out disabled buttons when board is locked and add lock icon to note
brandstetterm Mar 11, 2024
b7b3eae
Disable the moving of notes for participants when the board is locked
brandstetterm Mar 11, 2024
0b7da39
Hide note reactions when board is locked and participant is not
brandstetterm Mar 11, 2024
2ff2f67
Resolve merge conflicts
brandstetterm Mar 12, 2024
6e92701
Merge branch 'main' into mb/lock-board
brandstetterm Mar 12, 2024
82805ba
Remove box shadow when noteinput is disabled (only for normal
brandstetterm Mar 12, 2024
b3a6381
Only disable the menu bar items when the participant is not moderator
brandstetterm Mar 12, 2024
912ad67
Disable textarea of note for participants
brandstetterm Mar 12, 2024
1d018ce
Hide note reactions button for participants when board is locked
brandstetterm Mar 12, 2024
c63f550
Disable button to remove own note reaction for non-moderator
brandstetterm Mar 12, 2024
7d5eb95
Gray out plus icon in noteinput if board is locked
brandstetterm Mar 14, 2024
0ea5b5a
Remove margins from elements and add padding to noteinput
brandstetterm Mar 14, 2024
d61f193
Hide note dialog options (delete and unstack button) if board is locked
brandstetterm Mar 14, 2024
e647811
Merge remote-tracking branch 'origin/main' into mb/lock-board
brandstetterm Mar 14, 2024
cf35022
Hide button to add votes and disable remove vote button for participants
brandstetterm Mar 14, 2024
07a3343
Remove disabled state from mark as ready and raise hand buttons in user
brandstetterm Mar 14, 2024
179cbb8
Merge branch 'main' into mb/lock-board
brandstetterm Mar 15, 2024
db9cebd
Make switch to lock board in header menu accessible by adding role and
brandstetterm Mar 15, 2024
8afb2ae
Update tests and snapshot of header menu component
brandstetterm Mar 15, 2024
ebeddb5
Update tests of note input component
brandstetterm Mar 15, 2024
ddb4df7
Add translated titles to add and remove vote buttons and update
brandstetterm Mar 15, 2024
bfcf352
Update tests of votes component
brandstetterm Mar 15, 2024
efb028b
Fix liniting warnings
brandstetterm Mar 15, 2024
f4da7cf
Add container queries to note input component to enhance responsibility
brandstetterm Mar 15, 2024
c3295f2
Fix typo in header menu unit tests
brandstetterm Mar 18, 2024
2461ce9
Revert changes in column settings component
brandstetterm Mar 18, 2024
eb0885b
Merge main and resolve conflicts
brandstetterm Mar 18, 2024
832b343
Merge branch 'main' into mb/lock-board
brandstetterm Mar 18, 2024
cb015c0
Merge branch 'main' into mb/lock-board
brandstetterm Mar 18, 2024
48f2461
Hide board reactions menu if board is locked for non-moderators
brandstetterm Mar 18, 2024
db6d354
Change logic to hide reactions menu if board is locked
brandstetterm Mar 18, 2024
036ec47
refactor: change import order of menu bars component
brandstetterm Mar 18, 2024
dc54e95
Merge branch 'main' into mb/lock-board
brandstetterm Mar 20, 2024
3d2027a
improvement: locked board notification (#4104)
Schwehn42 Apr 30, 2024
80770b4
fix hard coded size and color
Schwehn42 May 6, 2024
3f47b6b
Merge branch 'refs/heads/main' into mb/lock-board
Schwehn42 May 6, 2024
da6ee93
make linter happy
Schwehn42 May 6, 2024
dbffdf2
Merge branch 'main' into mb/lock-board
brandstetterm May 7, 2024
024b1db
Revert "Change logic to hide reactions menu if board is locked"
Schwehn42 May 13, 2024
e1abc02
no longer disable board reactions menu
Schwehn42 May 13, 2024
ec93947
Revert "Hide board reactions menu if board is locked for non-moderators"
Schwehn42 May 13, 2024
0dbd526
remove unused store selector
Schwehn42 May 13, 2024
c272368
revert: reallow locked board reactions (#4144)
Schwehn42 May 14, 2024
f45bf17
refactor: allowEditing -> isLocked (#4145)
Schwehn42 May 29, 2024
f91b3c3
Merge branch 'main' into mb/lock-board
Schwehn42 May 29, 2024
0b772df
Merge branch 'refs/heads/main' into mb/lock-board
Schwehn42 Jun 17, 2024
2442722
fix icon
Schwehn42 Jun 17, 2024
37a6774
Merge branch 'refs/heads/main' into mb/lock-board
Schwehn42 Jun 26, 2024
0ee90ed
update collection
Schwehn42 Jun 26, 2024
fb12918
Merge branch 'refs/heads/main' into mb/lock-board
Schwehn42 Jul 16, 2024
4fd9827
increment migration file prefix
Schwehn42 Jul 16, 2024
e2c09d1
fix color names
Schwehn42 Jul 16, 2024
ff5043f
update postman collection
Schwehn42 Jul 16, 2024
b8f8712
Merge branch 'refs/heads/main' into mb/lock-board
Schwehn42 Jul 19, 2024
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
Disable textarea of note for participants
brandstetterm committed Mar 12, 2024
commit 912ad67da8f21a82d26a5f7acda4e1ccd18a2c0f
Original file line number Diff line number Diff line change
@@ -29,6 +29,8 @@ export const NoteDialogNoteContent: FC<NoteDialogNoteContentProps> = ({noteId, a
const dispatch = useDispatch();
const {t} = useTranslation();
const editable = viewer.user.id === authorId || viewer.role === "OWNER" || viewer.role === "MODERATOR";
const boardLocked = useAppSelector((state) => !state.board.data!.allowEditing);
const isModerator = viewer.role === "OWNER" || viewer.role === "MODERATOR";

const author = useAppSelector((state) => {
const noteAuthor = state.participants?.others.find((p) => p.user.id === authorId) ?? state.participants?.self;
@@ -89,7 +91,7 @@ export const NoteDialogNoteContent: FC<NoteDialogNoteContentProps> = ({noteId, a
<>
<textarea
className="note-dialog__note-content--text"
disabled={!editable}
disabled={!editable || (!isModerator && boardLocked)}
onBlur={(e) => onEdit(noteId!, e.target.value ?? "")}
onFocus={onFocus}
{...emoji.inputBindings}