fix: url alias modal when no url alias is present

Author: boazpoolman

packages/core/admin/api/url-alias.ts

@@ -5,7 +5,7 @@ export const useCreateUrlAlias = () => {
   const { post } = useFetchClient();
 
   const createUrlAlias = async (body: { id: number }, slug: string) => {
-    return post('/webtools/url-alias/create', {
+    return post<UrlAliasEntity>('/webtools/url-alias/create', {
       data: {
         ...body,
         contenttype: slug,
@@ -18,15 +18,13 @@ export const useCreateUrlAlias = () => {
 
 export const useUpdateUrlAlias = () => {
   const { put } = useFetchClient();
-  const updateUrlAliases = async (aliases: UrlAliasEntity[], slug: string) => {
-    return Promise.all(
-      aliases.map((alias) => put(`/webtools/url-alias/update/${alias.id}`, {
-        data: {
-          ...alias,
-          contenttype: slug,
-        },
-      })),
-    );
+  const updateUrlAliases = async (body: { id: number }, slug: string) => {
+    return put<UrlAliasEntity>(`/webtools/url-alias/update/${body.id}`, {
+      data: {
+        ...body,
+        contenttype: slug,
+      },
+    });
   };
 
   return { updateUrlAliases };

packages/core/admin/components/EditForm/index.tsx

@@ -19,17 +19,17 @@ import { UrlAliasEntity } from '../../types/url-aliases';
 
 const EditForm = () => {
   const { modifiedData, onChange } = useCMEditViewDataManager();
-  const modifiedDataUrlAliases = modifiedData.url_alias as UrlAliasEntity[];
+  const modifiedDataUrlAliases =
+    (modifiedData.url_alias as UrlAliasEntity[])?.length
+      ? modifiedData.url_alias as UrlAliasEntity[]
+      : [{
+        generated: true,
+      }] as UrlAliasEntity[];
   const { formatMessage } = useIntl();
 
   const updateValue = (index: number, name: string, value: string | number) => {
     const updatedUrlAliases = [...modifiedDataUrlAliases];
 
-    if (!updatedUrlAliases[index].id) {
-      console.error('Error: id is undefined', updatedUrlAliases[index]);
-      return;
-    }
-
     updatedUrlAliases[index] = {
       ...updatedUrlAliases[index],
       [name]: value,
@@ -53,7 +53,7 @@ const EditForm = () => {
           size="S"
         >
           <AccordionToggle
-            description={alias.url_path ? alias.url_path : 'URL alias not found'}
+            description={alias.url_path ? alias.url_path : 'Initial URL alias'}
           >
             {`Alias #${index + 1}`}
           </AccordionToggle>

packages/core/admin/components/EditView/index.tsx

@@ -20,6 +20,7 @@ const EditView = () => {
     slug,
   } = useCMEditViewDataManager();
 
+
   const modifiedDataUrlAliases = modifiedData.url_alias as UrlAliasEntity[];
   const i18nLang = new URLSearchParams(window.location.search).get('plugins[i18n][locale]');
 
@@ -55,15 +56,18 @@ const EditView = () => {
   const initialUrlAliases = initialData.url_alias as UrlAliasEntity[];
 
   const onSubmit = async () => {
-    if (initialUrlAliases?.length === 0) {
+    if (!initialUrlAliases || initialUrlAliases?.length === 0) {
       // Create new URL aliases
       const newAliases = await Promise.all(
-        modifiedUrlAliases.map((alias) => createUrlAlias(alias, slug)),
+        modifiedUrlAliases.map(async (alias) => (await createUrlAlias(alias, slug)).data),
       );
+
       onChange({ target: { name: 'url_alias', value: newAliases, type: 'array' } });
     } else {
       // Update existing URL aliases
-      await updateUrlAliases(modifiedUrlAliases, slug);
+      await Promise.all(
+        modifiedUrlAliases.map((alias) => updateUrlAliases(alias, slug)),
+      );
     }
   };
 
@@ -76,7 +80,9 @@ const EditView = () => {
         })}
         onSubmit={onSubmit}
         onCancel={() => {
-          if (initialUrlAliases?.length > 0) {
+          if (modifiedUrlAliases?.length > 0) {
+            onChange({ target: { name: 'url_alias', value: modifiedUrlAliases, type: 'array' } });
+          } else if (initialUrlAliases?.length > 0) {
             onChange({ target: { name: 'url_alias', value: initialUrlAliases, type: 'array' } });
           } else {
             onChange({ target: { name: 'url_alias', value: null, type: 'array' } });

playground/types/generated/contentTypes.d.ts

@@ -1026,52 +1026,6 @@ export interface ApiPrivateCategoryPrivateCategory
   };
 }
 
-export interface ApiProductProduct extends Schema.CollectionType {
-  collectionName: 'products';
-  info: {
-    singularName: 'product';
-    pluralName: 'products';
-    displayName: 'Products';
-    description: '';
-  };
-  options: {
-    draftAndPublish: true;
-  };
-  pluginOptions: {
-    webtools: {
-      enabled: true;
-    };
-  };
-  attributes: {
-    title: Attribute.String;
-    addition: Attribute.String;
-    createdAt: Attribute.DateTime;
-    updatedAt: Attribute.DateTime;
-    publishedAt: Attribute.DateTime;
-    createdBy: Attribute.Relation<
-      'api::product.product',
-      'oneToOne',
-      'admin::user'
-    > &
-      Attribute.Private;
-    updatedBy: Attribute.Relation<
-      'api::product.product',
-      'oneToOne',
-      'admin::user'
-    > &
-      Attribute.Private;
-    url_alias: Attribute.Relation<
-      'api::product.product',
-      'oneToMany',
-      'plugin::webtools.url-alias'
-    > &
-      Attribute.Unique;
-    sitemap_exclude: Attribute.Boolean &
-      Attribute.Private &
-      Attribute.DefaultTo<false>;
-  };
-}
-
 export interface ApiTestTest extends Schema.CollectionType {
   collectionName: 'tests';
   info: {
@@ -1082,6 +1036,7 @@ export interface ApiTestTest extends Schema.CollectionType {
   };
   options: {
     draftAndPublish: true;
+    populateCreatorFields: true;
   };
   pluginOptions: {
     webtools: {
@@ -1111,10 +1066,8 @@ export interface ApiTestTest extends Schema.CollectionType {
     createdAt: Attribute.DateTime;
     updatedAt: Attribute.DateTime;
     publishedAt: Attribute.DateTime;
-    createdBy: Attribute.Relation<'api::test.test', 'oneToOne', 'admin::user'> &
-      Attribute.Private;
-    updatedBy: Attribute.Relation<'api::test.test', 'oneToOne', 'admin::user'> &
-      Attribute.Private;
+    createdBy: Attribute.Relation<'api::test.test', 'oneToOne', 'admin::user'>;
+    updatedBy: Attribute.Relation<'api::test.test', 'oneToOne', 'admin::user'>;
     url_alias: Attribute.Relation<
       'api::test.test',
       'oneToMany',
@@ -1156,7 +1109,6 @@ declare module '@strapi/types' {
       'plugin::users-permissions.user': PluginUsersPermissionsUser;
       'api::category.category': ApiCategoryCategory;
       'api::private-category.private-category': ApiPrivateCategoryPrivateCategory;
-      'api::product.product': ApiProductProduct;
       'api::test.test': ApiTestTest;
     }
   }