Merge pull request #23 from Acode-Foundation/feat-supported_editor

style: update styles for publishPlugin and updatePluginEditor forms; …

Author: deadlyjack

client/pages/publishPlugin/style.scss

@@ -65,8 +65,9 @@
       strong {
         display: inline-flex;
         align-items: center;
+        line-height: 1;
         margin: 0 6px;
-        padding: 4px 12px;
+        padding: 0px 6px;
         background: rgba(255, 255, 255, 0.2);
         border-radius: 6px;
         font-weight: 600;
@@ -203,7 +204,6 @@
     }
 
     a {
-      width: 100%;
       justify-content: center;
       padding: 14px 20px;
     }

client/pages/updatePluginEditor/index.js

@@ -143,6 +143,20 @@ export default async function UpdatePluginEditor({ id }) {
         <span className='error'>{errorText}</span>
         <span className='success'>{successText}</span>
 
+        <div
+          style={{
+            display: 'flex',
+            alignItems: 'center',
+            marginBottom: '16px',
+            gap: '8px',
+          }}
+        >
+          <input type='checkbox' name='agree_tested' id='tested_agreement' required={true} />
+          <label htmlFor='tested_agreement' className='agreement'>
+            I have tested my plugin with the selected editor(s) and confirm that it works correctly.
+          </label>
+        </div>
+
         <button ref={submitButton} type='submit'>
           <span className='icon save' />
           {buttonText}

client/pages/updatePluginEditor/style.scss

@@ -129,8 +129,8 @@
   form {
     background: var(--box-background-color);
     border-radius: 8px;
-    padding: 28px;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
+    padding: 0 !important;
+    box-shadow: unset !important;
 
     .editor-options {
       margin-bottom: 24px;

server/apis/plugin.js

@@ -274,6 +274,10 @@ router.get('{/:pluginId}', async (req, res) => {
 
       if (supported_editor && ['ace', 'cm', 'all'].includes(supported_editor)) {
         where.push([Plugin.SUPPORTED_EDITOR, supported_editor]);
+
+        if (supported_editor !== 'all') {
+          where.push('OR', [Plugin.SUPPORTED_EDITOR, 'all']);
+        }
       } else if (!supported_editor && !allowAllEditors) {
         where.push([Plugin.SUPPORTED_EDITOR, 'all'], 'OR', [Plugin.SUPPORTED_EDITOR, 'ace']);
       }

server/updateSchema.js

@@ -1,16 +1,12 @@
 const db = require('./lib/db');
-const sendEmail = require('./lib/sendEmail');
 
-const queries = ['ALTER TABLE plugin ADD COLUMN supported_editor TEXT DEFAULT "ace"'];
+const queries = [];
 
 (async () => {
   for (const query of queries) {
     await new Promise((resolve, reject) => {
       try {
         db.exec(query);
-        // TODO: Remove in next schema update.
-        // safe to send email when successfully added the column, if it already exists, it means the email has already been sent in a previous run.
-        sendUpdateEmail();
         resolve();
       } catch (err) {
         if (err.message.includes('duplicate column name')) {
@@ -24,36 +20,3 @@ const queries = ['ALTER TABLE plugin ADD COLUMN supported_editor TEXT DEFAULT "a
     });
   }
 })();
-
-async function sendUpdateEmail() {
-  const usersWithPlugins = query('SELECT DISTINCT user_id FROM plugin');
-  const userIds = usersWithPlugins.map((row) => row.user_id);
-  if (userIds.length === 0) {
-    return;
-  }
-
-  for (const userId of userIds) {
-    const user = query('SELECT email, name FROM "user" WHERE id = ?', [userId]);
-    if (!user || user.length === 0) continue;
-    const [{ email, name }] = user;
-    const emailBody = `We have recently updated our plugin system to support CodeMirror editor. Following plugins are pending update to specify supported editor:
-<ul>
-${activePlugins
-  .map(
-    (plugin) => `<li>
-  <a href="https://acode.app/update-plugin-editor/${plugin.id}">${plugin.name}</a>  
-</li>`,
-  )
-  .join('')}
-</ul>
-Please update your plugins to specify supported editor to avoid any disruption in service. If you have any questions, feel free to reach out to us.`;
-
-    await sendEmail(user.email, user.name, 'Action required: Update your plugins for new editor support', emailBody);
-  }
-}
-
-function query(sql, values = []) {
-  const statement = db.prepare(sql);
-  const result = statement.all(...values);
-  return result;
-}