From 335bc4088ee8c8541507530c438f90ca11cfcaad Mon Sep 17 00:00:00 2001
From: andileco <daniel@andile.co>
Date: Tue, 25 Apr 2017 23:31:39 -0400
Subject: [PATCH] Changes from pareview.sh, including removing unused code and
fixing issues related to the implementation of ChartsInterface.
---
charts.services.yml | 2 +-
includes/charts.pages.inc | 6 ++--
.../charts_highcharts.module | 1 -
src/Form/ChartsConfigForm.php | 20 ++++-------
.../display/ChartsPluginDisplayChart.php | 3 +-
.../views/style/ChartsPluginStyleChart.php | 33 +++----------------
6 files changed, 16 insertions(+), 49 deletions(-)
diff --git a/charts.services.yml b/charts.services.yml
index ae62187..cda6738 100644
--- a/charts.services.yml
+++ b/charts.services.yml
@@ -10,4 +10,4 @@ services:
charts.settings:
class: Drupal\charts\Services\ChartsSettingsService
- arguments: ['@config.factory']
\ No newline at end of file
+ arguments: ['@config.factory']
diff --git a/includes/charts.pages.inc b/includes/charts.pages.inc
index 8de34d1..a5704d9 100644
--- a/includes/charts.pages.inc
+++ b/includes/charts.pages.inc
@@ -204,7 +204,7 @@ function charts_settings_form($form, $defaults = array(), $field_options = array
$charts_info = charts_info();
$library_options = array();
foreach ($charts_info as $library_name => $library_info) {
- if (\Drupal::moduleHandler()->moduleExists($charts_info[$library_name]['module'])) {
+ if (Drupal::moduleHandler()->moduleExists($charts_info[$library_name]['module'])) {
$library_options[$library_name] = $library_info['label'];
}
}
@@ -622,10 +622,8 @@ function charts_default_settings() {
$defaults['tooltips_use_html'] = FALSE;
$defaults['width'] = NULL;
$defaults['height'] = NULL;
-
$defaults['xaxis_title'] = '';
$defaults['xaxis_labels_rotation'] = 0;
-
$defaults['yaxis_title'] = '';
$defaults['yaxis_min'] = '';
$defaults['yaxis_max'] = '';
@@ -634,7 +632,7 @@ function charts_default_settings() {
$defaults['yaxis_decimal_count'] = '';
$defaults['yaxis_labels_rotation'] = 0;
- \Drupal::moduleHandler()->alter('charts_default_settings', $defaults);
+ Drupal::moduleHandler()->alter('charts_default_settings', $defaults);
return $defaults;
}
diff --git a/modules/charts_highcharts/charts_highcharts.module b/modules/charts_highcharts/charts_highcharts.module
index 258c824..3e24bb7 100644
--- a/modules/charts_highcharts/charts_highcharts.module
+++ b/modules/charts_highcharts/charts_highcharts.module
@@ -4,7 +4,6 @@
* Charts module integration with Highcharts library.
*/
-
/**
* Implements hook_charts_info().
*/
diff --git a/src/Form/ChartsConfigForm.php b/src/Form/ChartsConfigForm.php
index e9392f4..33bf6d0 100644
--- a/src/Form/ChartsConfigForm.php
+++ b/src/Form/ChartsConfigForm.php
@@ -3,12 +3,9 @@
namespace Drupal\charts\Form;
use Drupal\charts\Theme\ChartsInterface;
-use Drupal\Core\Extension\ModuleHandler;
use Drupal\Core\Url;
-use Drupal\Core\Link;
use Drupal\Core\Form\ConfigFormBase;
use Drupal\Core\Form\FormStateInterface;
-use Drupal\Core\Config\ConfigFactory;
use Drupal\Core\Config\ConfigFactoryInterface;
use Drupal\Core\Extension\ModuleHandlerInterface;
use Symfony\Component\DependencyInjection\ContainerInterface;
@@ -58,7 +55,7 @@ class ChartsConfigForm extends ConfigFormBase {
'#weight' => -100,
];
// Reuse the global settings form for defaults, but remove JS classes.
- $form = $this->charts_settings_form($form, $defaults, $field_options, $parents);
+ $form = $this->chartsSettingsForm($form, $defaults, $field_options, $parents);
$form['xaxis']['#attributes']['class'] = [];
$form['yaxis']['#attributes']['class'] = [];
$form['display']['colors']['#prefix'] = NULL;
@@ -67,7 +64,7 @@ class ChartsConfigForm extends ConfigFormBase {
$form['display']['#group'] = 'defaults';
$form['xaxis']['#group'] = 'defaults';
$form['yaxis']['#group'] = 'defaults';
- $form['defaults'] = ['#type' => 'vertical_tabs',];
+ $form['defaults'] = ['#type' => 'vertical_tabs'];
// Add submit buttons and normal saving behavior.
$form['actions']['#type'] = 'actions';
$form['actions']['submit'] = [
@@ -107,7 +104,6 @@ class ChartsConfigForm extends ConfigFormBase {
$defaults['yaxis_decimal_count'] = '';
$defaults['yaxis_labels_rotation'] = 0;
- //\Drupal::moduleHandler()->alter('charts_default_settings', $defaults);
$this->moduleHandler->alter('charts_default_settings', $defaults);
return $defaults;
@@ -131,7 +127,7 @@ class ChartsConfigForm extends ConfigFormBase {
];
}
- public function charts_settings_form($form, $defaults = [], $field_options = [], $parents = []) {
+ public function chartsSettingsForm($form, $defaults = [], $field_options = [], $parents = []) {
// Ensure all defaults are set.
$options = array_merge($this->charts_default_settings(), $defaults);
@@ -141,7 +137,7 @@ class ChartsConfigForm extends ConfigFormBase {
$charts_info = $this->charts_info();
$library_options = [];
foreach ($charts_info as $library_name => $library_info) {
- if (\Drupal::moduleHandler()->moduleExists($charts_info[$library_name]['module'])) {
+ if ($this->moduleHandler->moduleExists($charts_info[$library_name]['module'])) {
$library_options[$library_name] = $library_info['label'];
}
}
@@ -160,9 +156,8 @@ class ChartsConfigForm extends ConfigFormBase {
'#parents' => array_merge($parents, ['library']),
];
- //$chart_types = $this->charts_type_info();
- //This is a work around will need to revisit this
- $chart_types = $this->charts_charts_type_info();
+ // This is a work around will need to revisit this.
+ $chart_types = $this->chartsChartsTypeInfo();
$type_options = [];
foreach ($chart_types as $chart_type => $chart_type_info) {
$type_options[$chart_type] = $chart_type_info['label'];
@@ -196,7 +191,6 @@ class ChartsConfigForm extends ConfigFormBase {
if ($field_options) {
$first_field = key($field_options);
- //$field_keys = array_diff($field_options, array($first_field => NULL));
$form['fields']['#theme'] = 'charts_settings_fields';
$form['fields']['label_field'] = [
'#type' => 'radios',
@@ -475,7 +469,7 @@ class ChartsConfigForm extends ConfigFormBase {
/**
* @return mixed
*/
- public function charts_charts_type_info() {
+ public function chartsChartsTypeInfo() {
$chart_types['pie'] = [
'label' => $this->t('Pie'),
'axis' => ChartsInterface::CHARTS_SINGLE_AXIS,
diff --git a/src/Plugin/views/display/ChartsPluginDisplayChart.php b/src/Plugin/views/display/ChartsPluginDisplayChart.php
index 067201a..adbfde8 100644
--- a/src/Plugin/views/display/ChartsPluginDisplayChart.php
+++ b/src/Plugin/views/display/ChartsPluginDisplayChart.php
@@ -101,6 +101,7 @@ class ChartsPluginDisplayChart extends Attachment {
case 'displays':
$form['#title'] .= t('Parent display');
break;
+
case 'inherit_yaxis':
$form['#title'] .= t('Axis settings');
$form['inherit_yaxis'] = [
@@ -116,7 +117,6 @@ class ChartsPluginDisplayChart extends Attachment {
break;
}
-
}
/**
@@ -134,6 +134,7 @@ class ChartsPluginDisplayChart extends Attachment {
case 'displays':
$form_state->setValue($section, array_filter($form_state->getValue($section)));
break;
+
case 'inherit_arguments':
case 'inherit_exposed_filters':
case 'inherit_yaxis':
diff --git a/src/Plugin/views/style/ChartsPluginStyleChart.php b/src/Plugin/views/style/ChartsPluginStyleChart.php
index ad08c48..078cb53 100644
--- a/src/Plugin/views/style/ChartsPluginStyleChart.php
+++ b/src/Plugin/views/style/ChartsPluginStyleChart.php
@@ -2,6 +2,7 @@
namespace Drupal\charts\Plugin\views\style;
+use Drupal\charts\Theme\ChartsInterface;
use Drupal\core\form\FormStateInterface;
use Drupal\Core\Render\Element;
use Drupal\views\Plugin\views\style\StylePluginBase;
@@ -59,7 +60,7 @@ class ChartsPluginStyleChart extends StylePluginBase {
$handlers = $this->displayHandler->getHandlers('field');
if (empty($handlers)) {
- $form['error_markup'] = ['#markup' => '<div class="error messages">' . t('You need at least one field before you can configure your table settings') . '</div>',];
+ $form['error_markup'] = ['#markup' => '<div class="error messages">' . t('You need at least one field before you can configure your table settings') . '</div>'];
}
// Limit grouping options (we only support one grouping field).
@@ -79,35 +80,8 @@ class ChartsPluginStyleChart extends StylePluginBase {
$field_options = $this->displayHandler->getFieldLabels();
$form = charts_settings_form($form, $this->options, $field_options, ['style_options']);
- // Reduce the options if this is a chart extension.
- /*if (empty($this->displayHandler->getAttachedDisplays())) {
- $form['type']['#description'] = empty($form['type']['#description']) ? '' : $form['type']['#description'] . ' ';
- $form['type']['#description'] .= t('This chart will be combined with the parent display "@display_title",
- which is a "@type" chart. Not all chart types may be combined. Selecting a different chart type than
- the parent may cause errors.' //,
- // array('@display_title' => $parent_display->display_title, '@type' => $parent_chart_type['label'])
- );
- $form['fields']['label_field']['#disabled'] = TRUE;
- $form['display']['#access'] = FALSE;
- $form['xaxis']['#access'] = FALSE;
- if ($this->displayHandler->options['inherit_yaxis']) {
- $form['yaxis']['#access'] = FALSE;
- }
- else {
- $form['yaxis']['#title'] = t('Secondary axis');
- $form['yaxis']['#attributes']['class'] = array();
- }
- }*/
}
- /**
- * {@inheritdoc}
- */
- public function submitOptionsForm(&$form, FormStateInterface $form_state) {
- parent::submitOptionsForm($form, $form_state);
- }
-
-
/**
* {@inheritdoc}
*/
@@ -130,6 +104,7 @@ class ChartsPluginStyleChart extends StylePluginBase {
array_push($dataFieldsValueState, 1);
}
}
+
$dataFieldsCounter++;
}
@@ -193,7 +168,7 @@ class ChartsPluginStyleChart extends StylePluginBase {
'#theme' => 'views_view_charts',
];
$chart_type_info = charts_get_type($this->options['type']);
- if ($chart_type_info['axis'] === CHARTS_SINGLE_AXIS) {
+ if ($chart_type_info['axis'] === ChartsInterface::CHARTS_SINGLE_AXIS) {
$data_field_key = key($data_fields);
$data_field = $data_fields[$data_field_key];
--
GitLab