- {resources.map((dist = deepCopy(emptyResource), i) => {
- const urlIsValid = !dist.url || validateURL(dist.url);
+ {resources.map((resourceItem = deepCopy(emptyResource), i) => {
+ const urlIsValid = !resourceItem.url || validateURL(resourceItem.url);
+
function handleResourceChange(key) {
return (e) => {
const newValue = [...resources];
@@ -58,11 +91,11 @@ const Resources = ({ updateResources, resources, disabled }) => {
Enter a name for the resource
Entrez un titre pour la ressource
-
+
{
Entrez l'URL de la ressource
-
+
@@ -99,11 +132,13 @@ const Resources = ({ updateResources, resources, disabled }) => {
+ (!urlIsValid && )
+ || (resourceItem.url && urlIsActive[resourceItem.url] === false && )
+ || (resourceItem.url && urlIsActive[resourceItem.url] === true && )
}
error={!urlIsValid}
label="URL"
- value={dist.url}
+ value={resourceItem.url}
onChange={handleResourceChange("url")}
fullWidth
disabled={disabled}
@@ -119,7 +154,7 @@ const Resources = ({ updateResources, resources, disabled }) => {
diff --git a/src/components/Tabs/SubmitTab.jsx b/src/components/Tabs/SubmitTab.jsx
index e8f108c3..275fe4de 100644
--- a/src/components/Tabs/SubmitTab.jsx
+++ b/src/components/Tabs/SubmitTab.jsx
@@ -1,4 +1,4 @@
-import React, { useState } from "react";
+import React, { useEffect, useState, useRef } from "react";
import {
Paper,
@@ -16,13 +16,20 @@ import { useParams } from "react-router-dom";
import { paperClass } from "../FormComponents/QuestionStyles";
import { En, Fr, I18n } from "../I18n";
-import { getErrorsByTab, recordIsValid } from "../../utils/validate";
+import {
+ getErrorsByTab,
+ recordIsValid,
+ warnings,
+ validateFieldWarning,
+} from "../../utils/validate";
import tabs from "../../utils/tabs";
import GetRegionInfo from "../FormComponents/Regions";
const SubmitTab = ({ record, submitRecord }) => {
+ const mounted = useRef(false);
const [isSubmitting, setSubmitting] = useState(false);
+ const [validationWarnings, setValidationWarnings] = useState(false);
const { language } = useParams();
@@ -30,6 +37,52 @@ const SubmitTab = ({ record, submitRecord }) => {
const submitted = record.status === "submitted";
const regionInfo = GetRegionInfo();
+ useEffect(() => {
+
+ mounted.current = true
+
+ const getUrlWarningsByTab = async (recordObj) => {
+ const fields = Object.keys(warnings);
+
+ const validationPromises = fields.map((field) =>
+ validateFieldWarning(recordObj, field)
+ );
+
+ const validationResults = await Promise.all(validationPromises);
+
+ const validatedFields = fields.reduce((acc, field, index) => {
+ acc[field] = validationResults[index];
+ return acc;
+ }, {});
+
+ const inactiveUrls = fields.filter((field) => {
+ return validatedFields[field];
+ });
+ const fieldWarningInfo = inactiveUrls.map((field) => {
+ const { error, tab } = warnings[field];
+ return { error, tab };
+ });
+
+ const fieldWarningInfoReduced = fieldWarningInfo.reduce(
+ (acc, { error, tab }) => {
+ if (!acc[tab]) acc[tab] = [];
+ acc[tab].push(error);
+ return acc;
+ },
+ {}
+ );
+ if (mounted.current)
+ setValidationWarnings(fieldWarningInfoReduced);
+ };
+
+ getUrlWarningsByTab(record);
+
+ return () => {
+ mounted.current = false;
+ };
+
+ }, [record]);
+
return (
@@ -121,6 +174,16 @@ const SubmitTab = ({ record, submitRecord }) => {
) : (
<>
+ {/* Errors Section */}
+
+
+
+ Errors
+ Erreurs
+
+
+
+
@@ -157,6 +220,60 @@ const SubmitTab = ({ record, submitRecord }) => {
)}
+
+ {validationWarnings &&
+ Object.keys(validationWarnings).length > 0 ? (
+ <>
+ {/* Warnings Section Heading */}
+
+
+
+ Warnings
+ Avertissements
+
+
+
+
+
+
+
+
+ Some warnings were generated for the following fields.
+ Please review and fix the warnings as needed befor
+ submitting the record.
+
+
+ Certains avertissements ont été générés pour les champs
+ suivants. Veuillez examiner et corriger les
+ avertissements si nécessaire avant de soumettre
+ l'enregistrement.
+
+
+
+
+
+
+ {Object.keys(validationWarnings).map((tab) => (
+
+
+ {tabs[tab][language]}
+
+
+ {validationWarnings[tab].map(
+ ({ [language]: error }, i) => (
+
+
+
+ )
+ )}
+
+
+ ))}
+
+
+ ) : (
+ " "
+ )}
)}
diff --git a/src/providers/UserProvider.jsx b/src/providers/UserProvider.jsx
index 6f58e1cd..8f32ad58 100644
--- a/src/providers/UserProvider.jsx
+++ b/src/providers/UserProvider.jsx
@@ -88,6 +88,7 @@ class UserProvider extends FormClassTemplate {
const updateDraftDoi = firebase.functions().httpsCallable("updateDraftDoi");
const deleteDraftDoi = firebase.functions().httpsCallable("deleteDraftDoi");
const getDoiStatus = firebase.functions().httpsCallable("getDoiStatus");
+ const checkURLActive = firebase.functions().httpsCallable("checkURLActive");
return (
{children}
diff --git a/src/utils/misc.js b/src/utils/misc.js
index de72be82..558045e1 100644
--- a/src/utils/misc.js
+++ b/src/utils/misc.js
@@ -4,6 +4,7 @@ export function deepCopy(obj) {
export function deepEquals(obj1, obj2) {
return JSON.stringify(obj1) === JSON.stringify(obj2);
}
+
/*
Convert firebase to javascript, mostly just used to get real array elements
*/
diff --git a/src/utils/validate.js b/src/utils/validate.js
index c8f51b30..240f25ac 100644
--- a/src/utils/validate.js
+++ b/src/utils/validate.js
@@ -1,8 +1,12 @@
import validator from "validator";
+import firebase from "../firebase";
+
export const validateEmail = (email) => !email || validator.isEmail(email);
export const validateURL = (url) => !url || validator.isURL(url);
+const checkURLActive = firebase.functions().httpsCallable('checkURLActive');
+
// See https://stackoverflow.com/a/48524047/7416701
export const doiRegexp = /^(https:\/\/doi.org\/)?10\.\d{4,9}\/[-._;()/:A-Z0-9]+$/i;
function isValidHttpUrl(string) {
@@ -235,6 +239,7 @@ const validators = {
},
},
};
+
export const validateField = (record, fieldName) => {
const valueToValidate = record[fieldName];
// if no validator funciton exists, then it is not a required field
@@ -259,6 +264,42 @@ export const getErrorsByTab = (record) => {
}, {});
};
+
+export const warnings = {
+ distribution: {
+ tab: "resources",
+ validation: async (val) => {
+ const processedVal = await Promise.all(
+ val.map(async (dist) => {
+ const res = await checkURLActive(dist.url);
+ return {...dist, status:res.data};
+ })
+ );
+ const filterVal = processedVal.filter((dist) => !dist.status)
+ return filterVal.length
+ },
+ error: {
+ en:
+ "Resource URL is not accessible. This could be because it has not been created yet or is otherwise unreachable",
+ fr:
+ "L'URL de la ressource n'est pas accessible. Cela peut être dû au fait qu'il n'a pas encore été créé ou qu'il est autrement inaccessible.",
+ },
+ },
+};
+
+
+export const validateFieldWarning = async (record, fieldName) => {
+ const valueToValidate = record[fieldName];
+ // if no validator funciton exists, then it is not a required field
+ const validationFunction =
+ (warnings[fieldName] && warnings[fieldName].validation) || (() => true);
+
+ const res = await validationFunction(valueToValidate, record);
+ return validationFunction && res;
+};
+
+
+
export const percentValid = (record) => {
const fields = Object.keys(validators);
const numTotalRequired = fields.filter((field) => !validators[field].optional)