Merge branch 'v12/dev' into contrib

src/Umbraco.Web.UI.Client/package.json

@@ -18,10 +18,10 @@
     "npm": ">=9.5"
   },
   "dependencies": {
-    "@microsoft/signalr": "7.0.7",
-    "@umbraco-ui/uui": "1.3.0",
-    "@umbraco-ui/uui-css": "1.3.0",
-    "ace-builds": "1.22.1",
+    "@microsoft/signalr": "7.0.12",
+    "@umbraco-ui/uui": "1.4.0",
+    "@umbraco-ui/uui-css": "1.4.0",
+    "ace-builds": "1.30.0",
     "angular": "1.8.3",
     "angular-animate": "1.8.3",
     "angular-aria": "1.8.3",
@@ -43,7 +43,7 @@
     "diff": "5.1.0",
     "flatpickr": "4.6.13",
     "font-awesome": "4.7.0",
-    "jquery": "3.7.0",
+    "jquery": "3.7.1",
     "jquery-ui-dist": "1.13.2",
     "jquery-ui-touch-punch": "0.2.3",
     "lazyload-js": "1.0.0",
@@ -59,16 +59,16 @@
   "devDependencies": {
     "@babel/core": "7.21.8",
     "@babel/preset-env": "7.21.5",
-    "autoprefixer": "10.4.14",
+    "autoprefixer": "10.4.16",
     "cssnano": "6.0.1",
-    "eslint": "8.43.0",
+    "eslint": "8.51.0",
     "gulp": "4.0.2",
     "gulp-angular-embed-templates": "2.3.0",
     "gulp-babel": "8.0.0",
     "gulp-clean-css": "4.3.0",
     "gulp-cli": "2.3.0",
     "gulp-concat": "2.6.1",
-    "gulp-eslint-new": "1.8.1",
+    "gulp-eslint-new": "1.8.4",
     "gulp-imagemin": "7.1.0",
     "gulp-less": "5.0.0",
     "gulp-minify": "3.1.0",
@@ -80,14 +80,14 @@
     "gulp-watch": "5.0.1",
     "gulp-wrap": "0.15.0",
     "gulp-wrap-js": "0.4.1",
-    "jasmine-core": "5.0.1",
-    "jsdom": "21.1.2",
+    "jasmine-core": "5.1.1",
+    "jsdom": "22.1.0",
     "karma": "6.4.2",
     "karma-jasmine": "5.1.0",
-    "karma-jsdom-launcher": "14.0.0",
+    "karma-jsdom-launcher": "15.0.0",
     "karma-junit-reporter": "2.0.1",
     "karma-spec-reporter": "0.0.36",
-    "less": "4.1.3",
+    "less": "4.2.0",
     "lodash": "4.17.21",
     "merge-stream": "2.0.0",
     "postcss": "8.4.31",

src/Umbraco.Web.UI.Client/src/common/directives/components/content/edit.controller.js

@@ -346,7 +346,7 @@
                 labelKey: "buttons_saveAndPreview"
             };
 
-            const activeVariant = content.variants?.find((variant) => variant.compositeId === compositeId);
+            const activeVariant = content.variants?.find((variant) => content.documentType?.variations === "Nothing" || variant.compositeId === compositeId);
 
             $scope.previewSubButtons = activeVariant?.additionalPreviewUrls?.map((additionalPreviewUrl) => {
                 return {