{logo ? (
- 
+
{currentPageText}
diff --git a/src/components/UserManagerCollaborationEditTable.jsx b/src/components/UserManagerCollaborationEditTable.jsx
new file mode 100644
index 000000000..2dd89d80b
--- /dev/null
+++ b/src/components/UserManagerCollaborationEditTable.jsx
@@ -0,0 +1,197 @@
+import React, { useState } from 'react';
+import { useIntl } from 'react-intl';
+import { get } from 'lodash-es';
+
+import { collaborationLabelIds } from '../pages/userManagement/constants/collaboration';
+import { formatUserMessage } from '../pages/userManagement/utils';
+import EditCollaborationDialog from '../pages/userManagement/components/EditCollaborationDialog';
+import CustomAlert from './Alert';
+import Text from './Text';
+import DataDisplay from './dataDisplays/DataDisplay';
+import ActionIcon from './ActionIcon';
+import { cellRenderers } from './dataDisplays/cellRenderers';
+import usePatchCollaboration from '../models/collaboration/usePatchCollaboration';
+import {
+ getRequestedState,
+ getSummaryState,
+ summaryStates,
+} from '../utils/collaborationUtils';
+
+const ActionGroupRenderer = cellRenderers.actionGroup;
+
+function Actions({ onRevoke, ...actionGroupRendererProps }) {
+ const collaborationRow = actionGroupRendererProps.datum;
+
+ return (
+
+ onRevoke(collaborationRow?.guid)}
+ />
+
+ );
+}
+
+export default function UserManagerCollaborationEditTable({
+ inputData,
+ collaborationLoading,
+ collaborationError,
+}) {
+ const intl = useIntl();
+ const [activeCollaborationGuid, setActiveCollaborationGuid] =
+ useState(null);
+
+ const activeCollaboration = inputData?.find(
+ collaboration => collaboration?.guid === activeCollaborationGuid,
+ );
+
+ const {
+ mutate: revokeCollab,
+ success: revokeSuccess,
+ loading: revokeLoading,
+ clearSuccess: clearRevokeSuccess,
+ error: revokeError,
+ clearError: onClearRevokeError,
+ } = usePatchCollaboration();
+
+ const isLoading = revokeLoading || collaborationLoading;
+
+ function processRevoke(collaborationGuid) {
+ const operations = [
+ {
+ op: 'replace',
+ path: '/managed_view_permission',
+ value: { permission: 'revoked' },
+ },
+ ];
+
+ revokeCollab({ collaborationGuid, operations });
+ }
+
+ function handleEditCollaboration(_, collaborationRow) {
+ setActiveCollaborationGuid(collaborationRow?.guid);
+ }
+
+ function tranformDataForCollabTable(originalData) {
+ if (!originalData || originalData.length === 0) return null;
+ return originalData.map(collaboration => {
+ const collaborators = Object.values(
+ get(collaboration, 'members', {}),
+ );
+ const member1 = get(collaborators, 0, {});
+ const member2 = get(collaborators, 1, {});
+
+ // Note: the collaboration API call returned a members OBJECT instead of array of objects, which made some tranformation gymnastics here necessary
+ const currentAccess = getSummaryState(collaboration);
+ const currentAccessLabelId =
+ collaborationLabelIds[currentAccess];
+ const requestedAccessLabelId =
+ collaborationLabelIds[getRequestedState(collaboration)];
+
+ return {
+ guid: get(collaboration, 'guid'),
+ userOne: formatUserMessage(
+ { fullName: member1?.full_name, email: member1?.email },
+ intl,
+ ),
+ userOneGuid: get(member1, 'guid'),
+ userTwo: formatUserMessage(
+ { fullName: member2?.full_name, email: member2?.email },
+ intl,
+ ),
+ userTwoGuid: get(member2, 'guid'),
+ currentAccess: currentAccessLabelId
+ ? intl.formatMessage({ id: currentAccessLabelId })
+ : '',
+ requestedAccess: requestedAccessLabelId
+ ? intl.formatMessage({ id: requestedAccessLabelId })
+ : '',
+ isRevocable: Boolean(
+ currentAccess && currentAccess !== summaryStates.revoked,
+ ), // Only collaborations that are mutually approved can be mutually revoked.
+ };
+ });
+ }
+ const tableFriendlyData = tranformDataForCollabTable(inputData);
+ const tableColumns = [
+ {
+ name: 'userOne',
+ align: 'left',
+ labelId: 'USER_ONE',
+ },
+ {
+ name: 'userTwo',
+ align: 'left',
+ labelId: 'USER_TWO',
+ },
+ {
+ name: 'currentAccess',
+ align: 'left',
+ labelId: 'COLLABORATION_CURRENT_ACCESS',
+ },
+ {
+ name: 'requestedAccess',
+ align: 'left',
+ labelId: 'COLLABORATION_REQUESTED_ACCESS',
+ },
+ {
+ name: 'actions',
+ align: 'right',
+ labelId: 'ACTIONS',
+ options: {
+ displayInFilter: false,
+ customBodyComponent: Actions,
+ cellRendererProps: {
+ onRevoke: processRevoke,
+ onEdit: handleEditCollaboration,
+ },
+ },
+ },
+ ];
+ return (
+ <>
+ setActiveCollaborationGuid(null)}
+ collaboration={activeCollaboration}
+ />
+
+
+ )}
+ {someoneElse && viewerIsUserManager && (
+
+
)}
diff --git a/src/components/cards/EncounterCard.jsx b/src/components/cards/EncounterCard.jsx
index cb832bef6..a5650e5e6 100644
--- a/src/components/cards/EncounterCard.jsx
+++ b/src/components/cards/EncounterCard.jsx
@@ -1,4 +1,5 @@
-import React, { useMemo } from 'react';
+import React from 'react';
+import { useIntl } from 'react-intl';
import { get } from 'lodash-es';
import Paper from '@material-ui/core/Paper';
@@ -6,8 +7,6 @@ import Skeleton from '@material-ui/lab/Skeleton';
import defaultSightingSrc from '../../assets/defaultSighting.png';
import useEncounter from '../../models/encounter/useEncounter';
-import useSiteSettings from '../../models/site/useSiteSettings';
-import LocationIdViewer from '../fields/view/LocationIdViewer';
import Text from '../Text';
import Link from '../Link';
import {
@@ -16,19 +15,7 @@ import {
} from '../../utils/formatters';
export default function EncounterCard({ encounterGuid }) {
- const { data: siteSettings, siteSettingsVersion } =
- useSiteSettings();
-
- const regionChoices = useMemo(
- () =>
- get(
- siteSettings,
- ['site.custom.regions', 'value', 'locationID'],
- [],
- ),
- [siteSettingsVersion, siteSettings],
- );
-
+ const intl = useIntl();
const { data, loading, error } = useEncounter(encounterGuid);
const sightingOwner = get(
@@ -77,12 +64,11 @@ export default function EncounterCard({ encounterGuid }) {
variant="body2"
id="ENTITY_HEADER_REGION"
values={{
- region: (
-
+
+
) : (
+ {showView && (
+
+ );
+}
diff --git a/src/components/dataDisplays/cellRenderers/LocationRenderer.jsx b/src/components/dataDisplays/cellRenderers/LocationRenderer.jsx
index 472ce010c..d529edb1f 100644
--- a/src/components/dataDisplays/cellRenderers/LocationRenderer.jsx
+++ b/src/components/dataDisplays/cellRenderers/LocationRenderer.jsx
@@ -2,15 +2,11 @@ import React, { forwardRef, useState } from 'react';
import { get } from 'lodash-es';
import { useIntl } from 'react-intl';
-import DialogContent from '@material-ui/core/DialogContent';
-import DialogActions from '@material-ui/core/DialogActions';
-
import useOptions from '../../../hooks/useOptions';
-import StandardDialog from '../../StandardDialog';
-import SinglePoint from '../../maps/SinglePoint';
import Button from '../../Button';
import Text from '../../Text';
import OverflowController from './OverflowController';
+import SinglePointDialog from '../../dialogs/SinglePointDialog';
function Core({ value, lat, lng, ...rest }, ref) {
const [dialogOpen, setDialogOpen] = useState(false);
@@ -24,28 +20,12 @@ function Core({ value, lat, lng, ...rest }, ref) {
return (
<>
-
-
-