Merge branch 'release/4.0.2' into v4

CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file.
 
+## 4.0.2 - 2023.09.11
+### Fixed
+* Fixed an issue where the appropriate feature classes were not re-applied to the iFrame when multiple differently configured Canto DAM Asset fields are used on the same entry
+
 ## 4.0.1 - 2023.09.10
 ### Added
 * Added **Canto Asset Picker Type** field settings that allows you to choose the type of Canto assets that can be selected: Single Image, Multiple Images, or Whole Album

buildchain/src/js/canto-field.js

@@ -213,10 +213,16 @@
       $(cantoUCFrame).attr("data-type", type);
       $(cantoUCFrame).attr("src", cantoLoginPage);
     }
-    $(cantoUCFrame).on("load", function () {
-      $(cantoUCFrame).contents().find("body").addClass(bodyClass);
-      console.log($(cantoUCFrame).contents().find("body"));
-    });
+
+    // Apply the feature classes for the iFrame immediately, and also after the iFrame as loaded
+    function applyIFrameClasses() {
+      const $iFrameBody = $(cantoUCFrame).contents().find("body");
+      $iFrameBody.removeClass('can-select-single can-select-multiple can-select-album');
+      $iFrameBody.addClass(bodyClass);
+    }
+
+    $(cantoUCFrame).on("load", applyIFrameClasses);
+    applyIFrameClasses();
   }
 
   function getTenant(tokenInfo) {

composer.json

@@ -2,7 +2,7 @@
   "name": "lsst-epo/canto-dam-assets",
   "description": "This Craft CMS plugin adds a Field Type with GraphQL support for the Canto Digital Asset Management (DAM) web system",
   "type": "craft-plugin",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "license": "MIT",
   "require": {
     "php": ">=8.0.2",

src/services/Assets.php

@@ -42,6 +42,6 @@ public function getAuthToken($validateOnly = false): string
         }
         Craft::error("An exception occurred in getAuthToken()", __METHOD__);
 
-        return Craft::t("cantodamassets", "An error occurred fetching auth token!");
+        return Craft::t("_canto-dam-assets", "An error occurred fetching auth token!");
     }
 }