{loadingDoiDelete ? (
diff --git a/src/components/FormComponents/MetadataRecordListItem.jsx b/src/components/FormComponents/MetadataRecordListItem.jsx
index 3b4e0d76..7405a8d3 100644
--- a/src/components/FormComponents/MetadataRecordListItem.jsx
+++ b/src/components/FormComponents/MetadataRecordListItem.jsx
@@ -28,13 +28,14 @@ import { useParams } from "react-router-dom";
import { getRecordFilename } from "../../utils/misc";
import recordToEML from "../../utils/recordToEML";
import recordToERDDAP from "../../utils/recordToERDDAP";
-import recordToDataCite from "../../utils/recordToDataCite";
import { recordIsValid, percentValid } from "../../utils/validate";
+import recordToDataCite from "../../utils/recordToDataCite";
import { I18n, En, Fr } from "../I18n";
import LastEdited from "./LastEdited";
import RecordStatusIcon from "./RecordStatusIcon";
import { UserContext } from "../../providers/UserProvider";
import regions from "../../regions";
+import licenses from "../../utils/licenses"
const MetadataRecordListItem = ({
record,
@@ -102,7 +103,7 @@ const MetadataRecordListItem = ({
} else if (fileType === "erddap") {
data = [recordToERDDAP(record)];
} else if (fileType === "json") {
- data = [JSON.stringify(recordToDataCite(record, language, region), null, 2)];
+ data = await [JSON.stringify(recordToDataCite({metadata: record, language, regions, region, licenses}), null, 2)];
} else {
const res = await downloadRecord({ record, fileType });
data = Object.values(res.data.message);
diff --git a/src/components/FormComponents/SharedUsersList.jsx b/src/components/FormComponents/SharedUsersList.jsx
new file mode 100644
index 00000000..35a4a338
--- /dev/null
+++ b/src/components/FormComponents/SharedUsersList.jsx
@@ -0,0 +1,240 @@
+import React, { useEffect, useState } from "react";
+import { Add, Delete } from "@material-ui/icons";
+import {
+ Typography,
+ Paper,
+ Grid,
+ TextField,
+ Button,
+ List,
+ ListItem,
+ ListItemText,
+ IconButton,
+ ListItemSecondaryAction,
+ Box,
+} from "@material-ui/core";
+import Autocomplete from "@material-ui/lab/Autocomplete";
+
+import { paperClass, SupplementalText } from "./QuestionStyles";
+import { En, Fr, I18n } from "../I18n";
+import {
+ loadRegionUsers,
+ updateSharedRecord,
+} from "../../utils/firebaseRecordFunctions";
+
+const SharedUsersList = ({ record, updateRecord, region }) => {
+ const [users, setUsers] = useState({});
+ const [currentUser, setCurrentUser] = useState(null);
+ const [sharedWithUsers, setSharedWithUsers] = useState({});
+ const [shareRecordDisabled, setShareRecordDisabled] = useState(true);
+ const authorID = record.userID
+
+ // fetching users based on region
+ useEffect(() => {
+ let isMounted = true;
+
+ if (record.recordID) {
+ setShareRecordDisabled(false)
+ }
+
+ const fetchRegionUsers = async () => {
+ try {
+ const regionUsers = await loadRegionUsers(region);
+
+ if (isMounted) {
+ setUsers(regionUsers);
+ }
+ } catch (error) {
+ throw new Error(`Error loading region users: ${error}`);
+ }
+ };
+
+ fetchRegionUsers();
+
+ return () => {
+ isMounted = false;
+ };
+ }, [region, record.recordID]);
+
+ // Updates state with user emails for each userID in record.sharedWith, to track which users a record is shared with.
+ useEffect(() => {
+ const sharedWithDetails = {};
+ Object.keys(record.sharedWith || {}).forEach((userID) => {
+ const name = users[userID]?.userinfo?.displayName;
+ if (name) {
+ sharedWithDetails[userID] = { name };
+ }
+ });
+
+ setSharedWithUsers(sharedWithDetails);
+ }, [record.sharedWith, users]);
+
+ // Function to add an email to the sharedWith list
+ const addUserToSharedWith = (userID) => {
+ const updatedSharedWith = {
+ ...record.sharedWith,
+ [userID]: true,
+ };
+
+ setSharedWithUsers(updatedSharedWith);
+
+ updateRecord("sharedWith")(updatedSharedWith);
+
+ const shareRecordAsync = async () => {
+ try {
+ await updateSharedRecord(userID, record.recordID, authorID, region, true);
+ } catch (error) {
+ throw new Error(`Failed to update shared record: ${error}`);
+ }
+ };
+
+ shareRecordAsync();
+ };
+
+ // Function to remove an email from the sharedWith list
+ const removeUserFromSharedWith = (userID) => {
+ if (record.sharedWith && record.sharedWith[userID]) {
+ const updatedSharedWith = { ...record.sharedWith };
+ delete updatedSharedWith[userID];
+ updateRecord("sharedWith")(updatedSharedWith);
+
+ const unshareRecordAsync = async () => {
+ try {
+ await updateSharedRecord(userID, record.recordID, authorID, region, false);
+ } catch (error) {
+ throw new Error(`Failed to unshare the record: ${error}`);
+ }
+ };
+
+ unshareRecordAsync();
+ }
+ };
+
+ const shareWithOptions = Object.entries(users)
+ .map(([userID, userInfo]) => ({
+ label: userInfo.userinfo?.displayName,
+ userID,
+ }))
+ .filter((x) => x.label)
+ .sort((a, b) => a.label.localeCompare(b.label));
+
+ return (
+
+
+
+
+
+
+ To share editing access with another user, start typing their
+ name and select from the suggestions.
+
+
+ Pour partager l'accès en modification avec un autre utilisateur,
+ commencez à saisir son nom et sélectionnez parmi les
+ suggestions.
+
+
+
+
+
+
+ Please save the form before sharing access.
+
+
+
+ Veuillez enregistrer le formulaire avant de partager l'accès.
+
+
+
+
+
+
+
+
+ option.label}
+ getOptionSelected={(option, value) =>
+ option.userID === value.userID
+ }
+ value={currentUser}
+ onChange={(event, newValue) => setCurrentUser(newValue)}
+ fullWidth
+ filterSelectedOptions
+ renderInput={(params) => (
+ }
+ variant="outlined"
+ style={{ marginTop: "16px" }}
+ />
+ )}
+ />
+ }
+ onClick={() => {
+ if (currentUser) {
+ addUserToSharedWith(currentUser.userID);
+ setCurrentUser(null);
+ }
+ }}
+ style={{
+ height: "46px",
+ justifyContent: "center",
+ marginTop: "15px",
+ }}
+ >
+
+
+ Share Record
+ Partager l'enregistrement
+
+
+
+
+
+
+
+ {Object.keys(sharedWithUsers).length > 0 && (
+
+ Users this record is shared with:
+
+ Utilisateurs avec lesquels cet enregistrement est
+ partagé :
+
+
+ )}
+
+
+ {Object.entries(sharedWithUsers).map(
+ ([userID, userDetails], index) => (
+
+ {userDetails.name}}
+ />
+
+ removeUserFromSharedWith(userID)}
+ >
+
+
+
+
+ )
+ )}
+
+
+
+
+
+
+
+ );
+};
+
+export default SharedUsersList;
diff --git a/src/components/NavDrawer.jsx b/src/components/NavDrawer.jsx
index ac8c8c2c..ed962f7d 100644
--- a/src/components/NavDrawer.jsx
+++ b/src/components/NavDrawer.jsx
@@ -15,6 +15,7 @@ import {
SupervisorAccount,
Menu,
AssignmentTurnedIn,
+ FolderShared,
} from "@material-ui/icons";
import {
@@ -128,6 +129,7 @@ export default function MiniDrawer({ children }) {
isReviewer: userIsReviewer,
isAdmin: userIsAdmin,
authIsLoading,
+ hasSharedRecords,
} = useContext(UserContext);
let { language = "en", region = "region-select" } = useParams();
@@ -168,6 +170,7 @@ export default function MiniDrawer({ children }) {
admin:
,
signIn:
,
logout:
,
+ sharedWithMe:
,
};
const topBarBackgroundColor = region
? regions[region].colors.primary
@@ -351,6 +354,24 @@ export default function MiniDrawer({ children }) {
+ {hasSharedRecords && (
+
+ history.push(`${baseURL}/shared`)}
+ >
+
+
+
+
+
+
+ )}
+
{userIsReviewer && (
{
+ this.unsubscribe = onAuthStateChanged(getAuth(firebase), async (user) => {
if (user) {
// Reference to the regionAdmin in the database
const adminRef = ref(database, "admin");
@@ -66,8 +73,16 @@ class Admin extends FormClassTemplate {
const permissionsRef = child(regionAdminRef, "permissions");
const projects = await getRegionProjects(region);
- const datacitePrefix = await getDatacitePrefix(region);
- const credentialsStored = await getCredentialsStored(region);
+ const datacitePrefix = await getDatacitePrefix(region).then(
+ (response) => {
+ return response.data;
+ }
+ );
+ const credentialsStored = await getCredentialsStored(region).then(
+ (response) => {
+ return response.data;
+ }
+ );
onValue(permissionsRef, (permissionsFirebase) => {
const permissions = permissionsFirebase.toJSON();
@@ -125,7 +140,7 @@ class Admin extends FormClassTemplate {
handleDisableDoiCreation = async () => {
const { region } = this.props.match.params;
-
+
try {
await deleteAllDataciteCredentials(region);
this.setState({
@@ -145,22 +160,33 @@ class Admin extends FormClassTemplate {
const { match } = this.props;
const { region } = match.params;
+ const { reviewers, admins, projects } = this.state;
+ const database = getDatabase(firebase);
+
+ if (auth.currentUser) {
+ const regionAdminRef = ref(database, `admin/${region}`);
+ const permissionsRef = child(regionAdminRef, "permissions");
+ const projectsRef = child(regionAdminRef, "projects");
+
+ set(child(permissionsRef, "admins"), cleanArr(admins).join());
+
+ set(projectsRef, cleanArr(projects));
+ set(child(permissionsRef, "reviewers"), cleanArr(reviewers).join());
+ }
+ }
+
+ saveDoiCredentials() {
+ const { match } = this.props;
+ const { region } = match.params;
+
const {
- reviewers,
- admins,
- projects,
datacitePrefix,
dataciteAccountId,
datacitePass,
isDoiCreationEnabled,
} = this.state;
- const database = getDatabase(firebase);
- // Check if DOI creation is enabled but credentials are not stored
- if (isDoiCreationEnabled && (!datacitePrefix || !dataciteAccountId || !datacitePass)) {
- this.setState({ showCredentialsMissingDialog: true });
- return;
- }
+ const database = getDatabase(firebase);
const bufferObj = Buffer.from(
`${dataciteAccountId}:${datacitePass}`,
@@ -168,16 +194,19 @@ class Admin extends FormClassTemplate {
);
const base64String = bufferObj.toString("base64");
+ // Check if DOI creation is enabled but credentials are not stored
+ if (
+ isDoiCreationEnabled &&
+ (!datacitePrefix || !dataciteAccountId || !datacitePass)
+ ) {
+ this.setState({ showCredentialsMissingDialog: true });
+ return;
+ }
+
if (auth.currentUser) {
const regionAdminRef = ref(database, `admin/${region}`);
- const permissionsRef = child(regionAdminRef, "permissions");
- const projectsRef = child(regionAdminRef, "projects");
const dataciteRef = child(regionAdminRef, "dataciteCredentials");
- set(child(permissionsRef,"admins"), cleanArr(admins).join());
-
- set(projectsRef, cleanArr(projects));
- set(child(permissionsRef, "reviewers"), cleanArr(reviewers).join());
set(child(dataciteRef, "prefix"), datacitePrefix);
set(child(dataciteRef, "dataciteHash"), base64String);
@@ -196,17 +225,27 @@ class Admin extends FormClassTemplate {
aria-labelledby="alert-dialog-title"
aria-describedby="alert-dialog-description"
>
- Delete Datacite Credentials?
+
+ Delete Datacite Credentials?
+
- Disabling DOI creation will delete the stored credentials. Are you sure you want to proceed?
+ Disabling DOI creation will delete the stored credentials. Are you
+ sure you want to proceed?
-
@@ -222,14 +261,22 @@ class Admin extends FormClassTemplate {
aria-labelledby="credentials-missing-dialog-title"
aria-describedby="credentials-=missing-dialog-description"
>
- Missing DataCite Credentials
+
+ Missing DataCite Credentials
+
Please add DataCite credentials before saving.
-
@@ -247,9 +294,9 @@ class Admin extends FormClassTemplate {
};
validateDatacitePrefix = (prefix) => {
- const isValid = /^10\.\d+/.test(prefix);
- this.setState({ datacitePrefixValid: isValid });
-};
+ const isValid = /^10\.\d+/.test(prefix);
+ this.setState({ datacitePrefixValid: isValid });
+ };
render() {
const {
@@ -289,68 +336,82 @@ class Admin extends FormClassTemplate {
) : (
<>
-
-
-
-
- Projects
- Projets
-
-
-
-
-
- this.setState({ projects: e.target.value.split("\n") })
- }
- />
-
+
+
+
+
+ Projects
+ Projets
+
+
+
+
+
+ this.setState({ projects: e.target.value.split("\n") })
+ }
+ />
+
-
-
-
- Admins
- Administrateurs
-
-
-
-
-
- this.setState({ admins: e.target.value.split("\n") })
- }
- />
-
+
+
+
+ Admins
+ Administrateurs
+
+
+
+
+
+ this.setState({ admins: e.target.value.split("\n") })
+ }
+ />
+
+
+
+
+ Reviewers
+ Réviseurs
+
+
+
+
+
+ this.setState({
+ reviewers: e.target.value.split("\n"),
+ })
+ }
+ />
+
+
-
+ }
+ variant="contained"
+ color="primary"
+ style={{ margin: 10 }}
+ onClick={() => this.save()}
+ >
- Reviewers
- Réviseurs
+ Save Admin Settings
+ Enregistrer
-
-
-
-
- this.setState({
- reviewers: e.target.value.split("\n"),
- })
- }
- />
+
-
@@ -388,7 +449,13 @@ class Admin extends FormClassTemplate {
-
+
Credentials Stored
Identifiants Enregistrés
@@ -401,7 +468,13 @@ class Admin extends FormClassTemplate {
-
+
Please Add DataCite Credentials
Identifiants Enregistrés
@@ -427,7 +500,10 @@ class Admin extends FormClassTemplate {
onChange={this.handleChange}
fullWidth
error={!this.state.datacitePrefixValid}
- helperText={!this.state.datacitePrefixValid && "Prefix must start with '10.' followed by numbers."}
+ helperText={
+ !this.state.datacitePrefixValid &&
+ "Prefix must start with '10.' followed by numbers."
+ }
/>
@@ -476,28 +552,30 @@ class Admin extends FormClassTemplate {
)}
+ {this.state.isDoiCreationEnabled && (
+ }
+ variant="contained"
+ color="primary"
+ onClick={() => this.saveDoiCredentials()}
+ style={{ margin: 10 }}
+ >
+
+ Save DOI Settings
+ Enregistrer les paramètres DOI
+
+
+ )}
-
- }
- variant="contained"
- color="secondary"
- onClick={() => this.save()}
- >
-
- Save
- Enregistrer
-
-
-
)}
- {this.renderDeletionDialog()}
+ {this.renderDeletionDialog()}
{this.renderCredentialsMissingDialog()}
);
}
}
+Admin.contextType = UserContext;
export default Admin;
diff --git a/src/components/Pages/MetadataForm.jsx b/src/components/Pages/MetadataForm.jsx
index ee822ce6..e0aaba3e 100644
--- a/src/components/Pages/MetadataForm.jsx
+++ b/src/components/Pages/MetadataForm.jsx
@@ -144,7 +144,7 @@ class MetadataForm extends FormClassTemplate {
const loggedInUserOwnsRecord = loggedInUserID === recordUserID;
const { isReviewer } = this.context;
- this.setState({ projects: await getRegionProjects(region) });
+ this.setState({ projects: await getRegionProjects(region), loggedInUserID: user.uid });
let editorInfo;
// get info of the person openeing the record
const editorDataRef = child(ref(database, `${region}/users`), loggedInUserID);
@@ -187,8 +187,10 @@ class MetadataForm extends FormClassTemplate {
}
const record = firebaseToJSObject(recordFireBaseObj);
+ const loggedInUserIsSharedWith = record.sharedWith && record.sharedWith[loggedInUserID] === true;
+
const loggedInUserCanEditRecord =
- isReviewer || loggedInUserOwnsRecord;
+ isReviewer || loggedInUserOwnsRecord || loggedInUserIsSharedWith;
this.setState({
record: standardizeRecord(record, null, null, recordID),
@@ -254,11 +256,11 @@ class MetadataForm extends FormClassTemplate {
const { match } = this.props;
const { region, language } = match.params;
const { record} = this.state;
- const { datacitePrefix, dataciteAuthHash } = this.context;
+ const { datacitePrefix } = this.context;
try {
- if (datacitePrefix && dataciteAuthHash){
- const statusCode = await performUpdateDraftDoi(record, region, language, datacitePrefix, dataciteAuthHash);
+ if (datacitePrefix){
+ const statusCode = await performUpdateDraftDoi(record, region, language, datacitePrefix);
if (statusCode === 200) {
this.state.doiUpdated = true
@@ -382,6 +384,7 @@ class MetadataForm extends FormClassTemplate {
loggedInUserCanEditRecord,
saveIncompleteRecordModalOpen,
projects,
+ loggedInUserID,
} = this.state;
if (!record) {
@@ -397,8 +400,10 @@ class MetadataForm extends FormClassTemplate {
record,
handleUpdateRecord: this.handleUpdateRecord,
updateRecord: this.updateRecord,
+ userID:loggedInUserID,
};
const percentValidInt = Math.round(percentValid(record) * 100);
+
return loading ? (
) : (
diff --git a/src/components/Pages/Shared.jsx b/src/components/Pages/Shared.jsx
new file mode 100644
index 00000000..f048b788
--- /dev/null
+++ b/src/components/Pages/Shared.jsx
@@ -0,0 +1,202 @@
+import React from "react";
+
+import { Typography, CircularProgress, List } from "@material-ui/core";
+import { getDatabase, ref, onValue, get, off } from "firebase/database";
+import { I18n, En, Fr } from "../I18n";
+import FormClassTemplate from "./FormClassTemplate";
+import firebase from "../../firebase";
+import {
+ multipleFirebaseToJSObject,
+ cloneRecord,
+} from "../../utils/firebaseRecordFunctions";
+
+import { getAuth, onAuthStateChanged } from "../../auth";
+
+import MetadataRecordListItem from "../FormComponents/MetadataRecordListItem";
+
+class Shared extends FormClassTemplate {
+ constructor(props) {
+ super(props);
+ this.state = {
+ sharedRecords: {},
+ loading: false,
+ };
+ this.unsubscribe = null;
+ this.listenerRefs = [];
+ this.handleCloneRecord = this.handleCloneRecord.bind(this);
+ }
+
+ async loadSharedRecords() {
+ this.setState({ loading: true });
+ const { match } = this.props;
+ const { region } = match.params;
+ const database = getDatabase();
+
+ // Set up a listener for changes in authentication state
+ this.unsubscribe = onAuthStateChanged(getAuth(firebase), async (user) => {
+ if (user) {
+ // Reference to the 'shares' node for the current user in the specified region
+ const sharesRef = ref(database, `${region}/shares/${user.uid}`);
+ this.listenerRefs.push(sharesRef);
+
+ // Listen for changes in the shares data
+ onValue(sharesRef, async (snapshot) => {
+ // Snapshot of the user's shares
+ const sharesSnapshot = snapshot.val();
+
+ // Initialize an array to hold promises for fetching each shared record
+ const recordsPromises = [];
+
+ // Iterate over each shared record, organized by authorID under the user's ID
+ Object.entries(sharesSnapshot || {}).forEach(([authorID, recordsByAuthor]) => {
+ // Iterate over each recordID shared by this author
+ Object.keys(recordsByAuthor || {}).forEach((recordID) => {
+ // Construct the path to the actual record data based on its authorID and recordID
+ const recordPath = `${region}/users/${authorID}/records/${recordID}`;
+ const recordRef = ref(database, recordPath);
+ // Fetch the record's details and store the promise in the array
+ const recordPromise = get(recordRef).then((recordSnapshot) => {
+ const recordDetails = recordSnapshot.val();
+ if (recordDetails) {
+ // Return the complete record details, ensuring all data fields are included
+ return {
+ ...recordDetails,
+ recordID,
+ };
+ }
+ throw new Error(`No details found for record ${recordID} by author ${authorID}`);
+ });
+ recordsPromises.push(recordPromise); // Collect the promise
+ });
+ });
+
+ // Await the resolution of all record detail promises
+ const records = await Promise.all(recordsPromises);
+ // Accumulate the records into an object mapping record IDs to record details
+ const sharedRecords = records.reduce((acc, record) => {
+ acc[record.recordID] = record; // Map each record by its ID
+ return acc;
+ }, {});
+
+ // Update the component state with the fetched shared records and set loading to false
+ this.setState({
+ sharedRecords: multipleFirebaseToJSObject(sharedRecords),
+ loading: false,
+ });
+ });
+
+ // Keep a reference to the listener to remove it when the component unmounts
+ this.listenerRefs.push(sharesRef);
+ }
+ });
+ }
+
+ componentWillUnmount() {
+ // fixes error Can't perform a React state update on an unmounted component
+ this.unsubscribeAndCloseListeners();
+ }
+
+ unsubscribeAndCloseListeners() {
+ if (this.unsubscribe) this.unsubscribe();
+ if (this.listenerRefs.length) {
+ this.listenerRefs.forEach((refListener) => off(refListener));
+ }
+ }
+
+ async componentDidMount() {
+ this.loadSharedRecords();
+ }
+
+ editRecord(key, authorID) {
+ const { match, history } = this.props;
+ const { language, region } = match.params;
+ history.push(`/${language}/${region}/${authorID}/${key}`);
+ }
+
+ handleCloneRecord(recordID, authorID) {
+ const { region } = this.props.match.params;
+
+ const { currentUser } = getAuth(firebase);
+ if (currentUser) {
+ cloneRecord(recordID, authorID, currentUser.uid, region)
+ }
+ }
+
+ render() {
+ const { sharedRecords, loading } = this.state;
+
+ const recordDateSort = (a, b) =>
+ new Date(b[1].created) - new Date(a[1].created);
+
+ return (
+
+
+
+ Shared with me
+ Partagé avec moi
+
+
+
+ {loading ? (
+
+ ) : (
+
+
+
+
+
+ The following records have been shared with you for editing.
+
+
+ Les enregistrements suivants ont été partagés avec vous pour
+ modification.
+
+
+
+
+
+ You can edit them, but you cannot submit or delete.
+
+ Vous pouvez les modifier, mais vous ne pouvez pas les
+ soumettre ou les supprimer.
+
+
+
+
+ {Object.entries(sharedRecords || {})
+ .sort(recordDateSort)
+ .map(([key, record]) => {
+ const { title } = record;
+
+ if (!(title?.en || !title?.fr)) return null;
+
+ return (
+ this.handleCloneRecord(key, record.userID)}
+ showEditAction
+ showPercentComplete
+ onViewEditClick={() => this.editRecord(key, record.userID)}
+ />
+ );
+ })}
+
+
+ {!sharedRecords && (
+
+
+ You don't have any records shared with you.
+ Vous n'avez aucun enregistrement partagé avec vous.
+
+
+ )}
+
+ )}
+