Merge pull request #2164 from griidc/release/6.82.0

mickel1138 · web-flow · commit a3de67c62555 · 2026-01-13T15:25:26.000-06:00
Release/6.82.0
diff --git a/assets/static/js/dif.js b/assets/static/js/dif.js
@@ -1042,7 +1042,7 @@ function formChanged()
 {
     return $.Deferred(function() {
         var self = this;
-        if (formHash != $("#difForm").serialize() && typeof formHash !="undefined")
+        if (formHash != $("#difForm").serialize() && formHash)
         {
             $('<div><img src="' + imgWarning +'"><p>You will lose all changes. Do you wish to continue?</p></div>').dialog({
                 title: "Warning!",
diff --git a/composer.json b/composer.json
@@ -75,7 +75,7 @@
         "symfony/browser-kit": "7.4.*",
         "symfony/css-selector": "7.4.*",
         "symfony/debug-bundle": "7.4.*",
-        "symfony/phpunit-bridge": "7.4.*",
+        "symfony/phpunit-bridge": "8.0.*",
         "symfony/stopwatch": "7.4.*",
         "symfony/web-profiler-bundle": "7.4.*",
         "vimeo/psalm": "^6.0"
diff --git a/composer.lock b/composer.lock
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
         "eslint-plugin-vue": "^9.33.0",
         "file-loader": "^6.0.0",
         "react": "^18.3.1",
-        "react-dom": "^18.3.1",
+        "react-dom": "npm:^18.3.1",
         "regenerator-runtime": "^0.14.1",
         "sass-embedded": "1.64",
         "sass-loader": "^13.0.0",
@@ -41,7 +41,7 @@
     },
     "dependencies": {
         "@alpinejs/collapse": "^3.15.2",
-        "@geoman-io/leaflet-geoman-free": "^2.18.3",
+        "@geoman-io/leaflet-geoman-free": "^2.19.0",
         "@headlessui/react": "^1.7.19",
         "@heroicons/react": "^2.2.0",
         "@tailwindcss/typography": "^0.5.19",
@@ -59,7 +59,7 @@
         "exceljs": "^4.3.0",
         "file-saver": "^2.0.5",
         "jquery": "^3.5.1",
-        "jquery-migrate": "^3.5.2",
+        "jquery-migrate": "^3.6.0",
         "jquery-ui": "^1.13.2",
         "jquery.cookie": "^1.4.1",
         "leaflet": "^1.9.4",
diff --git a/src/Controller/UI/DIFController.php b/src/Controller/UI/DIFController.php
@@ -22,14 +22,12 @@ class DIFController extends AbstractController
      *
      * @param Request              $request          The Symfony request object.
      * @param FormFactoryInterface $formFactory      The form factory.
-     * @param string|null          $id               The id of the DIF to load.
      * @param FundingOrgFilter     $fundingOrgFilter Utility to filter by funding organization.
      *
-     *
      * @return Response A Response instance.
      */
-    #[Route(path: '/dif/{id}', name: 'pelagos_app_ui_dif_default')]
-    public function index(Request $request, FormFactoryInterface $formFactory, FundingOrgFilter $fundingOrgFilter, $id = null)
+    #[Route(path: '/dif', name: 'pelagos_app_ui_dif_default')]
+    public function index(Request $request, FormFactoryInterface $formFactory, FundingOrgFilter $fundingOrgFilter)
     {
         $this->denyAccessUnlessGranted('IS_AUTHENTICATED_FULLY');
 
diff --git a/src/Entity/Dataset.php b/src/Entity/Dataset.php
@@ -369,6 +369,14 @@ public function getDatasetSubmissionHistory()
         return $this->datasetSubmissionHistory;
     }
 
+    /**
+     * Whether this Dataset has any Dataset Submission history.
+     */
+    public function hasDatasetSubmissionHistory(): bool
+    {
+        return !$this->datasetSubmissionHistory->isEmpty();
+    }
+
     /**
      * Update the title for this Dataset.
      *
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1042,7 +1042,7 @@ function formChanged()`
`1042`	`1042`	`{`
`1043`	`1043`	`return $.Deferred(function() {`
`1044`	`1044`	`var self = this;`
`1045`		`- if (formHash != $("#difForm").serialize() && typeof formHash !="undefined")`
	`1045`	`+ if (formHash != $("#difForm").serialize() && formHash)`
`1046`	`1046`	`{`
`1047`	`1047`	`$('<div><img src="' + imgWarning +'"><p>You will lose all changes. Do you wish to continue?</p></div>').dialog({`
`1048`	`1048`	`title: "Warning!",`
Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,12 @@ class DIFController extends AbstractController`
`22`	`22`	`*`
`23`	`23`	`* @param Request $request The Symfony request object.`
`24`	`24`	`* @param FormFactoryInterface $formFactory The form factory.`
`25`		`- * @param string\|null $id The id of the DIF to load.`
`26`	`25`	`* @param FundingOrgFilter $fundingOrgFilter Utility to filter by funding organization.`
`27`	`26`	`*`
`28`		`- *`
`29`	`27`	`* @return Response A Response instance.`
`30`	`28`	`*/`
`31`		`- #[Route(path: '/dif/{id}', name: 'pelagos_app_ui_dif_default')]`
`32`		`- public function index(Request $request, FormFactoryInterface $formFactory, FundingOrgFilter $fundingOrgFilter, $id = null)`
	`29`	`+ #[Route(path: '/dif', name: 'pelagos_app_ui_dif_default')]`
	`30`	`+ public function index(Request $request, FormFactoryInterface $formFactory, FundingOrgFilter $fundingOrgFilter)`
`33`	`31`	`{`
`34`	`32`	`$this->denyAccessUnlessGranted('IS_AUTHENTICATED_FULLY');`
`35`	`33`
Original file line number	Diff line number	Diff line change
`@@ -369,6 +369,14 @@ public function getDatasetSubmissionHistory()`
`369`	`369`	`return $this->datasetSubmissionHistory;`
`370`	`370`	`}`
`371`	`371`
	`372`	`+ /**`
	`373`	`+ * Whether this Dataset has any Dataset Submission history.`
	`374`	`+ */`
	`375`	`+ public function hasDatasetSubmissionHistory(): bool`
	`376`	`+ {`
	`377`	`+ return !$this->datasetSubmissionHistory->isEmpty();`
	`378`	`+ }`
	`379`	`+`
`372`	`380`	`/**`
`373`	`381`	`* Update the title for this Dataset.`
`374`	`382`	`*`