Remove filterType from metadata attribute

exogee-technology · Jan 17, 2025 · b921fa3 · b921fa3
1 parent cdfdbcb
commit b921fa3
Show file tree

Hide file tree

Showing 20 changed files with 1 addition and 27 deletions.
diff --git a/src/examples/auth-zero/src/frontend/types.generated.ts b/src/examples/auth-zero/src/frontend/types.generated.ts
@@ -61,7 +61,6 @@ export type AdminUiEnumValueMetadata = {
 
 export type AdminUiFieldAttributeMetadata = {
   __typename?: 'AdminUiFieldAttributeMetadata';
-  filterType: AdminUiFilterType;
   isReadOnly: Scalars['Boolean']['output'];
   isRequired: Scalars['Boolean']['output'];
 };

diff --git a/src/examples/auth-zero/src/types.generated.ts b/src/examples/auth-zero/src/types.generated.ts
@@ -61,7 +61,6 @@ export type AdminUiEnumValueMetadata = {
 
 export type AdminUiFieldAttributeMetadata = {
   __typename?: 'AdminUiFieldAttributeMetadata';
-  filterType: AdminUiFilterType;
   isReadOnly: Scalars['Boolean']['output'];
   isRequired: Scalars['Boolean']['output'];
 };

diff --git a/src/examples/aws-cognito/src/frontend/types.generated.ts b/src/examples/aws-cognito/src/frontend/types.generated.ts
@@ -59,7 +59,6 @@ export type AdminUiEnumValueMetadata = {
 
 export type AdminUiFieldAttributeMetadata = {
   __typename?: 'AdminUiFieldAttributeMetadata';
-  filterType: AdminUiFilterType;
   isReadOnly: Scalars['Boolean']['output'];
   isRequired: Scalars['Boolean']['output'];
 };

diff --git a/src/examples/aws-cognito/src/types.generated.ts b/src/examples/aws-cognito/src/types.generated.ts
@@ -59,7 +59,6 @@ export type AdminUiEnumValueMetadata = {
 
 export type AdminUiFieldAttributeMetadata = {
   __typename?: 'AdminUiFieldAttributeMetadata';
-  filterType: AdminUiFilterType;
   isReadOnly: Scalars['Boolean']['output'];
   isRequired: Scalars['Boolean']['output'];
 };

diff --git a/src/examples/federation/src/frontend/types.generated.ts b/src/examples/federation/src/frontend/types.generated.ts
@@ -62,7 +62,6 @@ export type AdminUiEnumValueMetadata = {
 
 export type AdminUiFieldAttributeMetadata = {
   __typename?: 'AdminUiFieldAttributeMetadata';
-  filterType: AdminUiFilterType;
   isReadOnly: Scalars['Boolean']['output'];
   isRequired: Scalars['Boolean']['output'];
 };

diff --git a/src/examples/federation/src/types.generated.ts b/src/examples/federation/src/types.generated.ts
@@ -62,7 +62,6 @@ export type AdminUiEnumValueMetadata = {
 
 export type AdminUiFieldAttributeMetadata = {
   __typename?: 'AdminUiFieldAttributeMetadata';
-  filterType: AdminUiFilterType;
   isReadOnly: Scalars['Boolean']['output'];
   isRequired: Scalars['Boolean']['output'];
 };

diff --git a/src/examples/microsoft-entra/src/frontend/types.generated.ts b/src/examples/microsoft-entra/src/frontend/types.generated.ts
@@ -61,7 +61,6 @@ export type AdminUiEnumValueMetadata = {
 
 export type AdminUiFieldAttributeMetadata = {
   __typename?: 'AdminUiFieldAttributeMetadata';
-  filterType: AdminUiFilterType;
   isReadOnly: Scalars['Boolean']['output'];
   isRequired: Scalars['Boolean']['output'];
 };

diff --git a/src/examples/microsoft-entra/src/types.generated.ts b/src/examples/microsoft-entra/src/types.generated.ts
@@ -61,7 +61,6 @@ export type AdminUiEnumValueMetadata = {
 
 export type AdminUiFieldAttributeMetadata = {
   __typename?: 'AdminUiFieldAttributeMetadata';
-  filterType: AdminUiFilterType;
   isReadOnly: Scalars['Boolean']['output'];
   isRequired: Scalars['Boolean']['output'];
 };

diff --git a/src/examples/okta/src/frontend/types.generated.ts b/src/examples/okta/src/frontend/types.generated.ts
@@ -61,7 +61,6 @@ export type AdminUiEnumValueMetadata = {
 
 export type AdminUiFieldAttributeMetadata = {
   __typename?: 'AdminUiFieldAttributeMetadata';
-  filterType: AdminUiFilterType;
   isReadOnly: Scalars['Boolean']['output'];
   isRequired: Scalars['Boolean']['output'];
 };

diff --git a/src/examples/okta/src/types.generated.ts b/src/examples/okta/src/types.generated.ts
@@ -61,7 +61,6 @@ export type AdminUiEnumValueMetadata = {
 
 export type AdminUiFieldAttributeMetadata = {
   __typename?: 'AdminUiFieldAttributeMetadata';
-  filterType: AdminUiFilterType;
   isReadOnly: Scalars['Boolean']['output'];
   isRequired: Scalars['Boolean']['output'];
 };

diff --git a/src/examples/rest-with-auth/src/frontend/types.generated.ts b/src/examples/rest-with-auth/src/frontend/types.generated.ts
@@ -63,7 +63,6 @@ export type AdminUiEnumValueMetadata = {
 
 export type AdminUiFieldAttributeMetadata = {
   __typename?: 'AdminUiFieldAttributeMetadata';
-  filterType: AdminUiFilterType;
   isReadOnly: Scalars['Boolean']['output'];
   isRequired: Scalars['Boolean']['output'];
 };

diff --git a/src/examples/rest-with-auth/src/types.generated.ts b/src/examples/rest-with-auth/src/types.generated.ts
@@ -63,7 +63,6 @@ export type AdminUiEnumValueMetadata = {
 
 export type AdminUiFieldAttributeMetadata = {
   __typename?: 'AdminUiFieldAttributeMetadata';
-  filterType: AdminUiFilterType;
   isReadOnly: Scalars['Boolean']['output'];
   isRequired: Scalars['Boolean']['output'];
 };

diff --git a/src/examples/rest-with-auth/types.generated.ts b/src/examples/rest-with-auth/types.generated.ts
@@ -63,7 +63,6 @@ export type AdminUiEnumValueMetadata = {
 
 export type AdminUiFieldAttributeMetadata = {
   __typename?: 'AdminUiFieldAttributeMetadata';
-  filterType: AdminUiFilterType;
   isReadOnly: Scalars['Boolean']['output'];
   isRequired: Scalars['Boolean']['output'];
 };

diff --git a/src/examples/rest/src/frontend/types.generated.ts b/src/examples/rest/src/frontend/types.generated.ts
@@ -59,7 +59,6 @@ export type AdminUiEnumValueMetadata = {
 
 export type AdminUiFieldAttributeMetadata = {
   __typename?: 'AdminUiFieldAttributeMetadata';
-  filterType: AdminUiFilterType;
   isReadOnly: Scalars['Boolean']['output'];
   isRequired: Scalars['Boolean']['output'];
 };

diff --git a/src/examples/rest/src/types.generated.ts b/src/examples/rest/src/types.generated.ts
@@ -59,7 +59,6 @@ export type AdminUiEnumValueMetadata = {
 
 export type AdminUiFieldAttributeMetadata = {
   __typename?: 'AdminUiFieldAttributeMetadata';
-  filterType: AdminUiFilterType;
   isReadOnly: Scalars['Boolean']['output'];
   isRequired: Scalars['Boolean']['output'];
 };

diff --git a/src/examples/sqlite/src/frontend/types.generated.ts b/src/examples/sqlite/src/frontend/types.generated.ts
@@ -65,7 +65,6 @@ export type AdminUiEnumValueMetadata = {
 
 export type AdminUiFieldAttributeMetadata = {
   __typename?: 'AdminUiFieldAttributeMetadata';
-  filterType: AdminUiFilterType;
   isReadOnly: Scalars['Boolean']['output'];
   isRequired: Scalars['Boolean']['output'];
 };

diff --git a/src/examples/sqlite/src/types.generated.ts b/src/examples/sqlite/src/types.generated.ts
@@ -65,7 +65,6 @@ export type AdminUiEnumValueMetadata = {
 
 export type AdminUiFieldAttributeMetadata = {
   __typename?: 'AdminUiFieldAttributeMetadata';
-  filterType: AdminUiFilterType;
   isReadOnly: Scalars['Boolean']['output'];
   isRequired: Scalars['Boolean']['output'];
 };

diff --git a/src/packages/admin-ui-components/src/utils/graphql.ts b/src/packages/admin-ui-components/src/utils/graphql.ts
@@ -29,7 +29,6 @@ export const SCHEMA_QUERY = gql`
 					attributes {
 						isReadOnly
 						isRequired
-						filterType
 					}
 					extensions {
 						key

diff --git a/src/packages/core/src/metadata-service/field-attribute.ts b/src/packages/core/src/metadata-service/field-attribute.ts
@@ -1,5 +1,4 @@
 import { Entity, Field } from '../decorators';
-import { AdminUIFilterType } from '../types';
 
 @Entity('AdminUiFieldAttributeMetadata', {
 	apiOptions: { excludeFromBuiltInOperations: true, excludeFromFederation: true },
@@ -10,7 +9,4 @@ export class AdminUiFieldAttributeMetadata {
 
 	@Field(() => Boolean)
 	isRequired!: boolean;
-
-	@Field(() => AdminUIFilterType)
-	filterType!: AdminUIFilterType;
 }
diff --git a/src/packages/core/src/metadata-service/resolver.ts b/src/packages/core/src/metadata-service/resolver.ts
@@ -109,11 +109,9 @@ export const resolveAdminUiMetadata = (hooks?: Hooks) => {
 					name: field.name,
 					type: relatedObject?.name || typeName,
 					isArray: isList,
-					//@ts-expect-error - TODO fix me
 					attributes: {
 						isReadOnly,
 						isRequired,
-						// filterType: field.adminUIOptions?.filterType
 					},
 					hideInTable: field.adminUIOptions?.hideInTable,
 					hideInFilterBar: field.adminUIOptions?.hideInFilterBar,
@@ -141,9 +139,7 @@ export const resolveAdminUiMetadata = (hooks?: Hooks) => {
 				}
 
 				const filterType = field.adminUIOptions?.filterType ?? mapFilterType(fieldObject);
-				if (fieldObject.attributes) {
-					fieldObject.attributes.filterType = filterType;
-				}
+
 				fieldObject.filter = { type: filterType };
 
 				return fieldObject;