build: add prefer-template eslint rule (opensearch-project#581)

AMoo-Miki · Mar 9, 2020 · 6efc70b · 6efc70b
1 parent 72f9fcd
commit 6efc70b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/packages/osd-charts/.eslintrc.js b/packages/osd-charts/.eslintrc.js
@@ -70,6 +70,7 @@ module.exports = {
     '@typescript-eslint/no-inferrable-types': 'off',
     'react/jsx-curly-brace-presence': ['error', { props: 'never', children: 'never' }],
     'react/prop-types': 0,
+    'prefer-template': 'error',
     'file-header/file-header': [
       'error',
       [

diff --git a/packages/osd-charts/src/chart_types/partition_chart/layout/utils/calcs.ts b/packages/osd-charts/src/chart_types/partition_chart/layout/utils/calcs.ts
@@ -35,8 +35,8 @@ export function addOpacity(hexColorString: string, opacity: Ratio) {
     ? hexColorString
     : hexColorString.slice(0, 7) +
         (hexColorString.slice(7).length === 0 || parseInt(hexColorString.slice(7, 2), 16) === 255
-          ? ('00' + Math.round(opacity * 255).toString(16)).substr(-2) // color was of full opacity
-          : ('00' + Math.round((parseInt(hexColorString.slice(7, 2), 16) / 255) * opacity * 255).toString(16)).substr(
+          ? `00${Math.round(opacity * 255).toString(16)}`.substr(-2) // color was of full opacity
+          : `00${Math.round((parseInt(hexColorString.slice(7, 2), 16) / 255) * opacity * 255).toString(16)}`.substr(
               -2,
             ));
 }

diff --git a/packages/osd-charts/src/chart_types/partition_chart/layout/viewmodel/fill_text_layout.ts b/packages/osd-charts/src/chart_types/partition_chart/layout/viewmodel/fill_text_layout.ts
@@ -62,7 +62,7 @@ function angleToCircline(
 
 // todo pick a better unique key for the slices (D3 doesn't keep track of an index)
 export function nodeId(node: ShapeTreeNode): string {
-  return node.x0 + '|' + node.y0;
+  return `${node.x0}|${node.y0}`;
 }
 
 export function rectangleConstruction(node: ShapeTreeNode) {