From 1999041cdf7d5c7c3f4572d47e0abd1e324309a8 Mon Sep 17 00:00:00 2001
From: Ken Clary <kclary@edx.org>
Date: Mon, 18 Apr 2022 15:37:47 -0400
Subject: [PATCH] fix: rearrange and add several tinymce toolbar items.
 Addresses TNL-9874.

---
 src/editors/containers/TextEditor/index.jsx       |  1 +
 src/editors/containers/TextEditor/pluginConfig.js | 15 +++++----------
 src/editors/data/constants/tinyMCE.js             |  3 +++
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/editors/containers/TextEditor/index.jsx b/src/editors/containers/TextEditor/index.jsx
index b7a1109d0..459e481fb 100644
--- a/src/editors/containers/TextEditor/index.jsx
+++ b/src/editors/containers/TextEditor/index.jsx
@@ -10,6 +10,7 @@ import 'tinymce/icons/default';
 import 'tinymce/plugins/link';
 import 'tinymce/plugins/lists';
 import 'tinymce/plugins/table';
+import 'tinymce/plugins/hr';
 import 'tinymce/plugins/codesample';
 import 'tinymce/plugins/emoticons';
 import 'tinymce/plugins/emoticons/js/emojis';
diff --git a/src/editors/containers/TextEditor/pluginConfig.js b/src/editors/containers/TextEditor/pluginConfig.js
index 5bad9b806..dcbe8d2b7 100644
--- a/src/editors/containers/TextEditor/pluginConfig.js
+++ b/src/editors/containers/TextEditor/pluginConfig.js
@@ -10,6 +10,7 @@ export default StrictDict({
     plugins.codesample,
     plugins.emoticons,
     plugins.table,
+    plugins.hr,
     plugins.charmap,
     plugins.code,
     plugins.autoresize,
@@ -20,7 +21,7 @@ export default StrictDict({
   toolbar: mapToolbars([
     [buttons.undo, buttons.redo],
     [buttons.formatSelect],
-    [buttons.bold, buttons.italic, buttons.backColor],
+    [buttons.bold, buttons.italic, buttons.foreColor, buttons.backColor],
     [
       buttons.align.left,
       buttons.align.center,
@@ -33,15 +34,9 @@ export default StrictDict({
       buttons.outdent,
       buttons.indent,
     ],
-    [buttons.imageUploadButton],
-    [buttons.link],
-    [buttons.emoticons],
-    [buttons.table],
-    [buttons.codesample],
-    [buttons.charmap],
-    [buttons.removeFormat],
-    [buttons.hr],
-    [buttons.code],
+    [buttons.imageUploadButton, buttons.link, buttons.unlink, buttons.codesample, buttons.table],
+    [buttons.emoticons, buttons.charmap, buttons.hr],
+    [buttons.removeFormat, buttons.code],
   ]),
   imageToolbar: mapToolbars([
     // [buttons.rotate.left, buttons.rotate.right],
diff --git a/src/editors/data/constants/tinyMCE.js b/src/editors/data/constants/tinyMCE.js
index 52bd99ae6..05ad1bcc1 100644
--- a/src/editors/data/constants/tinyMCE.js
+++ b/src/editors/data/constants/tinyMCE.js
@@ -16,6 +16,7 @@ export const buttons = StrictDict({
     left: 'alignleft',
     right: 'alignright',
   }),
+  foreColor: 'forecolor',
   backColor: 'backcolor',
   bold: 'bold',
   bullist: 'bullist',
@@ -34,6 +35,7 @@ export const buttons = StrictDict({
   indent: 'indent',
   italic: 'italic',
   link: 'link',
+  unlink: 'unlink',
   numlist: 'numlist',
   outdent: 'outdent',
   redo: 'redo',
@@ -52,6 +54,7 @@ export const plugins = listKeyStore([
   'codesample',
   'emoticons',
   'table',
+  'hr',
   'charmap',
   'code',
   'autoresize',