fix 'NoTalen' strings

2 files changed, 16 insertions, 14 deletions

diff --git a/src/ReportTable.vue b/src/ReportTable.vue
index dc7d167..8550939 100644
--- a/src/ReportTable.vue
+++ b/src/ReportTable.vue
@@ -9,7 +9,7 @@
           </b-table-column>
 
           <b-table-column field="Talent" label="Talent">
-              {{ talentSlugToName(props.row.Talent) }}
+              {{ getTalentName(props.row.Talent) }}
           </b-table-column>
 
           <b-table-column field="Level" label="Average Level" sortable numeric>
@@ -36,24 +36,13 @@
 
 <script>
 import Vue from 'vue';
-
-function talentSlugToName(talent) {
-  if (talent == '' || talent == undefined) {
-    return 'No Talent';
-  }
-
-  return talent.substring(talent.lastIndexOf('_') + 1, talent.length - 1) // snake case to words
-               .replace(/([A-Z])/g, (s) => ' ' + s.toLowerCase())
-               .split(' ') // capitalize first letter
-               .map((s) => s.charAt(0).toUpperCase() + s.slice(1))
-               .join(' ');
-}
+import * as maps from './maps/maps';
 
 export default Vue.component('report-table', {
   props: [ 'report', 'totalPicks' ],
   data: function() {
     return {
-      talentSlugToName,
+      getTalentName: maps.getTalentName,
     };
   },
   computed: {
diff --git a/src/maps/maps.js b/src/maps/maps.js
index 1571806..0b121cd 100644
--- a/src/maps/maps.js
+++ b/src/maps/maps.js
@@ -1,5 +1,17 @@
 const rarities = require('./rarities.json');
 
+function getTalentName(talent) {
+  if (talent == 'NoTalent' || talent == '' || talent == undefined) {
+    return 'No Talent';
+  }
+
+  return talent.substring(talent.lastIndexOf('_') + 1, talent.length - 1) // snake case to words
+               .replace(/([A-Z])/g, (s) => ' ' + s.toLowerCase())
+               .split(' ') // capitalize first letter
+               .map((s) => s.charAt(0).toUpperCase() + s.slice(1))
+               .join(' ');
+}
+
 function getTalentRarity(talent) {
   switch (talent.slice(talent.length - 7 - 1, talent.length - 1)) {
     case 'TalentA': return 'Rare';
@@ -19,6 +31,7 @@ function getHero(actor) {
 }
 
 module.exports = {
+  getTalentName,
   getTalentRarity,
   getHero,
 };