Dex 1435 new notifications to fe

locale/en.json

@@ -1051,7 +1051,7 @@
   "INDIVIDUALS_MERGE_PENDING_TITLE": "Merge pending",
   "INDIVIDUALS_MERGE_PENDING_DESCRIPTION": "Your merge could not be completed immediately because you do not have edit access to all of the sightings associated with these individuals. A notification has been sent to the researchers who own these sightings so they can approve or block the merge. They must respond by {deadlineDate} to block the merge or it will proceed.",
   "DATE_MISSING": "DATE MISSING",
-  "COLLABORATION_ESTABLISHED_BY_USER_MANAGER": "Collaboration established by your user manager",
+  "COLLABORATION_ESTABLISHED_BY_USER_MANAGER": "Collaboration established by a user manager",
   "COLLABORATION_REVOKE_TITLE": "Revoke collaboration",
   "COLLABORATION_EDIT_REQUEST_TITLE": "Edit collaboration request",
   "COLLABORATION_EDIT_APPROVED_TITLE": "Collaboration edit approved",
@@ -1196,5 +1196,16 @@
   "EDIT_COLLABORATION_CURRENT_STATE_LABEL": "Current state",
   "EDIT_COLLABORATION_CURRENT_STATE_DESCRIPTION": "Changing the state will cancel any pending requests.",
   "COLLABORATIONS": "Collaborations",
-  "URLS_MUST_INCLUDE_HTTPS": "All URLs must include https:// to be valid"
+  "URLS_MUST_INCLUDE_HTTPS": "All URLs must include https:// to be valid",
+  "EDIT_COLLABORATION_REVOKED_BY_USER_MANAGER": "Edit collaboration revoked by a user manager.",
+  "EDIT_COLLABORATION_WAS_REVOKED_BY_A_USER_MANAGER": "An edit-level collaboration with {otherUserNameForManagerNotifications} was revoked by a user manager {managerName}.",
+  "COLLABORATION_EDIT_DENIED": "Collaboration edit denied",
+  "EDIT_COLLABORATION_DENIED_MESSAGE": "{userName} denied your collaboration edit request",
+  "COLLABORATION_DENIED_BY_USER_MANAGER": "Collaboration denied by a user manager",
+  "COLLABORATION_DENIED_BY_USER_MANAGER_MESSAGE": "Your collaboration with {otherUserNameForManagerNotifications} was denied by a user manager {managerName}.",
+  "EDIT_COLLABORATION_DENIED_BY_USER_MANAGER": "Edit-level collaboration denied by a user manager",
+  "EDIT_COLLABORATION_DENIED_BY_USER_MANAGER_MESSAGE": "An edit-level collaboration with {otherUserNameForManagerNotifications} was denied by a user manager {managerName}.",
+  "EDIT_COLLABORATION_APPROVED_BY_USER_MANAGER": "Edit collaboration approved by a user manager",
+  "EDIT_COLLABORATION_WAS_APPROVED_BY_A_USER_MANAGER": "An edit-level collaboration with {otherUserNameForManagerNotifications} was approved by a user manager {managerName}.",
+  "UNNAMED_MANAGER": "Unnamed manager"
 }

src/components/AuthenticatedAppHeader/NotificationPaneDisplayText.jsx

@@ -15,6 +15,9 @@ export default function NotificationPaneDisplayText({
   theirIndividualName,
   theirIndividualGuid,
   formattedDeadline,
+  otherUserGuidForManagerNotifications,
+  otherUserNameForManagerNotifications,
+  managerName,
   timeSince,
 }) {
   const theme = useTheme();
@@ -54,6 +57,17 @@ export default function NotificationPaneDisplayText({
             </span>
           ),
           formattedDeadline,
+          otherUserNameForManagerNotifications: (
+            <span>
+              <Link
+                newTab
+                href={`/users/${otherUserGuidForManagerNotifications}`}
+              >
+                {otherUserNameForManagerNotifications}
+              </Link>
+            </span>
+          ),
+          managerName,
         }}
       />
       <Text

src/components/AuthenticatedAppHeader/NotificationsPane.jsx

@@ -28,6 +28,7 @@ export default function NotificationsPane({
   refreshNotifications,
   shouldOpen,
   setShouldOpen,
+  currentUserGuid,
 }) {
   const intl = useIntl();
   const queryClient = useQueryClient();
@@ -85,7 +86,14 @@ export default function NotificationsPane({
                 theirIndividualName,
                 theirIndividualGuid,
                 formattedDeadline,
-              } = getNotificationProps(intl, notification);
+                otherUserGuidForManagerNotifications,
+                otherUserNameForManagerNotifications,
+                managerName,
+              } = getNotificationProps(
+                intl,
+                notification,
+                currentUserGuid,
+              );
               const deriveButtonPath = get(
                 currentNotificationSchema,
                 'deriveButtonPath',
@@ -130,6 +138,13 @@ export default function NotificationsPane({
                         theirIndividualName={theirIndividualName}
                         theirIndividualGuid={theirIndividualGuid}
                         formattedDeadline={formattedDeadline}
+                        otherUserGuidForManagerNotifications={
+                          otherUserGuidForManagerNotifications
+                        }
+                        otherUserNameForManagerNotifications={
+                          otherUserNameForManagerNotifications
+                        }
+                        managerName={managerName}
                         timeSince={timeSince}
                       />
                     </div>

src/components/AuthenticatedAppHeader/index.js

@@ -142,6 +142,7 @@ export default function AppHeader() {
             refreshNotifications={refreshNotifications}
             shouldOpen={shouldOpenNotificationPane}
             setShouldOpen={setShouldOpenNotificationPane}
+            currentUserGuid={meData?.guid}
           />
           <HeaderButton
             onClick={e => setUserMenuAnchorEl(e.currentTarget)}

src/components/dialogs/NotificationDetailsDialog.jsx

@@ -12,6 +12,7 @@ import ButtonLink from '../ButtonLink';
 import Button from '../Button';
 import CustomAlert from '../Alert';
 import { getNotificationProps } from '../../utils/notificationUtils';
+import useGetMe from '../../models/users/useGetMe';
 
 export default function NotificationDetailsDialog({
   open,
@@ -27,6 +28,20 @@ export default function NotificationDetailsDialog({
   const onCloseDialog = () => {
     onClose();
   };
+  const {
+    data: currentUserData,
+    loading: currentUserLoading,
+    error: currentUserError,
+  } = useGetMe();
+
+  const props =
+    currentUserLoading || currentUserError
+      ? {}
+      : getNotificationProps(
+          intl,
+          notification,
+          currentUserData?.guid,
+        );
 
   const {
     userName,
@@ -38,7 +53,10 @@ export default function NotificationDetailsDialog({
     theirIndividualName,
     theirIndividualGuid,
     formattedDeadline,
-  } = getNotificationProps(intl, notification);
+    otherUserGuidForManagerNotifications,
+    otherUserNameForManagerNotifications,
+    managerName,
+  } = props;
 
   return (
     <StandardDialog
@@ -81,6 +99,17 @@ export default function NotificationDetailsDialog({
               </span>
             ),
             formattedDeadline,
+            otherUserNameForManagerNotifications: (
+              <span>
+                <Link
+                  newTab
+                  href={`/users/${otherUserGuidForManagerNotifications}`}
+                >
+                  {otherUserNameForManagerNotifications}
+                </Link>
+              </span>
+            ),
+            managerName,
           }}
         />
       </DialogContent>

src/components/dialogs/notificationDialogUtils/NotificationCollaborationEditDeniedDialog.jsx

@@ -0,0 +1,30 @@
+import React from 'react';
+import { get } from 'lodash-es';
+import { notificationSchema } from '../../../constants/notificationSchema';
+import NotificationDetailsDialog from '../NotificationDetailsDialog';
+
+export default function NotificationCollaborationEditDeniedDialog({
+  notification,
+  onClose,
+  open,
+}) {
+  const notificationType = notification?.message_type;
+  const currentNotificationSchema = get(
+    notificationSchema,
+    notificationType,
+  );
+  const availableButtons = [];
+  return (
+    <NotificationDetailsDialog
+      open={open}
+      onClose={onClose}
+      notification={notification}
+      titleId={get(currentNotificationSchema, 'titleId')}
+      moreDetailedDescription={get(
+        currentNotificationSchema,
+        'moreDetailedDescription',
+      )}
+      buttons={availableButtons}
+    />
+  );
+}

src/components/dialogs/notificationDialogUtils/NotificationCollaborationManagerDeniedDialog.jsx

@@ -0,0 +1,30 @@
+import React from 'react';
+import { get } from 'lodash-es';
+import { notificationSchema } from '../../../constants/notificationSchema';
+import NotificationDetailsDialog from '../NotificationDetailsDialog';
+
+export default function NotificationCollaborationManagerDeniedDialog({
+  notification,
+  onClose,
+  open,
+}) {
+  const notificationType = notification?.message_type;
+  const currentNotificationSchema = get(
+    notificationSchema,
+    notificationType,
+  );
+  const availableButtons = [];
+  return (
+    <NotificationDetailsDialog
+      open={open}
+      onClose={onClose}
+      notification={notification}
+      titleId={get(currentNotificationSchema, 'titleId')}
+      moreDetailedDescription={get(
+        currentNotificationSchema,
+        'moreDetailedDescription',
+      )}
+      buttons={availableButtons}
+    />
+  );
+}

src/components/dialogs/notificationDialogUtils/NotificationCollaborationManagerEditApprovedDialog.jsx

@@ -0,0 +1,30 @@
+import React from 'react';
+import { get } from 'lodash-es';
+import { notificationSchema } from '../../../constants/notificationSchema';
+import NotificationDetailsDialog from '../NotificationDetailsDialog';
+
+export default function NotificationCollaborationManagerEditApprovedDialog({
+  notification,
+  onClose,
+  open,
+}) {
+  const notificationType = notification?.message_type;
+  const currentNotificationSchema = get(
+    notificationSchema,
+    notificationType,
+  );
+  const availableButtons = [];
+  return (
+    <NotificationDetailsDialog
+      open={open}
+      onClose={onClose}
+      notification={notification}
+      titleId={get(currentNotificationSchema, 'titleId')}
+      moreDetailedDescription={get(
+        currentNotificationSchema,
+        'moreDetailedDescription',
+      )}
+      buttons={availableButtons}
+    />
+  );
+}

src/components/dialogs/notificationDialogUtils/NotificationCollaborationManagerEditDeniedDialog.jsx

@@ -0,0 +1,30 @@
+import React from 'react';
+import { get } from 'lodash-es';
+import { notificationSchema } from '../../../constants/notificationSchema';
+import NotificationDetailsDialog from '../NotificationDetailsDialog';
+
+export default function NotificationCollaborationManagerEditDeniedDialog({
+  notification,
+  onClose,
+  open,
+}) {
+  const notificationType = notification?.message_type;
+  const currentNotificationSchema = get(
+    notificationSchema,
+    notificationType,
+  );
+  const availableButtons = [];
+  return (
+    <NotificationDetailsDialog
+      open={open}
+      onClose={onClose}
+      notification={notification}
+      titleId={get(currentNotificationSchema, 'titleId')}
+      moreDetailedDescription={get(
+        currentNotificationSchema,
+        'moreDetailedDescription',
+      )}
+      buttons={availableButtons}
+    />
+  );
+}

src/components/dialogs/notificationDialogUtils/NotificationCollaborationManagerEditRevokeDialog.jsx

@@ -0,0 +1,30 @@
+import React from 'react';
+import { get } from 'lodash-es';
+import { notificationSchema } from '../../../constants/notificationSchema';
+import NotificationDetailsDialog from '../NotificationDetailsDialog';
+
+export default function NotificationCollaborationManagerEditRevokeDialog({
+  notification,
+  onClose,
+  open,
+}) {
+  const notificationType = notification?.message_type;
+  const currentNotificationSchema = get(
+    notificationSchema,
+    notificationType,
+  );
+  const availableButtons = [];
+  return (
+    <NotificationDetailsDialog
+      open={open}
+      onClose={onClose}
+      notification={notification}
+      titleId={get(currentNotificationSchema, 'titleId')}
+      moreDetailedDescription={get(
+        currentNotificationSchema,
+        'moreDetailedDescription',
+      )}
+      buttons={availableButtons}
+    />
+  );
+}

src/components/dialogs/notificationDialogUtils/index.js

@@ -10,6 +10,12 @@ import NotificationCollaborationManagerRevokeDialog from './NotificationCollabor
 import NotificationIndividualMergeRequestDialog from './NotificationIndividualMergeRequestDialog';
 import NotificationIndividualMergeCompleteDialog from './NotificationIndividualMergeCompleteDialog';
 import NotificationIndividualMergeBlockDialog from './NotificationIndividualMergeBlockDialog';
+import NotificationCollaborationManagerEditApprovedDialog from './NotificationCollaborationManagerEditApprovedDialog';
+import NotificationCollaborationManagerEditRevokeDialog from './NotificationCollaborationManagerEditRevokeDialog';
+import NotificationCollaborationEditDeniedDialog from './NotificationCollaborationEditDeniedDialog';
+import NotificationCollaborationManagerDeniedDialog from './NotificationCollaborationManagerDeniedDialog';
+import NotificationCollaborationManagerEditDeniedDialog from './NotificationCollaborationManagerEditDeniedDialog';
+
 import { notificationTypeNames } from '../../../constants/notificationSchema';
 
 export const notificationTypes = {
@@ -37,4 +43,14 @@ export const notificationTypes = {
     NotificationIndividualMergeCompleteDialog,
   [notificationTypeNames.individual_merge_blocked]:
     NotificationIndividualMergeBlockDialog,
+  [notificationTypeNames.collaboration_manager_edit_approved]:
+    NotificationCollaborationManagerEditApprovedDialog,
+  [notificationTypeNames.collaboration_manager_edit_revoke]:
+    NotificationCollaborationManagerEditRevokeDialog,
+  [notificationTypeNames.collaboration_edit_denied]:
+    NotificationCollaborationEditDeniedDialog,
+  [notificationTypeNames.collaboration_manager_denied]:
+    NotificationCollaborationManagerDeniedDialog,
+  [notificationTypeNames.collaboration_manager_edit_denied]:
+    NotificationCollaborationManagerEditDeniedDialog,
 };