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.

Sign up for GitHub

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: remove onDelete for Placeholder tag for non Platform admiins #3959

Merged
merged 11 commits into from
Nov 20, 2024
+182 −41
Merged

feat: remove onDelete for Placeholder tag for non Platform admiins #3959

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
b2e5718
add validation to render tags and render options
RODO94 Nov 14, 2024
668b917
refine variable use in code
RODO94 Nov 15, 2024
ca17ae8
add changes requested
RODO94 Nov 15, 2024
b7600ee
add test coverage and alter platformAdmin checker
RODO94 Nov 18, 2024
53972c4
remove it.only
RODO94 Nov 18, 2024
958bda6
improve test readability
RODO94 Nov 18, 2024
09fc069
add changes
RODO94 Nov 19, 2024
518c33f
alter key name to editableBy
RODO94 Nov 19, 2024
39f8b60
alter fn name and use state role for validation
RODO94 Nov 20, 2024
170b5ff
remove comment
RODO94 Nov 20, 2024
43a8a4c
fix state call
RODO94 Nov 20, 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
4 changes: 2 additions & 2 deletions editor.planx.uk/src/pages/FlowEditor/components/Flow/components/Tag.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ import { FONT_WEIGHT_SEMI_BOLD } from "theme";

export const TAG_DISPLAY_VALUES: Record<
NodeTag,
{ color: keyof Palette["nodeTag"]; displayName: string; isEditable?: Role[] }
{ color: keyof Palette["nodeTag"]; displayName: string; editableBy?: Role[] }
> = {
placeholder: {
color: "blocking",
displayName: "Placeholder",
isEditable: ["platformAdmin"], // if new roles are added, we should update the canEdit() in ComponentTagSelect.tsx
editableBy: ["platformAdmin"], // if new roles are added, we should update the canEdit() in ComponentTagSelect.tsx
RODO94 marked this conversation as resolved.
Show resolved Hide resolved
},
toReview: {
color: "nonBlocking",
Expand Down
4 changes: 2 additions & 2 deletions editor.planx.uk/src/ui/editor/ComponentTagSelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const renderOption: AutocompleteProps<
false,
"div"
>["renderOption"] = (props, tag, { selected }) => {
if (TAG_DISPLAY_VALUES[tag].isEditable?.some(canEdit)) return null;
if (TAG_DISPLAY_VALUES[tag].editableBy?.some(canEdit)) return null;
return (
<ListItem {...props}>
<CustomCheckbox
Expand Down Expand Up @@ -70,7 +70,7 @@ const renderTags: AutocompleteProps<
),
})}
onDelete={
TAG_DISPLAY_VALUES[tag].isEditable?.some(canEdit)
TAG_DISPLAY_VALUES[tag].editableBy?.some(canEdit)
? undefined
: getTagProps({ index }).onDelete
}
Expand Down
Loading