From 36156d72840fe7e6461745ceb8b3d2c65eb78c70 Mon Sep 17 00:00:00 2001
From: Joshua Shoemaker <joshuashoemaker@outlook.com>
Date: Sun, 9 Aug 2020 02:30:07 -0500
Subject: [PATCH] refact: renamed ChartjsDataset to One AxisChart

---
 src/Constants/chartTypes.js                            |  6 +++---
 src/Constants/chartjsTypes.js                          |  3 ---
 src/Models/Chart/Chart.js                              |  3 ++-
 src/Models/Chart/Charts.js                             | 10 +++++-----
 .../Chart/{ChartjsDataset.js => OneAxisChart.js}       |  0
 src/views/CreateChart/CreateChartForm.js               |  4 ++--
 6 files changed, 12 insertions(+), 14 deletions(-)
 delete mode 100644 src/Constants/chartjsTypes.js
 rename src/Models/Chart/{ChartjsDataset.js => OneAxisChart.js} (100%)

diff --git a/src/Constants/chartTypes.js b/src/Constants/chartTypes.js
index 5f88ee1..06d32d4 100644
--- a/src/Constants/chartTypes.js
+++ b/src/Constants/chartTypes.js
@@ -1,3 +1,3 @@
-export default [
-  'line', 'bar', 'radar', 'doughnut', 'pie', 'polar', /*'bubble', 'scatter', 'area', 'mixed' */
-]
\ No newline at end of file
+export default {
+  oneAxisCharts: ['line', 'bar', 'radar', 'doughnut', 'pie', 'polar'] /*'bubble', 'scatter', 'area', 'mixed' */
+}
diff --git a/src/Constants/chartjsTypes.js b/src/Constants/chartjsTypes.js
deleted file mode 100644
index 5f88ee1..0000000
--- a/src/Constants/chartjsTypes.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export default [
-  'line', 'bar', 'radar', 'doughnut', 'pie', 'polar', /*'bubble', 'scatter', 'area', 'mixed' */
-]
\ No newline at end of file
diff --git a/src/Models/Chart/Chart.js b/src/Models/Chart/Chart.js
index dd0b53d..0b248b3 100644
--- a/src/Models/Chart/Chart.js
+++ b/src/Models/Chart/Chart.js
@@ -57,7 +57,8 @@ class Chart {
   }
 
   _validateChartType = type => {
-    if (chartTypes.includes(type)) return true
+    const allChartTypes = Object.values(chartTypes).flat()
+    if (allChartTypes.includes(type)) return true
     else return false
   }
 }
diff --git a/src/Models/Chart/Charts.js b/src/Models/Chart/Charts.js
index 87df6f9..895fcd9 100644
--- a/src/Models/Chart/Charts.js
+++ b/src/Models/Chart/Charts.js
@@ -1,6 +1,6 @@
 import { uuid } from 'uuidv4'
-import ChartJsDataset from '../../Models/Chart/ChartjsDataset'
-import chartjsTypes from '../../Constants/chartjsTypes' 
+import OneAxisChart from '../../Models/Chart/OneAxisChart'
+import chartTypes from '../../Constants/chartTypes' 
 
 let instance = null
 
@@ -13,7 +13,7 @@ class Charts {
 
   addNewChart = chart => {
     let newChart = null
-    if (chartjsTypes.includes(chart.type)) newChart = this._generateChartJsDataset(chart)
+    if (chartTypes.oneAxisCharts.includes(chart.type)) newChart = this._generateOneAxisChart(chart)
 
     if (newChart) this.collection.push(newChart)
   }
@@ -41,8 +41,8 @@ class Charts {
     if (indexToRemove > -1) this.collection.splice(indexToRemove, 1)
   }
 
-  _generateChartJsDataset = chart => {
-    const newChart = new ChartJsDataset({
+  _generateOneAxisChart = chart => {
+    const newChart = new OneAxisChart({
       id: chart.id || uuid(),
       label: chart.label,
       type: chart.type,
diff --git a/src/Models/Chart/ChartjsDataset.js b/src/Models/Chart/OneAxisChart.js
similarity index 100%
rename from src/Models/Chart/ChartjsDataset.js
rename to src/Models/Chart/OneAxisChart.js
diff --git a/src/views/CreateChart/CreateChartForm.js b/src/views/CreateChart/CreateChartForm.js
index 5ee7df0..1c123c2 100644
--- a/src/views/CreateChart/CreateChartForm.js
+++ b/src/views/CreateChart/CreateChartForm.js
@@ -1,6 +1,5 @@
 import React, { Component } from 'react'
 import { Button, Input, Header, Dropdown } from 'semantic-ui-react'
-// import './CreateNodule.css'
 
 import Tables from '../../Models/Tables'
 import Nodules from '../../Models/Nodules'
@@ -36,7 +35,8 @@ class CreateChartForm extends Component {
   }
 
   getChartTypeDropdownOptions = () => {
-    return chartTypes.map(t => {
+    const allChartTypes = Object.values(chartTypes).flat()
+    return allChartTypes.map(t => {
       return {key: t, text: t, value: t}
     })
   }