Merge pull request #1074 from NFDI4Chem/development

Development
NFDI4Chem · Jan 31, 2024 · e125d31 · e125d31
2 parents 49926db + ccb15d8
commit e125d31
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/app/Http/Controllers/CitationController.php b/app/Http/Controllers/CitationController.php
@@ -32,16 +32,17 @@ public function save(Request $request, UpdateProject $updater, Project $project)
  $processedCitations = [];
 
  foreach ($citations as $citation) {
- $title = $citation['title'];
+ $doi = $citation['doi'];
 
  Validator::make($citation, [
  'title' => ['required', 'string'],
+ 'doi' => ['required', 'string'],
  'authors' => ['required', 'string'],
  ])->validate();
 
- if (! is_null($title)) {
- $_citation = $project->citations->filter(function ($a) use ($title) {
- return $title === $a->title;
+ if (! is_null($doi)) {
+ $_citation = $project->citations->filter(function ($a) use ($doi) {
+ return $doi === $a->doi;
  })->first();
  //dd($_author);
  if ($_citation) {

diff --git a/database/factories/CitationFactory.php b/database/factories/CitationFactory.php
@@ -29,7 +29,7 @@ public function definition()
  $author = $author1.', '.$author2;
 
  return [
- 'doi' => null,
+ 'doi' => "10.102X/acs.jnatprod.1c01SS",
  'title' => $this->faker->title(),
  'authors' => $author,
  'citation_text' => $this->faker->text(),

diff --git a/resources/js/Mixins/Global.js b/resources/js/Mixins/Global.js
@@ -216,7 +216,11 @@ export default {
  extractQueryParam(query) {
  if (query.indexOf("http") > -1) {
  var url = new URL(query);
- query = url.pathname.replace("/", "");
+ if(query.indexOf("dois") > -1){
+ query = url.pathname.replace("/dois/", "");
+ } else {
+ query = url.pathname.replace("/", "");
+ }
  }
  return query.trim();
  },
@@ -324,7 +328,11 @@ export default {
  extractQueryParam(query) {
  if (query.indexOf("http") > -1) {
  var url = new URL(query);
- query = url.pathname.replace("/", "");
+ if(query.indexOf("dois") > -1){
+ query = url.pathname.replace("/dois/", "");
+ } else {
+ query = url.pathname.replace("/", "");
+ }
  }
  return query.trim();
  },