Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix doi validation #280

Merged
merged 9 commits into from
Dec 5, 2023
Merged

fix doi validation #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
950ec4f
fix doi validation
n-a-t-e Nov 22, 2023
0591b48
update doi example in form to remove url portion
sorochak Nov 30, 2023
f017132
remove valid http check to validate DOI
sorochak Dec 4, 2023
c4c6118
return valid http check to validate DOI
sorochak Dec 5, 2023
8efb81e
update doi example in form to return url portion
sorochak Dec 5, 2023
427e96e
prepend https://doi.org/ to the generated DOI
sorochak Dec 5, 2023
9ed5eca
strip off url from datasetidentifier when updating doi with datacite
sorochak Dec 5, 2023
801c5d0
strip off url from datasetidentifier when deleting doi with datacite
sorochak Dec 5, 2023
6eb9bf0
remove the word draft from generate, update, and delete DOI buttons
sorochak Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 16 additions & 11 deletions src/components/Tabs/IdentificationTab.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import RequiredMark from "../FormComponents/RequiredMark";
import SelectInput from "../FormComponents/SelectInput";
import licenses from "../../utils/licenses";
import recordToDataCite from "../../utils/recordToDataCite";
import { validateField, doiRegexp } from "../../utils/validate";
import { validateField, validateDOI } from "../../utils/validate";

import {
QuestionText,
Expand All @@ -44,9 +44,8 @@ const IdentificationTab = ({
const { createDraftDoi, updateDraftDoi, deleteDraftDoi } = useContext(UserContext);
const { language, region, userID } = useParams();
const regionInfo = regions[region];
const doiIsValid = Boolean(
!record.datasetIdentifier || doiRegexp.test(record.datasetIdentifier)
);
const doiIsValid =validateDOI(record.datasetIdentifier)

const languageUpperCase = language.toUpperCase();
const [doiGenerated, setDoiGenerated] = useState(false);
const [doiErrorFlag, setDoiErrorFlag] = useState(false);
Expand Down Expand Up @@ -89,13 +88,13 @@ const IdentificationTab = ({
})
.then(async (attributes) => {
// Update the record object with datasetIdentifier and doiCreationStatus
updateRecord("datasetIdentifier")(attributes.doi);
updateRecord("datasetIdentifier")(`https://doi.org/${attributes.doi}`);
updateRecord("doiCreationStatus")("draft");

// Create a new object with updated properties
const updatedRecord = {
...record,
datasetIdentifier: attributes.doi,
datasetIdentifier: `https://doi.org/${attributes.doi}`,
doiCreationStatus: "draft",
};

Expand Down Expand Up @@ -134,8 +133,11 @@ const IdentificationTab = ({
delete mappedDataCiteObject.data.type;
delete mappedDataCiteObject.data.attributes.prefix;

// Extract DOI from the full URL
const doi = record.datasetIdentifier.replace('https://doi.org/', '');

const dataObject = {
doi: record.datasetIdentifier,
doi,
data: mappedDataCiteObject,
}

Expand All @@ -161,7 +163,10 @@ const IdentificationTab = ({
setLoadingDoiDelete(true);

try {
deleteDraftDoi(record.datasetIdentifier)
// Extract DOI from the full URL
const doi = record.datasetIdentifier.replace('https://doi.org/', '');

deleteDraftDoi(doi)
.then((response) => response.data)
.then(async (statusCode) => {
if (statusCode === 204) {
Expand Down Expand Up @@ -732,7 +737,7 @@ const IdentificationTab = ({
Loading...
</>
) : (
"Generate Draft DOI"
"Generate DOI"
)}
</div>
</Button>
Expand All @@ -749,7 +754,7 @@ const IdentificationTab = ({
Loading...
</>
) : (
"Update Draft DOI"
"Update DOI"
)}
</div>
</Button>
Expand All @@ -766,7 +771,7 @@ const IdentificationTab = ({
Loading...
</>
) : (
"Delete Draft DOI"
"Delete DOI"
)}
</div>
</Button>
Expand Down
4 changes: 2 additions & 2 deletions src/utils/validate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function isValidHttpUrl(string) {

return url.protocol === "http:" || url.protocol === "https:";
}

export const validateDOI = (val) => !val || (doiRegexp.test(val) && isValidHttpUrl(val));
const validateLatitude = (num) => num >= -90 && num <= 90;

const deepCompare = (obj1, obj2) =>
Expand Down Expand Up @@ -81,7 +81,7 @@ const validators = {
},
},
datasetIdentifier: {
validation: (val) => !val || (doiRegexp.test(val) && isValidHttpUrl(val)),
validation: validateDOI,
optional: true,
tab: "dataID",
error: {
Expand Down
Loading