Fix gnarly action urls edge case

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release Notes for Dall-E Fieldtype for Craft CMS
 
+## 1.0.4 - 2023-03-16
+
+### Fixed
+
+- Action URLs used by the plugin were broken if both omitScriptNameInUrls was false and multisite was being used
+
 ## 1.0.3 - 2022-11-14
 
 ### Added

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "servd/craft-dalle",
     "description": "A field type to integrate with the Dall-E Image Generation API",
-    "version": "1.0.3",
+    "version": "1.0.4",
     "type": "craft-plugin",
     "keywords": [
         "cms",

src/web/assets/dallefieldtype.js

@@ -720,13 +720,21 @@
     }
 
     function createActionUrl(path, queryData) {
-        let baseUrl = Craft.actionUrl.replace(/\/+$/, '');
-        let fullUrl = baseUrl + '/' + path;
-        if (fullUrl.indexOf('?') >= 0) {
-            fullUrl += '&'
+        let baseUrl = Craft.actionUrl;
+        let parsedUrl = new URL(baseUrl);
+        if(parsedUrl.searchParams.get('p') && parsedUrl.searchParams.get('p').length > 0){
+            let existingPValue = parsedUrl.searchParams.get('p');
+            let newPValue = existingPValue.replace(/\/+$/, '') + '/' + path;
+            parsedUrl.searchParams.set('p', newPValue)
         } else {
-            fullUrl += '?'
+            parsedUrl.pathname = parsedUrl.pathname.replace(/\/+$/, '') + '/' + path;
         }
-        return fullUrl + new URLSearchParams(queryData);
+
+        let updatedParams = new URLSearchParams(queryData);
+        for (let [key, val] of updatedParams.entries()) {
+            parsedUrl.searchParams.append(key, val);
+        }
+
+        return parsedUrl.toString();
     }
 })();