Skip to content

Commit 044c43c

Browse files
committed
- only use graphql_types for mapping field groups to the Schema. Do not try and dynamically determine location rules at Schema Generation time.
1 parent 250b4e2 commit 044c43c

File tree

1 file changed

+30
-28
lines changed

1 file changed

+30
-28
lines changed

src/Registry.php

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -570,34 +570,36 @@ public function get_graphql_locations_for_field_group( array $field_group, array
570570

571571
$graphql_types = $field_group['graphql_types'] ?? [];
572572

573-
$field_group_name = '';
574-
575-
if ( ! empty( $field_group['graphql_field_name'] ) ) {
576-
$field_group_name = $field_group['graphql_field_name'];
577-
} elseif ( ! empty( $field_group['title'] ) ) {
578-
$field_group_name = $field_group['title'];
579-
} elseif ( ! empty( $field_group['name'] ) ) {
580-
$field_group_name = $field_group['name'];
581-
}
582-
583-
if ( empty( $field_group_name ) ) {
584-
return [];
585-
}
586-
587-
$field_group_name = Utils::format_field_name( $field_group_name, true );
588-
589-
$manually_set_graphql_types = isset( $field_group['map_graphql_types_from_location_rules'] ) && (bool) $field_group['map_graphql_types_from_location_rules'];
590-
591-
if ( false === $manually_set_graphql_types || empty( $graphql_types ) ) {
592-
if ( empty( $field_group['graphql_types'] ) ) {
593-
$location_rules = $this->get_location_rules( $acf_field_groups );
594-
if ( isset( $location_rules[ $field_group_name ] ) ) {
595-
$graphql_types = $location_rules[ $field_group_name ];
596-
}
597-
}
598-
}
599-
600-
return ! empty( $graphql_types ) && is_array( $graphql_types ) ? array_unique( array_filter( $graphql_types ) ) : [];
573+
return is_array( $graphql_types ) ? $graphql_types : [ $graphql_types ];
574+
575+
// $field_group_name = '';
576+
//
577+
// if ( ! empty( $field_group['graphql_field_name'] ) ) {
578+
// $field_group_name = $field_group['graphql_field_name'];
579+
// } elseif ( ! empty( $field_group['title'] ) ) {
580+
// $field_group_name = $field_group['title'];
581+
// } elseif ( ! empty( $field_group['name'] ) ) {
582+
// $field_group_name = $field_group['name'];
583+
// }
584+
//
585+
// if ( empty( $field_group_name ) ) {
586+
// return [];
587+
// }
588+
//
589+
// $field_group_name = Utils::format_field_name( $field_group_name, true );
590+
//
591+
// $manually_set_graphql_types = isset( $field_group['map_graphql_types_from_location_rules'] ) && (bool) $field_group['map_graphql_types_from_location_rules'];
592+
//
593+
// if ( false === $manually_set_graphql_types || empty( $graphql_types ) ) {
594+
// if ( empty( $field_group['graphql_types'] ) ) {
595+
// $location_rules = $this->get_location_rules( $acf_field_groups );
596+
// if ( isset( $location_rules[ $field_group_name ] ) ) {
597+
// $graphql_types = $location_rules[ $field_group_name ];
598+
// }
599+
// }
600+
// }
601+
//
602+
// return ! empty( $graphql_types ) && is_array( $graphql_types ) ? array_unique( array_filter( $graphql_types ) ) : [];
601603
}
602604

603605
/**

0 commit comments

Comments
 (0)