Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 9 additions & 2 deletions ppr-ui/src/components/queue/QueueFooter.vue
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,14 @@ import { useAnalystQueueStore } from '@/store/analystQueue';
import { updateQueuedTransfer } from '@/utils/mhr-api-helper'
import type { QueueReviewUpdatePayloadIF } from '@/composables/analystQueue/interfaces'

const { queueTransfer, reviewId, isAssignable, isInReview, reviewDecision, validationErrors } = storeToRefs(useAnalystQueueStore())
const {
queueTransfer,
reviewId,
isAssignable,
isDecisionAllowed,
reviewDecision,
validationErrors
} = storeToRefs(useAnalystQueueStore())
const { validateReviewDecision } = useAnalystQueueStore()

const isAssigned = computed(() => {
Expand Down Expand Up @@ -90,7 +97,7 @@ const emit = defineEmits(['go-to-dash'])
</div>
<div class="lg:col-span-3 flex justify-end space-x-3">
<UButton
v-if="isInReview"
v-if="isDecisionAllowed"
color="primary"
size="md"
class="rounded-sm"
Expand Down
4 changes: 2 additions & 2 deletions ppr-ui/src/pages/mhrInformation/MhrQueueTransfer/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const {
} = storeToRefs(useStore())

const analystQueueStore = useAnalystQueueStore()
const { queueTransfer, reviewId, isInReview } = storeToRefs(analystQueueStore)
const { queueTransfer, reviewId, isDecisionAllowed } = storeToRefs(analystQueueStore)

const isLoading = ref(false)

Expand Down Expand Up @@ -108,7 +108,7 @@ onMounted(async () => {
<UploadedDocuments :document-list="queueTransfer?.documents" />
</section>

<section v-if="isInReview" class="my-9">
<section v-if="isDecisionAllowed" class="my-9">
<ReviewDecision />
</section>
</main>
Expand Down
13 changes: 11 additions & 2 deletions ppr-ui/src/store/analystQueue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import type {
import { queueTableColumns, ReviewStatusTypes } from "@/composables"
import { getQueuedTransfer, getReviews } from "@/utils/mhr-api-helper"
import { computed, ref } from 'vue'

import { useStore } from '@/store/store'

export const useAnalystQueueStore = defineStore('mhr/queue', () => {
// queueTable
Expand Down Expand Up @@ -132,6 +132,15 @@ const showClearFilterButton = computed(() => {
})
})

const isDecisionAllowed = computed(() => {
const assetsStore = useStore()
const userFirstName = assetsStore.getUserFirstName
const userLastName = assetsStore.getUserLastName
const userName = `${userFirstName} ${userLastName}`
const isUserAssignee = userName === queueTransfer.value?.assigneeName
return isUserAssignee && isInReview.value
})

// Allow assigning/unassigning while NEW or IN_REVIEW.
const isAssignable = computed(() => {
return [ReviewStatusTypes.NEW, ReviewStatusTypes.IN_REVIEW].includes(queueTransferStatus.value)
Expand All @@ -142,7 +151,6 @@ const isInReview = computed(() => {
return queueTransferStatus.value === ReviewStatusTypes.IN_REVIEW
})


const assignees = computed(() => {
const uniqueAssignees = new Set()

Expand Down Expand Up @@ -198,6 +206,7 @@ const assignees = computed(() => {


return {
isDecisionAllowed,
assignees,
queueTableData,
columnsToShow,
Expand Down