diff --git a/sidekick.module b/sidekick.module index b925fa4..af70b36 100644 --- a/sidekick.module +++ b/sidekick.module @@ -46,10 +46,6 @@ function sidekick_form_node_form_alter( if ($api_key) { $sidekick_service = \Drupal::service('sidekick.service'); - $sidekickKeyStatus = $sidekick_service->checkKeyStatus( - $api_key, - $language_code - ); //--Whole node content $node = $form_state->getFormObject()->getEntity(); @@ -93,60 +89,52 @@ function sidekick_form_node_form_alter( ]; } - if (isset($sidekickKeyStatus['status'])) { - $api_url = Url::fromUri( - 'https://assistant.ai-sidekick.app/chat', - [ - 'query' => $sidekick_service->getQueryParameter( - $language_code - ), - ] - )->toString(); + $api_url = Url::fromUri( + 'https://assistant.ai-sidekick.app/chat', + [ + 'query' => $sidekick_service->getQueryParameter( + $language_code + ), + ] + )->toString(); - if ('inline' == $display_type - || 'inline_closed' == $display_type) { - $form['sidekick']['iframe'] = [ - '#type' => 'html_tag', - '#tag' => 'iframe', - '#attributes' => [ - 'src' => $api_url, - 'title' => t('Sidekick'), - 'referrerpolicy' => 'origin', - 'allow' => 'clipboard-write', - 'class' => ['sidekick-iframe'], - ], - ]; - if ('inline_closed' == $display_type) { - $form['sidekick']['#open'] = false; - } - } else { - $form['sidekick'] = [ - '#type' => 'fieldset', - '#group' => 'advanced', - '#weight' => $weight, - '#tree' => true, - '#attributes' => ['class' => ['sidekick-frame']], - ]; - $form['sidekick']['popup'] = [ - '#type' => 'link', - '#title' => t('Open Sidekick'), - '#url' => Url::fromRoute('sidekick.get.iframe'), - '#attributes' => [ - 'class' => 'use-ajax btn btn-primary button', - 'data-dialog-type' => 'modal', - ], - ]; + if ('inline' == $display_type + || 'inline_closed' == $display_type) { + $form['sidekick']['iframe'] = [ + '#type' => 'html_tag', + '#tag' => 'iframe', + '#attributes' => [ + 'src' => $api_url, + 'title' => t('Sidekick'), + 'referrerpolicy' => 'origin', + 'allow' => 'clipboard-write', + 'class' => ['sidekick-iframe'], + ], + ]; + if ('inline_closed' == $display_type) { + $form['sidekick']['#open'] = FALSE; } - } else { - $build_message = [ - '#type' => 'container', - '#markup' => $sidekickKeyStatus['message'], - '#attributes' => ['class' => ['messages--error']], + } + else { + $form['sidekick'] = [ + '#type' => 'fieldset', + '#group' => 'advanced', + '#weight' => $weight, + '#tree' => TRUE, + '#attributes' => ['class' => ['sidekick-frame']], + ]; + $form['sidekick']['popup'] = [ + '#type' => 'link', + '#title' => t('Open Sidekick'), + '#url' => Url::fromRoute('sidekick.get.iframe'), + '#attributes' => [ + 'class' => 'use-ajax btn btn-primary button', + 'data-dialog-type' => 'modal', + ], ]; - $message = \Drupal::service('renderer')->render($build_message); - \Drupal::messenger()->addError($message); } - } else { + } + else { $form['sidekick']['message'] = [ '#type' => 'html_tag', '#tag' => 'span', @@ -318,15 +306,6 @@ function sidekick_field_widget_complete_form_alter( \Drupal\Core\Form\FormStateInterface $form_state, $context ) { - $config = \Drupal::config('sidekick.settings'); - $api_key = $config->get('api_key'); - $language_code = $form_state->get('langcode'); - $sidekick_service = \Drupal::service('sidekick.service'); - $sidekickKeyStatus = $sidekick_service->checkKeyStatus( - $api_key, - $language_code - ); - $widget = $context['widget']; if (in_array($widget->getPluginId(), [ //only textfield 'string_textfield', @@ -335,7 +314,7 @@ function sidekick_field_widget_complete_form_alter( 'sidekick', 'sidekick_enabled', false - ) && isset($sidekickKeyStatus['status'])) { // api key is active + )) { if ($widget->getThirdPartySetting( 'sidekick', 'sidekick_settings'