From 97a37fa85779404d3da9eb96945feddc4cda4aeb Mon Sep 17 00:00:00 2001
From: Fernando Chavez <fernando.chavez@strapi.io>
Date: Fri, 25 Aug 2023 16:18:17 +0200
Subject: [PATCH] adapt cog button to creator fields

---
 .../components/Filter/Filter.js               |  8 ++++----
 .../SelectedEntriesModal/tests/index.test.js  | 19 +++++++++----------
 .../content-manager/pages/ListView/index.js   |  1 -
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/packages/core/admin/admin/src/content-manager/components/Filter/Filter.js b/packages/core/admin/admin/src/content-manager/components/Filter/Filter.js
index f98c8316ab..15bf1f9f01 100644
--- a/packages/core/admin/admin/src/content-manager/components/Filter/Filter.js
+++ b/packages/core/admin/admin/src/content-manager/components/Filter/Filter.js
@@ -1,4 +1,4 @@
-import React, { useRef, useState } from 'react';
+import React from 'react';
 
 import { Button } from '@strapi/design-system';
 import { FilterListURLQuery, FilterPopoverURLQuery, useTracking } from '@strapi/helper-plugin';
@@ -7,9 +7,9 @@ import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 
 export const Filter = ({ displayedFilters }) => {
-  const [isVisible, setIsVisible] = useState(false);
+  const [isVisible, setIsVisible] = React.useState(false);
   const { formatMessage } = useIntl();
-  const buttonRef = useRef();
+  const buttonRef = React.useRef();
   const { trackUsage } = useTracking();
 
   const handleToggle = () => {
@@ -24,7 +24,7 @@ export const Filter = ({ displayedFilters }) => {
       <Button
         variant="tertiary"
         ref={buttonRef}
-        startIcon={<Filter />}
+        startIcon={<FilterIcon />}
         onClick={handleToggle}
         size="S"
       >
diff --git a/packages/core/admin/admin/src/content-manager/pages/ListView/components/BulkActionButtons/SelectedEntriesModal/tests/index.test.js b/packages/core/admin/admin/src/content-manager/pages/ListView/components/BulkActionButtons/SelectedEntriesModal/tests/index.test.js
index f221fab7a9..3f889f4698 100644
--- a/packages/core/admin/admin/src/content-manager/pages/ListView/components/BulkActionButtons/SelectedEntriesModal/tests/index.test.js
+++ b/packages/core/admin/admin/src/content-manager/pages/ListView/components/BulkActionButtons/SelectedEntriesModal/tests/index.test.js
@@ -139,10 +139,6 @@ describe('Bulk publish selected entries modal', () => {
     server.listen();
   });
 
-  afterEach(() => {
-    server.resetHandlers();
-  });
-
   afterAll(() => {
     server.close();
   });
@@ -213,9 +209,11 @@ describe('Bulk publish selected entries modal', () => {
   });
 
   it('should publish valid entries after confirming and close the modal', async () => {
+    const mockOnToggle = jest.fn();
+
     const { queryByText } = render(
       <Table.Root defaultSelectedEntries={[1, 2, 3]} colCount={4}>
-        <SelectedEntriesModal onToggle={jest.fn()} />
+        <SelectedEntriesModal onToggle={mockOnToggle} />
       </Table.Root>
     );
 
@@ -237,11 +235,7 @@ describe('Bulk publish selected entries modal', () => {
       expect(publishDialog).not.toBeInTheDocument();
     });
 
-    await waitFor(() => {
-      expect(screen.queryByRole('gridcell', { name: 'Entry 1' })).not.toBeInTheDocument();
-      expect(screen.queryByRole('gridcell', { name: 'Entry 2' })).not.toBeInTheDocument();
-      expect(screen.queryByRole('gridcell', { name: 'Entry 3' })).not.toBeInTheDocument();
-    });
+    expect(mockOnToggle).toHaveBeenCalledTimes(1);
   });
 
   it('should only keep entries with validation errors in the modal after publish', async () => {
@@ -297,6 +291,8 @@ describe('Bulk publish selected entries modal', () => {
         screen.getByRole('gridcell', { name: 'components.Input.error.validation.required' })
       ).toBeInTheDocument();
     });
+
+    server.restoreHandlers();
   });
 
   it('should show validation errors if there is an error', async () => {
@@ -347,6 +343,8 @@ describe('Bulk publish selected entries modal', () => {
     await waitFor(() => {
       expect(publishButton).toBeDisabled();
     });
+
+    server.restoreHandlers();
   });
 
   it('should show the correct messages above the table in the selected entries modal', async () => {
@@ -399,5 +397,6 @@ describe('Bulk publish selected entries modal', () => {
       exact: false,
     });
     expect(countWithErrors).toHaveTextContent('1 entry waiting for action');
+    server.restoreHandlers();
   });
 });
diff --git a/packages/core/admin/admin/src/content-manager/pages/ListView/index.js b/packages/core/admin/admin/src/content-manager/pages/ListView/index.js
index 96d067696d..13de663bf3 100644
--- a/packages/core/admin/admin/src/content-manager/pages/ListView/index.js
+++ b/packages/core/admin/admin/src/content-manager/pages/ListView/index.js
@@ -95,7 +95,6 @@ function ListView({
   const fetchPermissionsRef = React.useRef(refetchPermissions);
   const { notifyStatus } = useNotifyAT();
   const { formatAPIError } = useAPIErrorHandler(getTrad);
-  const permissions = useSelector(selectAdminPermissions);
   const allowedAttributes = useAllowedAttributes(contentType, slug);
   const [{ query }] = useQueryParams();
   const { pathname } = useLocation();