Transitively archived groups will show links to directly archived ancestor groups.

krulis-martin · krulis-martin · commit dfda8d054fac · 2021-10-03T13:25:54.000+02:00
diff --git a/src/components/Groups/GroupArchivedWarning/GroupArchivedWarning.js b/src/components/Groups/GroupArchivedWarning/GroupArchivedWarning.js
@@ -2,10 +2,25 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { Row, Col } from 'react-bootstrap';
 import { FormattedMessage } from 'react-intl';
+import { Link } from 'react-router-dom';
+
+import GroupsNameContainer from '../../../containers/GroupsNameContainer';
 import Callout from '../../widgets/Callout';
 
-const GroupArchivedWarning = ({ archived, directlyArchived }) =>
-  archived && (
+const GroupArchivedWarning = ({
+  archived = false,
+  directlyArchived = false,
+  parentGroupsIds = [],
+  groupsDataAccessor = null,
+  linkFactory = null,
+}) => {
+  const directlyArchivedAncestors =
+    archived &&
+    !directlyArchived &&
+    groupsDataAccessor &&
+    parentGroupsIds.filter(id => groupsDataAccessor(id) && groupsDataAccessor(id).get('directlyArchived'));
+
+  return archived ? (
     <Row>
       <Col lg={12}>
         <Callout variant="warning">
@@ -15,19 +30,40 @@ const GroupArchivedWarning = ({ archived, directlyArchived }) =>
           />
           <br />
           {!directlyArchived && (
-            <FormattedMessage
-              id="app.group.notDirectlyArchived"
-              defaultMessage="This group inherits the archived flag from one of its parent groups."
-            />
+            <>
+              <FormattedMessage
+                id="app.group.notDirectlyArchived"
+                defaultMessage="This group inherits the archived flag from one of its parent groups."
+              />
+              {directlyArchivedAncestors && directlyArchivedAncestors.length > 0 && (
+                <ul>
+                  {directlyArchivedAncestors.map(id => (
+                    <li key={id}>
+                      {linkFactory ? (
+                        <Link to={linkFactory(id)}>
+                          <GroupsNameContainer groupId={id} fullName />
+                        </Link>
+                      ) : (
+                        <GroupsNameContainer groupId={id} fullName links />
+                      )}
+                    </li>
+                  ))}
+                </ul>
+              )}
+            </>
           )}
         </Callout>
       </Col>
     </Row>
-  );
+  ) : null;
+};
 
 GroupArchivedWarning.propTypes = {
-  archived: PropTypes.bool.isRequired,
-  directlyArchived: PropTypes.bool.isRequired,
+  archived: PropTypes.bool,
+  directlyArchived: PropTypes.bool,
+  parentGroupsIds: PropTypes.array,
+  groupsDataAccessor: PropTypes.func,
+  linkFactory: PropTypes.func,
 };
 
 export default GroupArchivedWarning;
diff --git a/src/locales/cs.json b/src/locales/cs.json
@@ -894,7 +894,7 @@
   "app.group.info": "Info skupiny",
   "app.group.isPublicWarning": "Skupina je veřejná, což znamená, že ji vidí všichni a kdokoli se do ní může přihlásit.",
   "app.group.mailtoAll": "Mail všem studentům",
-  "app.group.notDirectlyArchived": "Tato skupina zdědila příznak archivace od svých rodičů.",
+  "app.group.notDirectlyArchived": "Tato skupina zdědila příznak archivace od jednoho ze svých rodičů.",
   "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.spervisorsView.addStudent": "Přidat studenta",
diff --git a/src/pages/EditGroup/EditGroup.js b/src/pages/EditGroup/EditGroup.js
@@ -17,6 +17,7 @@ import ArchiveGroupButtonContainer from '../../containers/ArchiveGroupButtonCont
 import DeleteGroupButtonContainer from '../../containers/DeleteGroupButtonContainer';
 import Box from '../../components/widgets/Box';
 import Callout from '../../components/widgets/Callout';
+import GroupArchivedWarning from '../../components/Groups/GroupArchivedWarning/GroupArchivedWarning';
 import { BanIcon, InfoIcon, EditGroupIcon } from '../../components/icons';
 
 import { fetchGroup, fetchGroupIfNeeded, editGroup, relocateGroup } from '../../redux/modules/groups';
@@ -32,7 +33,6 @@ import { getLocalizedTextsInitialValues, transformLocalizedTextsFormData } from
 
 import withLinks from '../../helpers/withLinks';
 import { hasPermissions } from '../../helpers/common';
-import GroupArchivedWarning from '../../components/Groups/GroupArchivedWarning/GroupArchivedWarning';
 
 const canRelocate = group => hasPermissions(group, 'relocate') && !group.archived;
 
@@ -67,13 +67,13 @@ class EditGroup extends Component {
       groups,
       groupsAccessor,
       isSuperAdmin,
-      links: { GROUP_INFO_URI_FACTORY, INSTANCE_URI_FACTORY },
       editGroup,
       relocateGroup,
       hasThreshold,
       canViewParentDetail,
       instanceId,
       reload,
+      links: { GROUP_INFO_URI_FACTORY, INSTANCE_URI_FACTORY, GROUP_EDIT_URI_FACTORY },
       intl: { locale },
     } = this.props;
 
@@ -103,7 +103,7 @@ class EditGroup extends Component {
               </Row>
             )}
 
-            <GroupArchivedWarning archived={group.archived} directlyArchived={group.directlyArchived} />
+            <GroupArchivedWarning {...group} groupsDataAccessor={groupsAccessor} linkFactory={GROUP_EDIT_URI_FACTORY} />
 
             {hasPermissions(group, 'update') && (
               <>
diff --git a/src/pages/GroupDetail/GroupDetail.js b/src/pages/GroupDetail/GroupDetail.js
@@ -38,7 +38,7 @@ import { loggedInUserIdSelector } from '../../redux/selectors/auth';
 import { loggedInUserSelector, getLoggedInUserEffectiveRole } from '../../redux/selectors/users';
 import {
   groupSelector,
-  groupsSelector,
+  groupDataAccessorSelector,
   groupsAssignmentsSelector,
   groupsShadowAssignmentsSelector,
 } from '../../redux/selectors/groups';
@@ -130,6 +130,7 @@ class GroupDetail extends Component {
   render() {
     const {
       group,
+      groupsAccessor,
       students,
       loggedUser,
       effectiveRole,
@@ -149,6 +150,7 @@ class GroupDetail extends Component {
       fetchUsersSolutions,
       setShadowPoints,
       removeShadowPoints,
+      links: { GROUP_DETAIL_URI_FACTORY },
     } = this.props;
 
     return (
@@ -216,7 +218,11 @@ class GroupDetail extends Component {
                 </Row>
               )}
 
-              <GroupArchivedWarning archived={data.archived} directlyArchived={data.directlyArchived} />
+              <GroupArchivedWarning
+                {...data}
+                groupsDataAccessor={groupsAccessor}
+                linkFactory={GROUP_DETAIL_URI_FACTORY}
+              />
 
               {!data.organizational && hasPermissions(data, 'viewAssignments') && (
                 <>
@@ -421,12 +427,12 @@ GroupDetail.propTypes = {
   loggedUser: ImmutablePropTypes.map,
   effectiveRole: PropTypes.string,
   group: ImmutablePropTypes.map,
+  groupsAccessor: PropTypes.func.isRequired,
   instance: ImmutablePropTypes.map,
   students: PropTypes.array,
   assignments: ImmutablePropTypes.list,
   shadowAssignments: ImmutablePropTypes.list,
   assignmentEnvironmentsSelector: PropTypes.func,
-  groups: ImmutablePropTypes.map,
   isGroupAdmin: PropTypes.bool,
   isGroupSupervisor: PropTypes.bool,
   isGroupStudent: PropTypes.bool,
@@ -457,10 +463,10 @@ const mapStateToProps = (
 
   return {
     group: groupSelector(state, groupId),
+    groupsAccessor: groupDataAccessorSelector(state),
     userId,
     loggedUser: loggedInUserSelector(state),
     effectiveRole: getLoggedInUserEffectiveRole(state),
-    groups: groupsSelector(state),
     assignments: groupsAssignmentsSelector(state, groupId),
     shadowAssignments: groupsShadowAssignmentsSelector(state, groupId),
     assignmentEnvironmentsSelector: assignmentEnvironmentsSelector(state),
diff --git a/src/pages/GroupInfo/GroupInfo.js b/src/pages/GroupInfo/GroupInfo.js
@@ -18,7 +18,7 @@ import {
 import { fetchByIds, fetchUser } from '../../redux/modules/users';
 import { loggedInUserIdSelector } from '../../redux/selectors/auth';
 import { isLoggedAsSuperAdmin } from '../../redux/selectors/users';
-import { groupSelector, groupsSelector } from '../../redux/selectors/groups';
+import { groupSelector, groupDataAccessorSelector, groupsSelector } from '../../redux/selectors/groups';
 import {
   primaryAdminsOfGroupSelector,
   supervisorsOfGroupSelector,
@@ -46,6 +46,8 @@ import { BanIcon, GroupIcon } from '../../components/icons';
 import { hasPermissions, safeGet } from '../../helpers/common';
 import GroupArchivedWarning from '../../components/Groups/GroupArchivedWarning/GroupArchivedWarning';
 
+import withLinks from '../../helpers/withLinks';
+
 class GroupInfo extends Component {
   static loadAsync = ({ groupId }, dispatch) =>
     dispatch(fetchGroupIfNeeded(groupId))
@@ -87,6 +89,7 @@ class GroupInfo extends Component {
       group,
       userId,
       groups,
+      groupsAccessor,
       primaryAdmins = [],
       supervisors = [],
       observers = [],
@@ -102,6 +105,7 @@ class GroupInfo extends Component {
       addSupervisor,
       addObserver,
       removeMember,
+      links: { GROUP_INFO_URI_FACTORY },
       intl: { locale },
     } = this.props;
 
@@ -131,7 +135,7 @@ class GroupInfo extends Component {
                 </div>
               )}
 
-            <GroupArchivedWarning archived={data.archived} directlyArchived={data.directlyArchived} />
+            <GroupArchivedWarning {...data} groupsDataAccessor={groupsAccessor} linkFactory={GROUP_INFO_URI_FACTORY} />
 
             {!hasPermissions(data, 'viewDetail') && (
               <Row>
@@ -262,6 +266,7 @@ GroupInfo.propTypes = {
   match: PropTypes.shape({ params: PropTypes.shape({ groupId: PropTypes.string.isRequired }).isRequired }).isRequired,
   userId: PropTypes.string.isRequired,
   group: ImmutablePropTypes.map,
+  groupsAccessor: PropTypes.func.isRequired,
   instance: ImmutablePropTypes.map,
   primaryAdmins: PropTypes.array,
   supervisors: PropTypes.array,
@@ -301,6 +306,7 @@ const mapStateToProps = (
     group: groupSelector(state, groupId),
     userId,
     groups: groupsSelector(state),
+    groupsAccessor: groupDataAccessorSelector(state),
     primaryAdmins: primaryAdminsOfGroupSelector(state, groupId),
     supervisors: supervisorsOfGroupSelector(state, groupId),
     observers: observersOfGroupSelector(state, groupId),
@@ -337,4 +343,4 @@ const mapDispatchToProps = (dispatch, { match: { params } }) => ({
   removeMember: (userId, groupId) => dispatch(removeMember(userId, groupId)),
 });
 
-export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(GroupInfo));
+export default withLinks(connect(mapStateToProps, mapDispatchToProps)(injectIntl(GroupInfo)));
diff --git a/src/pages/GroupUserSolutions/GroupUserSolutions.js b/src/pages/GroupUserSolutions/GroupUserSolutions.js
@@ -26,13 +26,14 @@ import ResourceRenderer from '../../components/helpers/ResourceRenderer';
 import FetchManyResourceRenderer from '../../components/helpers/FetchManyResourceRenderer';
 import { LocalizedExerciseName } from '../../components/helpers/LocalizedNames';
 import EnvironmentsListItem from '../../components/helpers/EnvironmentsList/EnvironmentsListItem';
+import GroupArchivedWarning from '../../components/Groups/GroupArchivedWarning/GroupArchivedWarning';
 
 import { fetchUserIfNeeded } from '../../redux/modules/users';
 import { fetchAssignmentsForGroup } from '../../redux/modules/assignments';
 import { fetchGroupIfNeeded } from '../../redux/modules/groups';
 import { fetchRuntimeEnvironments } from '../../redux/modules/runtimeEnvironments';
 import { fetchGroupStudentsSolutions } from '../../redux/modules/solutions';
-import { groupSelector, groupsAssignmentsSelector } from '../../redux/selectors/groups';
+import { groupSelector, groupsAssignmentsSelector, groupDataAccessorSelector } from '../../redux/selectors/groups';
 import {
   assignmentEnvironmentsSelector,
   getUserSolutions,
@@ -291,6 +292,7 @@ class GroupUserSolutions extends Component {
       groupId,
       userId,
       group,
+      groupsAccessor,
       assignments,
       assignmentEnvironmentsSelector,
       getAssignmentSolutions,
@@ -318,6 +320,12 @@ class GroupUserSolutions extends Component {
               canViewDetail={hasPermissions(group, 'viewDetail')}
             />
 
+            <GroupArchivedWarning
+              {...group}
+              groupsDataAccessor={groupsAccessor}
+              linkFactory={links.GROUP_EDIT_URI_FACTORY}
+            />
+
             <div className="text-right text-nowrap py-2">
               <OnOffCheckbox
                 className="text-left mr-3"
@@ -436,6 +444,7 @@ GroupUserSolutions.propTypes = {
   groupId: PropTypes.string.isRequired,
   userId: PropTypes.string.isRequired,
   group: ImmutablePropTypes.map,
+  groupsAccessor: PropTypes.func.isRequired,
   assignments: ImmutablePropTypes.list,
   assignmentEnvironmentsSelector: PropTypes.func,
   fetchSolutionsStatus: PropTypes.string,
@@ -462,15 +471,14 @@ export default withLinks(
         groupId,
         userId,
         group: groupSelector(state, groupId),
+        groupsAccessor: groupDataAccessorSelector(state),
         assignments: groupsAssignmentsSelector(state, groupId),
         assignmentEnvironmentsSelector: assignmentEnvironmentsSelector(state),
         fetchSolutionsStatus: fetchManyGroupStudentsSolutionsStatus(state)(groupId, userId),
         fetchRuntimesStatus: fetchRuntimeEnvironmentsStatus(state),
-
         getAssignmentSolutions: assignmentId => getUserSolutions(state)(userId, assignmentId),
         getAssignmentSolutionsSorted: assignmentId => getUserSolutionsSortedData(state)(userId, assignmentId),
         getRuntime: runtimeEnvironmentSelector(state),
-
         loggedUserId: loggedInUserIdSelector(state),
       };
     },
