- $deleted_fields = $this->state->get('field.field.deleted') ?: [];
- $deleted_storages = $this->state->get('field.storage.deleted') ?: [];
- foreach ($deleted_fields as $id => $config) {
- // If the field storage itself is deleted, inject it directly in the field.
- if (isset($deleted_storages[$config['field_storage_uuid']])) {
- $config['field_storage'] = $this->entityManager->getStorage('field_storage_config')->create($deleted_storages[$config['field_storage_uuid']]);
+ $deleted_field_definitions = $this->deletedFieldsRepository->getFieldDefinitions();
+ foreach ($deleted_field_definitions as $id => $field_definition) {
+ if ($field_definition instanceof FieldConfigInterface) {
+ $fields[$id] = $field_definition;