Merge pull request #113 from pluginpal/feature/fix-105

fix: bug in query-layer-decorator

Author: boazpoolman

.changeset/old-worms-hear.md

@@ -0,0 +1,5 @@
+---
+"@pluginpal/webtools-core": patch
+---
+
+Fix bug in the query-layer-decorator to allow updates to entities without an URL alias (#105)

packages/core/server/admin-api/services/query-layer-decorator.ts

@@ -67,20 +67,28 @@ const decorator = (service: IDecoratedService) => ({
       return service.update.call(this, uid, entityId, opts);
     }
 
+    // Manually fetch the entity that's being updated.
+    // We do this becuase not all it's data is present in opts.data.
+    const entity = await service.findOne.call(this, uid, entityId, {
+      populate: {
+        url_alias: {
+          fields: ['id', 'generated'],
+        },
+      },
+    });
+
     // If a URL alias is allready present, fetch it.
     if (opts.data.url_alias) {
       urlAliasEntity = await getPluginService('urlAliasService').findOne(opts.data.url_alias);
+    } else if (entity.url_alias) {
+      urlAliasEntity = entity.url_alias;
     }
 
     // If a URL alias is present and 'generated' is set to false, do nothing.
     if (urlAliasEntity?.generated === false) {
       return service.update.call(this, uid, entityId, opts);
     }
 
-    // Manually fetch the entity that's being updated.
-    // We do this becuase not all it's data is present in opts.data.
-    const entity = await service.findOne.call(this, uid, entityId);
-
     // Generate the path.
     const generatedPath = await getPluginService('urlPatternService').resolvePattern(uid, { ...entity, ...opts.data });
 
@@ -95,7 +103,13 @@ const decorator = (service: IDecoratedService) => ({
     }
 
     // Eventually update the entity.
-    return service.update.call(this, uid, entityId, opts);
+    return service.update.call(this, uid, entityId, {
+      ...opts,
+      data: {
+        ...opts.data,
+        url_alias: urlAliasEntity.id,
+      },
+    });
   },
   async delete(uid: Common.UID.ContentType, entityId: number) {
     const hasWT = isContentTypeEnabled(uid);
@@ -106,18 +120,17 @@ const decorator = (service: IDecoratedService) => ({
     }
 
     // Fetch the entity because we need the url_alias id.
-    const entity = await strapi.entityService.findOne(uid, entityId, {
-      // @ts-ignore
-      populate: 'url_alias',
+    const entity = await service.findOne.call(this, uid, entityId, {
+      populate: {
+        url_alias: {
+          fields: ['id'],
+        },
+      },
     });
 
     // If a URL alias is present, delete it.
-    // @ts-ignore
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     if (entity.url_alias?.id) {
-      // @ts-ignore
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-      await getPluginService('urlAliasService').delete(Number(entity.url_alias.id));
+      await getPluginService('urlAliasService').delete(entity.url_alias.id);
     }
 
     // Eventually delete the entity.

packages/core/server/types/strapi.ts

@@ -1,4 +1,4 @@
-import { Strapi } from '@strapi/strapi';
+import { Attribute, Strapi } from '@strapi/strapi';
 
 /**
  * An extension of the Strapi type to include unsupported types.
@@ -29,7 +29,9 @@ export interface IDecoratedService {
     call: (context: any, uid: any, options: any) => Promise<{ id: number }>
   }
   findOne: {
-    call: (context: any, uid: any, options: any) => Promise<{ id: number }>
+    call: (context: any, uid: any, id: any, options: any) => Promise<{
+      id: number, url_alias?: Attribute.GetValues<'plugin::webtools.url-alias', Attribute.GetNonPopulatableKeys<'plugin::webtools.url-alias'>>
+    }>
   }
 }