pkp/pkp-lib#10768 Get the View counts only for relevant roles, warnings for author/reviewer combined with editor

* pkp/pkp-lib#10768 Get the View counts only for relevant roles

* pkp/pkp-lib#10768 Add warning messages for author/reviewer combined with editor

Author: jardakotesovec

src/components/SideNav/SideNav.vue

@@ -50,8 +50,19 @@ const menuItems = ref(convertLinksToArray(props.links));
 
 const {apiUrl: dashboardCountUrl} = useUrl('_submissions/viewsCount');
 
-const {data: dashboardCount, fetch: fetchDashboardCount} =
-	useFetch(dashboardCountUrl);
+const {data: dashboardCount, fetch: fetchDashboardCount} = useFetch(
+	dashboardCountUrl,
+	{
+		query: {
+			assignedWithRoles: [
+				pkp.const.ROLE_ID_SITE_ADMIN,
+				pkp.const.ROLE_ID_MANAGER,
+				pkp.const.ROLE_ID_SUB_EDITOR,
+				pkp.const.ROLE_ID_ASSISTANT,
+			],
+		},
+	},
+);
 
 const dashboardsMenuItem = menuItems.value.find(
 	(item) => item.key === 'dashboards',
@@ -67,6 +78,7 @@ const {apiUrl: mySubmissionsCountUrl} = useUrl('_submissions/viewsCount');
 
 const {data: mySubmissionsCount, fetch: fetchMySubmissionsCount} = useFetch(
 	mySubmissionsCountUrl,
+	{query: {assignedWithRoles: [pkp.const.ROLE_ID_AUTHOR]}},
 );
 
 const mySubmissionsMenuItem = menuItems.value.find(
@@ -82,7 +94,9 @@ if (mySubmissionsMenuItem) {
 const {apiUrl: reviewAssignmentCountUrl} = useUrl('_submissions/viewsCount');
 
 const {data: reviewAssignmentCount, fetch: fetchReviewAssignmentCount} =
-	useFetch(reviewAssignmentCountUrl);
+	useFetch(reviewAssignmentCountUrl, {
+		query: {assignedWithRoles: [pkp.const.ROLE_ID_REVIEWER]},
+	});
 
 const reviewAssignmentMenuItem = menuItems.value.find(
 	(item) => item.key === 'reviewAssignments',
@@ -186,7 +200,6 @@ const {sideMenuProps} = useSideMenu(menuItemsEnriched, {
 watch(
 	() => props.links,
 	(newLinks) => {
-		console.log('SideNav watch');
 		menuItems.value = convertLinksToArray(newLinks);
 	},
 );

src/composables/useCurrentUser.js

@@ -50,10 +50,19 @@ export function useCurrentUser() {
 		return roles.some((role) => assignedRoleIds.includes(role));
 	}
 
+	function isCurrentUserAssignedAsReviewer(submission) {
+		const {getActiveReviewAssignments} = useSubmission();
+
+		return getActiveReviewAssignments(submission.reviewAssignments).some(
+			(reviewAssignment) => reviewAssignment.isCurrentUserAssigned,
+		);
+	}
+
 	return {
 		hasCurrentUserAtLeastOneRole,
 		getCurrentUserId,
 		hasCurrentUserAtLeastOneAssignedRoleInStage,
 		hasCurrentUserAtLeastOneAssignedRoleInAnyStage,
+		isCurrentUserAssignedAsReviewer,
 	};
 }

src/pages/dashboard/components/DashboardTable/DashboardCellSubmissionActions.vue

@@ -15,14 +15,51 @@
 import {defineProps, computed} from 'vue';
 import PkpButton from '@/components/Button/Button.vue';
 import TableCell from '@/components/Table/TableCell.vue';
-import {useDashboardPageStore} from '@/pages/dashboard/dashboardPageStore.js';
+import {useCurrentUser} from '@/composables/useCurrentUser';
+
+import {
+	DashboardPageTypes,
+	useDashboardPageStore,
+} from '@/pages/dashboard/dashboardPageStore.js';
+
+const {
+	hasCurrentUserAtLeastOneAssignedRoleInAnyStage,
+	isCurrentUserAssignedAsReviewer,
+} = useCurrentUser();
 
 const props = defineProps({
 	item: {type: Object, required: true},
 });
 
-const showButton = computed(() => !props.item.submissionProgress);
+const showButton = computed(() => {
+	if (props.item.submissionProgress) {
+		return false;
+	}
+
+	if (
+		dashboardPageStore.dashboardPage === DashboardPageTypes.EDITORIAL_DASHBOARD
+	) {
+		// Don't show View button, when being author/reviewer on editorial dashboard while not being explicitely assigned to editorial role
 
+		const isCurrentUserAssignedAsAuthorOrReviewer =
+			isCurrentUserAssignedAsReviewer(props.item) ||
+			hasCurrentUserAtLeastOneAssignedRoleInAnyStage(props.item, [
+				pkp.const.ROLE_ID_AUTHOR,
+			]);
+		if (
+			isCurrentUserAssignedAsAuthorOrReviewer &&
+			!hasCurrentUserAtLeastOneAssignedRoleInAnyStage(props.item, [
+				pkp.const.ROLE_ID_MANAGER,
+				pkp.const.ROLE_ID_SUB_EDITOR,
+				pkp.const.ROLE_ID_ASSISTANT,
+			])
+		) {
+			return false;
+		}
+	}
+
+	return true;
+});
 function handleAction() {
 	dashboardPageStore.openWorkflowModal(props.item.id);
 }

src/pages/dashboard/components/DashboardTable/DashboardCellSubmissionActivity/DashboardCellSubmissionActivityActionAlert.vue

@@ -1,5 +1,5 @@
 <template>
-	<div class="flex items-center gap-x-2">
+	<div class="flex max-w-sm items-center gap-x-2 break-words">
 		<div v-if="alert">{{ alert }}</div>
 		<PkpButton v-if="actionName" size-variant="compact" @click="handleAction">
 			{{ actionLabel }}

src/pages/dashboard/composables/useDashboardConfigEditorialActivity.js

@@ -2,6 +2,8 @@ import {
 	useSubmission,
 	CompletedReviewAssignmentStatuses,
 } from '@/composables/useSubmission.js';
+import {useCurrentUser} from '@/composables/useCurrentUser';
+
 import {useLocalize} from '@/composables/useLocalize';
 import {useDate} from '@/composables/useDate';
 import {Actions as ParticipantManagerActions} from '@/managers/ParticipantManager/useParticipantManagerActions';
@@ -20,6 +22,11 @@ const {
 	getStageLabel,
 } = useSubmission();
 
+const {
+	hasCurrentUserAtLeastOneAssignedRoleInAnyStage,
+	isCurrentUserAssignedAsReviewer,
+} = useCurrentUser();
+
 export function useDashboardConfigEditorialActivity() {
 	function getEditorialActivityForEditorialDashboard(submission) {
 		const activeStage = getActiveStage(submission);
@@ -51,6 +58,46 @@ export function useDashboardConfigEditorialActivity() {
 			];
 		}
 
+		// Warning that I am assigned as author, relevant if I am NOT assigned via any editorial role
+		if (
+			hasCurrentUserAtLeastOneAssignedRoleInAnyStage(submission, [
+				pkp.const.ROLE_ID_AUTHOR,
+			]) &&
+			!hasCurrentUserAtLeastOneAssignedRoleInAnyStage(submission, [
+				pkp.const.ROLE_ID_MANAGER,
+				pkp.const.ROLE_ID_SUB_EDITOR,
+				pkp.const.ROLE_ID_ASSISTANT,
+			])
+		) {
+			return [
+				{
+					component: 'DashboardCellSubmissionActivityActionAlert',
+					props: {
+						alert: t('dashboard.noAccessBeingAuthor'),
+					},
+				},
+			];
+		}
+
+		// Warning that I am assigned as author, relevant if I am NOT assigned via any editorial role
+		if (
+			isCurrentUserAssignedAsReviewer(submission) &&
+			!hasCurrentUserAtLeastOneAssignedRoleInAnyStage(submission, [
+				pkp.const.ROLE_ID_MANAGER,
+				pkp.const.ROLE_ID_SUB_EDITOR,
+				pkp.const.ROLE_ID_ASSISTANT,
+			])
+		) {
+			return [
+				{
+					component: 'DashboardCellSubmissionActivityActionAlert',
+					props: {
+						alert: t('dashboard.noAccessBeingReviewer'),
+					},
+				},
+			];
+		}
+
 		if (activeStage.id === pkp.const.WORKFLOW_STAGE_ID_SUBMISSION) {
 			if (!submission.editorAssigned) {
 				return [