Merge pull request #381 from VirtusLab-Open-Source/fix/design-system-instance

Fix/design system instance

Author: mateusz-kleszcz

admin/src/providers/CommonProviders/index.tsx

@@ -1,7 +1,5 @@
-import { DesignSystemProvider } from '@strapi/design-system';
 import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
 import { FC, ReactNode } from 'react';
-import { usePluginTheme } from '@sensinum/strapi-utils';
 import { UserProvider } from '../../contexts/UserContext';
 
 const queryClient = new QueryClient({
@@ -13,15 +11,11 @@ const queryClient = new QueryClient({
   },
 });
 export const CommonProviders: FC<{ children: ReactNode }> = ({ children }) => {
-  const { theme } = usePluginTheme();
-
   return (
     <QueryClientProvider client={queryClient}>
-      <DesignSystemProvider theme={theme}>
-        <UserProvider>
-          {children}
-        </UserProvider>
-      </DesignSystemProvider>
+      <UserProvider>
+        {children}
+      </UserProvider>
     </QueryClientProvider>
   );
 };

admin/src/utils/__tests__/getMessage.test.ts

@@ -33,6 +33,27 @@ describe("getMessage()", () => {
       id: "comments.message.key",
     });
   });
+  it("should handle config object with empty id (fallback to formattedId)", () => {
+    expect(getMessage({ id: "" })).toEqual({
+      defaultMessage: "",
+      id: "comments.",
+    });
+  });
+  it("should handle config object with props", () => {
+    expect(
+      getMessage(
+        {
+          id: "message.key",
+          props: { count: 5 },
+        },
+        "default"
+      )
+    ).toEqual({
+      defaultMessage: "default",
+      id: "comments.message.key",
+      count: 5,
+    });
+  });
   it("should allow out of scope translates", () => {
     expect(
       getMessage(

admin/src/utils/__tests__/resolveCommentStatus.test.ts

@@ -53,4 +53,25 @@ describe('resolveCommentStatus()', () => {
       }),
     ).toEqual("UNKNOWN");
   });
+  it('should handle to review status when reviewFlowEnabled is true', () => {
+    expect(
+      resolveCommentStatus({
+        removed: false,
+        blocked: false,
+        blockedThread: false,
+        approvalStatus: 'PENDING',
+        reviewFlowEnabled: true,
+      }),
+    ).toEqual("TO_REVIEW");
+  });
+  it('should return OPEN when approvalStatus is null and no other conditions match', () => {
+    expect(
+      resolveCommentStatus({
+        removed: false,
+        blocked: false,
+        blockedThread: false,
+        approvalStatus: null,
+      }),
+    ).toEqual("OPEN");
+  });
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "strapi-plugin-comments",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "Strapi - Comments plugin",
   "strapi": {
     "name": "comments",
@@ -63,12 +63,12 @@
   "devDependencies": {
     "@jest/types": "29.5.x",
     "@sensinum/strapi-utils": "^1.0.10",
-    "@strapi/plugin-cloud": "^5.33.4",
-    "@strapi/plugin-graphql": "^5.33.4",
-    "@strapi/plugin-users-permissions": "^5.33.4",
+    "@strapi/plugin-cloud": "^5.37.0",
+    "@strapi/plugin-graphql": "^5.37.0",
+    "@strapi/plugin-users-permissions": "^5.37.0",
     "@strapi/sdk-plugin": "^5.3.2",
-    "@strapi/strapi": "^5.33.4",
-    "@strapi/types": "^5.33.4",
+    "@strapi/strapi": "^5.37.0",
+    "@strapi/types": "^5.37.0",
     "@types/jest": "^30.0.0",
     "@types/koa": "^2.15.0",
     "@types/minimatch": "3.0.5",

server/src/controllers/__tests__/admin.controller.test.ts

@@ -88,6 +88,15 @@ describe('Admin controller', () => {
       expect(result).toEqual(expectedResult);
       expect(mockAdminService.findReports).toHaveBeenCalledWith(validatedData);
     });
+
+    it('should throw error when validation fails', async () => {
+      const ctx = { query: {} } as RequestContext;
+      const error = new Error('Validation failed');
+
+      caster<jest.Mock>(adminValidator.getReportFindReportsValidator).mockReturnValue({ left: error });
+
+      await expect(getController(getStrapi()).findReports(ctx)).rejects.toThrow();
+    });
   });
 
   describe('findOne', () => {
@@ -141,6 +150,15 @@ describe('Admin controller', () => {
       expect(result).toEqual(expectedResult);
       expect(mockAdminService.changeBlockedComment).toHaveBeenCalledWith('1', true);
     });
+
+    it('should throw error when validation fails', async () => {
+      const ctx = { params: { id: 'invalid' } } as RequestContext<object, { id: string }>;
+      const error = new Error('Validation failed');
+
+      caster<jest.Mock>(adminValidator.getIdValidator).mockReturnValue({ left: error });
+
+      await expect(getController(getStrapi()).blockComment(ctx)).rejects.toThrow();
+    });
   });
 
   describe('resolveAbuseReport', () => {
@@ -157,6 +175,15 @@ describe('Admin controller', () => {
       expect(result).toEqual(expectedResult);
       expect(mockAdminService.resolveAbuseReport).toHaveBeenCalledWith(validatedData);
     });
+
+    it('should throw error when validation fails', async () => {
+      const ctx = { params: { id: 'invalid', reportId: '2' } } as RequestContext<object, { id: string; reportId: string }>;
+      const error = new Error('Validation failed');
+
+      caster<jest.Mock>(adminValidator.getCommentResolveAbuseReportValidator).mockReturnValue({ left: error });
+
+      await expect(getController(getStrapi()).resolveAbuseReport(ctx)).rejects.toThrow();
+    });
   });
 
   describe('resolveCommentMultipleAbuseReports', () => {
@@ -209,6 +236,18 @@ describe('Admin controller', () => {
       expect(result).toEqual(expectedResult);
       expect(mockAdminService.postComment).toHaveBeenCalledWith(validatedData);
     });
+
+    it('should throw error when validation fails', async () => {
+      const ctx = {
+        params: { id: '1' },
+        request: { body: { content: 'Test content', author: 'Test author' } }
+      } as RequestContext<any, any>;
+      const error = new Error('Validation failed');
+
+      caster<jest.Mock>(adminValidator.getCommentPostValidator).mockReturnValue({ left: error });
+
+      await expect(getController(getStrapi()).postComment(ctx)).rejects.toThrow();
+    });
   });
 
   describe('unblockComment', () => {
@@ -225,6 +264,15 @@ describe('Admin controller', () => {
       expect(result).toEqual(expectedResult);
       expect(mockAdminService.changeBlockedComment).toHaveBeenCalledWith('1', false);
     });
+
+    it('should throw error when validation fails', async () => {
+      const ctx = { params: { id: 'invalid' } } as RequestContext<object, { id: string }>;
+      const error = new Error('Validation failed');
+
+      caster<jest.Mock>(adminValidator.getIdValidator).mockReturnValue({ left: error });
+
+      await expect(getController(getStrapi()).unblockComment(ctx)).rejects.toThrow();
+    });
   });
 
   describe('deleteComment', () => {
@@ -241,6 +289,15 @@ describe('Admin controller', () => {
       expect(result).toEqual(expectedResult);
       expect(mockAdminService.deleteComment).toHaveBeenCalledWith('1');
     });
+
+    it('should throw error when validation fails', async () => {
+      const ctx = { params: { id: 'invalid' } } as RequestContext<object, { id: string }>;
+      const error = new Error('Validation failed');
+
+      caster<jest.Mock>(adminValidator.getIdValidator).mockReturnValue({ left: error });
+
+      await expect(getController(getStrapi()).deleteComment(ctx)).rejects.toThrow();
+    });
   });
 
   describe('blockCommentThread', () => {
@@ -257,6 +314,15 @@ describe('Admin controller', () => {
       expect(result).toEqual(expectedResult);
       expect(mockAdminService.blockCommentThread).toHaveBeenCalledWith('1', true);
     });
+
+    it('should throw error when validation fails', async () => {
+      const ctx = { params: { id: 'invalid' } } as RequestContext<object, { id: string }>;
+      const error = new Error('Validation failed');
+
+      caster<jest.Mock>(adminValidator.getIdValidator).mockReturnValue({ left: error });
+
+      await expect(getController(getStrapi()).blockCommentThread(ctx)).rejects.toThrow();
+    });
   });
 
   describe('unblockCommentThread', () => {
@@ -298,6 +364,15 @@ describe('Admin controller', () => {
       expect(result).toEqual(expectedResult);
       expect(mockAdminService.resolveAllAbuseReportsForComment).toHaveBeenCalledWith('1');
     });
+
+    it('should throw error when validation fails', async () => {
+      const ctx = { params: { id: 'invalid' } } as RequestContext<object, { id: string }>;
+      const error = new Error('Validation failed');
+
+      caster<jest.Mock>(adminValidator.getIdValidator).mockReturnValue({ left: error });
+
+      await expect(getController(getStrapi()).resolveAllAbuseReportsForComment(ctx)).rejects.toThrow();
+    });
   });
 
   describe('resolveAllAbuseReportsForThread', () => {
@@ -340,6 +415,16 @@ describe('Admin controller', () => {
       expect(result).toEqual(expectedResult);
       expect(mockAdminService.resolveMultipleAbuseReports).toHaveBeenCalledWith(reportIds);
     });
+
+    it('should throw error when validation fails', async () => {
+      const reportIds = ['invalid'];
+      const ctx = { request: { body: reportIds } } as RequestContext<Array<string>>;
+      const error = new Error('Validation failed');
+
+      caster<jest.Mock>(adminValidator.getReportsMultipleAbuseValidator).mockReturnValue({ left: error });
+
+      await expect(getController(getStrapi()).resolveMultipleAbuseReports(ctx)).rejects.toThrow();
+    });
   });
 
   describe('updateComment', () => {
@@ -359,6 +444,18 @@ describe('Admin controller', () => {
       expect(result).toEqual(expectedResult);
       expect(mockAdminService.updateComment).toHaveBeenCalledWith(validatedData);
     });
+
+    it('should throw error when validation fails', async () => {
+      const ctx = {
+        params: { id: '1' },
+        request: { body: { content: '' } }
+      } as RequestContext<any, any>;
+      const error = new Error('Validation failed');
+
+      caster<jest.Mock>(adminValidator.getUpdateCommentValidator).mockReturnValue({ left: error });
+
+      await expect(getController(getStrapi()).updateComment(ctx)).rejects.toThrow();
+    });
   });
 
   describe('approveComment', () => {
@@ -375,6 +472,15 @@ describe('Admin controller', () => {
       expect(result).toEqual(expectedResult);
       expect(mockAdminService.approveComment).toHaveBeenCalledWith('1');
     });
+
+    it('should throw error when validation fails', async () => {
+      const ctx = { params: { id: 'invalid' } } as RequestContext<any, any>;
+      const error = new Error('Validation failed');
+
+      caster<jest.Mock>(adminValidator.getIdValidator).mockReturnValue({ left: error });
+
+      await expect(getController(getStrapi()).approveComment(ctx)).rejects.toThrow();
+    });
   });
 
   describe('rejectComment', () => {
@@ -391,5 +497,14 @@ describe('Admin controller', () => {
       expect(result).toEqual(expectedResult);
       expect(mockAdminService.rejectComment).toHaveBeenCalledWith('1');
     });
+
+    it('should throw error when validation fails', async () => {
+      const ctx = { params: { id: 'invalid' } } as RequestContext<any, any>;
+      const error = new Error('Validation failed');
+
+      caster<jest.Mock>(adminValidator.getIdValidator).mockReturnValue({ left: error });
+
+      await expect(getController(getStrapi()).rejectComment(ctx)).rejects.toThrow();
+    });
   });
 });