From 510854c1ed58b0494439f60368ba2ed1fe3e5100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Viguier?= <jf.viguier@gmail.com>
Date: Thu, 22 Feb 2024 17:30:21 +0100
Subject: [PATCH 1/2] Add Tiny Mce licence key management

---
 _dev/src/components/FieldRepeater.vue         |  2 +
 prettyblocks.php                              | 20 +++++++++-
 .../AdminThemeManagerController.php           |  1 +
 upgrade/upgrade-2.2.1.php                     | 37 +++++++++++++++++++
 4 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 upgrade/upgrade-2.2.1.php

diff --git a/_dev/src/components/FieldRepeater.vue b/_dev/src/components/FieldRepeater.vue
index b184f341..f1e793cf 100644
--- a/_dev/src/components/FieldRepeater.vue
+++ b/_dev/src/components/FieldRepeater.vue
@@ -55,6 +55,7 @@ const removeTinyNotifications = () => {
     })
   }, 300)
 }
+let tinymce_api_key = ref(window.security_app.tinymce_api_key)
 </script>
 
 <template>
@@ -79,6 +80,7 @@ const removeTinyNotifications = () => {
       <div class="pb-4"> {{ f.label }} </div>
       <Editor
         v-model="f.value"
+        :api-key="tinymce_api_key"
         @init="removeTinyNotifications()"
         :init="{
           height: 500,
diff --git a/prettyblocks.php b/prettyblocks.php
index bc228034..f2fe5610 100755
--- a/prettyblocks.php
+++ b/prettyblocks.php
@@ -51,13 +51,14 @@ class PrettyBlocks extends Module implements WidgetInterface
         'displayRightColumn',
         'actionDispatcher',
         'actionFrontControllerSetVariables',
+        'ActionRegisterThemeSettings',
     ];
 
     public function __construct()
     {
         $this->name = 'prettyblocks';
         $this->tab = 'administration';
-        $this->version = '2.2.0';
+        $this->version = '2.2.1';
         $this->author = 'PrestaSafe';
         $this->need_instance = 1;
         $this->js_path = $this->_path . 'views/js/';
@@ -279,4 +280,21 @@ public static function renderZone($params)
 
         return $context->smarty->fetch('module:prettyblocks/views/templates/front/zone.tpl');
     }
+
+    /**
+     * Hook for adding theme settings
+     * quick fix for adding tinyMCE api key.
+     */
+    public function hookActionRegisterThemeSettings()
+    {
+        return [
+             'tinymce_api_key' => [
+                 'type' => 'text', // type of field
+                 'label' => $this->l('TinyMCE api key'), // label to display
+                 'description' => $this->l('Add your TinyMCE api key (free) https://www.tiny.cloud/pricing/'), // description to display
+                 'tab' => 'Settings',
+                 'default' => 'no-api-key', // default value (Boolean)
+             ],
+         ];
+    }    
 }
diff --git a/src/Controller/AdminThemeManagerController.php b/src/Controller/AdminThemeManagerController.php
index c0262c64..9eb3e5ed 100644
--- a/src/Controller/AdminThemeManagerController.php
+++ b/src/Controller/AdminThemeManagerController.php
@@ -250,6 +250,7 @@ public function indexAction()
             'security_app' => [
                 'ajax_token' => \Configuration::get('_PRETTYBLOCKS_TOKEN_'),
                 'prettyblocks_version' => $module->version,
+                'tinymce_api_key' => \TplSettings::getSettings('tinymce_api_key') ?? 'no-api-key',
             ],
             'css_build' => $css,
             'js_build' => $js,
diff --git a/upgrade/upgrade-2.2.1.php b/upgrade/upgrade-2.2.1.php
new file mode 100644
index 00000000..a0499468
--- /dev/null
+++ b/upgrade/upgrade-2.2.1.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Copyright (c) Since 2020 PrestaSafe and contributors
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License 3.0 (AFL-3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to contact@prestasafe.com so we can send you a copy immediately.
+ *
+ * @author    PrestaSafe <contact@prestasafe.com>
+ * @copyright Since 2020 PrestaSafe and contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
+ * International Registered Trademark & Property of PrestaSafe
+ */
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+/**
+ * @param prettyblocks $module
+ *
+ * @return bool|string
+ *
+ * @throws PrestaShopDatabaseException
+ * @throws PrestaShopException
+ */
+function upgrade_module_2_2_1($module)
+{
+    $module->registerHook('ActionRegisterThemeSettings');
+
+    return true;
+}

From 09d5b58131ff58eea8ca62271e53096af1fef940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Viguier?= <jf.viguier@gmail.com>
Date: Thu, 22 Feb 2024 17:39:02 +0100
Subject: [PATCH 2/2] cs fixer

---
 prettyblocks.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/prettyblocks.php b/prettyblocks.php
index f2fe5610..bc6e5270 100755
--- a/prettyblocks.php
+++ b/prettyblocks.php
@@ -288,13 +288,13 @@ public static function renderZone($params)
     public function hookActionRegisterThemeSettings()
     {
         return [
-             'tinymce_api_key' => [
-                 'type' => 'text', // type of field
-                 'label' => $this->l('TinyMCE api key'), // label to display
-                 'description' => $this->l('Add your TinyMCE api key (free) https://www.tiny.cloud/pricing/'), // description to display
-                 'tab' => 'Settings',
-                 'default' => 'no-api-key', // default value (Boolean)
-             ],
-         ];
-    }    
+            'tinymce_api_key' => [
+                'type' => 'text', // type of field
+                'label' => $this->l('TinyMCE api key'), // label to display
+                'description' => $this->l('Add your TinyMCE api key (free) https://www.tiny.cloud/pricing/'), // description to display
+                'tab' => 'Settings',
+                'default' => 'no-api-key', // default value (Boolean)
+            ],
+        ];
+    }
 }