fix: resolve relations for non-translated documents

Author: jorrit

packages/core/server/middlewares/generate-url-alias.ts

@@ -21,12 +21,13 @@ const generateUrlAliasMiddleware: Modules.Documents.Middleware.Middleware = asyn
 
   // Fetch the URL pattern for this content type.
   let relations: string[] = [];
-  let languages: string[] = [undefined];
   let urlAliasEntity: Data.ContentType<'plugin::webtools.url-alias'> | undefined;
 
-  languages = [];
-  const locales = await strapi.entityService.findMany('plugin::i18n.locale', {});
-  languages = locales.map((locale) => locale.code);
+  let languages: (string | undefined)[] = [undefined];
+  if (params.locale) {
+    const locales = await strapi.entityService.findMany('plugin::i18n.locale', {});
+    languages = locales.map((locale) => locale.code);
+  }
 
   await Promise.all(languages.map(async (lang) => {
     const urlPatterns = await getPluginService('url-pattern').findByUid(uid, lang);

packages/core/server/services/bulk-generate.ts

@@ -36,17 +36,12 @@ const generateUrlAliases = async (params: GenerateParams): Promise<number> => {
 
     let relations: string[] = [];
 
-    const locales = await strapi.documents('plugin::i18n.locale').findMany({});
-    const languages = locales.map((locale) => locale.code);
-
-    // Get all relations for the type
-    await Promise.all(languages.map(async (lang) => {
-      const urlPatterns = await getPluginService('url-pattern').findByUid(type, lang);
-      urlPatterns.forEach((urlPattern) => {
-        const languageRelations = getPluginService('url-pattern').getRelationsFromPattern(urlPattern);
-        relations = [...relations, ...languageRelations];
-      });
-    }));
+    // Get all relations for the type from all patterns for all languages.
+    const urlPatterns = await getPluginService('url-pattern').findByUid(type);
+    urlPatterns.forEach((urlPattern) => {
+      const languageRelations = getPluginService('url-pattern').getRelationsFromPattern(urlPattern);
+      relations = [...relations, ...languageRelations];
+    });
 
     // Query all the entities of the type that do not have a corresponding URL alias.
     const entities = await strapi.documents(type as 'api::test.test').findMany({
@@ -70,9 +65,10 @@ const generateUrlAliases = async (params: GenerateParams): Promise<number> => {
      */
     // eslint-disable-next-line no-restricted-syntax
     for (const entity of entities) {
+      // FIXME: just filter the `urlPatterns` we already have.
       // eslint-disable-next-line no-await-in-loop
-      const urlPatterns = await getPluginService('url-pattern').findByUid(type, entity.locale);
-      const resolvedPath = getPluginService('url-pattern').resolvePattern(type, entity, urlPatterns[0]);
+      const entityUrlPatterns = await getPluginService('url-pattern').findByUid(type, entity.locale);
+      const resolvedPath = getPluginService('url-pattern').resolvePattern(type, entity, entityUrlPatterns[0]);
 
       // eslint-disable-next-line no-await-in-loop
       const newUrlAlias = await strapi.documents('plugin::webtools.url-alias').create({