Merge pull request #292 from pluginpal/feature/fix-281

Feature/fix 281

Author: boazpoolman

.changeset/public-facts-rhyme.md

@@ -0,0 +1,5 @@
+---
+"strapi-plugin-webtools": patch
+---
+
+fix: duplicate forward slash removal

.changeset/stale-houses-poke.md

@@ -0,0 +1,5 @@
+---
+"strapi-plugin-webtools": patch
+---
+
+fix: actually slugify relational fields in the pattern

packages/core/server/services/url-pattern.ts

@@ -159,6 +159,7 @@ const customServices = () => ({
 
       fields.forEach((field) => {
         const relationalField = field.split('.').length > 1 ? field.split('.') : null;
+        const { slugify } = strapi.config.get<Config>('plugin::webtools');
 
         if (field === 'pluralName') {
           const fieldValue = strapi.contentTypes[uid].info.pluralName;
@@ -169,17 +170,16 @@ const customServices = () => ({
 
           resolvedPattern = resolvedPattern.replace(`[${field}]`, fieldValue || '');
         } else if (!relationalField) {
-          const { slugify } = strapi.config.get<Config>('plugin::webtools');
           const fieldValue = slugify(String(entity[field]));
           resolvedPattern = resolvedPattern.replace(`[${field}]`, fieldValue || '');
         } else if (Array.isArray(entity[relationalField[0]])) {
           strapi.log.error('Something went wrong whilst resolving the pattern.');
         } else if (typeof entity[relationalField[0]] === 'object') {
-          resolvedPattern = resolvedPattern.replace(`[${field}]`, entity[relationalField[0]] && String((entity[relationalField[0]] as any[])[relationalField[1]]) ? String((entity[relationalField[0]] as any[])[relationalField[1]]) : '');
+          resolvedPattern = resolvedPattern.replace(`[${field}]`, entity[relationalField[0]] && String((entity[relationalField[0]] as any[])[relationalField[1]]) ? slugify(String((entity[relationalField[0]] as any[])[relationalField[1]])) : '');
         }
       });
 
-      resolvedPattern = resolvedPattern.replace(/([^:]\/)\/+/g, '$1'); // Remove duplicate forward slashes.
+      resolvedPattern = resolvedPattern.replace(/\/+/g, '/'); // Remove duplicate forward slashes.
       resolvedPattern = resolvedPattern.startsWith('/') ? resolvedPattern : `/${resolvedPattern}`; // Add a starting slash.
       return resolvedPattern;
     };

playground/package.json

@@ -12,9 +12,9 @@
     "sitemap": "strapi-sitemap"
   },
   "dependencies": {
-    "@strapi/plugin-cloud": "^5.10.4",
-    "@strapi/plugin-users-permissions": "^5.10.4",
-    "@strapi/strapi": "^5.10.4",
+    "@strapi/plugin-cloud": "^5.17.0",
+    "@strapi/plugin-users-permissions": "^5.17.0",
+    "@strapi/strapi": "^5.17.0",
     "better-sqlite3": "11.3.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0",

playground/types/generated/contentTypes.d.ts

@@ -34,6 +34,10 @@ export interface AdminApiToken extends Struct.CollectionTypeSchema {
         minLength: 1;
       }> &
       Schema.Attribute.DefaultTo<''>;
+    encryptedKey: Schema.Attribute.Text &
+      Schema.Attribute.SetMinMaxLength<{
+        minLength: 1;
+      }>;
     expiresAt: Schema.Attribute.DateTime;
     lastUsedAt: Schema.Attribute.DateTime;
     lifespan: Schema.Attribute.BigInteger;