@@ -226,6 +259,7 @@ ExerciseDetail.propTypes = {
id: PropTypes.string.isRequired,
name: PropTypes.string.isRequired,
authorId: PropTypes.string.isRequired,
+ adminsIds: PropTypes.array,
groupsIds: PropTypes.array,
difficulty: PropTypes.string.isRequired,
description: PropTypes.string,
diff --git a/src/components/Groups/AddSupervisor/AddSupervisor.js b/src/components/Groups/AddSupervisor/AddSupervisor.js
index 30eb26535..0fc495933 100644
--- a/src/components/Groups/AddSupervisor/AddSupervisor.js
+++ b/src/components/Groups/AddSupervisor/AddSupervisor.js
@@ -8,7 +8,7 @@ import { defaultMemoize } from 'reselect';
import Button, { TheButtonGroup } from '../../widgets/TheButton';
import AddUserContainer from '../../../containers/AddUserContainer';
import { knownRoles, isSupervisorRole } from '../../helpers/usersRoles';
-import { AdminIcon, ObserverIcon, SupervisorIcon, LoadingIcon } from '../../icons';
+import { AdminRoleIcon, ObserverIcon, SupervisorIcon, LoadingIcon } from '../../icons';
const ROLES_FILTER = knownRoles.filter(isSupervisorRole);
@@ -67,7 +67,7 @@ const AddSupervisor = ({
onClick={() => addAdmin(groupId, id)}
disabled={isMember}
variant={isMember ? 'secondary' : 'success'}>
-
+
)}
diff --git a/src/components/Groups/MemberGroupsDropdown/MemberGroupsDropdown.js b/src/components/Groups/MemberGroupsDropdown/MemberGroupsDropdown.js
index e9d909cf9..2bbec17ee 100644
--- a/src/components/Groups/MemberGroupsDropdown/MemberGroupsDropdown.js
+++ b/src/components/Groups/MemberGroupsDropdown/MemberGroupsDropdown.js
@@ -5,7 +5,7 @@ import { FormattedMessage } from 'react-intl';
import { Link } from 'react-router-dom';
import GroupsNameContainer from '../../../containers/GroupsNameContainer';
-import { GroupIcon, AdminIcon, SupervisorIcon, ObserverIcon, UserIcon } from '../../icons';
+import { GroupIcon, AdminRoleIcon, SupervisorIcon, ObserverIcon, UserIcon } from '../../icons';
import withLinks from '../../../helpers/withLinks';
import './MemberGroupsDropdown.css';
@@ -43,7 +43,7 @@ const MemberGroupsDropdown = ({ groupId = null, memberGroups }) => (
groupId={groupId}
groups={memberGroups.admin}
title={}
- icon={}
+ icon={}
/>
}>
-
+
) : type === 'supervisor' ? (
}>
)}
diff --git a/src/components/icons/index.js b/src/components/icons/index.js
index 93516846e..fe403b56c 100644
--- a/src/components/icons/index.js
+++ b/src/components/icons/index.js
@@ -12,7 +12,8 @@ const defaultMessageIcon = ['far', 'envelope'];
export const AbortIcon = props => ;
export const AcceptIcon = props => ;
export const AddIcon = props => ;
-export const AdminIcon = props => ;
+export const AdminIcon = props => ;
+export const AdminRoleIcon = props => ;
export const AdressIcon = props => ;
export const ArchiveIcon = props => ;
export const ArchiveGroupIcon = ({ archived = false, ...props }) => (
@@ -20,6 +21,7 @@ export const ArchiveGroupIcon = ({ archived = false, ...props }) => (
);
export const AssignmentIcon = props => ;
export const AssignmentsIcon = props => ;
+export const AuthorIcon = props => ;
export const BanIcon = props => ;
export const BindIcon = props => ;
export const BonusIcon = props => ;
diff --git a/src/containers/ExerciseUserButtonsContainer/ExerciseUserButtonsContainer.js b/src/containers/ExerciseUserButtonsContainer/ExerciseUserButtonsContainer.js
new file mode 100644
index 000000000..68444ca0a
--- /dev/null
+++ b/src/containers/ExerciseUserButtonsContainer/ExerciseUserButtonsContainer.js
@@ -0,0 +1,128 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { connect } from 'react-redux';
+import { OverlayTrigger, Tooltip } from 'react-bootstrap';
+import { FormattedMessage } from 'react-intl';
+
+import { setAuthor, setAdmins } from '../../redux/modules/exercises';
+import { getExerciseSetAuthorStatus, getExerciseSetAdminsStatus } from '../../redux/selectors/exercises';
+
+import Button, { TheButtonGroup } from '../../components/widgets/TheButton';
+import { AdminIcon, AuthorIcon, LoadingIcon, WarningIcon } from '../../components/icons';
+
+const ExerciseUserButtonsContainer = ({
+ exercise,
+ userId,
+ setAuthor,
+ setAuthorStatus,
+ addAdmin,
+ removeAdmin,
+ setAdminsStatus,
+ size = 'xs',
+}) => {
+ const isAdmin = exercise.adminsIds && exercise.adminsIds.includes(userId);
+ return exercise.authorId !== userId ? (
+
+ {exercise.permissionHints.changeAuthor && (
+
+
+
+ }>
+
+
+ )}
+
+ {exercise.permissionHints.updateAdmins && (
+
+ {isAdmin ? (
+
+ ) : (
+
+ )}
+
+ }>
+
+
+ )}
+
+ ) : (
+
+
+
+ }>
+
+
+ );
+};
+
+ExerciseUserButtonsContainer.propTypes = {
+ userId: PropTypes.string.isRequired,
+ exercise: PropTypes.object.isRequired,
+ setAuthorStatus: PropTypes.bool,
+ setAdminsStatus: PropTypes.bool,
+ size: PropTypes.string,
+ setAuthor: PropTypes.func.isRequired,
+ addAdmin: PropTypes.func.isRequired,
+ removeAdmin: PropTypes.func.isRequired,
+};
+
+export default connect(
+ (state, { exercise }) => ({
+ setAuthorStatus: getExerciseSetAuthorStatus(state, exercise.id),
+ setAdminsStatus: getExerciseSetAdminsStatus(state, exercise.id),
+ }),
+ (dispatch, { exercise, userId }) => ({
+ setAuthor: () => dispatch(setAuthor(exercise.id, userId)),
+ addAdmin: () => dispatch(setAdmins(exercise.id, [...exercise.adminsIds, userId])),
+ removeAdmin: () =>
+ dispatch(
+ setAdmins(
+ exercise.id,
+ exercise.adminsIds.filter(id => id !== userId)
+ )
+ ),
+ })
+)(ExerciseUserButtonsContainer);
diff --git a/src/containers/ExerciseUserButtonsContainer/index.js b/src/containers/ExerciseUserButtonsContainer/index.js
new file mode 100644
index 000000000..9e5a4e19e
--- /dev/null
+++ b/src/containers/ExerciseUserButtonsContainer/index.js
@@ -0,0 +1,2 @@
+import ExerciseUserButtonsContainer from './ExerciseUserButtonsContainer';
+export default ExerciseUserButtonsContainer;
diff --git a/src/locales/cs.json b/src/locales/cs.json
index 0513c1a06..6d9687efa 100644
--- a/src/locales/cs.json
+++ b/src/locales/cs.json
@@ -375,11 +375,16 @@
"app.editEnvironmentSimpleForm.success": "Konfigurace byla změněna.",
"app.editEnvironmentSimpleForm.validation.environments": "Přidejte prosím alespoň jedno běhové prostředí.",
"app.editEnvironmentSimpleForm.validation.standaloneEnvironmentsCollisions": "Některá vybraná běhová prostředí ({envs}) nemohou být kombinovaná s jinými. Odeberte tato běhová prostředí, nebo zajistěte, že bude vybrané právě jedno z nich.",
+ "app.editExercise.addAdminButton": "Zařadit uživatele mezi administrátory úlohy",
"app.editExercise.deleteExercise": "Smazat úlohu",
"app.editExercise.deleteExerciseWarning": "Smazání úlohy nebude mít žádný vliv na již zadané instance této úlohy ani jejich řešení, zadané úlohy pouze již nebude možné aktualizovat. Smazání ovšem efektivně odebre tuto úlohu ze všech domovských skupin.",
"app.editExercise.editConfig": "Konfigurace úlohy",
"app.editExercise.editTags": "Editace nálepek",
+ "app.editExercise.manageUsers": "Spravovat přidružené uživatele",
+ "app.editExercise.removeAdminButton": "Odebrat uživatele ze seznamu administrátorů úlohy",
+ "app.editExercise.setAuthorButton": "Nahradit stávajícího autora úlohy tímto uživatelem",
"app.editExercise.title": "Upravit základní nastavení úlohy",
+ "app.editExercise.userIsAuthor": "Uživatel je autorem úlohy",
"app.editExerciseAdvancedConfigForm.validation.emptyFileName": "Prosíme, vložte platné jméno.",
"app.editExerciseConfig.cannotDisplayConfigForm": "Formulář s nastavením úlohy nemůže být zobrazen dokud nebude definován alespoň jeden test.",
"app.editExerciseConfig.cannotDisplayPipelinesForm": "Testy a běhové prostředí musí být správně nastaveny, aby bylo možné zobrazit konfiguraci pipeline.",
@@ -700,6 +705,8 @@
"app.evaluationTable.notAvailable": "Vyhodnocení není dostupné",
"app.evaluationTable.score": "Skóre:",
"app.exercise.addReferenceSolutionDetailed": "Referenční řešení můžete vytvořit na hlavní stránce úlohy.",
+ "app.exercise.admins": "Administrátoři",
+ "app.exercise.admins.explanation": "Administrátoři mají stejná práva jako autor úlohy, ale nejsou zobrazováni v seznamech ani nejsou použiti při filtrování úloh.",
"app.exercise.assignButton": "Zadat",
"app.exercise.assignToGroup": "Zde můžete zadat úlohu najednou do více skupin, ve kterých jste vedoucím. Úlohu je také možné zadat individuálně na stránkách jednotlivých skupin. Vezměte prosím na vědomí, že úloha může být zadána v jedné skupině vícekrát, a proto je vhodné se ujistit, že vícenásobné zadání není způsobeno omylem.",
"app.exercise.attach": "Připojit",
@@ -720,6 +727,7 @@
"app.exercise.isPublicExplanation": "Veřejné úlohy jsou viditelné všem vedoucím v asociovaných skupinách a jejich podskupinách. Privátní (neveřejné) úlohy jsou viditelné pouze autorovi.",
"app.exercise.manageGroupAttachments": "Úprava vazeb na skupiny",
"app.exercise.mergeJudgeLogsExplanation": "Tento příznak určuje zda dojde ke spojení primárního (stdout) a sekundárního (stderr) logu sudího do jednoho (což je výchozí postup u vestavěných sudích). Pokud zůstanou logy odděleny, jejich viditelnost může být u zadaných úloh nastavena nezávisle. To je užitečné v případě, že máte vlastního sudího, který vrací dva oddělené logy (např. jeden pro studenty a jeden pro vyučujicí).",
+ "app.exercise.noAdmins": "žádní administrátoři nebyli přiřazeni",
"app.exercise.noRefSolutions": "Úloha nebyla dostatečně ověřena. Aby bylo možné úlohu zadat musí existovat alespoň jedno referenční řešení.",
"app.exercise.noReferenceSolutions": "Tato úloha zatím nemá žádná referenční řešení.",
"app.exercise.noReferenceSolutionsDetailed": "Konfigurace úlohy by měla být prověřena alespoň jedním referenčním řešením než bude možné ji zadat ve skupině.",
diff --git a/src/locales/en.json b/src/locales/en.json
index 1b139ea89..d570c52b8 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -375,11 +375,16 @@
"app.editEnvironmentSimpleForm.success": "Environments Saved.",
"app.editEnvironmentSimpleForm.validation.environments": "Please add at least one runtime environment.",
"app.editEnvironmentSimpleForm.validation.standaloneEnvironmentsCollisions": "Some of the selected environments ({envs}) cannot be combined with any other environment. You need to deselect these environment(s) or make sure only one environment is selected.",
+ "app.editExercise.addAdminButton": "Make the user an exercise admin",
"app.editExercise.deleteExercise": "Delete the exercise",
"app.editExercise.deleteExerciseWarning": "Deletion of an exercise will not affect any existing assignments nor their solutions, except they could not be synchronized anymore. However, the deletion will effectively remove the exercise from all groups of residence.",
"app.editExercise.editConfig": "Exercise Configuration",
"app.editExercise.editTags": "Edit Tags",
+ "app.editExercise.manageUsers": "Manage related users",
+ "app.editExercise.removeAdminButton": "Remove the user from exercise admins",
+ "app.editExercise.setAuthorButton": "Make this user an author of the exercise (replacing current author)",
"app.editExercise.title": "Change Basic Exercise Settings",
+ "app.editExercise.userIsAuthor": "The user is the author of the exercise",
"app.editExerciseAdvancedConfigForm.validation.emptyFileName": "Please, fill in a vaild file name.",
"app.editExerciseConfig.cannotDisplayConfigForm": "The exercise configuration form cannot be displayed until at least one test is defined.",
"app.editExerciseConfig.cannotDisplayPipelinesForm": "The tests and runtime environment must be correctly defined before the pipeline configuration becomes available.",
@@ -700,6 +705,8 @@
"app.evaluationTable.notAvailable": "Evaluation not available",
"app.evaluationTable.score": "Score:",
"app.exercise.addReferenceSolutionDetailed": "A reference solution can be added on the exercise detail page.",
+ "app.exercise.admins": "Administrators",
+ "app.exercise.admins.explanation": "The administrators have the same permissions as the author towards the exercise, but they are not explicitly mentioned in listings or used in search filters.",
"app.exercise.assignButton": "Assign",
"app.exercise.assignToGroup": "Here, you can assign this exercise simultaneously to multiple groups under your supervision. The exercise can also be assigned from within the groups individually. Please note that an exercise may be assigned multiple times in a group, so beware accidental repetitive assignment.",
"app.exercise.attach": "Attach",
@@ -720,6 +727,7 @@
"app.exercise.isPublicExplanation": "Public exercise is visible to all supervisors in its home groups and respective nested groups. Private (not public) exercise is visible to the author only.",
"app.exercise.manageGroupAttachments": "Manage Group Attachments",
"app.exercise.mergeJudgeLogsExplanation": "The merge flag indicates whether primary (stdout) and secondary (stderr) judge logs are are concatenated in one log (which should be default for built-in judges). If the logs are separated, the visibility of each part may be controlled idividually in assignments. That might be helpful if you need to pass two separate logs from a custom judge (e.g., one is for students and one is for supervisors).",
+ "app.exercise.noAdmins": "no administrators appointed",
"app.exercise.noRefSolutions": "Exercise has no proof of concept. Exercise must get at least one reference solution before it can be assigned.",
"app.exercise.noReferenceSolutions": "There are no reference solutions for this exercise yet.",
"app.exercise.noReferenceSolutionsDetailed": "The exercise configuration should be verified on one reference solution at least before it can be assigned.",
diff --git a/src/pages/EditExercise/EditExercise.js b/src/pages/EditExercise/EditExercise.js
index 42eb088ce..4a2a4038e 100644
--- a/src/pages/EditExercise/EditExercise.js
+++ b/src/pages/EditExercise/EditExercise.js
@@ -15,15 +15,16 @@ import AttachmentFilesTableContainer from '../../containers/AttachmentFilesTable
import ExercisesTagsEditContainer from '../../containers/ExercisesTagsEditContainer';
import DeleteExerciseButtonContainer from '../../containers/DeleteExerciseButtonContainer';
import ExerciseCallouts, { exerciseCalloutsAreVisible } from '../../components/Exercises/ExerciseCallouts';
+import EditExerciseUsers from '../../components/Exercises/EditExerciseUsers';
import { EditExerciseIcon } from '../../components/icons';
import { fetchExerciseIfNeeded, editExercise, fetchTags } from '../../redux/modules/exercises';
import { getExercise } from '../../redux/selectors/exercises';
import { isSubmitting } from '../../redux/selectors/submission';
-import { loggedInUserIdSelector } from '../../redux/selectors/auth';
+import { loggedInUserSelector } from '../../redux/selectors/users';
import { getLocalizedTextsInitialValues, transformLocalizedTextsFormData } from '../../helpers/localizedData';
-import { hasPermissions } from '../../helpers/common';
+import { hasPermissions, safeGet } from '../../helpers/common';
import withLinks from '../../helpers/withLinks';
import { withRouterProps } from '../../helpers/withRouter';
@@ -89,15 +90,17 @@ class EditExercise extends Component {
links: { EXERCISES_URI },
navigate,
exercise,
+ loggedUser,
} = this.props;
return (
}
title={}>
- {exercise =>
- exercise && (
+ {(exercise, loggedUser) =>
+ exercise &&
+ loggedUser && (