Skip to content

Commit

Permalink
pkp/pkp-lib#10688 UI refinments on workflow and filemanager
Browse files Browse the repository at this point in the history
  • Loading branch information
jardakotesovec committed Dec 19, 2024
1 parent 1641ced commit 04fb165
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/managers/FileManager/FileManager.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
</div>
</template>
<TableHeader>
<TableColumn>{{ t('common.id') }}</TableColumn>
<TableColumn>{{ t('common.numero') }}</TableColumn>
<TableColumn>{{ t('common.fileName') }}</TableColumn>
<TableColumn>{{ t('common.dateUploaded') }}</TableColumn>
<TableColumn>{{ t('common.type') }}</TableColumn>
Expand Down
15 changes: 8 additions & 7 deletions src/managers/FileManager/useFileManagerActions.js
Original file line number Diff line number Diff line change
Expand Up @@ -217,13 +217,6 @@ export function useFileManagerActions() {
function getItemActions({managerConfig}) {
const actions = [];
const enabledActions = managerConfig.permittedActions;
if (enabledActions.includes(Actions.FILE_SEE_NOTES)) {
actions.push({
label: t('grid.action.moreInformation'),
name: Actions.FILE_SEE_NOTES,
icon: 'View',
});
}

if (enabledActions.includes(Actions.FILE_EDIT)) {
actions.push({
Expand All @@ -233,6 +226,14 @@ export function useFileManagerActions() {
});
}

if (enabledActions.includes(Actions.FILE_SEE_NOTES)) {
actions.push({
label: t('grid.action.moreInformation'),
name: Actions.FILE_SEE_NOTES,
icon: 'View',
});
}

if (enabledActions.includes(Actions.FILE_DELETE)) {
actions.push({
label: t('grid.action.delete'),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<span class="text-lg-normal">
{{ t('submission.list.changeSubmissionLanguage.currentLanguage') }}
</span>
<span class="text-lg-bold">{{ languageLabel }}</span>
<span class="text-lg-bold text-heading">{{ languageLabel }}</span>
<PkpButton
v-if="canChangeSubmissionLanguage"
is-link
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export function getPublicationTitle(publicationMenuTitle) {
})} ${publicationMenuTitle}`;
}

export function getReviewItems({submission, stageId, title}) {
export function getReviewItems({submission, stageId}) {
const {getActiveStage, getCurrentReviewRound} = useSubmission();

const activeStage = getActiveStage(submission);
Expand All @@ -63,14 +63,23 @@ export function getReviewItems({submission, stageId, title}) {
const {getReviewRoundsForStage} = useSubmission();
const reviewRounds = getReviewRoundsForStage(submission, stageId);

const TitleKeys = {
[pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW]:
'submission.stage.externalReviewWithRound',
[pkp.const.WORKFLOW_STAGE_ID_INTERNAL_REVIEW]:
'submission.stage.internalReviewWithRound',
};

reviewRounds.forEach((reviewRound) => {
reviewMenuItems.push(
getReviewItem({
stageId,
reviewRound,
isActive:
activeStage.id === stageId && activeReviewRound.id === reviewRound.id,
title: title,
title: getWorkflowTitle(
t(TitleKeys[stageId], {round: reviewRound.round}),
),
}),
);
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,11 @@ export function useWorkflowNavigationConfigOMP(pageInitConfig) {
const internalReviewItems = getReviewItems({
submission,
stageId: pkp.const.WORKFLOW_STAGE_ID_INTERNAL_REVIEW,
title: t('workflow.review.internalReview'),
});

const externalReviewItems = getReviewItems({
submission,
stageId: pkp.const.WORKFLOW_STAGE_ID_EXTERNAL_REVIEW,
title: t('workflow.review.externalReview'),
});

const items = [];
Expand Down

0 comments on commit 04fb165

Please sign in to comment.