Skip to content

Commit aa79151

Browse files
committed
🐛 Address permission display issues on archetypes page
Signed-off-by: ibolton336 <[email protected]>
1 parent da3c1bf commit aa79151

File tree

1 file changed

+78
-71
lines changed

1 file changed

+78
-71
lines changed

client/src/app/pages/archetypes/archetypes-page.tsx

+78-71
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ const Archetypes: React.FC = () => {
307307
<FilterToolbar {...filterToolbarProps} />
308308
<ToolbarGroup variant="button-group">
309309
<ToolbarItem>
310-
<CreateButton />
310+
{archetypeWriteAccess && <CreateButton />}
311311
</ToolbarItem>
312312
</ToolbarGroup>
313313
<ToolbarItem {...paginationToolbarItemProps}>
@@ -381,76 +381,83 @@ const Archetypes: React.FC = () => {
381381
<ArchetypeApplicationsColumn archetype={archetype} />
382382
</Td>
383383
<Td isActionCell>
384-
<ActionsColumn
385-
items={[
386-
...(archetypeWriteAccess
387-
? [
388-
{
389-
title: t("actions.duplicate"),
390-
onClick: () =>
391-
setArchetypeToDuplicate(archetype),
392-
},
393-
]
394-
: []),
395-
...(assessmentWriteAccess
396-
? [
397-
{
398-
title: t("actions.assess"),
399-
onClick: () =>
400-
assessSelectedArchetype(archetype),
401-
},
402-
]
403-
: []),
404-
...(reviewsWriteAccess
405-
? [
406-
{
407-
title: t("actions.review"),
408-
onClick: () =>
409-
reviewSelectedArchetype(archetype),
410-
},
411-
]
412-
: []),
413-
...(archetypeWriteAccess
414-
? [
415-
{
416-
title: t("actions.edit"),
417-
onClick: () =>
418-
setArchetypeToEdit(archetype),
419-
},
420-
]
421-
: []),
422-
...(archetype?.assessments?.length &&
423-
assessmentWriteAccess
424-
? [
425-
{
426-
title: t("actions.discardAssessment"),
427-
onClick: () =>
428-
setAssessmentToDiscard(archetype),
429-
},
430-
]
431-
: []),
432-
...(archetype?.review && reviewsWriteAccess
433-
? [
434-
{
435-
title: t("actions.discardReview"),
436-
onClick: () =>
437-
setReviewToDiscard(archetype),
438-
},
439-
]
440-
: []),
441-
{ isSeparator: true },
442-
...(archetypeWriteAccess
443-
? [
444-
{
445-
title: t("actions.delete"),
446-
onClick: () =>
447-
setArchetypeToDelete(archetype),
448-
isDanger: true,
449-
},
450-
]
451-
: []),
452-
]}
453-
/>
384+
{(archetypeWriteAccess ||
385+
assessmentWriteAccess ||
386+
reviewsWriteAccess ||
387+
(archetype?.assessments?.length &&
388+
assessmentWriteAccess) ||
389+
(archetype?.review && reviewsWriteAccess)) && (
390+
<ActionsColumn
391+
items={[
392+
...(archetypeWriteAccess
393+
? [
394+
{
395+
title: t("actions.duplicate"),
396+
onClick: () =>
397+
setArchetypeToDuplicate(archetype),
398+
},
399+
]
400+
: []),
401+
...(assessmentWriteAccess
402+
? [
403+
{
404+
title: t("actions.assess"),
405+
onClick: () =>
406+
assessSelectedArchetype(archetype),
407+
},
408+
]
409+
: []),
410+
...(reviewsWriteAccess
411+
? [
412+
{
413+
title: t("actions.review"),
414+
onClick: () =>
415+
reviewSelectedArchetype(archetype),
416+
},
417+
]
418+
: []),
419+
...(archetypeWriteAccess
420+
? [
421+
{
422+
title: t("actions.edit"),
423+
onClick: () =>
424+
setArchetypeToEdit(archetype),
425+
},
426+
]
427+
: []),
428+
...(archetype?.assessments?.length &&
429+
assessmentWriteAccess
430+
? [
431+
{
432+
title: t("actions.discardAssessment"),
433+
onClick: () =>
434+
setAssessmentToDiscard(archetype),
435+
},
436+
]
437+
: []),
438+
...(archetype?.review && reviewsWriteAccess
439+
? [
440+
{
441+
title: t("actions.discardReview"),
442+
onClick: () =>
443+
setReviewToDiscard(archetype),
444+
},
445+
]
446+
: []),
447+
{ isSeparator: true },
448+
...(archetypeWriteAccess
449+
? [
450+
{
451+
title: t("actions.delete"),
452+
onClick: () =>
453+
setArchetypeToDelete(archetype),
454+
isDanger: true,
455+
},
456+
]
457+
: []),
458+
]}
459+
/>
460+
)}
454461
</Td>
455462
</TableRowContentWithControls>
456463
</Tr>

0 commit comments

Comments
 (0)