From ca8df1fa7f4bc2dac4ac35b01976eabda23efbdb Mon Sep 17 00:00:00 2001
From: nagyad <joevagyok@gmail.com>
Date: Fri, 4 Jan 2019 10:59:30 +0100
Subject: [PATCH] OPENEUROPA-1500: Some improvements.

---
 .../schema/oe_webtools_analytics.schema.yml   |  2 +-
 .../oe_webtools_analytics.links.menu.yml      |  2 +-
 .../oe_webtools_analytics.routing.yml         |  2 +-
 .../Form/WebtoolsAnalyticsSettingsForm.php    | 30 +++++++++----------
 tests/features/analytics.feature              |  1 -
 5 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/modules/oe_webtools_analytics/config/schema/oe_webtools_analytics.schema.yml b/modules/oe_webtools_analytics/config/schema/oe_webtools_analytics.schema.yml
index 3f12ab52..ae976b12 100644
--- a/modules/oe_webtools_analytics/config/schema/oe_webtools_analytics.schema.yml
+++ b/modules/oe_webtools_analytics/config/schema/oe_webtools_analytics.schema.yml
@@ -13,4 +13,4 @@ oe_webtools_analytics.settings:
     instance:
       type: string
       label: 'Instance'
-      description: 'The test server instance. e.g. testing, ec.europa.eu or europa.eu.'
+      description: 'The server instance. e.g. testing, ec.europa.eu or europa.eu.'
diff --git a/modules/oe_webtools_analytics/oe_webtools_analytics.links.menu.yml b/modules/oe_webtools_analytics/oe_webtools_analytics.links.menu.yml
index d1c5ef8f..7e08be02 100644
--- a/modules/oe_webtools_analytics/oe_webtools_analytics.links.menu.yml
+++ b/modules/oe_webtools_analytics/oe_webtools_analytics.links.menu.yml
@@ -2,4 +2,4 @@ oe_webtools_analytics.settings:
   title: Webtools Analytics
   description: 'Configure Webtools Analytics.'
   route_name: oe_webtools_analytics.settings
-  parent: system.admin_config_regional
+  parent: system.admin_config_system
diff --git a/modules/oe_webtools_analytics/oe_webtools_analytics.routing.yml b/modules/oe_webtools_analytics/oe_webtools_analytics.routing.yml
index a5a88db6..681925e3 100644
--- a/modules/oe_webtools_analytics/oe_webtools_analytics.routing.yml
+++ b/modules/oe_webtools_analytics/oe_webtools_analytics.routing.yml
@@ -1,5 +1,5 @@
 oe_webtools_analytics.settings:
-  path: '/admin/config/regional/oe_webtools_analytics'
+  path: '/admin/config/system/oe_webtools_analytics'
   defaults:
     _form: 'Drupal\oe_webtools_analytics\Form\WebtoolsAnalyticsSettingsForm'
     _title: 'Webtools Analytics settings'
diff --git a/modules/oe_webtools_analytics/src/Form/WebtoolsAnalyticsSettingsForm.php b/modules/oe_webtools_analytics/src/Form/WebtoolsAnalyticsSettingsForm.php
index 87d8406c..f25ad58a 100644
--- a/modules/oe_webtools_analytics/src/Form/WebtoolsAnalyticsSettingsForm.php
+++ b/modules/oe_webtools_analytics/src/Form/WebtoolsAnalyticsSettingsForm.php
@@ -17,6 +17,20 @@ class WebtoolsAnalyticsSettingsForm extends ConfigFormBase {
    */
   const CONFIGNAME = 'oe_webtools_analytics.settings';
 
+  /**
+   * {@inheritdoc}
+   */
+  public function getFormId() {
+    return 'oe_webtools_analytics_settings';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function getEditableConfigNames() {
+    return ['oe_webtools_analytics.settings'];
+  }
+
   /**
    * {@inheritdoc}
    */
@@ -37,7 +51,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#type' => 'textfield',
       '#title' => $this->t('Instance'),
       '#default_value' => $this->config(static::CONFIGNAME)->get('instance'),
-      '#description' => $this->t('The test server instance. e.g. testing, ec.europa.eu or europa.eu.'),
+      '#description' => $this->t('The server instance. e.g. testing, ec.europa.eu or europa.eu.'),
     ];
     return parent::buildForm($form, $form_state);
   }
@@ -54,18 +68,4 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     parent::submitForm($form, $form_state);
   }
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'oe_webtools_analytics_settings';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  protected function getEditableConfigNames() {
-    return ['oe_webtools_analytics.settings'];
-  }
-
 }
diff --git a/tests/features/analytics.feature b/tests/features/analytics.feature
index eb5aa06c..a2f9847c 100644
--- a/tests/features/analytics.feature
+++ b/tests/features/analytics.feature
@@ -3,7 +3,6 @@ Feature: Webtools Analytics
   In order to provide analytics
   As the site manager
   I need to be able to configure the settings
-  And Webtools Analytics works as expected
 
   Background:
     Given I am logged in as a user with the "administer site configuration" permission