Merge pull request #244 from pluginpal/feature/i18n

Feature/i18n

Author: boazpoolman

.changeset/funny-turkeys-invite.md

@@ -0,0 +1,5 @@
+---
+"strapi-plugin-webtools": patch
+---
+
+fix: make the locale filter actually work by rewriting the URL params

.changeset/social-hands-check.md

@@ -0,0 +1,5 @@
+---
+"strapi-plugin-webtools": patch
+---
+
+fix: make sure the edit URL respects the alias locale

.changeset/wet-taxis-send.md

@@ -0,0 +1,5 @@
+---
+"strapi-plugin-webtools": patch
+---
+
+fix: actually return the localized entity in the router endpoint

packages/core/admin/hooks/useQueryParams.ts

@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react';
+import qs from 'qs';
 import { useLocation } from 'react-router-dom';
 
 const useQueryParams = () => {
@@ -23,9 +24,22 @@ const useQueryParams = () => {
       searchParams.append('pagination[pageSize]', pageSize);
     }
 
-    setParams(searchParams.toString());
-  }, [location]);
+    const paramsObj = qs.parse(searchParams.toString());
+    // @ts-expect-error
+    const filters = paramsObj?.filters?.$and as Array<{ [key: string]: any }>;
+    const localeFilterIndex = filters?.findIndex((filter) => filter.locale !== undefined);
+    const localeFilter = filters?.[localeFilterIndex];
+
+    if (localeFilter) {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+      paramsObj.locale = localeFilter.locale.$eq as string;
+      filters.splice(localeFilterIndex, 1);
+      // @ts-expect-error
+      paramsObj.filters.$and = filters;
+    }
 
+    setParams(qs.stringify(paramsObj));
+  }, [location]);
 
   return params;
 };

packages/core/server/controllers/url-alias.ts

@@ -26,8 +26,13 @@ export default factories.createCoreController(contentTypeSlug, ({ strapi }) => (
     const contentTypeObj = strapi.contentTypes[contentType];
     const contentTypeUrlPartial = contentTypeObj.kind === 'singleType' ? 'single-types' : 'collection-types';
 
+    const model = strapi.getModel(contentType);
+    // @ts-expect-error
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    const isLocalized = model.pluginOptions.i18n?.localized as boolean;
+
     ctx.body = {
-      link: `/content-manager/${contentTypeUrlPartial}/${contentType}/${contentTypeObj.kind === 'collectionType' ? entity.documentId : ''}`,
+      link: `/content-manager/${contentTypeUrlPartial}/${contentType}/${contentTypeObj.kind === 'collectionType' ? entity.documentId : ''}${isLocalized ? `?plugins[i18n][locale]=${entity.locale}` : ''}`,
     };
   },
   generate: async (

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

@@ -16,10 +16,15 @@ const customServices = () => ({
     }
 
     const contentTypeUid = urlAliasEntity.contenttype as UID.ContentType;
+    const model = strapi.getModel(contentTypeUid);
+    // @ts-expect-error
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    const isLocalized = model.pluginOptions.i18n?.localized as boolean;
 
     const entity = await strapi.documents(contentTypeUid as 'api::test.test').findFirst({
       status: 'published',
       ...query,
+      ...(isLocalized ? { locale: urlAliasEntity.locale } : {}),
       filters: {
         ...query?.filters,
         url_alias: { documentId: urlAliasEntity.documentId },