Skip to content

Commit

Permalink
pkp/pkp-lib#10067 Rename dashboard cells for consistency, using Dashb…
Browse files Browse the repository at this point in the history
…oard prefix
  • Loading branch information
jardakotesovec committed Feb 24, 2025
1 parent a869848 commit b493cc4
Show file tree
Hide file tree
Showing 23 changed files with 98 additions and 95 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
<script setup>
import {defineProps, computed} from 'vue';
import TableCell from '@/components/Table/TableCell.vue';
import CellReviewAssignmentActivityAlert from './CellReviewAssignmentActivity/CellReviewAssignmentActivityAlert.vue';
import DashboardCellReviewAssignmentActivityAlert from './DashboardCellReviewAssignmentActivityAlert.vue';
import {useDashboardPageStore} from '@/pages/dashboard/dashboardPageStore';
const Components = {
CellReviewAssignmentActivityAlert,
DashboardCellReviewAssignmentActivityAlert,
};
const dashboardStore = useDashboardPageStore();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
</template>

<script setup>
import CellSubmissionActivityActionAlert from './CellSubmissionActivityActionAlert.vue';
import CellSubmissionActivityReviews from './CellSubmissionActivityReviews.vue';
import CellSubmissionActivityReviewsUpdate from './CellSubmissionActivityReviewsUpdate.vue';
import CellSubmissionActivityReviewsOpen from './CellSubmissionActivityReviewsOpen.vue';
import DashboardCellSubmissionActivityActionAlert from './DashboardCellSubmissionActivityActionAlert.vue';
import DashboardCellSubmissionActivityReviews from './DashboardCellSubmissionActivityReviews.vue';
import DashboardCellSubmissionActivityReviewsUpdate from './DashboardCellSubmissionActivityReviewsUpdate.vue';
import DashboardCellSubmissionActivityReviewsOpen from './DashboardCellSubmissionActivityReviewsOpen.vue';
import {defineProps, computed} from 'vue';
import TableCell from '@/components/Table/TableCell.vue';
Expand All @@ -26,10 +26,10 @@ import {
} from '@/pages/dashboard/dashboardPageStore';
const Components = {
CellSubmissionActivityActionAlert,
CellSubmissionActivityReviews,
CellSubmissionActivityReviewsUpdate,
CellSubmissionActivityReviewsOpen,
DashboardCellSubmissionActivityActionAlert,
DashboardCellSubmissionActivityReviews,
DashboardCellSubmissionActivityReviewsUpdate,
DashboardCellSubmissionActivityReviewsOpen,
};
const dashboardStore = useDashboardPageStore();
Expand All @@ -47,3 +47,4 @@ const cellConfig = computed(() => {
return [];
});
</script>
./DashboardDashboardCellSubmissionActivityActionAlert.vue./DashboardDashboardCellSubmissionActivityReviews.vue./DashboardDashboardCellSubmissionActivityReviewsOpen.vue./DashboardDashboardCellSubmissionActivityReviewsUpdate.vue
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<template>
<div v-if="reviewAssignments.length">
<span class="flex gap-x-1">
<CellSubmissionActivityReviewsItem
<DashboardCellSubmissionActivityReviewsItem
v-for="reviewAssignment in reviewAssignments"
:key="reviewAssignment.id"
:review-assignment="reviewAssignment"
@action="
(actionName, {reviewAssignment}) =>
handleAction(actionName, {reviewAssignment})
"
></CellSubmissionActivityReviewsItem>
></DashboardCellSubmissionActivityReviewsItem>
</span>
</div>
</template>
<script setup>
import {useDashboardPageStore} from '@/pages/dashboard/dashboardPageStore';
import CellSubmissionActivityReviewsItem from './CellSubmissionActivityReviewsItem.vue';
import DashboardCellSubmissionActivityReviewsItem from './DashboardCellSubmissionActivityReviewsItem.vue';
const props = defineProps({
submissionId: {type: Number, required: true},
Expand All @@ -31,3 +31,4 @@ function handleAction(actionName, {reviewAssignment}) {
});
}
</script>
./DashboardDashboardCellSubmissionActivityReviewsItem.vue
45 changes: 23 additions & 22 deletions src/pages/dashboard/components/DashboardTable/DashboardTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"
>
<TableRow v-for="item in items" :key="item.id">
<CellBulkDelete
<DashboardCellBulkDelete
v-if="dashboardStore.bulkDeleteSelectionEnabled"
:item="item"
/>
Expand All @@ -55,18 +55,18 @@ import TableHeader from '@/components/Table/TableHeader.vue';
import TableBody from '@/components/Table/TableBody.vue';
import TableRow from '@/components/Table/TableRow.vue';
import TablePagination from '@/components/Table/TablePagination.vue';
import CellBulkDelete from './CellBulkDelete.vue';
import CellSubmissionActions from './CellSubmissionActions.vue';
import CellSubmissionActivity from './CellSubmissionActivity/CellSubmissionActivity.vue';
import CellSubmissionDays from './CellSubmissionDays.vue';
import CellSubmissionId from './CellSubmissionId.vue';
import CellSubmissionStage from './CellSubmissionStage.vue';
import CellSubmissionTitle from './CellSubmissionTitle.vue';
import DashboardCellBulkDelete from './DashboardCellBulkDelete.vue';
import DashboardCellSubmissionActions from './DashboardCellSubmissionActions.vue';
import DashboardCellSubmissionActivity from './DashboardCellSubmissionActivity/DashboardCellSubmissionActivity.vue';
import DashboardCellSubmissionDays from './DashboardCellSubmissionDays.vue';
import DashboardCellSubmissionId from './DashboardCellSubmissionId.vue';
import DashboardCellSubmissionStage from './DashboardCellSubmissionStage.vue';
import DashboardCellSubmissionTitle from './DashboardCellSubmissionTitle.vue';
import CellReviewAssignmentId from './CellReviewAssignmentId.vue';
import CellReviewAssignmentTitle from './CellReviewAssignmentTitle.vue';
import CellReviewAssignmentActivity from './CellReviewAssignmentActivity.vue';
import CellReviewAssignmentActions from './CellReviewAssignmentActions.vue';
import DashboardCellReviewAssignmentId from './DashboardCellReviewAssignmentId.vue';
import DashboardCellReviewAssignmentTitle from './DashboardCellReviewAssignmentTitle.vue';
import DashboardCellReviewAssignmentActivity from './DashboardCellReviewAssignmentActivity/DashboardCellReviewAssignmentActivity.vue';
import DashboardCellReviewAssignmentActions from './DashboardCellReviewAssignmentActions.vue';
import {useDashboardPageStore} from '@/pages/dashboard/dashboardPageStore';
Expand All @@ -79,17 +79,18 @@ defineProps({
const emit = defineEmits(['setPage', 'sortColumn']);
const cellComponents = {
CellSubmissionActions,
CellSubmissionActivity,
CellSubmissionDays,
CellSubmissionId,
CellSubmissionStage,
CellSubmissionTitle,
CellReviewAssignmentId,
CellReviewAssignmentTitle,
CellReviewAssignmentActivity,
CellReviewAssignmentActions,
DashboardCellSubmissionActions,
DashboardCellSubmissionActivity,
DashboardCellSubmissionDays,
DashboardCellSubmissionId,
DashboardCellSubmissionStage,
DashboardCellSubmissionTitle,
DashboardCellReviewAssignmentId,
DashboardCellReviewAssignmentTitle,
DashboardCellReviewAssignmentActivity,
DashboardCellReviewAssignmentActions,
};
const dashboardStore = useDashboardPageStore();
</script>
./DashboardCellReviewAssignmentActivity/DashboardCellReviewAssignmentActivity.vue./DashboardDashboardCellBulkDelete.vue./DashboardDashboardCellReviewAssignmentActions.vue./DashboardDashboardCellReviewAssignmentId.vue./DashboardDashboardCellReviewAssignmentTitle.vue./DashboardDashboardCellSubmissionActions.vue./DashboardDashboardCellSubmissionDays.vue./DashboardDashboardCellSubmissionId.vue./DashboardDashboardCellSubmissionStage.vue./DashboardDashboardCellSubmissionTitle.vue./DashboardCellSubmissionActivity/DashboardDashboardCellSubmissionActivity.vue
30 changes: 15 additions & 15 deletions src/pages/dashboard/composables/useDashboardConfiguration.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,105 +38,105 @@ export function useDashboardConfiguration() {
columns.push({
id: 'id',
header: t('common.id'),
component: 'CellReviewAssignmentId',
component: 'DashboardCellReviewAssignmentId',
sortable: true,
});

columns.push({
id: 'title',
header: t('navigation.submissions'),
component: 'CellReviewAssignmentTitle',
component: 'DashboardCellReviewAssignmentTitle',
sortable: false,
});

columns.push({
id: 'activity',
header: t('stats.editorialActivity'),
component: 'CellReviewAssignmentActivity',
component: 'DashboardCellReviewAssignmentActivity',
sortable: false,
});

columns.push({
id: 'actions',
header: t('admin.jobs.list.actions'),
component: 'CellReviewAssignmentActions',
component: 'DashboardCellReviewAssignmentActions',
sortable: false,
});
} else if (dashboardPage === DashboardPageTypes.MY_SUBMISSIONS) {
columns.push({
id: 'id',
header: t('common.id'),
component: 'CellSubmissionId',
component: 'DashboardCellSubmissionId',
sortable: true,
});

columns.push({
id: 'title',
header: t('navigation.submissions'),
component: 'CellSubmissionTitle',
component: 'DashboardCellSubmissionTitle',
sortable: false,
});

columns.push({
id: 'stage',
header: t('workflow.stage'),
component: 'CellSubmissionStage',
component: 'DashboardCellSubmissionStage',
sortable: false,
});

columns.push({
id: 'activity',
header: t('stats.editorialActivity'),
component: 'CellSubmissionActivity',
component: 'DashboardCellSubmissionActivity',
sortable: false,
});

columns.push({
id: 'actions',
header: t('admin.jobs.list.actions'),
component: 'CellSubmissionActions',
component: 'DashboardCellSubmissionActions',
sortable: false,
});
} else {
columns.push({
id: 'id',
header: t('common.id'),
component: 'CellSubmissionId',
component: 'DashboardCellSubmissionId',
sortable: true,
});

columns.push({
id: 'title',
header: t('navigation.submissions'),
component: 'CellSubmissionTitle',
component: 'DashboardCellSubmissionTitle',
sortable: false,
});

columns.push({
id: 'stage',
header: t('workflow.stage'),
component: 'CellSubmissionStage',
component: 'DashboardCellSubmissionStage',
sortable: false,
});

columns.push({
id: 'lastActivity',
header: t('editor.submission.days'),
component: 'CellSubmissionDays',
component: 'DashboardCellSubmissionDays',
sortable: true,
});

columns.push({
id: 'activity',
header: t('stats.editorialActivity'),
component: 'CellSubmissionActivity',
component: 'DashboardCellSubmissionActivity',
sortable: false,
});

columns.push({
id: 'actions',
header: t('admin.jobs.list.actions'),
component: 'CellSubmissionActions',
component: 'DashboardCellSubmissionActions',
sortable: false,
});
}
Expand Down
Loading

0 comments on commit b493cc4

Please sign in to comment.