From c4d747b8ccf141fe87a263e802263e85415a7fef Mon Sep 17 00:00:00 2001 From: Sofien Haj Chedhli Date: Thu, 12 Dec 2024 17:58:15 +0100 Subject: [PATCH] feat: Remove insert image feature flag - EXO-75970 - Meeds-io/MIPs#145 (#1252) --- .../WEB-INF/conf/wiki/ckeditor/config.js | 23 ++++--------------- .../conf/wiki/ckeditor/inline-config.js | 19 ++------------- .../conf/wiki/feature-flags-configuration.xml | 2 -- .../webui/workspace/UINotesHeadTemplate.gtmpl | 1 - 4 files changed, 6 insertions(+), 39 deletions(-) diff --git a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/ckeditor/config.js b/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/ckeditor/config.js index 75d452abf..9c16ebd7c 100644 --- a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/ckeditor/config.js +++ b/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/ckeditor/config.js @@ -20,15 +20,13 @@ CKEDITOR.editorConfig = function (config) { } CKEDITOR.plugins.addExternal('toc','/notes/javascript/eXo/wiki/ckeditor/plugins/toc/','plugin.js'); CKEDITOR.plugins.addExternal('linkBalloon', '/social/js/ckeditorPlugins/linkBalloon/', 'plugin.js'); - if (eXo.env.portal.insertImageOptionEnabled) { - CKEDITOR.plugins.addExternal('insertImage','/notes/javascript/eXo/wiki/ckeditor/plugins/insertImage/','plugin.js'); - } + CKEDITOR.plugins.addExternal('insertImage','/notes/javascript/eXo/wiki/ckeditor/plugins/insertImage/','plugin.js'); - let blocksToolbarGroup = [ + const blocksToolbarGroup = [ 'Blockquote', 'tagSuggester', 'emoji', - `${eXo.env.portal.insertImageOptionEnabled && 'insertImage' || 'selectImage'}`, + 'insertImage', 'Table', 'EmbedSemantic', 'CodeSnippet', @@ -79,23 +77,10 @@ CKEDITOR.editorConfig = function (config) { if (!webPageNote) { mobileToolbar[mobileToolbar.findIndex(item => item.name ==='blocks')].items.push('attachFile'); } - let extraPlugins = `a11ychecker,balloonpanel,indent,indentblock,indentlist,codesnippet,sharedspace,copyformatting,table,tabletools,embedsemantic,autolink,colordialog${!webPageNote && ',tagSuggester' || ''},emoji,link,font,justify,widget,${!webPageNote && ',insertOptions' || ''},contextmenu,tabletools,tableresize,toc,linkBalloon,suggester,${eXo.env.portal.insertImageOptionEnabled && 'image2,insertImage' || ''}`; + let extraPlugins = `a11ychecker,balloonpanel,indent,indentblock,indentlist,codesnippet,sharedspace,copyformatting,table,tabletools,embedsemantic,autolink,colordialog${!webPageNote && ',tagSuggester' || ''},emoji,link,font,justify,widget,${!webPageNote && ',insertOptions' || ''},contextmenu,tabletools,tableresize,toc,linkBalloon,suggester,image2,insertImage`; let removePlugins = `image,confirmBeforeReload,maximize,resize,autoembed${webPageNote && ',tagSuggester' || ''}`; require(['SHARED/extensionRegistry'], function(extensionRegistry) { - if (!eXo.env.portal.insertImageOptionEnabled) { - const ckEditorExtensions = extensionRegistry.loadExtensions('WYSIWYGPlugins', 'image'); - if (ckEditorExtensions?.length) { - const ckEditorExtraPlugins = ckEditorExtensions.map(ckEditorExtension => ckEditorExtension.extraPlugin).join(','); - const ckEditorRemovePlugins = ckEditorExtensions.map(ckEditorExtension => ckEditorExtension.removePlugin).join(','); - if (ckEditorExtraPlugins) { - extraPlugins = `${extraPlugins},${ckEditorExtraPlugins}`; - } - if (ckEditorRemovePlugins) { - removePlugins = `${removePlugins},${ckEditorRemovePlugins}`; - } - } - } const notesEditorExtensions = extensionRegistry.loadExtensions('NotesEditor', 'ckeditor-extensions'); if (notesEditorExtensions?.length) { notesEditorExtensions.forEach(notesEditorExtension => { diff --git a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/ckeditor/inline-config.js b/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/ckeditor/inline-config.js index eb009f1c0..cb01dedcb 100644 --- a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/ckeditor/inline-config.js +++ b/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/ckeditor/inline-config.js @@ -15,30 +15,15 @@ CKEDITOR.editorConfig = function (config) { CKEDITOR.plugins.addExternal('insertOptions','/notes/javascript/eXo/wiki/ckeditor/plugins/insertOptions/','plugin.js'); CKEDITOR.plugins.addExternal('toc','/notes/javascript/eXo/wiki/ckeditor/plugins/toc/','plugin.js'); CKEDITOR.plugins.addExternal('linkBalloon', '/social/js/ckeditorPlugins/linkBalloon/', 'plugin.js'); - if (eXo.env.portal.insertImageOptionEnabled) { - CKEDITOR.plugins.addExternal('insertImage','/notes/javascript/eXo/wiki/ckeditor/plugins/insertImage/','plugin.js'); - } + CKEDITOR.plugins.addExternal('insertImage','/notes/javascript/eXo/wiki/ckeditor/plugins/insertImage/','plugin.js'); let extraPlugins = 'simpleLink,a11ychecker,balloonpanel,indent,indentblock,indentlist,codesnippet,sharedspace,copyformatting,table,tabletools,embedsemantic,' + - `autolink,colordialog,emoji,link,font,justify,widget,insertOptions,contextmenu,tabletools,tableresize,toc,editorplaceholder,formatOption,linkBalloon,${eXo.env.portal.insertImageOptionEnabled && 'image2,insertImage' || ''}`; + 'autolink,colordialog,emoji,link,font,justify,widget,insertOptions,contextmenu,tabletools,tableresize,toc,editorplaceholder,formatOption,linkBalloon,image2,insertImage'; let removePlugins = 'image,confirmBeforeReload,maximize,resize,autoembed,tagSuggester,attachImage'; require(['SHARED/extensionRegistry'], function(extensionRegistry) { - if (!eXo.env.portal.insertImageOptionEnabled) { - const ckEditorExtensions = extensionRegistry.loadExtensions('WYSIWYGPlugins', 'image'); - if (ckEditorExtensions?.length) { - const ckEditorExtraPlugins = ckEditorExtensions.map(ckEditorExtension => ckEditorExtension.extraPlugin).join(','); - const ckEditorRemovePlugins = ckEditorExtensions.map(ckEditorExtension => ckEditorExtension.removePlugin).join(','); - if (ckEditorExtraPlugins) { - extraPlugins = `${extraPlugins},${ckEditorExtraPlugins}`; - } - if (ckEditorRemovePlugins) { - removePlugins = `${removePlugins},${ckEditorRemovePlugins}`; - } - } - } const notesEditorExtensions = extensionRegistry.loadExtensions('NotesEditor', 'ckeditor-extensions'); if (notesEditorExtensions?.length) { notesEditorExtensions.forEach(notesEditorExtension => { diff --git a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/feature-flags-configuration.xml b/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/feature-flags-configuration.xml index 5202dd8ba..d7f415e4a 100644 --- a/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/feature-flags-configuration.xml +++ b/notes-webapp/src/main/webapp/WEB-INF/conf/wiki/feature-flags-configuration.xml @@ -28,8 +28,6 @@ NoteFeatureProperties Note Feature enablement flag - diff --git a/notes-webapp/src/main/webapp/groovy/webui/workspace/UINotesHeadTemplate.gtmpl b/notes-webapp/src/main/webapp/groovy/webui/workspace/UINotesHeadTemplate.gtmpl index cf049d71d..180a6e0e5 100644 --- a/notes-webapp/src/main/webapp/groovy/webui/workspace/UINotesHeadTemplate.gtmpl +++ b/notes-webapp/src/main/webapp/groovy/webui/workspace/UINotesHeadTemplate.gtmpl @@ -7,5 +7,4 @@