From 0034eba8b2bb4561b2fe0bc0777f81a0e4e7d457 Mon Sep 17 00:00:00 2001
From: JonathanTGold <jonathan.gold@86@gmail.com>
Date: Wed, 17 Jan 2024 11:26:44 +0200
Subject: [PATCH 1/3] fix(FEC-13517): Wrong and inconsistent order of plugins

---
 src/components/plugin-button/plugin-button.tsx | 3 ++-
 src/index.ts                                   | 2 +-
 src/moderation-plugin.tsx                      | 8 +++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/components/plugin-button/plugin-button.tsx b/src/components/plugin-button/plugin-button.tsx
index b2a1518..90e951a 100644
--- a/src/components/plugin-button/plugin-button.tsx
+++ b/src/components/plugin-button/plugin-button.tsx
@@ -1,6 +1,7 @@
 import {h} from 'preact';
 import {icons} from '../icons';
 import {ui} from '@playkit-js/kaltura-player-js';
+import { pluginName } from "../../index";
 
 const {Tooltip, Icon} = KalturaPlayer.ui.components;
 const {withText, Text} = KalturaPlayer.ui.preacti18n;
@@ -19,7 +20,7 @@ export const PluginButton = withText(translates)(({label, setRef}: PluginButtonP
     <Tooltip label={label} type="bottom">
         <button type="button" aria-label={label} className={ui.style.upperBarIcon} data-testid="moderationPluginButton" ref={setRef}>
           <Icon
-            id="moderation-plugin-button"
+            id={pluginName}
             height={icons.BigSize}
             width={icons.BigSize}
             viewBox={`0 0 ${icons.BigSize} ${icons.BigSize}`}
diff --git a/src/index.ts b/src/index.ts
index afe517f..be7ad04 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -9,6 +9,6 @@ const NAME = __NAME__;
 export {ModerationPlugin as Plugin};
 export {VERSION, NAME};
 
-const pluginName: string = 'playkit-js-moderation';
+export const pluginName: string = 'playkit-js-moderation';
 
 KalturaPlayer.core.registerPlugin(pluginName, ModerationPlugin);
diff --git a/src/moderation-plugin.tsx b/src/moderation-plugin.tsx
index d623b90..09196ab 100644
--- a/src/moderation-plugin.tsx
+++ b/src/moderation-plugin.tsx
@@ -12,6 +12,7 @@ import {SuccessIcon} from './components/icons/success-icon';
 import {ModerationEvent} from './event';
 // @ts-ignore
 import {FakeEvent} from '@playkit-js/playkit-js';
+import { pluginName } from "./index";
 
 const {ReservedPresetAreas, ReservedPresetNames} = ui;
 const {Text} = ui.preacti18n;
@@ -193,8 +194,13 @@ export class ModerationPlugin extends KalturaPlayer.core.BasePlugin {
       return;
     }
     this.player.ready().then(() => {
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
       this._pluginIcon = this.upperBarManager!.add({
-        label: 'Moderation',
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        displayName: 'Moderation',
+        ariaLabel: 'Moderation',
         component: () => <PluginButton setRef={this._setPluginButtonRef} />,
         svgIcon: {path: icons.PLUGIN_ICON, viewBox: `0 0 ${icons.BigSize} ${icons.BigSize}`},
         onClick: this._toggleOverlay

From c9ca27578c1232a4c82757c810235569932c99f5 Mon Sep 17 00:00:00 2001
From: JonathanTGold <jonathan.gold@86@gmail.com>
Date: Wed, 17 Jan 2024 13:17:03 +0200
Subject: [PATCH 2/3] add icon

---
 src/moderation-plugin.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/moderation-plugin.tsx b/src/moderation-plugin.tsx
index 09196ab..017850a 100644
--- a/src/moderation-plugin.tsx
+++ b/src/moderation-plugin.tsx
@@ -201,6 +201,7 @@ export class ModerationPlugin extends KalturaPlayer.core.BasePlugin {
         // @ts-ignore
         displayName: 'Moderation',
         ariaLabel: 'Moderation',
+        order: 90,
         component: () => <PluginButton setRef={this._setPluginButtonRef} />,
         svgIcon: {path: icons.PLUGIN_ICON, viewBox: `0 0 ${icons.BigSize} ${icons.BigSize}`},
         onClick: this._toggleOverlay

From 45d078a9957be2dae138a69101208270269b67ee Mon Sep 17 00:00:00 2001
From: JonathanTGold <jonathan.gold@86@gmail.com>
Date: Sun, 21 Jan 2024 14:41:29 +0200
Subject: [PATCH 3/3] fix cp

---
 src/components/plugin-button/plugin-button.tsx | 2 +-
 src/index.ts                                   | 3 +--
 src/moderation-plugin.tsx                      | 3 ++-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/plugin-button/plugin-button.tsx b/src/components/plugin-button/plugin-button.tsx
index 90e951a..ec008f7 100644
--- a/src/components/plugin-button/plugin-button.tsx
+++ b/src/components/plugin-button/plugin-button.tsx
@@ -1,7 +1,7 @@
 import {h} from 'preact';
 import {icons} from '../icons';
 import {ui} from '@playkit-js/kaltura-player-js';
-import { pluginName } from "../../index";
+import { pluginName } from "../../moderation-plugin";
 
 const {Tooltip, Icon} = KalturaPlayer.ui.components;
 const {withText, Text} = KalturaPlayer.ui.preacti18n;
diff --git a/src/index.ts b/src/index.ts
index be7ad04..a81ad3d 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,4 +1,4 @@
-import {ModerationPlugin} from './moderation-plugin';
+import { ModerationPlugin, pluginName } from "./moderation-plugin";
 
 declare var __VERSION__: string;
 declare var __NAME__: string;
@@ -9,6 +9,5 @@ const NAME = __NAME__;
 export {ModerationPlugin as Plugin};
 export {VERSION, NAME};
 
-export const pluginName: string = 'playkit-js-moderation';
 
 KalturaPlayer.core.registerPlugin(pluginName, ModerationPlugin);
diff --git a/src/moderation-plugin.tsx b/src/moderation-plugin.tsx
index 017850a..7ec7224 100644
--- a/src/moderation-plugin.tsx
+++ b/src/moderation-plugin.tsx
@@ -10,9 +10,10 @@ import {ReportLoader, KalturaModerationFlag} from './providers';
 import {ErrorIcon} from './components/icons/error-icon';
 import {SuccessIcon} from './components/icons/success-icon';
 import {ModerationEvent} from './event';
+
+export const pluginName: string = 'playkit-js-moderation';
 // @ts-ignore
 import {FakeEvent} from '@playkit-js/playkit-js';
-import { pluginName } from "./index";
 
 const {ReservedPresetAreas, ReservedPresetNames} = ui;
 const {Text} = ui.preacti18n;