From 5c137bc0746ffa60e9f1003f04f1a06578b9ce66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maia=20T=C3=B8mmerbakk?= <maito@equinor.com>
Date: Fri, 3 Sep 2021 08:02:31 +0200
Subject: [PATCH] Allow everyone to view all evaluations

---
 .../Action/EditForm/ActionEditForm.tsx        |   9 +-
 .../Action/EditForm/ActionEditSidebar.tsx     |  12 +-
 .../components/Action/QuestionActionsList.tsx |  11 +-
 frontend/src/components/QuestionItem.tsx      |   4 +-
 frontend/src/components/QuestionsList.tsx     |   4 +-
 frontend/src/components/helpers.ts            |   9 +-
 frontend/src/globals/contexts.ts              |   5 +-
 frontend/src/utils/QuestionAndAnswerUtils.ts  |   6 +-
 frontend/src/utils/RoleBasedAccess.ts         | 175 +++++++++++++++++-
 frontend/src/utils/disableComponents.ts       |  55 ++++++
 .../src/views/Evaluation/EvaluationView.tsx   |   1 -
 .../Evaluation/FollowUp/FollowUpView.tsx      |  38 +---
 .../Evaluation/Individual/IndividualView.tsx  |  28 +--
 .../Evaluation/Nomination/NominationTable.tsx |   6 +-
 .../Evaluation/Nomination/NominationView.tsx  |  52 +-----
 .../Preparation/PreparationView.tsx           |  48 ++---
 .../Evaluation/Workshop/WorkshopSummary.tsx   |  28 ++-
 .../Workshop/WorkshopSummaryWithApi.tsx       |  19 +-
 .../Evaluation/Workshop/WorkshopTabs.tsx      |  14 +-
 .../Evaluation/Workshop/WorkshopView.tsx      |  49 ++---
 20 files changed, 346 insertions(+), 227 deletions(-)
 create mode 100644 frontend/src/utils/disableComponents.ts

diff --git a/frontend/src/components/Action/EditForm/ActionEditForm.tsx b/frontend/src/components/Action/EditForm/ActionEditForm.tsx
index dcaecad9..b9445c28 100644
--- a/frontend/src/components/Action/EditForm/ActionEditForm.tsx
+++ b/frontend/src/components/Action/EditForm/ActionEditForm.tsx
@@ -28,6 +28,7 @@ interface Props {
     isClosingRemarkSaved: boolean
     apiErrorClosingRemark: string
     apiErrorAction: string
+    disableEditAction: boolean
 }
 
 const ActionEditForm = ({
@@ -41,6 +42,7 @@ const ActionEditForm = ({
     createClosingRemark,
     apiErrorClosingRemark,
     apiErrorAction,
+    disableEditAction,
 }: Props) => {
     const [title, setTitle] = useState<string>((action && action.title) || '')
     const [titleValidity, setTitleValidity] = useState<Validity>('default')
@@ -60,6 +62,7 @@ const ActionEditForm = ({
         title: personDetails.name,
         key: personDetails.azureUniqueId,
         isSelected: personDetails.azureUniqueId === assignedToId,
+        isDisabled: disableEditAction
     }))
 
     const createdDateString = new Date(action.createDate).toLocaleDateString()
@@ -177,6 +180,7 @@ const ActionEditForm = ({
                         variant={titleValidity}
                         helperText={titleValidity === 'error' ? 'required' : ''}
                         helperIcon={titleValidity === 'error' ? ErrorIcon : <></>}
+                        disabled={disableEditAction}
                     />
                 </Grid>
                 <Grid item xs={5}>
@@ -193,6 +197,7 @@ const ActionEditForm = ({
                         label="Due date"
                         onChange={newDate => setDueDate(newDate !== null ? newDate : new Date())}
                         selectedDate={dueDate}
+                        disabled={disableEditAction}
                     />
                 </Grid>
                 <Grid item xs={3}>
@@ -220,6 +225,7 @@ const ActionEditForm = ({
                         onSelect={option => {
                             setPriority(option.key as Priority)
                         }}
+                        disabled={disableEditAction}
                     />
                 </Grid>
                 <Grid item xs={12}>
@@ -239,6 +245,7 @@ const ActionEditForm = ({
                         }}
                         variant="default"
                         style={{ height: 150 }}
+                        disabled={disableEditAction}
                     />
                 </Grid>
                 {!completed && (
@@ -249,7 +256,7 @@ const ActionEditForm = ({
                                 setCompleteActionViewOpen(true)
                                 setCompletingReason('')
                             }}
-                            disabled={completeActionViewOpen}
+                            disabled={completeActionViewOpen || disableEditAction}
                             data-testid="complete_action_button"
                         >
                             Complete action
diff --git a/frontend/src/components/Action/EditForm/ActionEditSidebar.tsx b/frontend/src/components/Action/EditForm/ActionEditSidebar.tsx
index 54d82fbe..98b380d0 100644
--- a/frontend/src/components/Action/EditForm/ActionEditSidebar.tsx
+++ b/frontend/src/components/Action/EditForm/ActionEditSidebar.tsx
@@ -10,6 +10,8 @@ import { SavingState } from '../../../utils/Variables'
 import { useAllPersonDetailsAsync, useEffectNotOnMount } from '../../../utils/hooks'
 import NotesAndClosingRemarksList from './NotesAndClosingRemarksList'
 import NoteCreateForm from './NoteCreateForm'
+import { useParticipant } from '../../../globals/contexts'
+import { participantCanEditAction } from '../../../utils/RoleBasedAccess'
 
 const WRITE_DELAY_MS = 1000
 
@@ -57,6 +59,8 @@ const ActionEditSidebar = ({
     const [delayedAction, setDelayedAction] = useState<Action | undefined>(undefined)
     const notesAndClosingRemarks: (Note | ClosingRemark)[] = action.notes.map(note => note)
 
+    const participant = useParticipant()
+
     if (action.closingRemarks !== undefined) {
         action.closingRemarks.forEach(closingRemark => {
             notesAndClosingRemarks.push(closingRemark)
@@ -138,6 +142,7 @@ const ActionEditSidebar = ({
                         isClosingRemarkSaved={isClosingRemarkSaved}
                         apiErrorClosingRemark={apiErrorClosingRemark}
                         apiErrorAction={apiErrorAction}
+                        disableEditAction={!participantCanEditAction(participant)}
                     />
                     {apiErrorAction && (
                         <div style={{ marginTop: 20 }}>
@@ -149,7 +154,12 @@ const ActionEditSidebar = ({
                             <TextArea value={apiErrorNote} onChange={() => {}} />
                         </div>
                     )}
-                    <NoteCreateForm text={note} onChange={onChangeNote} onCreateClick={onCreateNote} disabled={isNoteSaving} />
+                    <NoteCreateForm
+                        text={note}
+                        onChange={onChangeNote}
+                        onCreateClick={onCreateNote}
+                        disabled={isNoteSaving || !participantCanEditAction(participant)}
+                    />
                     <NotesAndClosingRemarksList notesAndClosingRemarks={notesAndClosingRemarks} participantsDetails={personDetailsList} />
                 </div>
             )}
diff --git a/frontend/src/components/Action/QuestionActionsList.tsx b/frontend/src/components/Action/QuestionActionsList.tsx
index a253216a..1f212e42 100644
--- a/frontend/src/components/Action/QuestionActionsList.tsx
+++ b/frontend/src/components/Action/QuestionActionsList.tsx
@@ -11,6 +11,8 @@ import PriorityIndicator from './PriorityIndicator'
 import ActionEditSidebarWithApi from './EditForm/ActionEditSidebarWithApi'
 import ActionCreateSidebarWithApi from './CreateForm/ActionCreateSidebarWithApi'
 import ConfirmationDialog from './../ConfirmationDialog'
+import { useParticipant } from '../../globals/contexts'
+import { participantCanCreateAction, participantCanDeleteAction } from '../../utils/RoleBasedAccess'
 
 interface Props {
     question: Question
@@ -26,6 +28,7 @@ const QuestionActionsList = ({ question, participants, deleteAction, errorDeleti
     const [actionIdToEdit, setActionIdToEdit] = useState<string | undefined>()
     const [actionToDelete, setActionToDelete] = useState<string | undefined>()
     const actions = [...question.actions]
+    const participant = useParticipant()
 
     const openActionEditSidebar = (action: Action) => {
         setIsEditSidebarOpen(true)
@@ -47,12 +50,12 @@ const QuestionActionsList = ({ question, participants, deleteAction, errorDeleti
                             Actions
                         </Typography>
                     </Box>
-                    <Box>
+                    {participantCanCreateAction(participant) && <Box>
                         <Button variant="ghost" onClick={() => setIsCreateSidebarOpen(true)}>
                             <Icon data={add}></Icon>
                             Add action
                         </Button>
-                    </Box>
+                    </Box>}
                 </Box>
                 {actions
                     .sort((a1, a2) => {
@@ -90,7 +93,7 @@ const QuestionActionsList = ({ question, participants, deleteAction, errorDeleti
                                             </Box>
                                         )}
                                     </Box>
-                                    <IconButton
+                                    {participantCanDeleteAction(participant) && <IconButton
                                         data-testid={`delete_action_button_${action.id}`}
                                         onClick={() => {
                                             setIsConfirmDeleteDialogOpen(true)
@@ -98,7 +101,7 @@ const QuestionActionsList = ({ question, participants, deleteAction, errorDeleti
                                         }}
                                     >
                                         <DeleteIcon />
-                                    </IconButton>
+                                    </IconButton>}
                                 </Box>
                             </div>
                         )
diff --git a/frontend/src/components/QuestionItem.tsx b/frontend/src/components/QuestionItem.tsx
index ccfe9ddf..8c8c7c21 100644
--- a/frontend/src/components/QuestionItem.tsx
+++ b/frontend/src/components/QuestionItem.tsx
@@ -17,14 +17,14 @@ interface Props {
 
 
 const QuestionItem = ({ question, viewProgression, disable, displayActions = false, onQuestionSummarySelected }: Props) => {
-    const { azureUniqueId } = useParticipant()
+    const participant = useParticipant()
 
     const useSharedAnswer = useSharedFacilitatorAnswer(viewProgression)
     const answer = findCorrectAnswer(
         question,
         viewProgression,
         useSharedAnswer,
-        azureUniqueId
+        participant
     )
 
     return (
diff --git a/frontend/src/components/QuestionsList.tsx b/frontend/src/components/QuestionsList.tsx
index bba945d7..9e2cc659 100644
--- a/frontend/src/components/QuestionsList.tsx
+++ b/frontend/src/components/QuestionsList.tsx
@@ -17,14 +17,14 @@ type Props = {
 }
 
 const QuestionsList = ({ questions, viewProgression, disable, displayActions, onQuestionSummarySelected, severityFilter, organizationFilter }: Props) => {
-    const { azureUniqueId: currentUserAzureUniqueId } = useParticipant()
+    const participant = useParticipant()
 
     const severityFilteredQuestions = severityFilter !== undefined
         ? questions.filter(q =>
             hasSeverity(
                 q,
                 severityFilter,
-                currentUserAzureUniqueId,
+                participant,
                 viewProgression
             )
         )
diff --git a/frontend/src/components/helpers.ts b/frontend/src/components/helpers.ts
index e50a02de..b9b390d3 100644
--- a/frontend/src/components/helpers.ts
+++ b/frontend/src/components/helpers.ts
@@ -1,14 +1,17 @@
 import { Context } from '@equinor/fusion'
-import { Question, Progression, Role, Severity } from '../api/models'
+import { Question, Progression, Role, Severity, Participant } from '../api/models'
 import { SeverityCount } from '../utils/Severity'
 
-export const findCorrectAnswer = (question: Question, viewProgression: Progression, useFacilitatorAnswer: boolean, userId: string) => {
+export const findCorrectAnswer = (question: Question, viewProgression: Progression, useFacilitatorAnswer: boolean, participant: Participant | undefined) => {
     const answers = question.answers.filter(a => a.progression === viewProgression)
+    if (!participant) {
+        return undefined
+    }
 
     if (useFacilitatorAnswer) {
         return answers.find(a => a.answeredBy?.role === Role.Facilitator)
     } else {
-        return answers.find(a => a.answeredBy?.azureUniqueId === userId)
+        return answers.find(a => a.answeredBy?.azureUniqueId === participant.azureUniqueId)
     }
 }
 
diff --git a/frontend/src/globals/contexts.ts b/frontend/src/globals/contexts.ts
index 9f66f2eb..27e831f5 100644
--- a/frontend/src/globals/contexts.ts
+++ b/frontend/src/globals/contexts.ts
@@ -6,11 +6,8 @@ export const CurrentParticipantContext = createContext<Participant | undefined>(
 export const EvaluationContext = createContext<Evaluation | undefined>(undefined)
 export const ProjectContext = createContext<Project | undefined>(undefined)
 
-export const useParticipant = (): Participant => {
+export const useParticipant = (): Participant | undefined => {
     const participant = useContext(CurrentParticipantContext)
-    if (participant === undefined) {
-        throw new Error(`You might not be a participant on this evaluation. No participant provided for context. `)
-    }
     return participant
 }
 
diff --git a/frontend/src/utils/QuestionAndAnswerUtils.ts b/frontend/src/utils/QuestionAndAnswerUtils.ts
index 5f500e2a..370b71d0 100644
--- a/frontend/src/utils/QuestionAndAnswerUtils.ts
+++ b/frontend/src/utils/QuestionAndAnswerUtils.ts
@@ -1,4 +1,4 @@
-import { Answer, Organization, Progression, Question, Severity } from '../api/models'
+import { Answer, Organization, Participant, Progression, Question, Severity } from '../api/models'
 import { findCorrectAnswer, useSharedFacilitatorAnswer } from '../components/helpers'
 
 export const checkIfAnswerFilled = (answer: Answer): boolean => {
@@ -16,12 +16,12 @@ export const getFilledUserAnswersForProgression = (questions: Question[], progre
     return participantAnswers.filter(a => checkIfAnswerFilled(a))
 }
 
-export const hasSeverity = (question: Question, severityFilter: Severity[], AzureUniqueId: string, viewProgression: Progression) => {
+export const hasSeverity = (question: Question, severityFilter: Severity[], participant: Participant | undefined, viewProgression: Progression) => {
     if (severityFilter.length === 0) {
         return true
     } else {
         const useSharedAnswer = useSharedFacilitatorAnswer(viewProgression)
-        const answer = findCorrectAnswer(question, viewProgression, useSharedAnswer, AzureUniqueId)
+        const answer = findCorrectAnswer(question, viewProgression, useSharedAnswer, participant)
         const severity = (answer && answer.severity) || Severity.Na
         return severityFilter.includes(severity)
     }
diff --git a/frontend/src/utils/RoleBasedAccess.ts b/frontend/src/utils/RoleBasedAccess.ts
index 2ac50a88..bb96cc13 100644
--- a/frontend/src/utils/RoleBasedAccess.ts
+++ b/frontend/src/utils/RoleBasedAccess.ts
@@ -7,7 +7,10 @@ import {Answer, Participant, Progression, Role} from "../api/models"
  * Participants and ReadOnly are not allowed to read other peoples _Individual_
  * answers.
  */
-export const participantCanReadAnswer = (participant: Participant, answer: Answer) => {
+export const participantCanReadAnswer = (participant: Participant | undefined, answer: Answer) => {
+    if (!participant) {
+        return false
+    }
     switch (participant.role) {
         case Role.Facilitator: // Intentional fall-through
         case Role.OrganizationLead:
@@ -25,15 +28,18 @@ export const participantCanReadAnswer = (participant: Participant, answer: Answe
 
 
 /* Role-based rule for adding another Participant to the Evaluation */
-export const participantCanAddParticipant = (participantRole: Role) => {
+export const participantCanAddParticipant = (participant: Participant | undefined) => {
     /* Currently this share the same access as for deleting Participants */
-    return participantCanDeleteParticipant(participantRole)
+    return participantCanDeleteParticipant(participant)
 }
 
 
 /* Role-based rule for deleting another Participant from the Evaluation */
-export const participantCanDeleteParticipant = (participantRole: Role) => {
-    switch (participantRole) {
+export const participantCanDeleteParticipant = (participant: Participant | undefined) => {
+    if (!participant) {
+        return false
+    }
+    switch (participant.role) {
         case Role.Facilitator: // Intentional fall-through
         case Role.OrganizationLead:
             return true
@@ -47,8 +53,163 @@ export const participantCanDeleteParticipant = (participantRole: Role) => {
 
 
 /* Role-based rule for progressing an Evaluation */
-export const participantCanProgressEvaluation = (participantRole: Role) => {
-    switch (participantRole) {
+export const participantCanProgressEvaluation = (participant: Participant | undefined) => {
+    if (!participant) {
+        return false
+    }
+    switch (participant.role) {
+        case Role.Facilitator:
+            return true
+        case Role.OrganizationLead:
+        case Role.Participant: // Intentional fall-through
+        case Role.ReadOnly:
+            return false
+        default:
+            return false
+    }
+}
+
+/* Role-based rule for creating an action */
+export const participantCanCreateAction = (participant: Participant | undefined) => {
+    if (!participant) {
+        return false
+    }
+    switch (participant.role) {
+        case Role.Facilitator:
+        case Role.OrganizationLead:
+        case Role.Participant: // Intentional fall-through
+            return true
+        case Role.ReadOnly:
+            return false
+        default:
+            return false
+    }
+}
+
+/* Role-based rule for editing an action */
+export const participantCanEditAction = (participant: Participant | undefined) => {
+    if (!participant) {
+        return false
+    }
+    switch (participant.role) {
+        case Role.Facilitator:
+        case Role.OrganizationLead:
+        case Role.Participant: // Intentional fall-through
+            return true
+        case Role.ReadOnly:
+            return false
+        default:
+            return false
+    }
+}
+
+/* Role-based rule for deleting an action */
+export const participantCanDeleteAction = (participant: Participant | undefined) => {
+    if (!participant) {
+        return false
+    }
+    switch (participant.role) {
+        case Role.Facilitator:
+        case Role.OrganizationLead:
+        case Role.Participant: // Intentional fall-through
+            return true
+        case Role.ReadOnly:
+            return false
+        default:
+            return false
+    }
+}
+
+/* Role-based rule for access to the workshop summary */
+export const participantCanViewWorkshopSummary = (participant: Participant | undefined) => {
+    if (!participant) {
+        return true
+    }
+    switch (participant.role) {
+        case Role.Facilitator:
+        case Role.OrganizationLead:
+        case Role.Participant: // Intentional fall-through
+        case Role.ReadOnly:
+            return true
+        default:
+            return false
+    }
+}
+
+/* Role-based rule for editing the workshop summary */
+export const participantCanEditWorkshopSummary = (participant: Participant | undefined) => {
+    if (!participant) {
+        return false
+    }
+    switch (participant.role) {
+        case Role.Facilitator:
+            return true
+        case Role.OrganizationLead:
+        case Role.Participant: // Intentional fall-through
+        case Role.ReadOnly:
+            return false
+        default:
+            return false
+    }
+}
+
+/* Role-based rule for input to Individual */
+export const participantCanInputIndividual = (participant: Participant | undefined) => {
+    if (!participant) {
+        return false
+    }
+    switch (participant.role) {
+        case Role.Facilitator:
+        case Role.OrganizationLead:
+        case Role.Participant: // Intentional fall-through
+            return true
+        case Role.ReadOnly:
+            return false
+        default:
+            return false
+    }
+}
+
+/* Role-based rule for input to Preparation */
+export const participantCanInputPreparation = (participant: Participant | undefined) => {
+    if (!participant) {
+        return false
+    }
+    switch (participant.role) {
+        case Role.Facilitator:
+        case Role.OrganizationLead:
+            return true
+        case Role.Participant: // Intentional fall-through
+        case Role.ReadOnly:
+            return false
+        default:
+            return false
+    }
+}
+
+/* Role-based rule for input to Workshop */
+export const participantCanInputWorkshop = (participant: Participant | undefined) => {
+    if (!participant) {
+        return false
+    }
+    switch (participant.role) {
+        case Role.Facilitator:
+            return true
+        case Role.OrganizationLead:
+        case Role.Participant: // Intentional fall-through
+        case Role.ReadOnly:
+            return false
+        default:
+            return false
+    }
+}
+
+/* Role-based rule for input to FollowUp */
+export const participantCanInputFollowUp = (participant: Participant | undefined) => {
+    if (!participant) {
+        return false
+    }
+    switch (participant.role) {
         case Role.Facilitator:
             return true
         case Role.OrganizationLead:
diff --git a/frontend/src/utils/disableComponents.ts b/frontend/src/utils/disableComponents.ts
new file mode 100644
index 00000000..204626ed
--- /dev/null
+++ b/frontend/src/utils/disableComponents.ts
@@ -0,0 +1,55 @@
+import { Evaluation, Participant, Progression, Role } from "../api/models"
+import { participantCanInputFollowUp, participantCanInputIndividual, participantCanInputPreparation, participantCanInputWorkshop, participantCanProgressEvaluation } from "./RoleBasedAccess"
+
+ export const disableProgression = (evaluation: Evaluation, participant: Participant | undefined, viewProgression: Progression) => {
+    if (evaluation.progression !== viewProgression) {
+        return true
+    }
+    return !participantCanProgressEvaluation(participant)
+}
+
+export const disableCompleteSwitch = (participant: Participant | undefined, evaluation: Evaluation, viewProgression: Progression) => {
+    if (!participant) {
+        return true
+    }
+    if (evaluation.progression !== viewProgression || participant.progression !== viewProgression) {
+        return true
+    }
+    switch (viewProgression) {
+        case Progression.Individual:
+            return !participantCanInputIndividual(participant)
+        case Progression.Preparation:
+            return !participantCanInputPreparation(participant)
+        case Progression.Workshop:
+            return !participantCanInputWorkshop(participant)
+        default:
+            return true
+    }
+}
+
+export const disableAnswer = (participant: Participant | undefined, evaluation: Evaluation, viewProgression: Progression) => {
+    if (!participant) {
+        return true
+    }
+    if (evaluation.progression !== viewProgression || participant.progression !== viewProgression) {
+        /* In Individual and Workshop, only facilitators can answer questions
+         if the evaluation or the participant is not on the current progression */
+        if (viewProgression === Progression.Individual || viewProgression === Progression.Workshop) {
+            return participant.role !== Role.Facilitator
+        }
+        return true
+    }
+    switch (viewProgression) {
+        case Progression.Individual:
+            return !participantCanInputIndividual(participant)
+        case Progression.Preparation:
+            return !participantCanInputPreparation(participant)
+        case Progression.Workshop:
+            return !participantCanInputWorkshop(participant)
+        case Progression.FollowUp:
+            return !participantCanInputFollowUp(participant)
+        default:
+            return true
+    }
+    
+}
diff --git a/frontend/src/views/Evaluation/EvaluationView.tsx b/frontend/src/views/Evaluation/EvaluationView.tsx
index 9d16a18d..ab898c32 100644
--- a/frontend/src/views/Evaluation/EvaluationView.tsx
+++ b/frontend/src/views/Evaluation/EvaluationView.tsx
@@ -66,7 +66,6 @@ const EvaluationView = ({ evaluation, onProgressEvaluationClick, onProgressParti
                     stepKey={Progression.Workshop}
                 >
                     <WorkshopTabs
-                        allowedRoles={[Role.Facilitator]}
                         evaluation={evaluation}
                     >
                         <WorkshopView
diff --git a/frontend/src/views/Evaluation/FollowUp/FollowUpView.tsx b/frontend/src/views/Evaluation/FollowUp/FollowUpView.tsx
index 3ebca57b..cfbf30ae 100644
--- a/frontend/src/views/Evaluation/FollowUp/FollowUpView.tsx
+++ b/frontend/src/views/Evaluation/FollowUp/FollowUpView.tsx
@@ -3,11 +3,10 @@ import React from 'react'
 import { Box } from '@material-ui/core'
 import { Typography } from '@equinor/eds-core-react'
 
-import { Barrier, Evaluation, Question, Progression, Role, Severity, Organization } from '../../../api/models'
+import { Barrier, Evaluation, Question, Progression, Severity, Organization } from '../../../api/models'
 import AnswerSummarySidebar from '../../../components/AnswerSummarySidebar'
 import { barrierToString } from '../../../utils/EnumToString'
 import { useParticipant } from '../../../globals/contexts'
-import { progressionLessThan } from '../../../utils/ProgressionStatus'
 import SeveritySummary from '../../../components/SeveritySummary'
 import QuestionProgressionFollowUpSidebar from './QuestionProgressionFollowUpSidebar'
 import { countSeverities } from '../../../utils/Severity'
@@ -15,11 +14,8 @@ import QuestionsList from '../../../components/QuestionsList'
 import { useFilter } from '../../../utils/hooks'
 import OrganizationFilter from '../../../components/OrganizationFilter'
 import { getBarrierAnswers, onScroll } from '../../helpers'
-import {
-    hasSeverity,
-    hasOrganization,
-    toggleFilter
-} from '../../../utils/QuestionAndAnswerUtils'
+import { hasSeverity, hasOrganization, toggleFilter } from '../../../utils/QuestionAndAnswerUtils'
+import { disableAnswer } from '../../../utils/disableComponents'
 
 const TOP_POSITION_SCROLL_WINDOW = 200
 
@@ -46,15 +42,7 @@ const FollowUpView = ({ evaluation }: FollowUpViewProps) => {
         setSelectedQuestion(question)
     }
 
-    const { role: participantRole, progression: participantProgression, azureUniqueId: participantUniqueId } = useParticipant()
-    const allowedRoles = [Role.Facilitator]
-
-    const isEvaluationAtThisProgression = evaluation.progression == viewProgression
-    const participantAllowed = allowedRoles.includes(participantRole)
-    const isParticipantCompleted = progressionLessThan(viewProgression, participantProgression)
-    const isEvaluationFinishedHere = progressionLessThan(viewProgression, evaluation.progression)
-
-    const disableAllUserInput = isEvaluationFinishedHere || !participantAllowed || !isEvaluationAtThisProgression
+    const participant = useParticipant()
 
     const closeAnswerSummarySidebar = () => {
         setSelectedQuestion(undefined)
@@ -77,17 +65,11 @@ const FollowUpView = ({ evaluation }: FollowUpViewProps) => {
         }
     }
 
-    const filterAndSortQuestions = (
-        organizations: Organization[],
-        severities: Severity[]
-    ) => {
-        return barrierQuestions.filter(q => hasSeverity(q,
-                severities,
-                participantUniqueId,
-                viewProgression
-            )
-        ).filter(q => hasOrganization(q, organizations)
-        ).sort((q1, q2) => q1.order - q2.order)
+    const filterAndSortQuestions = (organizations: Organization[], severities: Severity[]) => {
+        return barrierQuestions
+            .filter(q => hasSeverity(q, severities, participant, viewProgression))
+            .filter(q => hasOrganization(q, organizations))
+            .sort((q1, q2) => q1.order - q2.order)
     }
 
     const onSeverityFilterChange = (sev: Severity) => {
@@ -148,7 +130,7 @@ const FollowUpView = ({ evaluation }: FollowUpViewProps) => {
                         organizationFilter={organizationFilter}
                         questions={barrierQuestions}
                         viewProgression={viewProgression}
-                        disable={disableAllUserInput || isParticipantCompleted}
+                        disable={disableAnswer(participant, evaluation, viewProgression)}
                         onQuestionSummarySelected={onQuestionSummarySelected}
                     />
                 </Box>
diff --git a/frontend/src/views/Evaluation/Individual/IndividualView.tsx b/frontend/src/views/Evaluation/Individual/IndividualView.tsx
index 9d495b0e..d25603d3 100644
--- a/frontend/src/views/Evaluation/Individual/IndividualView.tsx
+++ b/frontend/src/views/Evaluation/Individual/IndividualView.tsx
@@ -3,15 +3,16 @@ import React from 'react'
 import { Box } from '@material-ui/core'
 import { Button, Typography } from '@equinor/eds-core-react'
 
-import { Barrier, Evaluation, Organization, Progression, Role } from '../../../api/models'
+import { Barrier, Evaluation, Organization, Progression } from '../../../api/models'
 import EvaluationSidebar from '../EvaluationSidebar'
 import { barrierToString, progressionToString } from '../../../utils/EnumToString'
 import ProgressionCompleteSwitch from '../../../components/ProgressionCompleteSwitch'
-import { getNextProgression, progressionGreaterThanOrEqual, progressionLessThan } from '../../../utils/ProgressionStatus'
+import { getNextProgression, progressionLessThan } from '../../../utils/ProgressionStatus'
 import { useParticipant } from '../../../globals/contexts'
 import QuestionsList from '../../../components/QuestionsList'
 import { useFilter } from '../../../utils/hooks'
 import OrganizationFilter from '../../../components/OrganizationFilter'
+import { disableAnswer, disableCompleteSwitch, disableProgression } from '../../../utils/disableComponents'
 
 interface IndividualViewProps {
     evaluation: Evaluation
@@ -27,21 +28,12 @@ const IndividualView = ({ evaluation, onNextStepClick, onProgressParticipant }:
     const questions = evaluation.questions
     const barrierQuestions = questions.filter(q => q.barrier === selectedBarrier)
 
-    const { role: participantRole, progression: participantProgression, azureUniqueId: participantUniqueId } = useParticipant()
-
     const viewProgression = Progression.Individual
-    const allowedRoles = Object.values(Role)
-
-    const isEvaluationAtThisProgression = evaluation.progression == viewProgression
-    const participantAllowed = allowedRoles.includes(participantRole)
-    const isParticipantCompleted = progressionLessThan(viewProgression, participantProgression)
-    const isEvaluationFinishedHere = progressionLessThan(viewProgression, evaluation.progression)
-    const hasParticipantBeenHere = progressionGreaterThanOrEqual(participantProgression, viewProgression)
-
-    const disableAllUserInput = isEvaluationFinishedHere || !participantAllowed || !hasParticipantBeenHere
-
+    const participant = useParticipant()
+    const isParticipantCompleted = participant ? progressionLessThan(viewProgression, participant.progression) : false
+ 
     const localOnClompleteClick = () => {
-        const nextProgression = getNextProgression(participantProgression)
+        const nextProgression = getNextProgression(participant!.progression)
         onProgressParticipant(nextProgression)
     }
 
@@ -83,7 +75,7 @@ const IndividualView = ({ evaluation, onNextStepClick, onProgressParticipant }:
                         <Box mr={2}>
                             <ProgressionCompleteSwitch
                                 isCheckedInitially={isParticipantCompleted}
-                                disabled={disableAllUserInput}
+                                disabled={disableCompleteSwitch(participant, evaluation, viewProgression)}
                                 onCompleteClick={localOnClompleteClick}
                                 onUncompleteClick={localOnUncompleteClick}
                             />
@@ -91,7 +83,7 @@ const IndividualView = ({ evaluation, onNextStepClick, onProgressParticipant }:
                         <Box>
                             <Button
                                 onClick={onNextStepClick}
-                                disabled={participantRole !== Role.Facilitator || !isEvaluationAtThisProgression}
+                                disabled={disableProgression(evaluation, participant, viewProgression)}
                             >
                                 Finish {progressionToString(viewProgression)}
                             </Button>
@@ -101,7 +93,7 @@ const IndividualView = ({ evaluation, onNextStepClick, onProgressParticipant }:
                         questions={barrierQuestions}
                         organizationFilter={organizationFilter}
                         viewProgression={viewProgression}
-                        disable={(disableAllUserInput || isParticipantCompleted) && participantRole !== Role.Facilitator}
+                        disable={disableAnswer(participant, evaluation, viewProgression)}
                     />
                 </Box>
             </Box>
diff --git a/frontend/src/views/Evaluation/Nomination/NominationTable.tsx b/frontend/src/views/Evaluation/Nomination/NominationTable.tsx
index 897575dd..5f21b1fd 100644
--- a/frontend/src/views/Evaluation/Nomination/NominationTable.tsx
+++ b/frontend/src/views/Evaluation/Nomination/NominationTable.tsx
@@ -97,11 +97,7 @@ const disableDelete = (evaluation: Evaluation, azureUniqueId: string) => {
 
     const loggedInUser = evaluation.participants.find(p => p.azureUniqueId === azureUniqueId)
 
-    if (!loggedInUser) {
-        return true
-    }
-
-    return !participantCanDeleteParticipant(loggedInUser.role)
+    return !participantCanDeleteParticipant(loggedInUser)
 }
 
 interface NominationTableProps {
diff --git a/frontend/src/views/Evaluation/Nomination/NominationView.tsx b/frontend/src/views/Evaluation/Nomination/NominationView.tsx
index 9346a6bc..470277bd 100644
--- a/frontend/src/views/Evaluation/Nomination/NominationView.tsx
+++ b/frontend/src/views/Evaluation/Nomination/NominationView.tsx
@@ -7,61 +7,23 @@ import { Button, TextArea } from '@equinor/fusion-components'
 import AddNomineeDialog from './AddNomineeDialog'
 import { Evaluation, Organization, Participant, Progression, Role } from '../../../api/models'
 import NominationTable from './NominationTable'
-import { participantCanProgressEvaluation, participantCanAddParticipant } from '../../../utils/RoleBasedAccess'
-import { useAzureUniqueId } from '../../../utils/Variables'
+import { participantCanAddParticipant } from '../../../utils/RoleBasedAccess'
 import { apiErrorMessage } from '../../../api/error'
 import { PARTICIPANT_FIELDS_FRAGMENT } from '../../../api/fragments'
+import { useParticipant } from '../../../globals/contexts'
+import { disableProgression } from '../../../utils/disableComponents'
 
 interface NominationViewProps {
     evaluation: Evaluation
     onNextStep: () => void
 }
 
-/** Who (Role) can progress Evaluation past Nomination, and when
- *
- * Who:
- *  Facilitators and OrganizationLeads
- *
- * When:
- *  Evaluation is at Nomination stage
- */
-const disableProgression = (evaluation: Evaluation, azureUniqueId: string) => {
-    if (evaluation.progression !== Progression.Nomination) {
-        return true
-    }
-
-    const loggedInUser = evaluation.participants.find(p => p.azureUniqueId === azureUniqueId)
-
-    if (!loggedInUser) {
-        return true
-    }
-
-    return !participantCanProgressEvaluation(loggedInUser.role)
-}
-
-/** Who (Role) can add add users, and when (Progression)
- *
- * Who:
- *  Facilitators and OrganizationLeads
- *
- * When:
- *  Any Progression
- */
-const disableAddParticipant = (evaluation: Evaluation, azureUniqueId: string) => {
-    const loggedInUser = evaluation.participants.find(p => p.azureUniqueId === azureUniqueId)
-
-    if (!loggedInUser) {
-        return true
-    }
-
-    return !participantCanAddParticipant(loggedInUser.role)
-}
-
 const NominationView = ({ evaluation, onNextStep }: NominationViewProps) => {
     const [panelOpen, setPanelOpen] = React.useState(false)
     const { createParticipant, error: errorMutation } = useCreateParticipantMutation()
     const { loading: loadingQuery, participants, error: errorQuery } = useParticipantsQuery(evaluation.id)
-    const azureUniqueId = useAzureUniqueId()
+    const participant = useParticipant()
+    const viewProgression = Progression.Nomination
 
     const onNextStepClick = () => {
         onNextStep()
@@ -98,7 +60,7 @@ const NominationView = ({ evaluation, onNextStep }: NominationViewProps) => {
                     <h2 data-testid="evaluation_title">{evaluation.name}</h2>
                 </Box>
                 <Box>
-                    <Button onClick={onNextStepClick} disabled={disableProgression(evaluation, azureUniqueId)}>
+                    <Button onClick={onNextStepClick} disabled={disableProgression(evaluation, participant, viewProgression)}>
                         Finish Nomination
                     </Button>
                 </Box>
@@ -108,7 +70,7 @@ const NominationView = ({ evaluation, onNextStep }: NominationViewProps) => {
                 onClick={() => {
                     setPanelOpen(true)
                 }}
-                disabled={disableAddParticipant(evaluation, azureUniqueId)}
+                disabled={!participantCanAddParticipant(participant)}
             >
                 Add Person
             </Button>
diff --git a/frontend/src/views/Evaluation/Preparation/PreparationView.tsx b/frontend/src/views/Evaluation/Preparation/PreparationView.tsx
index 58d54edf..5d86f7cc 100644
--- a/frontend/src/views/Evaluation/Preparation/PreparationView.tsx
+++ b/frontend/src/views/Evaluation/Preparation/PreparationView.tsx
@@ -3,24 +3,21 @@ import React from 'react'
 import { Box } from '@material-ui/core'
 import { Button, Typography } from '@equinor/eds-core-react'
 
-import { Barrier, Evaluation, Question, Progression, Role, Organization, Severity } from '../../../api/models'
+import { Barrier, Evaluation, Question, Progression, Organization, Severity } from '../../../api/models'
 import EvaluationSidebar from '../EvaluationSidebar'
 import AnswerSummarySidebar from '../../../components/AnswerSummarySidebar'
 import { barrierToString, progressionToString } from '../../../utils/EnumToString'
 import ProgressionCompleteSwitch from '../../../components/ProgressionCompleteSwitch'
 import { useParticipant } from '../../../globals/contexts'
-import { getNextProgression, progressionGreaterThanOrEqual, progressionLessThan } from '../../../utils/ProgressionStatus'
+import { getNextProgression, progressionLessThan } from '../../../utils/ProgressionStatus'
 import QuestionsList from '../../../components/QuestionsList'
 import { useFilter } from '../../../utils/hooks'
 import OrganizationFilter from '../../../components/OrganizationFilter'
 import { getBarrierAnswers, onScroll } from '../../helpers'
 import SeveritySummary from '../../../components/SeveritySummary'
 import { countSeverities } from '../../../utils/Severity'
-import {
-    hasSeverity,
-    hasOrganization,
-    toggleFilter
-} from '../../../utils/QuestionAndAnswerUtils'
+import { hasSeverity, hasOrganization, toggleFilter } from '../../../utils/QuestionAndAnswerUtils'
+import { disableAnswer, disableCompleteSwitch, disableProgression } from '../../../utils/disableComponents'
 
 const TOP_POSITION_SCROLL_WINDOW = 200
 
@@ -41,18 +38,9 @@ const PreparationView = ({ evaluation, onNextStepClick, onProgressParticipant }:
     const questions = evaluation.questions
     const barrierQuestions = questions.filter(q => q.barrier === selectedBarrier)
 
-    const { role: participantRole, progression: participantProgression, azureUniqueId: participantUniqueId } = useParticipant()
-
     const viewProgression = Progression.Preparation
-    const allowedRoles = [Role.Facilitator, Role.OrganizationLead]
-
-    const isEvaluationAtThisProgression = evaluation.progression == viewProgression
-    const participantAllowed = allowedRoles.includes(participantRole)
-    const isParticipantCompleted = progressionLessThan(viewProgression, participantProgression)
-    const isEvaluationFinishedHere = progressionLessThan(viewProgression, evaluation.progression)
-    const hasParticipantBeenHere = progressionGreaterThanOrEqual(participantProgression, viewProgression)
-
-    const disableAllUserInput = isEvaluationFinishedHere || !participantAllowed || !hasParticipantBeenHere
+    const participant = useParticipant()
+    const isParticipantCompleted = participant ? progressionLessThan(viewProgression, participant.progression) : false
 
     const onQuestionSummarySelected = (question: Question) => {
         if (selectedQuestion && question.id === selectedQuestion.id) {
@@ -63,7 +51,7 @@ const PreparationView = ({ evaluation, onNextStepClick, onProgressParticipant }:
     }
 
     const localOnClompleteClick = () => {
-        const nextProgression = getNextProgression(participantProgression)
+        const nextProgression = getNextProgression(participant!.progression)
         onProgressParticipant(nextProgression)
     }
 
@@ -92,17 +80,11 @@ const PreparationView = ({ evaluation, onNextStepClick, onProgressParticipant }:
         }
     }
 
-    const filterAndSortQuestions = (
-        organizations: Organization[],
-        severities: Severity[]
-    ) => {
-        return barrierQuestions.filter(q => hasSeverity(q,
-                severities,
-                participantUniqueId,
-                viewProgression
-            )
-        ).filter(q => hasOrganization(q, organizations)
-        ).sort((q1, q2) => q1.order - q2.order)
+    const filterAndSortQuestions = (organizations: Organization[], severities: Severity[]) => {
+        return barrierQuestions
+            .filter(q => hasSeverity(q, severities, participant, viewProgression))
+            .filter(q => hasOrganization(q, organizations))
+            .sort((q1, q2) => q1.order - q2.order)
     }
 
     const onSeverityFilterChange = (sev: Severity) => {
@@ -162,14 +144,14 @@ const PreparationView = ({ evaluation, onNextStepClick, onProgressParticipant }:
                             <Box flexDirection="row" mt={1}>
                                 <ProgressionCompleteSwitch
                                     isCheckedInitially={isParticipantCompleted}
-                                    disabled={disableAllUserInput}
+                                    disabled={disableCompleteSwitch(participant, evaluation, viewProgression)}
                                     onCompleteClick={localOnClompleteClick}
                                     onUncompleteClick={localOnUncompleteClick}
                                 />
                                 <Button
                                     style={{ marginLeft: '20px' }}
                                     onClick={onNextStepClick}
-                                    disabled={participantRole !== Role.Facilitator || !isEvaluationAtThisProgression}
+                                    disabled={disableProgression(evaluation, participant, viewProgression)}
                                 >
                                     {'Finish ' + progressionToString(viewProgression)}
                                 </Button>
@@ -181,7 +163,7 @@ const PreparationView = ({ evaluation, onNextStepClick, onProgressParticipant }:
                         severityFilter={severityFilter}
                         organizationFilter={organizationFilter}
                         viewProgression={viewProgression}
-                        disable={disableAllUserInput || isParticipantCompleted}
+                        disable={disableAnswer(participant, evaluation, viewProgression)}
                         onQuestionSummarySelected={onQuestionSummarySelected}
                     />
                 </Box>
diff --git a/frontend/src/views/Evaluation/Workshop/WorkshopSummary.tsx b/frontend/src/views/Evaluation/Workshop/WorkshopSummary.tsx
index 0a12e952..54c9ae58 100644
--- a/frontend/src/views/Evaluation/Workshop/WorkshopSummary.tsx
+++ b/frontend/src/views/Evaluation/Workshop/WorkshopSummary.tsx
@@ -1,31 +1,27 @@
 import AnswerMarkdownForm from '../../../components/QuestionAndAnswer/AnswerMarkdownForm'
 import { SavingState } from '../../../utils/Variables'
 import SaveIndicator from '../../../components/SaveIndicator'
-
+import Disabler from '../../../components/Disabler'
 
 interface WorkshopSummaryProps {
-    localSummary: string,
+    localSummary: string
     onChange: (value: string) => void
     savingState: SavingState
+    disable: boolean
 }
 
-const WorkshopSummary = ({
-    localSummary,
-    onChange,
-    savingState,
-}: WorkshopSummaryProps) => {
+const WorkshopSummary = ({ localSummary, onChange, savingState, disable }: WorkshopSummaryProps) => {
     return (
         <>
             <h3>Summary</h3>
-            <p>
-                As facilitator you can use this field to write up a summary of
-                the workshop.
-            </p>
-            <AnswerMarkdownForm
-                markdown={localSummary === '' ? ' ' : localSummary /*Fixes backspace error in markdown editor*/}
-                onMarkdownChange={onChange}
-                disabled={false}
-            />
+            <p>As facilitator you can use this field to write up a summary of the workshop.</p>
+            <Disabler disable={disable}>
+                <AnswerMarkdownForm
+                    markdown={localSummary === '' ? ' ' : localSummary /*Fixes backspace error in markdown editor*/}
+                    onMarkdownChange={onChange}
+                    disabled={false}
+                />
+            </Disabler>
             <SaveIndicator savingState={savingState} />
         </>
     )
diff --git a/frontend/src/views/Evaluation/Workshop/WorkshopSummaryWithApi.tsx b/frontend/src/views/Evaluation/Workshop/WorkshopSummaryWithApi.tsx
index 7b28b58b..f9506581 100644
--- a/frontend/src/views/Evaluation/Workshop/WorkshopSummaryWithApi.tsx
+++ b/frontend/src/views/Evaluation/Workshop/WorkshopSummaryWithApi.tsx
@@ -7,16 +7,14 @@ import { useEffectNotOnMount } from '../../../utils/hooks'
 import { SavingState } from '../../../utils/Variables'
 import WorkshopSummary from './WorkshopSummary'
 
-
 const WRITE_DELAY_MS = 1000
 
 interface WorkshopSummaryWithApiProps {
     evaluation: Evaluation
+    disable: boolean
 }
 
-const WorkshopSummaryWithApi = ({
-    evaluation
-}: React.PropsWithChildren<WorkshopSummaryWithApiProps>) => {
+const WorkshopSummaryWithApi = ({ evaluation, disable }: React.PropsWithChildren<WorkshopSummaryWithApiProps>) => {
     const [localSummary, setLocalSummary] = useState(evaluation.summary ?? '')
     const [savingState, setSavingState] = useState(SavingState.None)
     const { setSummary, loading, error } = useSummaryMutation()
@@ -56,13 +54,14 @@ const WorkshopSummaryWithApi = ({
     }
 
     return (
-        <>
-            <WorkshopSummary
-                localSummary={localSummary}
-                onChange={onChange}
-                savingState={savingState}
+        <div style={{ padding: '30px' }}>
+            <WorkshopSummary 
+                localSummary={localSummary} 
+                onChange={onChange} 
+                savingState={savingState} 
+                disable={disable} 
             />
-        </>
+        </div>
     )
 }
 
diff --git a/frontend/src/views/Evaluation/Workshop/WorkshopTabs.tsx b/frontend/src/views/Evaluation/Workshop/WorkshopTabs.tsx
index 8695b05b..28185326 100644
--- a/frontend/src/views/Evaluation/Workshop/WorkshopTabs.tsx
+++ b/frontend/src/views/Evaluation/Workshop/WorkshopTabs.tsx
@@ -5,19 +5,15 @@ import { Evaluation, Role } from '../../../api/models'
 import { useParticipant } from '../../../globals/contexts'
 import { StyledTabPanel } from '../../../components/StyledTabs'
 import WorkshopSummaryWithApi from './WorkshopSummaryWithApi'
+import { participantCanEditWorkshopSummary, participantCanViewWorkshopSummary } from '../../../utils/RoleBasedAccess'
 
 const { TabList, Tab, TabPanels } = Tabs
 
 interface WorkshopTabsProps {
     evaluation: Evaluation
-    allowedRoles: Role[]
 }
 
-const WorkshopTabs = ({
-    children,
-    allowedRoles,
-    evaluation,
-}: React.PropsWithChildren<WorkshopTabsProps>) => {
+const WorkshopTabs = ({ children, evaluation }: React.PropsWithChildren<WorkshopTabsProps>) => {
     const [activeTab, setActiveTab] = useState(0)
     const participant = useParticipant()
 
@@ -25,14 +21,12 @@ const WorkshopTabs = ({
         <Tabs activeTab={activeTab} onChange={setActiveTab}>
             <TabList>
                 <Tab>Questionaire</Tab>
-                <Tab>Workshop Summary</Tab>
+                <Tab disabled={!participantCanViewWorkshopSummary(participant)}>Workshop Summary</Tab>
             </TabList>
             <TabPanels>
                 <StyledTabPanel>{children}</StyledTabPanel>
                 <StyledTabPanel>
-                    {allowedRoles.includes(participant.role) && (
-                        <WorkshopSummaryWithApi evaluation={evaluation} />
-                    )}
+                    <WorkshopSummaryWithApi evaluation={evaluation} disable={!participantCanEditWorkshopSummary(participant)} />
                 </StyledTabPanel>
             </TabPanels>
         </Tabs>
diff --git a/frontend/src/views/Evaluation/Workshop/WorkshopView.tsx b/frontend/src/views/Evaluation/Workshop/WorkshopView.tsx
index d1fdd487..4fbbe688 100644
--- a/frontend/src/views/Evaluation/Workshop/WorkshopView.tsx
+++ b/frontend/src/views/Evaluation/Workshop/WorkshopView.tsx
@@ -2,24 +2,21 @@ import React from 'react'
 import { Box } from '@material-ui/core'
 import { Button, Typography } from '@equinor/eds-core-react'
 
-import { Barrier, Evaluation, Organization, Progression, Question, Role, Severity } from '../../../api/models'
+import { Barrier, Evaluation, Organization, Progression, Question, Severity } from '../../../api/models'
 import EvaluationSidebar from '../EvaluationSidebar'
 import AnswerSummarySidebar from '../../../components/AnswerSummarySidebar'
 import { barrierToString, progressionToString } from '../../../utils/EnumToString'
 import ProgressionCompleteSwitch from '../../../components/ProgressionCompleteSwitch'
 import { useParticipant } from '../../../globals/contexts'
-import { getNextProgression, progressionGreaterThanOrEqual, progressionLessThan } from '../../../utils/ProgressionStatus'
+import { getNextProgression, progressionLessThan } from '../../../utils/ProgressionStatus'
 import QuestionsList from '../../../components/QuestionsList'
 import { useFilter } from '../../../utils/hooks'
 import OrganizationFilter from '../../../components/OrganizationFilter'
 import { getBarrierAnswers, onScroll } from '../../helpers'
 import SeveritySummary from '../../../components/SeveritySummary'
 import { countSeverities } from '../../../utils/Severity'
-import {
-    hasSeverity,
-    hasOrganization,
-    toggleFilter
-} from '../../../utils/QuestionAndAnswerUtils'
+import { hasSeverity, hasOrganization, toggleFilter } from '../../../utils/QuestionAndAnswerUtils'
+import { disableAnswer, disableCompleteSwitch, disableProgression } from '../../../utils/disableComponents'
 
 const TOP_POSITION_SCROLL_WINDOW = 150
 
@@ -48,22 +45,12 @@ const WorkshopView = ({ evaluation, onNextStepClick, onProgressParticipant }: Wo
         setSelectedQuestion(question)
     }
 
-    const { role: participantRole, progression: participantProgression, azureUniqueId: participantUniqueId } = useParticipant()
-
     const viewProgression = Progression.Workshop
-    const allowedRoles = [Role.Facilitator]
-
-    const isEvaluationAtThisProgression = evaluation.progression == viewProgression
-    const participantAllowed = allowedRoles.includes(participantRole)
-    const isParticipantCompleted = progressionLessThan(viewProgression, participantProgression)
-    const isParticipantFacilitator = participantRole === Role.Facilitator
-    const isEvaluationFinishedHere = progressionLessThan(viewProgression, evaluation.progression)
-    const hasParticipantBeenHere = progressionGreaterThanOrEqual(participantProgression, viewProgression)
-
-    const disableAllUserInput = isEvaluationFinishedHere || !participantAllowed || !hasParticipantBeenHere
+    const participant = useParticipant()
+    const isParticipantCompleted = participant ? progressionLessThan(viewProgression, participant.progression) : false
 
     const localOnClompleteClick = () => {
-        const nextProgression = getNextProgression(participantProgression)
+        const nextProgression = getNextProgression(participant!.progression)
         onProgressParticipant(nextProgression)
     }
 
@@ -91,17 +78,11 @@ const WorkshopView = ({ evaluation, onNextStepClick, onProgressParticipant }: Wo
         }
     }
 
-    const filterAndSortQuestions = (
-        organizations: Organization[],
-        severities: Severity[]
-    ) => {
-        return barrierQuestions.filter(q => hasSeverity(q,
-                severities,
-                participantUniqueId,
-                viewProgression
-            )
-        ).filter(q => hasOrganization(q, organizations)
-        ).sort((q1, q2) => q1.order - q2.order)
+    const filterAndSortQuestions = (organizations: Organization[], severities: Severity[]) => {
+        return barrierQuestions
+            .filter(q => hasSeverity(q, severities, participant, viewProgression))
+            .filter(q => hasOrganization(q, organizations))
+            .sort((q1, q2) => q1.order - q2.order)
     }
 
     const onSeverityFilterChange = (sev: Severity) => {
@@ -161,14 +142,14 @@ const WorkshopView = ({ evaluation, onNextStepClick, onProgressParticipant }: Wo
                             <Box flexDirection="row" mt={1}>
                                 <ProgressionCompleteSwitch
                                     isCheckedInitially={isParticipantCompleted}
-                                    disabled={disableAllUserInput}
+                                    disabled={disableCompleteSwitch(participant, evaluation, viewProgression)}
                                     onCompleteClick={localOnClompleteClick}
                                     onUncompleteClick={localOnUncompleteClick}
                                 />
                                 <Button
                                     style={{ marginLeft: '20px' }}
                                     onClick={onNextStepClick}
-                                    disabled={participantRole !== Role.Facilitator || !isEvaluationAtThisProgression}
+                                    disabled={disableProgression(evaluation, participant, viewProgression)}
                                 >
                                     {'Finish ' + progressionToString(viewProgression)}
                                 </Button>
@@ -181,7 +162,7 @@ const WorkshopView = ({ evaluation, onNextStepClick, onProgressParticipant }: Wo
                         organizationFilter={organizationFilter}
                         questions={barrierQuestions}
                         viewProgression={viewProgression}
-                        disable={!isParticipantFacilitator && (disableAllUserInput || isParticipantCompleted)}
+                        disable={disableAnswer(participant, evaluation, viewProgression)}
                         onQuestionSummarySelected={onQuestionSummarySelected}
                     />
                 </Box>