Merge pull request #19970 from strapi/fix/issue-19532

fix issue #19532
strapi · Apr 2, 2024 · bfe081a · bfe081a
2 parents cf82c83 + 48671c2
commit bfe081a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 14 deletions.
diff --git a/packages/core/admin/ee/admin/src/content-manager/pages/ListView/constants.ts b/packages/core/admin/ee/admin/src/content-manager/pages/ListView/constants.ts
@@ -66,10 +66,7 @@ export const REVIEW_WORKFLOW_FILTERS = [
       type: 'relation',
       mainField: {
         name: 'name',
-
-        schema: {
-          type: 'string',
-        },
+        type: 'string',
       },
     },
 
@@ -90,10 +87,7 @@ export const REVIEW_WORKFLOW_FILTERS = [
       type: 'relation',
       mainField: {
         name: 'id',
-
-        schema: {
-          type: 'integer',
-        },
+        type: 'integer',
       },
     },
 

diff --git a/packages/core/helper-plugin/src/components/FilterListURLQuery.tsx b/packages/core/helper-plugin/src/components/FilterListURLQuery.tsx
@@ -111,8 +111,7 @@ const AttributeTag = ({ attribute, filter, onClick, operator, value }: Attribute
 
   const { fieldSchema } = attribute;
 
-  const type =
-    fieldSchema.type === 'relation' ? fieldSchema?.mainField?.schema?.type : fieldSchema.type;
+  const type = fieldSchema.type === 'relation' ? fieldSchema?.mainField?.type : fieldSchema.type;
 
   let formattedValue = value;
 

diff --git a/packages/core/helper-plugin/src/components/FilterPopoverURLQuery.tsx b/packages/core/helper-plugin/src/components/FilterPopoverURLQuery.tsx
@@ -344,8 +344,8 @@ const DefaultInputs = ({
 const getFilterList = (filterSchema: FilterData['fieldSchema']): Operator[] => {
   let type = filterSchema.type;
 
-  if (filterSchema.type === 'relation' && filterSchema?.mainField?.schema?.type) {
-    type = filterSchema.mainField.schema.type;
+  if (filterSchema.type === 'relation' && filterSchema?.mainField?.type) {
+    type = filterSchema.mainField.type;
   }
 
   switch (type) {

diff --git a/packages/core/helper-plugin/src/components/tests/FilterListURLQuery.test.tsx b/packages/core/helper-plugin/src/components/tests/FilterListURLQuery.test.tsx
@@ -50,7 +50,7 @@ describe('FilterListURLQuery', () => {
           type: 'relation',
           mainField: {
             name: 'postal_code',
-            schema: { type: 'string', pluginOptions: { i18n: { localized: true } } },
+            type: 'string',
           },
         },
       },

diff --git a/packages/core/helper-plugin/src/types.ts b/packages/core/helper-plugin/src/types.ts
@@ -61,7 +61,7 @@ export interface FilterData {
     options?: string[];
     mainField?: {
       name: string;
-      schema?: Attribute.Any;
+      type?: Attribute.Any['type'];
     };
   };
   trackedEvent?: TrackingEvent;