}
- description={getDescription(localizedTexts, locale)}
type="primary"
collapsable
noPadding
unlimitedHeight>
-
+ )}
+
+ )}
+
{isPublic && isAdmin && (
@@ -153,7 +180,6 @@ const GroupInfoTable = ({
GroupInfoTable.propTypes = {
group: PropTypes.shape({
- externalId: PropTypes.string,
parentGroupId: PropTypes.string,
threshold: PropTypes.number,
public: PropTypes.bool.isRequired,
@@ -163,9 +189,9 @@ GroupInfoTable.propTypes = {
threshold: PropTypes.number,
pointsLimit: PropTypes.number,
publicStats: PropTypes.bool.isRequired,
- bindings: PropTypes.object,
}),
}),
+ externalAttributes: ImmutablePropTypes.map,
isAdmin: PropTypes.bool,
locale: PropTypes.string.isRequired,
};
diff --git a/src/components/Pipelines/BoxForm/BoxForm.js b/src/components/Pipelines/BoxForm/BoxForm.js
index e42d7a28b..c8429d6e7 100644
--- a/src/components/Pipelines/BoxForm/BoxForm.js
+++ b/src/components/Pipelines/BoxForm/BoxForm.js
@@ -10,7 +10,7 @@ import { TextField, SelectField } from '../../forms/Fields';
import Button, { TheButtonGroup } from '../../widgets/TheButton';
import InsetPanel from '../../widgets/InsetPanel';
import SubmitButton from '../../forms/SubmitButton';
-import { CloseIcon, SaveIcon, RefreshIcon, InputIcon, OutputIcon } from '../../../components/icons';
+import { CloseIcon, RefreshIcon, InputIcon, OutputIcon } from '../../../components/icons';
import { encodeId, safeSet } from '../../../helpers/common.js';
import { getBoxTypeDescription } from '../comments.js';
@@ -223,9 +223,8 @@ class BoxForm extends Component {
submitting={submitting}
invalid={invalid}
dirty={dirty}
- hasSuceeded={submitSucceeded}
+ hasSucceeded={submitSucceeded}
reset={reset}
- defaultIcon={
-
-
-
-
-
- {groups.length > 0 ? (
-
-
- {groups.map(({ id, name }) => (
-
-
-
- {name}
-
- ))}
-
-
- ) : (
-
-
- )}
-
- {submitFailed && (
-
-
- )}
-
- {error && {error} }
-
-
-
-
- {groups.length > 0 && (
- <>
-
-
-
- onSubmit(data).then(reset))}
- submitting={submitting}
- dirty={dirty}
- hasSucceeded={submitSucceeded}
- hasFailed={submitFailed}
- disabled={invalid}
- messages={{
- submit: (
-
-
-
-
-
-
- );
- }
-}
-
-ArchiveTermGroups.propTypes = {
- handleSubmit: PropTypes.func.isRequired,
- onSubmit: PropTypes.func.isRequired,
- submitFailed: PropTypes.bool,
- error: PropTypes.object,
- dirty: PropTypes.bool,
- submitSucceeded: PropTypes.bool,
- submitting: PropTypes.bool,
- invalid: PropTypes.bool,
- reset: PropTypes.func,
- change: PropTypes.func.isRequired,
- onClose: PropTypes.func.isRequired,
- isOpen: PropTypes.bool.isRequired,
- externalId: PropTypes.string,
- groups: PropTypes.array.isRequired,
- intl: PropTypes.object.isRequired,
-};
-
-const validate = ({ groups }) => {
- const errors = {};
-
- if (groups && groups.length > 0 && Object.values(groups).every(group => group === false)) {
- errors._error = (
-
-
-
- {getLocalizedData(days, locale)[dayOfWeek]} {time}
- {fortnightly ? ({getLocalizedData(oddEven, locale)[oddWeeks ? 0 : 1]}) : ''} {room}
-
-
- ) : (
-
-
-
-
- )}
- {getLocalizedData(captions, locale)} ({code})
- {groupsCount > 0 && (
-
-
- {groupsCount > 1 && {groupsCount}x }
- 1} />
-
-
- )}
-
-);
-
-CourseLabel.propTypes = {
- type: PropTypes.string.isRequired,
- captions: PropTypes.object.isRequired,
- code: PropTypes.string,
- dayOfWeek: PropTypes.number,
- time: PropTypes.string,
- fortnightly: PropTypes.bool,
- oddWeeks: PropTypes.bool,
- room: PropTypes.string,
- groupsCount: PropTypes.number,
- intl: PropTypes.object.isRequired,
-};
-
-export default injectIntl(CourseLabel);
diff --git a/src/components/SisIntegration/CourseLabel/index.js b/src/components/SisIntegration/CourseLabel/index.js
deleted file mode 100644
index b09b11c24..000000000
--- a/src/components/SisIntegration/CourseLabel/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import CourseLabel, { getLocalizedData } from './CourseLabel.js';
-export { getLocalizedData };
-export default CourseLabel;
diff --git a/src/components/SisIntegration/EditTerm/EditTerm.js b/src/components/SisIntegration/EditTerm/EditTerm.js
deleted file mode 100644
index 9a31992fa..000000000
--- a/src/components/SisIntegration/EditTerm/EditTerm.js
+++ /dev/null
@@ -1,138 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { Modal } from 'react-bootstrap';
-import { FormattedMessage } from 'react-intl';
-import { Field, reduxForm } from 'redux-form';
-
-import DatetimeField from '../../forms/Fields/DatetimeField.js';
-import SubmitButton from '../../forms/SubmitButton';
-import Button from '../../widgets/TheButton';
-import { CloseIcon, SaveIcon } from '../../icons';
-
-const EditTerm = ({
- isOpen,
- onClose,
- submitting,
- handleSubmit,
- onSubmit,
- dirty = false,
- submitFailed = false,
- submitSucceeded = false,
- invalid,
- reset,
-}) => (
-
-
-
-
-
-
-
-
- onSubmit(data).then(reset))}
- submitting={submitting}
- dirty={dirty}
- hasSucceeded={submitSucceeded}
- hasFailed={submitFailed}
- invalid={invalid}
- defaultIcon={
-
-
-
-);
-
-EditTerm.propTypes = {
- handleSubmit: PropTypes.func.isRequired,
- onSubmit: PropTypes.func.isRequired,
- submitFailed: PropTypes.bool,
- dirty: PropTypes.bool,
- submitSucceeded: PropTypes.bool,
- submitting: PropTypes.bool,
- invalid: PropTypes.bool,
- reset: PropTypes.func,
- onClose: PropTypes.func.isRequired,
- isOpen: PropTypes.bool.isRequired,
-};
-
-const validate = ({ beginning, end, advertiseUntil }) => {
- const errors = {};
-
- if (!beginning) {
- errors.beginning = (
-
-
-
-
-
-
-
-
- {rootGroups.map(group => (
-
-
- {existingSemestralGroups[group.id].length === 0 ? (
-
-
- {existingSemestralGroups[group.id].length === 0
- ? getLocalizedName(group, locale)
- : existingSemestralGroups[group.id].map(existGroup => (
-
- {getLocalizedName(group, locale)} / {getLocalizedName(existGroup, locale)}
-
- ))}
-
-
- {existingSemestralGroups[group.id].map(existGroup => (
- 0}
- />
- ))}
-
-
- ))}
-
-
-
-
-
- )}
-
- {error && {error} }
-
-
-
- onSubmit(data).then(reset))}
- submitting={submitting}
- dirty={dirty}
- hasSucceeded={submitSucceeded}
- hasFailed={submitFailed}
- disabled={invalid}
- messages={{
- submit:
-
-
-
-
- );
-};
-
-PlantTermGroups.propTypes = {
- handleSubmit: PropTypes.func.isRequired,
- onSubmit: PropTypes.func.isRequired,
- submitFailed: PropTypes.bool,
- error: PropTypes.object,
- dirty: PropTypes.bool,
- submitSucceeded: PropTypes.bool,
- submitting: PropTypes.bool,
- invalid: PropTypes.bool,
- reset: PropTypes.func,
- onClose: PropTypes.func.isRequired,
- isOpen: PropTypes.bool.isRequired,
- externalId: PropTypes.string,
- groups: PropTypes.array.isRequired,
- rootGroups: PropTypes.array.isRequired,
- intl: PropTypes.object.isRequired,
-};
-
-const validate = ({ groups, localizedTexts }) => {
- const errors = {};
-
- if (groups && Object.values(groups).every(group => group === false)) {
- errors._error = (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {terms.map((term, i) => (
-
-
-
-
- )}
-
-
-);
-
-TermsList.propTypes = {
- terms: PropTypes.array,
- createActions: PropTypes.func,
- intl: PropTypes.shape({ locale: PropTypes.string.isRequired }).isRequired,
-};
-
-export default injectIntl(TermsList);
diff --git a/src/components/SisIntegration/TermsList/index.js b/src/components/SisIntegration/TermsList/index.js
deleted file mode 100644
index 3262d749d..000000000
--- a/src/components/SisIntegration/TermsList/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import TermsList from './TermsList.js';
-export default TermsList;
diff --git a/src/components/SisIntegration/TermsListItem/TermsListItem.js b/src/components/SisIntegration/TermsListItem/TermsListItem.js
deleted file mode 100644
index 81d10adf7..000000000
--- a/src/components/SisIntegration/TermsListItem/TermsListItem.js
+++ /dev/null
@@ -1,46 +0,0 @@
-import React from 'react';
-import PropTypes from 'prop-types';
-import { FormattedMessage } from 'react-intl';
-
-import Icon from '../../icons';
-import DateTime from '../../widgets/DateTime';
-
-const TermsListItem = ({ data, createActions }) => (
-
-
- {data.beginning * 1000 <= Date.now() && Date.now() <= data.end * 1000 && (
-
- {data.year}
-
- {data.term === 1 && {data.term} }
-
-
-
-
-
-
-
- {createActions && createActions(data.id, data)}
-
-);
-
-TermsListItem.propTypes = {
- data: PropTypes.shape({
- id: PropTypes.string.isRequired,
- year: PropTypes.number.isRequired,
- term: PropTypes.number.isRequired,
- beginning: PropTypes.number,
- end: PropTypes.number,
- advertiseUntil: PropTypes.number,
- }),
- createActions: PropTypes.func,
-};
-
-export default TermsListItem;
diff --git a/src/components/SisIntegration/TermsListItem/index.js b/src/components/SisIntegration/TermsListItem/index.js
deleted file mode 100644
index 2250dcdf0..000000000
--- a/src/components/SisIntegration/TermsListItem/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import TermsListItem from './TermsListItem.js';
-export default TermsListItem;
diff --git a/src/components/Solutions/TestResultsTable/TestResultsTableRow.js b/src/components/Solutions/TestResultsTable/TestResultsTableRow.js
index 897e553ef..0e92f9cd9 100644
--- a/src/components/Solutions/TestResultsTable/TestResultsTableRow.js
+++ b/src/components/Solutions/TestResultsTable/TestResultsTableRow.js
@@ -195,7 +195,7 @@ const TestResultsTableRow = ({
{(showJudgeLogStdout || showJudgeLogStderr) && (
-
+
{toggleLogOpen && ((judgeLogStdout && showJudgeLogStdout) || (judgeLogStderr && showJudgeLogStderr)) && (
-
- }>
- {submitFailed && (
-
-
- )}
-
-
diff --git a/src/components/forms/EditGroupForm/EditGroupForm.js b/src/components/forms/EditGroupForm/EditGroupForm.js
index 3d7b4bc5e..c465c58ae 100644
--- a/src/components/forms/EditGroupForm/EditGroupForm.js
+++ b/src/components/forms/EditGroupForm/EditGroupForm.js
@@ -10,9 +10,9 @@ import FormBox from '../../widgets/FormBox';
import Explanation from '../../widgets/Explanation';
import SubmitButton from '../SubmitButton';
import LocalizedTextsFormField from '../LocalizedTextsFormField';
-import { RefreshIcon } from '../../icons';
+import { RefreshIcon, SendIcon } from '../../icons';
-import { TextField, CheckboxField, NumericTextField } from '../Fields';
+import { CheckboxField, NumericTextField } from '../Fields';
import { getLocalizedTextsInitialValues, validateLocalizedTextsFormData } from '../../../helpers/localizedData.js';
export const EDIT_GROUP_FORM_LOCALIZED_TEXTS_DEFAULT = {
@@ -80,6 +80,7 @@ const EditGroupForm = ({
hasSucceeded={submitSucceeded}
hasFailed={submitFailed}
invalid={invalid}
+ defaultIcon={createNew ?
{isSuperAdmin && (
-
-
-
-
-
-
-
- {course &&
-
-
-
-
- )}
-
- {warning && {warning} }
-
-
-
-
-
-
-
-
-
-
-
-);
-
-SisBindGroupForm.propTypes = {
- isOpen: PropTypes.bool.isRequired,
- onClose: PropTypes.func.isRequired,
- onSubmit: PropTypes.func.isRequired,
- dirty: PropTypes.bool,
- handleSubmit: PropTypes.func.isRequired,
- invalid: PropTypes.bool,
- submitting: PropTypes.bool,
- submitSucceeded: PropTypes.bool,
- submitFailed: PropTypes.bool,
- warning: PropTypes.object,
- groups: PropTypes.array,
- groupsAccessor: PropTypes.func.isRequired,
- course: PropTypes.object,
- courseGroupsCount: PropTypes.number,
- intl: PropTypes.object.isRequired,
-};
-
-const warn = ({ groupId }) => {
- const warnings = {};
-
- if (!groupId) {
- warnings._warning = (
-
-
-
-
-
-
-
- {course &&
-
-
-
-
- )}
-
- {warning && {warning} }
-
-
-
-
-
-
-
-
-
-
-
- );
- }
-}
-
-SisCreateGroupForm.propTypes = {
- isOpen: PropTypes.bool.isRequired,
- onClose: PropTypes.func.isRequired,
- onSubmit: PropTypes.func.isRequired,
- dirty: PropTypes.bool,
- handleSubmit: PropTypes.func.isRequired,
- invalid: PropTypes.bool,
- submitting: PropTypes.bool,
- submitSucceeded: PropTypes.bool,
- submitFailed: PropTypes.bool,
- warning: PropTypes.object,
- groupIds: PropTypes.array,
- groupsAccessor: PropTypes.func.isRequired,
- course: PropTypes.object,
- courseGroupsCount: PropTypes.number,
- intl: PropTypes.object.isRequired,
-};
-
-const warn = ({ parentGroupId }) => {
- const warnings = {};
-
- if (!parentGroupId) {
- warnings._warning = (
-
-
-
-
- {sisStatus => (
-
- {!sisStatus.accessible && (
-
-
- )}
- {sisStatus.accessible &&
- sisStatus.terms
- .filter(({ isAdvertised }) => isAdvertised)
- .map((term, i) => (
-
-
-
-
-
- {courses => (
-
- {courses && preprocessCourses(courses, groupsAccessor, locale).length > 0 ? (
- preprocessCourses(courses, groupsAccessor, locale).map(
- course =>
- course && (
-
- {course &&
-
-
-
- {course.groups &&
- course.groups.map((group, i) => (
-
-
- {getGroupCanonicalLocalizedName(group, groupsAccessor, locale)}
-
-
- {group.primaryAdminsIds.map(id => (
-
-
-
- {group.privateData &&
- group.privateData.students.includes(currentUserId) && (
-
-
-
- )}
-
- {!group.organizational &&
- (!group.privateData ||
- !group.privateData.detaining ||
- !group.privateData.students.includes(currentUserId)) && (
-
-
-
- ))}
-
-
-
-
- )
- )
- ) : (
-
-
- )}
-
-
- ))}
-
-
-
- );
-};
-
-MyAccordionButton.propTypes = {
- children: PropTypes.any,
- eventKey: PropTypes.string.isRequired,
-};
-
-class SisSupervisorGroupsContainer extends Component {
- state = { createDialog: null, bindDialog: null, pendingUnbinds: {} };
-
- openCreateDialog = (possibleParents, course, term) => {
- this.setState({
- createDialog: {
- possibleParents,
- course: course.course,
- groupsCount: course.groups.length,
- term,
- },
- });
- };
-
- closeCreateDialog = () => {
- this.setState({ createDialog: null });
- };
-
- submitCreateDialog = data => {
- const { createGroup, currentUserId } = this.props;
- if (this.state.createDialog === null) {
- return;
- }
-
- const { course, term } = this.state.createDialog;
- return createGroup(course.code, data, currentUserId, term.year, term.term).then(res => {
- this.closeCreateDialog();
- return res;
- });
- };
-
- openBindDialog = (course, term) => {
- this.setState({
- bindDialog: {
- groups: filterGroupsForBinding(this.props.groups, course.groups),
- course: course.course,
- groupsCount: course.groups.length,
- term,
- },
- });
- };
-
- closeBindDialog = () => {
- this.setState({ bindDialog: null });
- };
-
- submitBindDialog = data => {
- const { bindGroup, currentUserId } = this.props;
- if (this.state.bindDialog === null) {
- return;
- }
-
- const { course, term } = this.state.bindDialog;
- return bindGroup(course.code, data, currentUserId, term.year, term.term).then(res => {
- this.closeBindDialog();
- return res;
- });
- };
-
- isUnbindPending = (courseId, groupId) => {
- const key = `${courseId}:${groupId}`;
- return Boolean(this.state.pendingUnbinds[key]);
- };
-
- unbindGroup = (courseId, groupId, userId, year, term) => {
- const key = `${courseId}:${groupId}`;
- this.setState({ pendingUnbinds: { ...this.state.pendingUnbinds, [key]: true } });
- this.props.unbindGroup(courseId, groupId, userId, year, term).finally(() => {
- this.setState({ pendingUnbinds: { ...this.state.pendingUnbinds, [key]: false } });
- });
- };
-
- componentDidMount() {
- this.props.loadData(this.props.currentUserId);
- }
-
- static loadData = (dispatch, loggedInUserId) => {
- dispatch(fetchSisStatusIfNeeded())
- .then(res => res.value)
- .then(
- ({ accessible, terms }) =>
- accessible &&
- terms
- .filter(({ isAdvertised }) => isAdvertised)
- .map(({ year, term }) =>
- dispatch(fetchSisSupervisedCourses(loggedInUserId, year, term))
- .then(res => res.value)
- .then(({ courses }) =>
- courses.map(course =>
- dispatch(fetchSisPossibleParentsIfNeeded(course.course.code))
- .then(res => res.value)
- .then(groups =>
- unique(groups.reduce((acc, group) => acc.concat(group.parentGroupsIds), [])).map(groupId =>
- dispatch(fetchGroupIfNeeded(groupId))
- )
- )
- )
- )
- )
- );
- };
-
- render() {
- const {
- sisStatus,
- sisCourses,
- currentUserId,
- sisPossibleParents,
- groupsAccessor,
- groupsResourcesAccessor,
- links: {
- GROUP_EDIT_URI_FACTORY,
- GROUP_INFO_URI_FACTORY,
- GROUP_ASSIGNMENTS_URI_FACTORY,
- GROUP_STUDENTS_URI_FACTORY,
- },
- intl: { locale },
- } = this.props;
-
- return (
-
-
-
-
-
-
-
- {sisStatus => (
-
- {!sisStatus.accessible && (
-
-
- )}
- {sisStatus.accessible &&
- sisStatus.terms
- .filter(({ isAdvertised }) => isAdvertised)
- .map((term, i) => (
-
-
-
-
- {courses => (
-
- {courses && Object.keys(courses).length > 0 ? (
-
- {Object.values(courses)
- .sort(
- (a, b) =>
- getLocalizedData(a.course.captions, locale).localeCompare(
- getLocalizedData(b.course.captions, locale),
- locale
- ) || a.course.code.localeCompare(b.course.code, locale)
- )
- .map(course => (
-
-
-
- {course && (
-
-
- )}
-
-
-
-
- <>
-
- {course.groups.length > 0 ? (
-
-
-
-
-
-
-
-
-
-
- {course.groups.map(groupId => (
-
-
-
-
- }>
- {group =>
- group ? (
-
-
- {group.organizational && (
-
-
- {getGroupCanonicalLocalizedName(
- group,
- groupsAccessor,
- locale
- )}
- {(
- safeGet(group, ['privateData', 'bindings', 'sis']) ||
- []
- ).length > 1 && (
-
-
-
-
-
- {group.privateData.bindings.sis
- .sort()
- .map(code => (
-
- {code}
- {code === course.course.code && (
-
- ))}
-
-
-
- }>
-
-
-
- )}
-
-
- {group.primaryAdminsIds.map(id => (
-
-
-
- {hasPermissions(group, 'update') && (
-
-
-
- )}
-
-
-
-
-
- {hasPermissions(group, 'viewDetail') && (
-
-
-
- )}
-
- {!group.organizational &&
- hasPermissions(group, 'viewAssignments') && (
-
-
-
- )}
-
-
- this.unbindGroup(
- course.course.code,
- group.id,
- currentUserId,
- term.year,
- term.term
- )
- }
- question={
-
- {this.isUnbindPending(
- course.course.code,
- group.id
- ) ? (
-
-
-
- {hasPermissions(group, 'remove') &&
- group.parentGroupId !== null &&
- group.childGroups.length === 0 && (
-
-
-
- ) : null
- }
-
- ))}
-
-
- ) : (
-
-
- )}
-
-
-
-
- {possibleParents => (
-
-
-
- this.openCreateDialog(possibleParents, course, term)
- }>
-
-
- this.openBindDialog(course, term)}>
-
-
-
-
-
-
-
- ))}
-
- ) : (
-
-
- )}
-
-
- ))}
-
-
-
-
-
-
+
{user.name.firstName} {user.name.lastName}
) : (
@@ -76,6 +77,7 @@ UsersNameContainer.propTypes = {
link: PropTypes.oneOfType([PropTypes.string, PropTypes.func, PropTypes.bool]),
noAvatar: PropTypes.bool,
isSimple: PropTypes.bool,
+ simpleClassName: PropTypes.string,
showEmail: PropTypes.string,
showExternalIdentifiers: PropTypes.bool,
showRoleIcon: PropTypes.bool,
diff --git a/src/locales/cs.json b/src/locales/cs.json
index c47cc65ff..a1301f53d 100644
--- a/src/locales/cs.json
+++ b/src/locales/cs.json
@@ -45,15 +45,6 @@
"app.addLicense.validation.note": "Popis nemůže být prázdný.",
"app.addLicense.validation.validUntilEmpty": "Konec platnosti licence musí být nastaven.",
"app.addLicense.validation.validUntilInThePast": "Platnost licence musí být v budoucnosti.",
- "app.addSisTermForm.failed": "Nebylo možné uložit nový SIS semestr.",
- "app.addSisTermForm.processing": "Ukládání...",
- "app.addSisTermForm.submit": "Uložit nový semestr",
- "app.addSisTermForm.success": "Semestr byl uložen.",
- "app.addSisTermForm.summer": "Letní semestr",
- "app.addSisTermForm.term": "Semestr:",
- "app.addSisTermForm.title": "Přidat nový semestr",
- "app.addSisTermForm.winter": "Zimní semestr",
- "app.addSisTermForm.year": "Rok:",
"app.addStudent.cannotSearch": "Nemáte oprávnění prohledávat studenty, takže je nemůžete přidávat do skupiny přímo.",
"app.addStudent.inviteButton": "Pozvat k registraci",
"app.addStudent.inviteDialog.explain": "Pozvánka bude zaslána uživateli na danou mailovou adresu. Uživatel obdrží odkaz pro registraci lokálním účtem. Detaily uživatelského profilu (jméno a email) vyplňte pečlivě, uživatel nebude mít možnost je změnit. Volitelně můžete také vybrat seznam skupin, do kterých bude uživatel přidán hned po registraci.",
@@ -96,13 +87,6 @@
"app.archiveGroupButton.setShort": "Archivovat",
"app.archiveGroupButton.unset": "Vrátit archivaci skupiny",
"app.archiveGroupButton.unsetShort": "Vrátit",
- "app.archiveSisTerm.archiveGroups": "Archivovat skupiny",
- "app.archiveSisTerm.archived": "Archivováno",
- "app.archiveSisTerm.archiving": "Archivuji...",
- "app.archiveSisTerm.failed": "Archivace selhala. Některé skupiny možná nebyly přesunuty do archivu.",
- "app.archiveSisTerm.noGroups": "S tímto semestrem nejsou asociovány žádné skupiny. Je možné, že již byly všechny archivovány.",
- "app.archiveSisTerm.noGroupsSelected": "Alespoň jedna skupina musí být vybrána.",
- "app.archiveSisTerm.title": "Archivovat skupiny ze SIS semestru",
"app.assignExerciseButton.isBroken": "Rozbitá",
"app.assignExerciseButton.isLocked": "Zamčená",
"app.assignExerciseButton.noRefSolutions": "Neověřená",
@@ -282,7 +266,6 @@
"app.createExerciseForm.validation.noGroupSelected": "Nebyla vybrána domovská skupina.",
"app.createGroup.detaining": "Zadržuje studenty",
"app.createGroup.detaining.explanation": "Studenti nemohou sami opustit skupinu, odebrat je může pouze vedoucí/administrátor skupiny.",
- "app.createGroup.externalId": "Externí identifikátor skupiny:",
"app.createGroup.hasThreshold": "Studenti potřebují určitý počet bodů pro splnění kurzu",
"app.createGroup.hasThreshold.explanation": "Potřebný počet bodů může být specifikován relativně (jako procentuální poměr z maximálního počtu bodů) nebo jako absolutní bodový limit. Pouze jedna z těchto hodnot může být vyplněna.",
"app.createGroup.isExam": "Zkoušková",
@@ -299,11 +282,9 @@
"app.createUserForm.validation.emailTaken": "Tato e-mailová adresa již patří jinému uživateli.",
"app.createUserForm.validation.emptyPassword": "Heslo nemůže zůstat prázdné.",
"app.dashboard.memberOf": "Skupiny, ve kterých jste členem",
- "app.dashboard.sisGroupsStudent": "Přihlásit se do skupin asociovaných s kurzy ze SISu UK",
- "app.dashboard.sisGroupsStudentExplain": "SIS kurzy, které máte zapsané v určitém semestru a které mají odpovídající skupiny v ReCodExu.",
- "app.dashboard.studentNoGroups": "Zatím nejste členem žádné skupiny. Vedoucí skupiny vás může přidat do jeho/její skupiny, nebo můžete použít jiné mechanismy (jako např. dialog na stránce SIS integrace) a stát se členy skupin, které vám přísluší.",
+ "app.dashboard.studentNoGroups": "Zatím nejste členem žádné skupiny. Prosím, řiďte se pokyny vaší vzdělávací instituce ohledně získávání členství ve skupinách.",
"app.dashboard.studentNoGroupsTitle": "Žádná členství ve skupinách",
- "app.dashboard.supervisorNoGroups": "Aktuálně nemáte ve správě žádné skupiny. Skupinu vám může vytvořit administrátor, nebo můžete použít jiné mechanismy (jako např. dialog na stránce SIS integrace) pro vytvoření skupin pro vaše studenty.",
+ "app.dashboard.supervisorNoGroups": "Aktuálně nemáte ve správě žádné skupiny.",
"app.dashboard.supervisorNoGroupsTitle": "Žádné skupiny",
"app.dashboard.supervisorOf": "Skupiny pod vaší správou (jako administrátor nebo vedoucí)",
"app.dashboard.title": "Celkový přehled všech skupin",
@@ -619,14 +600,6 @@
"app.editShadowAssignmentPointsForm.removePoints": "Odstranit celý záznam",
"app.editShadowAssignmentPointsForm.setNow": "Teď",
"app.editShadowAssignmentPointsForm.validation.pointsOutOfRange": "Body jsou mimo běžný rozsah. Běžný rozsah je od 0 do {maxPoints}.",
- "app.editSisTerm.advertiseUntil": "Nabízet studentům tento semestr do:",
- "app.editSisTerm.beginning": "Začátek semestru:",
- "app.editSisTerm.end": "Konec semestru:",
- "app.editSisTerm.title": "Upravit SIS semestr",
- "app.editSisTerm.validation.advertiseInLimits": "Semestr může být nabízen pouze v době jeho trvání.",
- "app.editSisTerm.validation.noAdvertiseUntil": "Datum konce nabízení semestru je povinný.",
- "app.editSisTerm.validation.noBeginning": "Začátek semestru je povinný.",
- "app.editSisTerm.validation.noEnd": "Konec semestru je povinný.",
"app.editSolutionNoteForm.failed": "Nebylo možné uložit poznámku k řešení.",
"app.editSolutionNoteForm.note": "Poznámka:",
"app.editSystemMessageForm.role": "Uživatelé s touto a vyšší rolí uvidí tuto zprávu.",
@@ -1068,15 +1041,11 @@
"app.group.organizationalExplain": "Tato skupina je organizační, takže nemůže mít žádné studenty ani zadané úlohy. Nicméně úlohy spojené s touto skupinou je možné zadat v podskupinách.",
"app.group.setRoot": "Vybrat",
"app.group.students": "Studenti",
- "app.group.unbind": "Odvázat",
- "app.group.unbind.confirmQuestion": "Opravdu si přejete zrušit tuto vazbu na skupinu? Skupina zůstane na svém místě, ale bez odpovídající vazby na SIS ji nemusí nalézt studenti.",
"app.group.unsetRoot": "Zrušit výběr",
"app.groupAssignments.groupExercises": "Úlohy k zadání ve skupině",
"app.groupDetail.assignments": "Zadané úlohy",
- "app.groupDetail.bindings.genericProvider": "Externí vazby na \"{provider}\"",
- "app.groupDetail.bindings.sis": "Kódy rozvrhových lístků ze SIS UK",
"app.groupDetail.description": "Popis skupiny",
- "app.groupDetail.externalId": "Externí identifikace skupiny",
+ "app.groupDetail.externalAttributes": "Externí atributy:",
"app.groupDetail.hasPublicStats": "Studenti smí vidět body ostatních studentů",
"app.groupDetail.isPublic": "Tuto skupinu vidí každý (a může se do ní přihlásit)",
"app.groupDetail.loading": "Načítání dat skupiny...",
@@ -1159,6 +1128,8 @@
"app.groupStudents.privateStats": "Administrátor skupiny omezil přístup k výsledkům studentů. Z toho důvodu můžete vidět pouze vlastní výsledky, nikoli výsledky ostatních studentů.",
"app.groupStudents.studentsResultsTable": "Studenti a jejich výsledky",
"app.groupStudents.title": "Studenti ve skupině",
+ "app.groupTree.treeViewLeaf.adminPopover.title": "Administrátoři skupiny",
+ "app.groupTree.treeViewLeaf.adminsCount": "{count} {count, plural, one {administrátor} =2 {administrátoři} =3 {administrátoři} =4 {administrátoři} other {administrátorů}}",
"app.groupTree.treeViewLeaf.archivedTooltip": "Tato skupina byla odsunuta do archivu",
"app.groupTree.treeViewLeaf.examTooltip": "Zkoušková skupina",
"app.groupTree.treeViewLeaf.organizationalTooltip": "Skupina je organizační (nemá žádné studenty ani zadané úlohy)",
@@ -1502,11 +1473,6 @@
"app.pipelinesList.judgeOnlyIconTooltip": "Pipeline pouze se sudím",
"app.pipelinesList.stdoutIconTooltip": "Testované řešení by mělo vypsat svoje výsledky na standardní výstup",
"app.pipelinesList.universalPipelineIconTooltip": "Univerzální pipeline, která se používá v konfiguracích běžných úloh.",
- "app.plantSisTerm.noGroupsSelected": "Musí být vybrána alespoň jedna rodičovská skupina.",
- "app.plantSisTerm.plantGroups": "Osadit skupiny",
- "app.plantSisTerm.planted": "Osazeno",
- "app.plantSisTerm.planting": "Sázím...",
- "app.plantSisTerm.title": "Osadit skupiny pro semestr dle SISu",
"app.pointsForm.bonusPoints": "Bonusové body:",
"app.pointsForm.failed": "Ukládání bonusových bodů se nezdařilo.",
"app.pointsForm.maxPointsEver": "(max. bodů bez ohledu na termíny je {maxPointsEver})",
@@ -1767,7 +1733,6 @@
"app.sidebar.menu.admin.instances": "Instance",
"app.sidebar.menu.admin.messages": "Systémové zprávy",
"app.sidebar.menu.admin.server": "Správa serveru",
- "app.sidebar.menu.admin.sis": "SIS integrace [stará]",
"app.sidebar.menu.admin.title": "Administrátor",
"app.sidebar.menu.admin.users": "Uživatelé",
"app.sidebar.menu.archive": "Archiv",
@@ -1779,47 +1744,6 @@
"app.sidebar.menu.pipelines": "Pipeline",
"app.sidebar.menu.signIn": "Přihlásit se",
"app.sidebar.menu.title": "Menu",
- "app.sisBindGroupForm.emptyGroup": "Nejprve vyberte skupinu.",
- "app.sisBindGroupForm.failed": "Svazování skupiny selhalo. Zkuste to prosím později.",
- "app.sisBindGroupForm.group": "Skupina ke svázání:",
- "app.sisBindGroupForm.info": "Vybraný kurz (uvedený výše) bude svázán s vybranou existující skupinou. Pokud nemáte vhodnou skupinu vytvořenou, použijte raději tlačítko 'Vytvořit novou'.",
- "app.sisBindGroupForm.submit": "Svázat",
- "app.sisBindGroupForm.submitting": "Svazuji...",
- "app.sisBindGroupForm.success": "Skupina byla svázána.",
- "app.sisBindGroupForm.title": "Svázat existující skupinu z ReCodExu s rozvrhovým lístkem SISu",
- "app.sisCreateGroupForm.emptyParentGroup": "Nejprve vyberte rodičovskou skupinu.",
- "app.sisCreateGroupForm.failed": "Vytváření skupiny selhalo. Zkuste to prosím později.",
- "app.sisCreateGroupForm.info": "Nově vytvořená skupina bude umístěna přímo pod zvolenou rodičovskou skupinu a bude automaticky svázána s vybraným kurzem (uvedeným výše). Název nové skupiny bude odvozen z názvu kurzu a jeho rozvržení (můžete jej změnit později).",
- "app.sisCreateGroupForm.parentGroup": "Rodičovská skupina:",
- "app.sisCreateGroupForm.submit": "Vytvořit",
- "app.sisCreateGroupForm.submitting": "Vytvářím...",
- "app.sisCreateGroupForm.success": "Skupina byla vytvořena.",
- "app.sisCreateGroupForm.title": "Vytvořit novou skupinu sváznou s rozvrhovým lístkem SISu",
- "app.sisIntegration.deleteConfirm": "Opravdu chcete smazat SIS semestr?",
- "app.sisIntegration.identityInfo": "Váš účet v ReCodExu je asociován se SIS identifikátorem \"{externalId}\".",
- "app.sisIntegration.list": "SIS Semestry",
- "app.sisIntegration.noAccessible": "Váš účet nepodporuje integraci se SISem. Přihlašte se prosím pomocí CAS-UK.",
- "app.sisIntegration.noCasIdentifier": "Váš účet v ReCodExu není asociován s žádným SIS identifikátorem.",
- "app.sisIntegration.noCoursesGroupsAvailable": "V tuto chvíli nejsou v ReCodExu žádné skupiny odpovídající předmětům, které máte zapsány tento semestr.",
- "app.sisIntegration.noSisGroups": "V tuto chvíli nemáte v SISu žádné rozvrhové lístky pro tento semestr.",
- "app.sisIntegration.plantButton": "Osadit",
- "app.sisIntegration.title": "UK SIS Integrace",
- "app.sisIntegration.yearTerm": "Rok a semestr:",
- "app.sisSupervisor.bindGroupButton": "Svázat s existující skupinou",
- "app.sisSupervisor.createGroupButton": "Vytvořit novou skupinu",
- "app.sisSupervisor.groupAdmins": "Administrátoři skupiny",
- "app.sisSupervisor.groupsAlreadyExist": "S daným kurzem je již asociována skupina.",
- "app.sisSupervisor.lab": "Cvičení",
- "app.sisSupervisor.lecture": "Přednáška",
- "app.sisSupervisor.multiGroupPopover.title": "Skupina má vícero vazeb:",
- "app.sisSupervisor.noAccessible": "Váš účet nepodporuje integraci se SISem. Přihlašte se prosím pomocí CAS-UK.",
- "app.sisSupervisor.noSisGroups": "V současnosti nejsou v ReCodExu žádné skupiny, které by odpovídaly tomuto lístku ze SISu.",
- "app.sisSupervisor.noUsersInNewGroupsWarning": "Upozornění: při založení nebo svázání skupiny s lístkem ze SISu nejsou do skupiny přidáni žádní studenti. Svázání pouze zajistí, že je skupina viditelná pro příslušné studenty, a že se do ní mohou sami přihlásit.",
- "app.sisSupervisor.notScheduled": "nerozvrženo",
- "app.sisSupervisor.organizationalGroupWarning": "Studenti se nemohou přidat do organizační skupiny.",
- "app.sisSupervisor.sisGroupsCreate": "Zakládání skupin asociovaných s kurzy ze SISu UK",
- "app.sisSupervisor.sisGroupsCreateExplain": "SIS kurzy, které vyučujete v určitém semestru a které mají mapování do ReCodExu. Můžete vytvořit novou skupinu s vazbou na SIS, nebo svázat existující skupinu na tyto kurzy.",
- "app.sisSupervisor.yearTerm": "Rok a semestr:",
"app.solution.actions.accept": "Akceptovat",
"app.solution.actions.acceptLong": "Akceptovat jako finální",
"app.solution.actions.points.clearOverride": "Zrušit přenastavení bodů",
@@ -2069,14 +1993,6 @@
"app.systemMessagesList.visibleTo": "Viditelné do",
"app.tabbedArrayField.empty": "Nyní zde nejsou žádné záložky.",
"app.tabbedArrayField.reallyRemoveQuestion": "Opravdu chcete tuto záložku odstranit?",
- "app.termsList.advertiseUntil": "Nabízet do",
- "app.termsList.end": "Konec",
- "app.termsList.noTerms": "V tomto seznamu nejsou žádné semestry ze SISu.",
- "app.termsList.start": "Počátek",
- "app.termsList.summer": "Léto",
- "app.termsList.term": "Semestr",
- "app.termsList.winter": "Zima",
- "app.termsList.year": "Rok",
"app.uploadFiles.addFileButton": "Vybrat soubor(y) pro nahrání",
"app.uploadFiles.cancelIconTooltip": "Nahrávání se ruší...",
"app.uploadFiles.completingIconTooltip": "Server konsoliduje nahraná data...",
@@ -2212,4 +2128,4 @@
"recodex-judge-shuffle-all": "Sudí neuspořádaných tokenů a řádků",
"recodex-judge-shuffle-newline": "Sudí neuspořádaných tokenů (ignorující konce řádků)",
"recodex-judge-shuffle-rows": "Sudí neuspořádaných řádků"
-}
+}
\ No newline at end of file
diff --git a/src/locales/en.json b/src/locales/en.json
index 8efdff02a..aeb6bade9 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -45,15 +45,6 @@
"app.addLicense.validation.note": "Note cannot be empty.",
"app.addLicense.validation.validUntilEmpty": "The expiration date of the valid period of the license must be set.",
"app.addLicense.validation.validUntilInThePast": "The expiration date of the valid period of the license must be in the future.",
- "app.addSisTermForm.failed": "Cannot save the new SIS term.",
- "app.addSisTermForm.processing": "Saving...",
- "app.addSisTermForm.submit": "Save new term",
- "app.addSisTermForm.success": "The term is saved.",
- "app.addSisTermForm.summer": "Summer term",
- "app.addSisTermForm.term": "Term:",
- "app.addSisTermForm.title": "Add new term",
- "app.addSisTermForm.winter": "Winter term",
- "app.addSisTermForm.year": "Year:",
"app.addStudent.cannotSearch": "You do not have permissions to search students, so you cannot add them explicitly.",
"app.addStudent.inviteButton": "Invite to Register",
"app.addStudent.inviteDialog.explain": "An invitation will be sent to the user at given email address. The user will receive a link for registration as a local user. User profile details (name and email) must be filled in correctly, since the user will not be able to modify them. Optionally, you may select a list of groups to which the user will be assigned immediately after registration.",
@@ -96,13 +87,6 @@
"app.archiveGroupButton.setShort": "Archive",
"app.archiveGroupButton.unset": "Excavate from Archive",
"app.archiveGroupButton.unsetShort": "Excavate",
- "app.archiveSisTerm.archiveGroups": "Archive Groups",
- "app.archiveSisTerm.archived": "Archived",
- "app.archiveSisTerm.archiving": "Archiving...",
- "app.archiveSisTerm.failed": "Archiving failed. Some of the groups may not have been archived.",
- "app.archiveSisTerm.noGroups": "There are no groups associated with this semester. Perhaps they have all been archived already.",
- "app.archiveSisTerm.noGroupsSelected": "At least one group needs to be selected.",
- "app.archiveSisTerm.title": "Archive Groups of SIS Term",
"app.assignExerciseButton.isBroken": "Broken",
"app.assignExerciseButton.isLocked": "Locked",
"app.assignExerciseButton.noRefSolutions": "Unproven",
@@ -282,7 +266,6 @@
"app.createExerciseForm.validation.noGroupSelected": "No group of residence has been selected.",
"app.createGroup.detaining": "Detaining",
"app.createGroup.detaining.explanation": "Students cannot leave the group on their own. Only a group supervisor/admin can remove them.",
- "app.createGroup.externalId": "External ID of the group:",
"app.createGroup.hasThreshold": "Students require certain number of points to complete the course",
"app.createGroup.hasThreshold.explanation": "The required amount of points can be specified relatively (percentage of total sum of points) or as an absolute point limit. Only one of these values should be specified.",
"app.createGroup.isExam": "Exam",
@@ -299,11 +282,9 @@
"app.createUserForm.validation.emailTaken": "This email address is already taken by someone else.",
"app.createUserForm.validation.emptyPassword": "The password cannot be empty.",
"app.dashboard.memberOf": "Groups you are a member of",
- "app.dashboard.sisGroupsStudent": "Join Groups Associated with UK SIS Courses",
- "app.dashboard.sisGroupsStudentExplain": "SIS courses you are enrolled to in particular semesters and which have corresponding groups in ReCodEx.",
- "app.dashboard.studentNoGroups": "You are not a member of any group yet. A group supervisor may add you into his/her group, or you can use other mechanisms (like the dialog on the SIS integration page) to join some groups that apply to you.",
+ "app.dashboard.studentNoGroups": "You are not a member of any group yet. Please, follow the guidelines provided by your educational institution about how to join a group.",
"app.dashboard.studentNoGroupsTitle": "No Group Memberships",
- "app.dashboard.supervisorNoGroups": "You are currently not supervising any groups. An administrator may create a group for you or you can use other mechanisms (like the dialog on the SIS integration page) to create groups for your students.",
+ "app.dashboard.supervisorNoGroups": "You are currently not supervising any groups.",
"app.dashboard.supervisorNoGroupsTitle": "No Groups",
"app.dashboard.supervisorOf": "Groups managed by you (as admin or supervisor)",
"app.dashboard.title": "Dashboard — a Complete Overview",
@@ -619,14 +600,6 @@
"app.editShadowAssignmentPointsForm.removePoints": "Remove Points Record",
"app.editShadowAssignmentPointsForm.setNow": "Now",
"app.editShadowAssignmentPointsForm.validation.pointsOutOfRange": "Points are out of regular range. Regular score for this assignment is between 0 and {maxPoints}.",
- "app.editSisTerm.advertiseUntil": "Advertise this term to students until:",
- "app.editSisTerm.beginning": "Beginning of the term:",
- "app.editSisTerm.end": "End of the term:",
- "app.editSisTerm.title": "Edit SIS Term",
- "app.editSisTerm.validation.advertiseInLimits": "The term can be advertised only in its period.",
- "app.editSisTerm.validation.noAdvertiseUntil": "End date of advertising the term is required.",
- "app.editSisTerm.validation.noBeginning": "Start of the term is required.",
- "app.editSisTerm.validation.noEnd": "End of the term is required.",
"app.editSolutionNoteForm.failed": "Cannot save the solution note.",
"app.editSolutionNoteForm.note": "Note:",
"app.editSystemMessageForm.role": "Users with this role and its children can see notification.",
@@ -1068,15 +1041,11 @@
"app.group.organizationalExplain": "This group is organizational, so it cannot have any students nor assignments. However, it may have attached exercises which can be assigned in sub-groups.",
"app.group.setRoot": "Select",
"app.group.students": "Students",
- "app.group.unbind": "Unbind",
- "app.group.unbind.confirmQuestion": "Do you really wish to unbind the group? The group will linger on, but it will be detached from the SIS so the students will not see it.",
"app.group.unsetRoot": "Unset",
"app.groupAssignments.groupExercises": "Exercises for Assignment in the Group",
"app.groupDetail.assignments": "Assignments",
- "app.groupDetail.bindings.genericProvider": "External binding to \"{provider}\"",
- "app.groupDetail.bindings.sis": "SIS UK scheduling event codes",
"app.groupDetail.description": "Group Description",
- "app.groupDetail.externalId": "External identification of the group",
+ "app.groupDetail.externalAttributes": "External Attributes:",
"app.groupDetail.hasPublicStats": "Students can see progress of other students",
"app.groupDetail.isPublic": "Everyone can see and join this group",
"app.groupDetail.loading": "Loading group data...",
@@ -1159,6 +1128,8 @@
"app.groupStudents.privateStats": "The admin of the group has restricted the access to the results of students. Therefore, you can see only your own results, not the results of other students.",
"app.groupStudents.studentsResultsTable": "Students and Their Results",
"app.groupStudents.title": "Group Students",
+ "app.groupTree.treeViewLeaf.adminPopover.title": "Group administrators",
+ "app.groupTree.treeViewLeaf.adminsCount": "{count} {count, plural, one {admin} other {admins}}",
"app.groupTree.treeViewLeaf.archivedTooltip": "The group is archived",
"app.groupTree.treeViewLeaf.examTooltip": "Exam group",
"app.groupTree.treeViewLeaf.organizationalTooltip": "The group is organizational (it does not have any students or assignments)",
@@ -1502,11 +1473,6 @@
"app.pipelinesList.judgeOnlyIconTooltip": "Judge-only pipeline",
"app.pipelinesList.stdoutIconTooltip": "Tested solution is expected to yield results to standard output",
"app.pipelinesList.universalPipelineIconTooltip": "Universal pipeline which is used in common (simple) exercise configurations.",
- "app.plantSisTerm.noGroupsSelected": "At least one parent group needs to be selected.",
- "app.plantSisTerm.plantGroups": "Plant Groups",
- "app.plantSisTerm.planted": "Planted",
- "app.plantSisTerm.planting": "Planting...",
- "app.plantSisTerm.title": "Plant Groups for SIS Term",
"app.pointsForm.bonusPoints": "Bonus points:",
"app.pointsForm.failed": "Cannot save the bonus points.",
"app.pointsForm.maxPointsEver": "(max. points limit regardless deadlines is {maxPointsEver})",
@@ -1767,7 +1733,6 @@
"app.sidebar.menu.admin.instances": "Instances",
"app.sidebar.menu.admin.messages": "System Messages",
"app.sidebar.menu.admin.server": "Server Management",
- "app.sidebar.menu.admin.sis": "SIS Integration [old]",
"app.sidebar.menu.admin.title": "Administration",
"app.sidebar.menu.admin.users": "Users",
"app.sidebar.menu.archive": "Archive",
@@ -1779,47 +1744,6 @@
"app.sidebar.menu.pipelines": "Pipelines",
"app.sidebar.menu.signIn": "Sign in",
"app.sidebar.menu.title": "Menu",
- "app.sisBindGroupForm.emptyGroup": "You need to select the group first.",
- "app.sisBindGroupForm.failed": "Binding group failed. Please try again later.",
- "app.sisBindGroupForm.group": "Group to bind:",
- "app.sisBindGroupForm.info": "The selected course (mentioned above) will be bound to selected existing group. If you do not have an appropriate group yet, use 'Create group' button instead.",
- "app.sisBindGroupForm.submit": "Bind",
- "app.sisBindGroupForm.submitting": "Binding...",
- "app.sisBindGroupForm.success": "The group was bound.",
- "app.sisBindGroupForm.title": "Bind existing ReCodEx group with SIS scheduling event",
- "app.sisCreateGroupForm.emptyParentGroup": "You need to select the parent group first.",
- "app.sisCreateGroupForm.failed": "Creating group failed. Please try again later.",
- "app.sisCreateGroupForm.info": "The newly created group will be placed right under selected parent group and it will be automatically bind to selected course (mentioned above). The name of the new group will be derived from the name of the course and its scheduling (you may change it later).",
- "app.sisCreateGroupForm.parentGroup": "Parent group:",
- "app.sisCreateGroupForm.submit": "Create",
- "app.sisCreateGroupForm.submitting": "Creating...",
- "app.sisCreateGroupForm.success": "The group was created.",
- "app.sisCreateGroupForm.title": "Create a new group associated with SIS scheduling event",
- "app.sisIntegration.deleteConfirm": "Are you sure you want to delete the SIS term?",
- "app.sisIntegration.identityInfo": "Your ReCodEx account is associated with SIS identity identifier \"{externalId}\".",
- "app.sisIntegration.list": "SIS Terms",
- "app.sisIntegration.noAccessible": "Your account does not support SIS integration. Please, log in using CAS-UK.",
- "app.sisIntegration.noCasIdentifier": "Your ReCodEx account is not associated with any SIS identity identifier.",
- "app.sisIntegration.noCoursesGroupsAvailable": "There are currently no groups in ReCodEx bound to courses you are enrolled to in this semester.",
- "app.sisIntegration.noSisGroups": "Currently you have no courses in SIS for this semester.",
- "app.sisIntegration.plantButton": "Plant",
- "app.sisIntegration.title": "UK SIS Integration",
- "app.sisIntegration.yearTerm": "Year and term:",
- "app.sisSupervisor.bindGroupButton": "Bind Existing Group",
- "app.sisSupervisor.createGroupButton": "Create New Group",
- "app.sisSupervisor.groupAdmins": "Group Administrators",
- "app.sisSupervisor.groupsAlreadyExist": "Group(s) have been already associated with this course.",
- "app.sisSupervisor.lab": "Lab (seminar)",
- "app.sisSupervisor.lecture": "Lecture",
- "app.sisSupervisor.multiGroupPopover.title": "The group has multiple bindings:",
- "app.sisSupervisor.noAccessible": "Your account does not support SIS integration. Please, log in using CAS-UK.",
- "app.sisSupervisor.noSisGroups": "Currently there are no ReCodEx groups matching this SIS course.",
- "app.sisSupervisor.noUsersInNewGroupsWarning": "Please note that when a group is created from or bound to a SIS course, no students are added to this group. The binding process only ensures that the group is visible to the students and they are allowed to join it.",
- "app.sisSupervisor.notScheduled": "not scheduled",
- "app.sisSupervisor.organizationalGroupWarning": "Students cannot join organizational groups.",
- "app.sisSupervisor.sisGroupsCreate": "Create Groups Associated with UK SIS Courses",
- "app.sisSupervisor.sisGroupsCreateExplain": "SIS courses you teach in particular semesters and which have mapping to ReCodEx. You may create new groups with binding or bind existing groups to these courses.",
- "app.sisSupervisor.yearTerm": "Year and term:",
"app.solution.actions.accept": "Accept",
"app.solution.actions.acceptLong": "Accept as Final",
"app.solution.actions.points.clearOverride": "Clear Points Override",
@@ -2069,14 +1993,6 @@
"app.systemMessagesList.visibleTo": "Visible To",
"app.tabbedArrayField.empty": "There are currently no tabs.",
"app.tabbedArrayField.reallyRemoveQuestion": "Do you really wish to delete this tab?",
- "app.termsList.advertiseUntil": "Advertise Until",
- "app.termsList.end": "End",
- "app.termsList.noTerms": "There are no SIS terms in this list.",
- "app.termsList.start": "Start",
- "app.termsList.summer": "Summer",
- "app.termsList.term": "Term",
- "app.termsList.winter": "Winter",
- "app.termsList.year": "Year",
"app.uploadFiles.addFileButton": "Select File(s) for Upload",
"app.uploadFiles.cancelIconTooltip": "Canceling the upload...",
"app.uploadFiles.completingIconTooltip": "The server is consolidating uploaded data...",
diff --git a/src/pages/Dashboard/Dashboard.js b/src/pages/Dashboard/Dashboard.js
index 88e87eaa4..1acca06d4 100644
--- a/src/pages/Dashboard/Dashboard.js
+++ b/src/pages/Dashboard/Dashboard.js
@@ -162,7 +162,7 @@ class Dashboard extends Component {
@@ -233,7 +233,7 @@ class Dashboard extends Component {
diff --git a/src/pages/EditAssignment/EditAssignment.js b/src/pages/EditAssignment/EditAssignment.js
index a46bc6f15..d433f0def 100644
--- a/src/pages/EditAssignment/EditAssignment.js
+++ b/src/pages/EditAssignment/EditAssignment.js
@@ -241,7 +241,6 @@ EditAssignment.propTypes = {
visibility: PropTypes.string,
visibleFrom: PropTypes.object,
canViewLimitRatios: PropTypes.bool,
- allowVisibleFrom: PropTypes.bool,
exerciseSync: PropTypes.func.isRequired,
validateAssignment: PropTypes.func.isRequired,
links: PropTypes.object,
@@ -262,7 +261,6 @@ export default withLinks(
hasNotificationAsyncJob: hasPendingNotificationAsyncJob(state, assignmentId),
deadlines: editAssignmentFormSelector(state, 'deadlines'),
visibility: editAssignmentFormSelector(state, 'visibility'),
- allowVisibleFrom: editAssignmentFormSelector(state, 'allowVisibleFrom'),
visibleFrom: editAssignmentFormSelector(state, 'visibleFrom'),
canViewLimitRatios: editAssignmentFormSelector(state, 'canViewLimitRatios'),
};
diff --git a/src/pages/EditGroup/EditGroup.js b/src/pages/EditGroup/EditGroup.js
index 4d5a6cc94..c7796081a 100644
--- a/src/pages/EditGroup/EditGroup.js
+++ b/src/pages/EditGroup/EditGroup.js
@@ -53,14 +53,8 @@ class EditGroup extends Component {
}
getInitialValues = lruMemoize(
- ({
- localizedTexts,
- externalId,
- public: isPublic,
- privateData: { publicStats, threshold, pointsLimit, detaining },
- }) => ({
+ ({ localizedTexts, public: isPublic, privateData: { publicStats, threshold, pointsLimit, detaining } }) => ({
localizedTexts: getLocalizedTextsInitialValues(localizedTexts, EDIT_GROUP_FORM_LOCALIZED_TEXTS_DEFAULT),
- externalId,
isPublic,
publicStats,
detaining,
@@ -330,20 +324,11 @@ export default withLinks(
reset: () => dispatch(reset('editGroup')),
loadAsync: () => dispatch(fetchGroupIfNeeded(groupId)),
reload: () => dispatch(fetchGroup(groupId)),
- editGroup: ({
- localizedTexts,
- externalId,
- isPublic,
- publicStats,
- detaining,
- hasThreshold,
- threshold,
- pointsLimit,
- }) =>
+ editGroup: ({ localizedTexts, isPublic, publicStats, detaining, hasThreshold, threshold, pointsLimit }) =>
dispatch(
editGroup(groupId, {
localizedTexts: transformLocalizedTextsFormData(localizedTexts),
- externalId,
+ externalId: '',
isPublic,
publicStats,
detaining,
diff --git a/src/pages/ExerciseAssignments/ExerciseAssignments.js b/src/pages/ExerciseAssignments/ExerciseAssignments.js
index 612060a9f..7e546f94c 100644
--- a/src/pages/ExerciseAssignments/ExerciseAssignments.js
+++ b/src/pages/ExerciseAssignments/ExerciseAssignments.js
@@ -12,7 +12,7 @@ import { ExerciseNavigation } from '../../components/layout/Navigation';
import ResourceRenderer from '../../components/helpers/ResourceRenderer';
import Box from '../../components/widgets/Box';
import Callout from '../../components/widgets/Callout';
-import { AssignmentsIcon, LockIcon, CheckRequiredIcon, SaveIcon } from '../../components/icons';
+import { AssignmentsIcon, LockIcon, CheckRequiredIcon } from '../../components/icons';
import ExerciseCallouts, { exerciseCalloutsAreVisible } from '../../components/Exercises/ExerciseCallouts';
import ExerciseButtons from '../../components/Exercises/ExerciseButtons';
import AssignmentsTable from '../../components/Assignments/Assignment/AssignmentsTable';
@@ -123,6 +123,7 @@ class ExerciseAssignments extends Component {
groupsAccessor,
deadlines,
visibility,
+ canViewLimitRatios,
syncAssignment,
editAssignment,
deleteAssignment,
@@ -230,8 +231,8 @@ class ExerciseAssignments extends Component {
visibility={visibility}
showSendNotification
submitButtonMessages={SUBMIT_BUTTON_MESSAGES}
- defaultIcon={ refreshUser(user.id)} />
- )}
-
-
- {groups => (
- <>
- {isStudentRole(effectiveRole) && (
-
-
- )}
-
- {isSupervisorRole(effectiveRole) && (
-
-
- )}
-
- {isSuperadminRole(effectiveRole) && (
-
-
- {() => (
- (
-
- {Date.now() <= data.advertiseUntil * 1000 && (
- this.openPlantDialog(data, groups)}>
-
- )}
- this.openArchiveDialog(data, groups)}>
-
- this.openEditDialog(id, data)}>
-
- deleteTerm(id)}
- question={
-
-
-
-
- )}
- />
-
- )}
-
-
-
- )}
-
-
-
- ) : (
-
-
- );
- }}
-
- );
- }
-}
-
-SisIntegration.propTypes = {
- loggedInUser: ImmutablePropTypes.map,
- effectiveRole: PropTypes.string,
- fetchStatus: PropTypes.string,
- sisTerms: PropTypes.array.isRequired,
- adminOfGroups: ImmutablePropTypes.map,
- allGroups: ImmutablePropTypes.map,
- loadAsync: PropTypes.func.isRequired,
- createNewTerm: PropTypes.func,
- deleteTerm: PropTypes.func,
- editTerm: PropTypes.func,
- addSubgroup: PropTypes.func,
- setArchived: PropTypes.func,
- refreshGroups: PropTypes.func,
- refreshUser: PropTypes.func.isRequired,
- intl: PropTypes.object.isRequired,
-};
-
-const mapStateToProps = state => {
- return {
- loggedInUser: loggedInUserSelector(state),
- effectiveRole: getLoggedInUserEffectiveRole(state),
- fetchStatus: fetchManyStatus(state),
- sisTerms: readySisTermsSelector(state),
- adminOfGroups: loggedUserAdminOfGroupsSelector(state),
- allGroups: notArchivedGroupsSelector(state),
- };
-};
-
-const mapDispatchToProps = (dispatch, { params }) => ({
- loadAsync: () => SisIntegration.loadAsync(params, dispatch),
- createNewTerm: data => dispatch(create(data)),
- deleteTerm: id => dispatch(deleteTerm(id)),
- editTerm: (id, data) => {
- // convert deadline times to timestamps
- const processedData = Object.assign({}, data, {
- beginning: moment(data.beginning).unix(),
- end: moment(data.end).unix(),
- advertiseUntil: moment(data.advertiseUntil).unix(),
- });
- return dispatch(editTerm(id, processedData));
- },
- addSubgroup: (parentGroup, { localizedTexts, ...data }) =>
- dispatch(
- createGroup({
- ...data,
- localizedTexts: transformLocalizedTextsFormData(localizedTexts),
- instanceId: parentGroup.privateData.instanceId,
- parentGroupId: parentGroup.id,
- })
- ).then(),
- setArchived: groupId => dispatch(setArchived(groupId, true)),
- refreshGroups: () => dispatch(fetchAllGroups()),
- refreshUser: userId => dispatch(fetchUser(userId)),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(SisIntegration));
diff --git a/src/pages/SisIntegration/index.js b/src/pages/SisIntegration/index.js
deleted file mode 100644
index eeb735160..000000000
--- a/src/pages/SisIntegration/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import SisIntegration from './SisIntegration.js';
-export default SisIntegration;
diff --git a/src/pages/routes.js b/src/pages/routes.js
index c188c0feb..f573ced9b 100644
--- a/src/pages/routes.js
+++ b/src/pages/routes.js
@@ -44,7 +44,6 @@ import Registration from './Registration';
import ResetPassword from './ResetPassword';
import ServerManagement from './ServerManagement';
import ShadowAssignment from './ShadowAssignment';
-import SisIntegration from './SisIntegration';
import Solution from './Solution';
import SolutionPlagiarisms from './SolutionPlagiarisms';
import SolutionSourceCodes from './SolutionSourceCodes';
@@ -181,7 +180,6 @@ const routesDescriptors = [
r('app/user/:userId/edit', EditUser, 'EDIT_USER_URI_FACTORY', true),
r('app/submission-failures', SubmissionFailures, 'FAILURES_URI', true),
r('app/system-messages', SystemMessages, 'MESSAGES_URI', true),
- r('app/sis-integration', SisIntegration, 'SIS_INTEGRATION_URI', true),
r('app/archive', Archive, 'ARCHIVE_URI', true),
r('app/server', ServerManagement, 'SERVER_MANAGEMENT_URI', true),
r('admin/instances', Instances, 'ADMIN_INSTANCES_URI', true),
diff --git a/src/redux/modules/groups.js b/src/redux/modules/groups.js
index bbfe50a6d..2abc134e5 100644
--- a/src/redux/modules/groups.js
+++ b/src/redux/modules/groups.js
@@ -13,9 +13,6 @@ import {
additionalActionTypes as additionalInvitationsActionTypes,
} from './groupInvitations.js';
import { actionTypes as shadowAssignmentsActionTypes } from './shadowAssignments.js';
-import { actionTypes as sisSupervisedCoursesActionTypes } from './sisSupervisedCoursesTypes.js';
-import { actionTypes as sisSubscribedCoursesActionTypes } from './sisSubscribedGroups.js';
-import { actionTypes as sisPossibleParentsActionTypes } from './sisPossibleParents.js';
import { selectedInstanceId } from '../selectors/auth.js';
import { objectMap, arrayToObject } from '../../helpers/common.js';
@@ -42,6 +39,7 @@ export const additionalActionTypes = {
...createActionsWithPostfixes('LOCK_STUDENT_EXAM', 'recodex/groups'),
...createActionsWithPostfixes('UNLOCK_STUDENT_EXAM', 'recodex/groups'),
...createActionsWithPostfixes('RELOCATE', 'recodex/groups'),
+ ...createActionsWithPostfixes('GET_ATTRIBUTES', 'recodex/groups'),
};
export const loadGroup = actions.pushResource;
@@ -167,6 +165,14 @@ export const relocateGroup = (groupId, newParentId) =>
endpoint: `/groups/${groupId}/relocate/${newParentId}`,
});
+export const fetchGroupAttributes = groupId =>
+ createApiAction({
+ type: additionalActionTypes.GET_ATTRIBUTES,
+ method: 'GET',
+ endpoint: `/group-attributes/${groupId}`,
+ meta: { groupId },
+ });
+
/*
* Exam-related stuff
*/
@@ -222,6 +228,11 @@ export const unlockStudentFromExam = (groupId, userId) =>
* Reducer
*/
+const sortAttributes = attributes =>
+ attributes.sort(
+ (a, b) => a.service.localeCompare(b.service) || a.key.localeCompare(b.key) || a.value.localeCompare(b.value)
+ );
+
const reducer = handleActions(
Object.assign({}, reduceActions, {
[actionTypes.ADD_FULFILLED]: (state, action) => {
@@ -326,6 +337,18 @@ const reducer = handleActions(
state
),
+ [additionalActionTypes.GET_ATTRIBUTES_PENDING]: (state, { meta: { groupId } }) =>
+ state.setIn(['attributes', groupId], createRecord()),
+
+ [additionalActionTypes.GET_ATTRIBUTES_FULFILLED]: (state, { meta: { groupId }, payload }) =>
+ state.setIn(
+ ['attributes', groupId],
+ createRecord({ state: resourceStatus.FULFILLED, data: sortAttributes(payload) })
+ ),
+
+ [additionalActionTypes.GET_ATTRIBUTES_REJECTED]: (state, { meta: { groupId }, payload: error }) =>
+ state.setIn(['attributes', groupId], createRecord({ state: resourceStatus.FAILED, error })),
+
[additionalActionTypes.SET_EXAM_FLAG_PENDING]: (state, { meta: { groupId } }) =>
state.setIn(['resources', groupId, 'pending-group-type'], true),
@@ -427,50 +450,6 @@ const reducer = handleActions(
)
),
- [sisSupervisedCoursesActionTypes.CREATE_FULFILLED]: (state, { payload: data }) =>
- state.setIn(['resources', data.id], createRecord({ state: resourceStatus.FULFILLED, data })),
-
- [sisSupervisedCoursesActionTypes.BIND_FULFILLED]: (state, { payload: data }) =>
- state.setIn(['resources', data.id], createRecord({ state: resourceStatus.FULFILLED, data })),
-
- [sisSupervisedCoursesActionTypes.UNBIND_FULFILLED]: (state, { meta: { courseId, groupId } }) =>
- state.updateIn(['resources', groupId, 'data', 'privateData', 'bindings', 'sis'], bindings =>
- bindings.filter(binding => binding !== courseId)
- ),
-
- [sisSupervisedCoursesActionTypes.FETCH_FULFILLED]: (state, { payload: { groups } }) =>
- state.update('resources', oldGroups =>
- oldGroups.merge(
- arrayToObject(
- groups,
- o => o.id,
- data => createRecord({ state: resourceStatus.FULFILLED, data })
- )
- )
- ),
-
- [sisSubscribedCoursesActionTypes.FETCH_FULFILLED]: (state, { payload: { groups } }) =>
- state.update('resources', oldGroups =>
- oldGroups.merge(
- arrayToObject(
- groups,
- o => o.id,
- data => createRecord({ state: resourceStatus.FULFILLED, data })
- )
- )
- ),
-
- [sisPossibleParentsActionTypes.FETCH_FULFILLED]: (state, { payload: groups }) =>
- state.update('resources', oldGroups =>
- oldGroups.merge(
- arrayToObject(
- groups,
- o => o.id,
- data => createRecord({ state: resourceStatus.FULFILLED, data })
- )
- )
- ),
-
[invitationsActionTypes.FETCH_FULFILLED]: (state, { payload: { groups } }) =>
state.update('resources', oldGroups =>
oldGroups.merge(
diff --git a/src/redux/modules/sisPossibleParents.js b/src/redux/modules/sisPossibleParents.js
deleted file mode 100644
index 1a12e1072..000000000
--- a/src/redux/modules/sisPossibleParents.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import { handleActions } from 'redux-actions';
-import factory, { initialState, createRecord, resourceStatus } from '../helpers/resourceManager';
-
-const resourceName = 'sisPossibleParents';
-const { actionTypes, actions, reduceActions } = factory({
- resourceName,
- apiEndpointFactory: courseId => `/extensions/sis/remote-courses/${courseId}/possible-parents`,
-});
-
-export { actionTypes };
-
-/**
- * Actions & reducer
- */
-
-export const fetchSisPossibleParentsIfNeeded = actions.fetchOneIfNeeded;
-
-const reducer = handleActions(
- Object.assign({}, reduceActions, {
- [actionTypes.FETCH_FULFILLED]: (state, { payload, meta: { id } }) =>
- state.setIn(
- ['resources', id],
- createRecord({ state: resourceStatus.FULFILLED, data: payload.map(group => group.id) })
- ),
- }),
- initialState
-);
-
-export default reducer;
diff --git a/src/redux/modules/sisStatus.js b/src/redux/modules/sisStatus.js
deleted file mode 100644
index 4f65c24a8..000000000
--- a/src/redux/modules/sisStatus.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import { handleActions } from 'redux-actions';
-import factory, { initialState } from '../helpers/resourceManager';
-
-/**
- * Create actions & reducer
- */
-
-const resourceName = 'sisStatus';
-const { actions, reduceActions } = factory({
- resourceName,
- apiEndpointFactory: () => '/extensions/sis/status',
-});
-
-export const fetchSisStatusIfNeeded = () => actions.fetchOneIfNeeded('status');
-
-const reducer = handleActions(Object.assign({}, reduceActions, {}), initialState);
-
-export default reducer;
diff --git a/src/redux/modules/sisSubscribedGroups.js b/src/redux/modules/sisSubscribedGroups.js
deleted file mode 100644
index 3f55006b8..000000000
--- a/src/redux/modules/sisSubscribedGroups.js
+++ /dev/null
@@ -1,47 +0,0 @@
-import { handleActions } from 'redux-actions';
-import factory, { initialState, createRecord, resourceStatus } from '../helpers/resourceManager';
-import { createApiAction } from '../middleware/apiMiddleware.js';
-import { fromJS } from 'immutable';
-
-/**
- * Create actions & reducer
- */
-
-const resourceName = 'sisSubscribedGroups';
-const { reduceActions } = factory({
- resourceName,
-});
-
-export const actionTypes = {
- FETCH: 'recodex/sisSubscribedGroups/FETCH',
- FETCH_PENDING: 'recodex/sisSubscribedGroups/FETCH_PENDING',
- FETCH_REJECTED: 'recodex/sisSubscribedGroups/FETCH_REJECTED',
- FETCH_FULFILLED: 'recodex/sisSubscribedGroups/FETCH_FULFILLED',
-};
-
-export const fetchSisSubscribedGroups = (userId, year, term) =>
- createApiAction({
- type: actionTypes.FETCH,
- method: 'GET',
- endpoint: `/extensions/sis/users/${userId}/subscribed-groups/${year}/${term}/as-student`,
- meta: { userId, year, term },
- });
-
-const reducer = handleActions(
- Object.assign({}, reduceActions, {
- [actionTypes.FETCH_PENDING]: (state, { meta: { userId, year, term } }) =>
- state.setIn(['resources', userId, `${year}-${term}`], createRecord()),
-
- [actionTypes.FETCH_REJECTED]: (state, { meta: { userId, year, term } }) =>
- state.setIn(['resources', userId, `${year}-${term}`], createRecord({ state: resourceStatus.FAILED })),
-
- [actionTypes.FETCH_FULFILLED]: (state, { payload: { courses }, meta: { userId, year, term } }) =>
- state.setIn(
- ['resources', userId, `${year}-${term}`],
- createRecord({ state: resourceStatus.FULFILLED, data: fromJS(courses) })
- ),
- }),
- initialState
-);
-
-export default reducer;
diff --git a/src/redux/modules/sisSupervisedCourses.js b/src/redux/modules/sisSupervisedCourses.js
deleted file mode 100644
index 682312d19..000000000
--- a/src/redux/modules/sisSupervisedCourses.js
+++ /dev/null
@@ -1,103 +0,0 @@
-import { handleActions } from 'redux-actions';
-import factory, { initialState, createRecord, resourceStatus } from '../helpers/resourceManager';
-import { createApiAction } from '../middleware/apiMiddleware.js';
-import { fromJS } from 'immutable';
-import { actionTypes } from './sisSupervisedCoursesTypes.js';
-import { actionTypes as groupsActionTypes } from './groups.js';
-/**
- * Create actions & reducer
- */
-
-const resourceName = 'sisSupervisedCourses';
-const { reduceActions } = factory({
- resourceName,
-});
-
-export const fetchSisSupervisedCourses = (userId, year, term) =>
- createApiAction({
- type: actionTypes.FETCH,
- method: 'GET',
- endpoint: `/extensions/sis/users/${userId}/supervised-courses/${year}/${term}`,
- meta: { userId, year, term },
- });
-
-export const sisCreateGroup = (courseId, data, userId, year, term) =>
- createApiAction({
- type: actionTypes.CREATE,
- method: 'POST',
- endpoint: `/extensions/sis/remote-courses/${courseId}/create`,
- meta: { userId, courseId, year, term },
- body: { ...data },
- });
-
-export const sisBindGroup = (courseId, data, userId, year, term) =>
- createApiAction({
- type: actionTypes.BIND,
- method: 'POST',
- endpoint: `/extensions/sis/remote-courses/${courseId}/bind`,
- meta: { courseId, userId, year, term },
- body: { ...data },
- });
-
-export const sisUnbindGroup = (courseId, groupId, userId, year, term) =>
- createApiAction({
- type: actionTypes.UNBIND,
- method: 'DELETE',
- endpoint: `/extensions/sis/remote-courses/${courseId}/bindings/${groupId}`,
- meta: { courseId, groupId, userId, year, term },
- });
-
-const reducer = handleActions(
- Object.assign({}, reduceActions, {
- [actionTypes.CREATE_FULFILLED]: (state, { meta: { userId, courseId, year, term }, payload: { id: groupId } }) =>
- state.updateIn(['resources', userId, `${year}-${term}`, 'data', courseId, 'groups'], groups =>
- groups.push(groupId)
- ),
-
- [actionTypes.BIND_FULFILLED]: (state, { meta: { courseId, userId, year, term }, payload: { id: groupId } }) =>
- state.updateIn(['resources', userId, `${year}-${term}`, 'data', courseId, 'groups'], groups =>
- groups.push(groupId)
- ),
-
- [actionTypes.UNBIND_FULFILLED]: (state, { meta: { courseId, groupId, userId } }) =>
- state.updateIn(['resources', userId], terms =>
- terms.map(term => term.updateIn(['data', courseId, 'groups'], groups => groups.filter(g => g !== groupId)))
- ),
-
- [actionTypes.FETCH_PENDING]: (state, { meta: { userId, year, term } }) =>
- state.setIn(['resources', userId, `${year}-${term}`], createRecord()),
-
- [actionTypes.FETCH_REJECTED]: (state, { meta: { userId, year, term } }) =>
- state.setIn(['resources', userId, `${year}-${term}`], createRecord({ state: resourceStatus.FAILED })),
-
- [actionTypes.FETCH_FULFILLED]: (state, { payload: { courses }, meta: { userId, year, term } }) =>
- state.setIn(
- ['resources', userId, `${year}-${term}`],
- createRecord({
- state: resourceStatus.FULFILLED,
- data: fromJS(
- courses.reduce((map, p) => {
- map[p.course.code] = p;
- return map;
- }, {})
- ),
- })
- ),
-
- [groupsActionTypes.REMOVE_FULFILLED]: (state, { meta: { id: groupId } }) =>
- state.update('resources', users =>
- users.map(userTerms =>
- userTerms.map(term =>
- term.update(
- 'data',
- courses =>
- courses && courses.map(course => course.update('groups', groups => groups.filter(g => g !== groupId)))
- )
- )
- )
- ),
- }),
- initialState
-);
-
-export default reducer;
diff --git a/src/redux/modules/sisSupervisedCoursesTypes.js b/src/redux/modules/sisSupervisedCoursesTypes.js
deleted file mode 100644
index 61e797c40..000000000
--- a/src/redux/modules/sisSupervisedCoursesTypes.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// action types declaration was moved outside the auth module to break cyclic import dependencies
-export const actionTypes = {
- FETCH: 'recodex/sisSupervisedCourses/FETCH',
- FETCH_PENDING: 'recodex/sisSupervisedCourses/FETCH_PENDING',
- FETCH_REJECTED: 'recodex/sisSupervisedCourses/FETCH_REJECTED',
- FETCH_FULFILLED: 'recodex/sisSupervisedCourses/FETCH_FULFILLED',
- CREATE: 'recodex/sisSupervisedCourses/CREATE',
- CREATE_FULFILLED: 'recodex/sisSupervisedCourses/CREATE_FULFILLED',
- BIND: 'recodex/sisSupervisedCourses/BIND',
- BIND_FULFILLED: 'recodex/sisSupervisedCourses/BIND_FULFILLED',
- UNBIND: 'recodex/sisSupervisedCourses/UNBIND',
- UNBIND_FULFILLED: 'recodex/sisSupervisedCourses/UNBIND_FULFILLED',
-};
diff --git a/src/redux/modules/sisTerms.js b/src/redux/modules/sisTerms.js
deleted file mode 100644
index a0ed01bc1..000000000
--- a/src/redux/modules/sisTerms.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import { handleActions } from 'redux-actions';
-import factory, { initialState } from '../helpers/resourceManager';
-
-/**
- * Create actions & reducer
- */
-
-const resourceName = 'sisTerms';
-const { actions, reduceActions } = factory({
- resourceName,
- apiEndpointFactory: id => `/extensions/sis/terms/${id}`,
-});
-
-export const fetchManyEndpoint = '/extensions/sis/terms';
-
-export const fetchAllTerms = () =>
- actions.fetchMany({
- endpoint: fetchManyEndpoint,
- });
-export const fetchTermsIfNeeded = actions.fetchIfNeeded;
-export const fetchTermIfNeeded = actions.fetchOneIfNeeded;
-export const create = actions.addResource;
-export const editTerm = actions.updateResource;
-export const deleteTerm = actions.removeResource;
-
-const reducer = handleActions(Object.assign({}, reduceActions, {}), initialState);
-
-export default reducer;
diff --git a/src/redux/reducer.js b/src/redux/reducer.js
index fb5bdfb10..b092695ef 100644
--- a/src/redux/reducer.js
+++ b/src/redux/reducer.js
@@ -39,11 +39,6 @@ import referenceSolutionEvaluations from './modules/referenceSolutionEvaluations
import registration from './modules/registration.js';
import runtimeEnvironments from './modules/runtimeEnvironments.js';
import shadowAssignments from './modules/shadowAssignments.js';
-import sisPossibleParents from './modules/sisPossibleParents.js';
-import sisStatus from './modules/sisStatus.js';
-import sisSubscribedGroups from './modules/sisSubscribedGroups.js';
-import sisSupervisedCourses from './modules/sisSupervisedCourses.js';
-import sisTerms from './modules/sisTerms.js';
import solutions from './modules/solutions.js';
import solutionFiles from './modules/solutionFiles.js';
import solutionReviews from './modules/solutionReviews.js';
@@ -99,11 +94,6 @@ const createRecodexReducers = (token, instanceId, lang) => ({
registration,
runtimeEnvironments,
shadowAssignments,
- sisPossibleParents,
- sisSubscribedGroups,
- sisSupervisedCourses,
- sisStatus,
- sisTerms,
solutions,
solutionFiles,
solutionReviews,
diff --git a/src/redux/selectors/exercisesAuthors.js b/src/redux/selectors/exercisesAuthors.js
index cc71db2b0..db74bca99 100644
--- a/src/redux/selectors/exercisesAuthors.js
+++ b/src/redux/selectors/exercisesAuthors.js
@@ -6,13 +6,13 @@ import { usersSelector } from './users.js';
const exericsesAuthorsAllSelector = state => state.exercisesAuthors.get('all');
const exericsesAuthorsOfGroupSelector = groupId => state => state.exercisesAuthors.getIn(['groups', groupId]);
-export const getAllExericsesAuthors = createSelector(
+export const getAllExercisesAuthors = createSelector(
[exericsesAuthorsAllSelector, usersSelector],
(authors, users) =>
(authors && isReady(authors) && users && authors.get('data').map(id => users.get(id))) || EMPTY_LIST
);
-export const getAllExericsesAuthorsIsLoading = createSelector([exericsesAuthorsAllSelector], authors =>
+export const getAllExercisesAuthorsIsLoading = createSelector([exericsesAuthorsAllSelector], authors =>
Boolean(authors && isLoading(authors))
);
diff --git a/src/redux/selectors/groups.js b/src/redux/selectors/groups.js
index c79071a2e..1e5f8e626 100644
--- a/src/redux/selectors/groups.js
+++ b/src/redux/selectors/groups.js
@@ -170,3 +170,5 @@ export const getGroupsAdmins = groups => {
groups.forEach(group => group && group.primaryAdminsIds && group.primaryAdminsIds.forEach(id => ids.add(id)));
return Array.from(ids);
};
+
+export const groupAttributesSelector = (state, groupId) => state.groups.getIn(['attributes', groupId], null);
diff --git a/src/redux/selectors/sisPossibleParents.js b/src/redux/selectors/sisPossibleParents.js
deleted file mode 100644
index 2afe118ba..000000000
--- a/src/redux/selectors/sisPossibleParents.js
+++ /dev/null
@@ -1 +0,0 @@
-export const sisPossibleParentsSelector = state => state.sisPossibleParents.get('resources');
diff --git a/src/redux/selectors/sisStatus.js b/src/redux/selectors/sisStatus.js
deleted file mode 100644
index 6f39d2f42..000000000
--- a/src/redux/selectors/sisStatus.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { createSelector } from 'reselect';
-
-const getResources = state => state.sisStatus.get('resources');
-
-export const sisStateSelector = createSelector(
- getResources,
- resources => resources.get('status')
-);
diff --git a/src/redux/selectors/sisSubscribedGroups.js b/src/redux/selectors/sisSubscribedGroups.js
deleted file mode 100644
index f4b9681e4..000000000
--- a/src/redux/selectors/sisSubscribedGroups.js
+++ /dev/null
@@ -1,11 +0,0 @@
-import { createSelector } from 'reselect';
-import { Map } from 'immutable';
-
-const getResources = state => state.sisSubscribedGroups.get('resources');
-
-export const sisSubscribedCoursesGroupsSelector = (userId, year, term) =>
- createSelector(getResources, resources =>
- resources && resources.get(userId) && resources.getIn([userId, `${year}-${term}`])
- ? resources.getIn([userId, `${year}-${term}`])
- : Map()
- );
diff --git a/src/redux/selectors/sisSupervisedCourses.js b/src/redux/selectors/sisSupervisedCourses.js
deleted file mode 100644
index 8f8d4fddb..000000000
--- a/src/redux/selectors/sisSupervisedCourses.js
+++ /dev/null
@@ -1,22 +0,0 @@
-import { createSelector } from 'reselect';
-import { Map } from 'immutable';
-import { EMPTY_MAP } from '../../helpers/common.js';
-import { loggedInUserIdSelector } from './auth.js';
-
-const getResources = state => state.sisSupervisedCourses.get('resources');
-
-const getSisStateTerms = state => state.sisStatus.getIn(['resources', 'status', 'data', 'terms']);
-
-export const sisSupervisedCoursesSelector = createSelector(
- [getResources, getSisStateTerms, loggedInUserIdSelector],
- (resources, terms, userId) => {
- return resources && terms && terms.size > 0 && resources.get(userId)
- ? Map(
- terms.map(term => {
- const termKey = term.get('year') + '-' + term.get('term');
- return [termKey, resources.getIn([userId, termKey], EMPTY_MAP)];
- })
- )
- : EMPTY_MAP;
- }
-);
diff --git a/src/redux/selectors/sisTerms.js b/src/redux/selectors/sisTerms.js
deleted file mode 100644
index 73b1d084a..000000000
--- a/src/redux/selectors/sisTerms.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { createSelector } from 'reselect';
-import { fetchManyEndpoint } from '../modules/sisTerms.js';
-import { isReady, getJsData } from '../helpers/resourceManager';
-
-const getTerms = state => state.sisTerms;
-const getResources = exercises => exercises.get('resources');
-
-export const termsSelector = createSelector(getTerms, getResources);
-export const termSelector = termId => createSelector(termsSelector, terms => terms.get(termId));
-
-export const fetchManyStatus = createSelector(getTerms, state => state.getIn(['fetchManyStatus', fetchManyEndpoint]));
-
-export const readySisTermsSelector = createSelector(termsSelector, terms =>
- terms
- .toList()
- .filter(isReady)
- .map(getJsData)
- .sort((a, b) => a.year * 10 + a.term < b.year * 10 + b.term)
- .toArray()
-);