trusty-cms 7.0.39 → 7.0.40

data/app/javascript/trusty_cms/ckeditor5.js

@@ -0,0 +1,391 @@
+/**
+ * This configuration was generated using the CKEditor 5 Builder. You can modify it anytime using this link:
+ * https://ckeditor.com/ckeditor-5/builder/#installation/NoJgNARCB0Ds0FYKQByxARgGwNgFlgAYsURMBOPFAZkNmvJBxHxdgQyazz3JT2QQApgDtkhMMAxgJE6fIC6kLOQwAjFUIgKgA===
+ */
+
+const defaultStyleDefinitions = [
+            {
+                name: 'Article category',
+                element: 'h3',
+                classes: ['category']
+            },
+            {
+                name: 'Title',
+                element: 'h2',
+                classes: ['document-title']
+            },
+            {
+                name: 'Subtitle',
+                element: 'h3',
+                classes: ['document-subtitle']
+            },
+            {
+                name: 'Info box',
+                element: 'p',
+                classes: ['info-box']
+            },
+            {
+                name: 'CTA Link Primary',
+                element: 'a',
+                classes: ['button', 'button--green']
+            },
+            {
+                name: 'CTA Link Secondary',
+                element: 'a',
+                classes: ['button', 'button--black']
+            },
+            {
+                name: 'Marker',
+                element: 'span',
+                classes: ['marker']
+            },
+            {
+                name: 'Spoiler',
+                element: 'span',
+                classes: ['spoiler']
+            }
+        ]
+
+import {
+    ClassicEditor,
+    Alignment,
+    Autoformat,
+    AutoImage,
+    AutoLink,
+    Autosave,
+    BlockQuote,
+    Bold,
+    Bookmark,
+    Code,
+    Essentials,
+    FindAndReplace,
+    FontBackgroundColor,
+    FontColor,
+    FontFamily,
+    FontSize,
+    FullPage,
+    Fullscreen,
+    GeneralHtmlSupport,
+    Heading,
+    Highlight,
+    HorizontalLine,
+    HtmlComment,
+    HtmlEmbed,
+    ImageBlock,
+    ImageCaption,
+    ImageEditing,
+    ImageInline,
+    ImageInsert,
+    ImageInsertViaUrl,
+    ImageResize,
+    ImageStyle,
+    ImageTextAlternative,
+    ImageToolbar,
+    ImageUpload,
+    ImageUtils,
+    Indent,
+    IndentBlock,
+    Italic,
+    Link,
+    LinkImage,
+    List,
+    ListProperties,
+    Paragraph,
+    PasteFromOffice,
+    RemoveFormat,
+    ShowBlocks,
+    SimpleUploadAdapter,
+    SourceEditing,
+    SpecialCharacters,
+    SpecialCharactersArrows,
+    SpecialCharactersCurrency,
+    SpecialCharactersEssentials,
+    SpecialCharactersLatin,
+    SpecialCharactersMathematical,
+    SpecialCharactersText,
+    Strikethrough,
+    Style,
+    Subscript,
+    Superscript,
+    Table,
+    TableCaption,
+    TableCellProperties,
+    TableColumnResize,
+    TableLayout,
+    TableProperties,
+    TableToolbar,
+    TextTransformation,
+    TodoList,
+    Underline
+} from 'ckeditor5';
+
+import "ckeditor5/ckeditor5.css";
+
+
+const editorConfig = {
+    toolbar: {
+        items: [
+            'undo',
+            'redo',
+            '|',
+            'sourceEditing',
+            'showBlocks',
+            'findAndReplace',
+            'fullscreen',
+            '|',
+            'heading',
+            'style',
+            '|',
+            'fontSize',
+            'fontFamily',
+            'fontColor',
+            'fontBackgroundColor',
+            '|',
+            'bold',
+            'italic',
+            'underline',
+            'strikethrough',
+            'subscript',
+            'superscript',
+            'code',
+            'removeFormat',
+            '|',
+            'specialCharacters',
+            'horizontalLine',
+            'link',
+            'bookmark',
+            'insertImage',
+            'insertTable',
+            'insertTableLayout',
+            'highlight',
+            'blockQuote',
+            'htmlEmbed',
+            '|',
+            'alignment',
+            '|',
+            'bulletedList',
+            'numberedList',
+            'todoList',
+            'outdent',
+            'indent'
+        ],
+        shouldNotGroupWhenFull: true
+    },
+    plugins: [
+        Alignment,
+        Autoformat,
+        AutoImage,
+        AutoLink,
+        Autosave,
+        BlockQuote,
+        Bold,
+        Bookmark,
+        Code,
+        Essentials,
+        FindAndReplace,
+        FontBackgroundColor,
+        FontColor,
+        FontFamily,
+        FontSize,
+        FullPage,
+        Fullscreen,
+        GeneralHtmlSupport,
+        Heading,
+        Highlight,
+        HorizontalLine,
+        HtmlComment,
+        HtmlEmbed,
+        ImageBlock,
+        ImageCaption,
+        ImageEditing,
+        ImageInline,
+        ImageInsert,
+        ImageInsertViaUrl,
+        ImageResize,
+        ImageStyle,
+        ImageTextAlternative,
+        ImageToolbar,
+        ImageUpload,
+        ImageUtils,
+        Indent,
+        IndentBlock,
+        Italic,
+        Link,
+        LinkImage,
+        List,
+        ListProperties,
+        Paragraph,
+        PasteFromOffice,
+        RemoveFormat,
+        ShowBlocks,
+        SimpleUploadAdapter,
+        SourceEditing,
+        SpecialCharacters,
+        SpecialCharactersArrows,
+        SpecialCharactersCurrency,
+        SpecialCharactersEssentials,
+        SpecialCharactersLatin,
+        SpecialCharactersMathematical,
+        SpecialCharactersText,
+        Strikethrough,
+        Style,
+        Subscript,
+        Superscript,
+        Table,
+        TableCaption,
+        TableCellProperties,
+        TableColumnResize,
+        TableLayout,
+        TableProperties,
+        TableToolbar,
+        TextTransformation,
+        TodoList,
+        Underline
+    ],
+    fontFamily: {
+        supportAllValues: true
+    },
+    fontSize: {
+        options: [10, 12, 14, 'default', 18, 20, 22],
+        supportAllValues: true
+    },
+    fullscreen: {
+        onEnterCallback: container =>
+            container.classList.add(
+                'editor-container',
+                'editor-container_classic-editor',
+                'editor-container_include-style',
+                'editor-container_include-fullscreen',
+                'main-container'
+            )
+    },
+    heading: {
+        options: [
+            {
+                model: 'paragraph',
+                title: 'Paragraph',
+                class: 'ck-heading_paragraph'
+            },
+            {
+                model: 'heading1',
+                view: 'h1',
+                title: 'Heading 1',
+                class: 'ck-heading_heading1'
+            },
+            {
+                model: 'heading2',
+                view: 'h2',
+                title: 'Heading 2',
+                class: 'ck-heading_heading2'
+            },
+            {
+                model: 'heading3',
+                view: 'h3',
+                title: 'Heading 3',
+                class: 'ck-heading_heading3'
+            },
+            {
+                model: 'heading4',
+                view: 'h4',
+                title: 'Heading 4',
+                class: 'ck-heading_heading4'
+            },
+            {
+                model: 'heading5',
+                view: 'h5',
+                title: 'Heading 5',
+                class: 'ck-heading_heading5'
+            },
+            {
+                model: 'heading6',
+                view: 'h6',
+                title: 'Heading 6',
+                class: 'ck-heading_heading6'
+            }
+        ]
+    },
+    htmlSupport: {
+        allow: [
+            {
+                name: /^.*$/,
+                styles: true,
+                attributes: true,
+                classes: true
+            }
+        ]
+    },
+    image: {
+        toolbar: [
+            'toggleImageCaption',
+            'imageTextAlternative',
+            '|',
+            'imageStyle:inline',
+            'imageStyle:wrapText',
+            'imageStyle:breakText',
+            '|',
+            'resizeImage'
+        ]
+    },
+
+    licenseKey: 'GPL',
+    link: {
+        addTargetToExternalLinks: true,
+        defaultProtocol: 'https://',
+        decorators: {
+            toggleDownloadable: {
+                mode: 'manual',
+                label: 'Downloadable',
+                attributes: {
+                    download: 'file'
+                }
+            }
+        }
+    },
+    list: {
+        properties: {
+            styles: true,
+            startIndex: true,
+            reversed: true
+        }
+    },
+    menuBar: {
+        isVisible: true
+    },
+    placeholder: 'Type or paste your content here!',
+    style: {
+       definitions: 
+         window.TRUSTY_CMS_EDITOR?.styleDefinitions?.length
+        ? window.TRUSTY_CMS_EDITOR.styleDefinitions
+        : defaultStyleDefinitions,
+    },
+    table: {
+        contentToolbar: ['tableColumn', 'tableRow', 'mergeTableCells', 'tableProperties', 'tableCellProperties']
+    },
+    simpleUpload: {
+        uploadUrl: '/admin/assets/uploader',
+        headers: {
+            'X-CSRF-TOKEN': document.querySelector('meta[name="csrf-token"]').getAttribute('content')
+        }
+    }
+};
+
+const editorElements = document.querySelectorAll('[id^="editor_"]');
+
+editorElements.forEach((editorElement) => {
+    ClassicEditor
+        .create(editorElement, editorConfig)
+        .then(editor => {
+            const pagePart = editorElement.getAttribute('data-part');
+            const hiddenInput = document.querySelector(`#part_${pagePart}_content`);
+
+            if (!hiddenInput) {
+                return;
+            }
+            
+            editor.model.document.on('change:data', () => {
+                hiddenInput.value = editor.getData();
+            });
+        }).catch(error => {
+            console.error(error);
+        });
+});

data/app/models/asset.rb

@@ -1,4 +1,6 @@
 class Asset < ActiveRecord::Base
+  APPROVED_CONTENT_TYPES = %w[application/zip image/jpg image/jpeg image/png image/gif application/pdf text/css text/calendar].freeze
+
   has_many :page_attachments, dependent: :destroy
   has_many :pages, through: :page_attachments
   has_site if respond_to? :has_site
@@ -36,7 +38,7 @@ class Asset < ActiveRecord::Base
             presence: true,
             blob:
               {
-                content_type: %w[application/zip image/jpg image/jpeg image/png image/gif application/pdf text/css],
+                content_type: APPROVED_CONTENT_TYPES,
                 size_range: 1..10.megabytes,
               }
   before_save :assign_title

data/app/views/admin/page_parts/_page_part.html.haml

@@ -1,14 +1,18 @@
-.page{:id => "page_#{page_part.name.to_slug}", 'data-caption'=>h(page_part.name)}
-  .part{:id => "part-#{page_part.name.to_slug}"}
-    = hidden_field_tag "page[parts_attributes][#{page_part_counter}][name]", page_part.name, :id => "part_#{page_part.name.to_slug}_name"
-    = hidden_field_tag "page[parts_attributes][#{page_part_counter}][id]", page_part.id, :id => "part_#{page_part_counter}_id", :class => 'id_input' unless page_part.new_record?
-    = hidden_field_tag "page[parts_attributes][#{page_part_counter}][_destroy]", page_part._destroy, :class => 'delete_input'
+.page{ :id => "page_#{ page_part.name.to_slug }", 'data-caption'=>h(page_part.name) }
+  .part{ :id => "part-#{ page_part.name.to_slug }" }
+    = hidden_field_tag "page[parts_attributes][#{ page_part_counter }][name]", page_part.name, :id => "part_#{ page_part.name.to_slug }_name"
+    = hidden_field_tag "page[parts_attributes][#{ page_part_counter }][id]", page_part.id, :id => "part_#{ page_part_counter }_id", :class => 'id_input' unless page_part.new_record?
+    = hidden_field_tag "page[parts_attributes][#{ page_part_counter }][_destroy]", page_part._destroy, :class => 'delete_input'
     .content
       %label To use HTML or Radius tags, switch to plain text view by clicking the 'Source' button.
       %span.reference_links
         = t('reference')
-        %span{:id => "tag_reference_link_#{page_part.name.to_slug}"}
+        %span{ :id => "tag_reference_link_#{ page_part.name.to_slug }" }
           = link_to t('available_tags'), admin_reference_url(:tags), id: 'tag_reference'
-      = render_region :part_controls, :locals => {:page_part => page_part}
-    %div
-      = cktext_area :page_part, page_part.content || '', :name => "page[parts_attributes][#{page_part_counter}][content]", :value => page_part.content || '', :style => 'width: 100%', :id => "part_#{page_part.name.to_slug}_content"
+      = render_region :part_controls, :locals => { :page_part => page_part }
+    .main-container
+      .editor-container.editor-container_classic-editor.editor-container_include-style.editor-container_include-fullscreen#editor-container
+        .editor-container__editor
+          %div{ id: "editor_#{ page_part.name.to_slug }", data: { part: page_part.name.to_slug } }
+            = page_part.content.to_s.html_safe # rubocop:disable Rails/OutputSafety
+          = hidden_field_tag :page_part, page_part.content || '', name: "page[parts_attributes][#{ page_part_counter }][content]", id: "part_#{ page_part.name.to_slug }_content"

data/app/views/layouts/application.html.haml

@@ -41,7 +41,12 @@
     - javascript_overrides.each do |javascript|
       = javascript_include_tag javascript
 
+    = stylesheet_link_tag href="trusty_cms/ckeditor5"
     = csrf_meta_tags
+    
+    :javascript
+      window.TRUSTY_CMS_EDITOR = window.TRUSTY_CMS_EDITOR || {};
+      window.TRUSTY_CMS_EDITOR.styleDefinitions = #{(@editor_style_definitions || []).to_json.html_safe};
 
   %body{:class=>body_classes.join(" ")}
     - if gtm_container_id
@@ -84,3 +89,4 @@
 
       #popups
         = yield :popups
+    = javascript_include_tag "trusty_cms/ckeditor5", "data-turbo-track": "reload", defer: true

data/config/routes.rb

@@ -29,6 +29,9 @@ TrustyCms::Application.routes.draw do
       get :remove, on: :member
       get :refresh, on: :collection
       put :refresh, on: :member
+      collection do
+        post :uploader
+      end
     end
     resources :page_attachments, only: [:new] do
       get :remove, on: :member

data/lib/generators/trusty_cms/templates/application.rb.erb

@@ -3,7 +3,6 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 require 'acts_as_tree'
 require 'trusty_cms'
-require 'ckeditor'
 require 'radius'
 require 'trusty_cms/extension_loader'
 require 'trusty_cms/initializer'

data/lib/trusty_cms/engine.rb

@@ -1,4 +1,3 @@
-require 'ckeditor'
 require 'devise'
 require 'ransack'
 require 'paper_trail'
@@ -10,14 +9,12 @@ module TrustyCms
     paths['app/helpers'] = []
     initializer 'trusty_cms.assets.precompile' do |app|
       app.config.assets.paths << Rails.root.join('../trusty-cms/node_modules')
+      engine_builds = Rails.root.join('app/assets/builds')
+      app.config.assets.paths << engine_builds
       app.config.assets.precompile += %w(
-        admin/main.css admin.js
-        ckeditor/config.js
-        ckeditor/contents.css
-        ckeditor/config.js
-        ckeditor/styles.js
-        ckeditor/skins/moono/editor.css
-        ckeditor/lang/en.js
+        admin/main.css
+        admin.js
+        trusty-cms-manifest.js
       )
     end
   end

data/lib/trusty_cms/version.rb

@@ -1,3 +1,3 @@
 module TrustyCms
-  VERSION = '7.0.39'.freeze
+  VERSION = '7.0.40'.freeze
 end

data/lib/trusty_cms.rb

@@ -2,6 +2,8 @@ require 'trusty_cms/version'
 require 'trusty_cms/engine'
 
 module TrustyCms
+  mattr_accessor :editor_stylesheets, default: []
+  mattr_accessor :editor_style_definitions, default: []
 end
 
 TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..')) unless defined? TRUSTY_CMS_ROOT

data/package.json

@@ -3,12 +3,16 @@
   "version": "5.3.1",
   "description": "TrustyCMS is a branch of Radiant CMS. Its goal is to pull the Radiant framework into Rails 6 with minimal changes to its infrastructure.",
   "main": "index.js",
-  "repository": "https://github.com/pgharts/trusty-cms.git",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/pgharts/trusty-cms.git"
+  },
   "author": "Danielle Greaves <danigreaves@gmail.com>",
   "license": "MIT",
   "dependencies": {
     "@fortawesome/fontawesome-free": "^5.15.4",
     "blueimp-file-upload": "^10.32.0",
+    "ckeditor5": "^46.0.3",
     "jquery": "^3.6.1",
     "jquery-treetable": "^3.2.0-1",
     "jquery-ui": "^1.13.2",
@@ -18,9 +22,23 @@
     "tablesaw": "^3.1.2"
   },
   "devDependencies": {
+    "esbuild": "^0.23.0",
     "stylelint": "^13.3.2",
     "stylelint-config-recommended": "^3.0.0",
     "stylelint-order": "^4.0.0",
     "stylelint-scss": "^3.17.0"
-  }
+  },
+  "directories": {
+    "lib": "lib"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "esbuild app/javascript/trusty_cms/ckeditor5.js --bundle --sourcemap --outdir=app/assets/builds/trusty_cms --public-path=/assets",
+    "build:watch": "npm run build -- --watch"
+  },
+  "keywords": [],
+  "bugs": {
+    "url": "https://github.com/pgharts/trusty-cms/issues"
+  },
+  "homepage": "https://github.com/pgharts/trusty-cms#readme"
 }

data/spec/controllers/assets_controller.rb

@@ -0,0 +1,66 @@
+require 'spec_helper'
+require 'rack/test'
+
+RSpec.describe Admin::AssetsController, type: :controller do
+  routes { TrustyCms::Engine.routes }
+
+  let(:user) { create(:admin) }
+  let(:fixtures_path) { TrustyCms::Engine.root.join('spec', 'fixtures', 'files') }
+
+  before do
+    allow(controller).to receive(:authenticate_user!).and_return(true)
+    allow(controller).to receive(:current_user).and_return(user)
+  end
+
+  around do |example|
+    original_kraken = defined?($kraken) ? $kraken : nil
+    $kraken = double('KrakenClient', api_key: nil)
+    example.run
+    $kraken = original_kraken
+  end
+
+  describe 'POST #uploader' do
+    it 'returns the asset url when the upload succeeds' do
+      file = Rack::Test::UploadedFile.new(fixtures_path.join('sample.ics'), 'text/calendar')
+      asset_storage = double('AssetStorage', url: '/assets/sample.ics')
+      asset = instance_double(Asset,
+                              valid?: true,
+                              asset: asset_storage,
+                              page_attachments: double('Assoc', build: nil),
+                              id: 1)
+
+      allow(asset).to receive(:created_by_id=)
+      allow(asset).to receive(:updated_by_id=)
+      allow(asset).to receive(:save!)
+      allow(Asset).to receive(:create).and_return(asset)
+      allow(controller).to receive(:maybe_compress).and_return(file)
+
+      post :uploader, params: { upload: file }, format: :json
+
+      expect(response).to have_http_status(:ok)
+      expect(JSON.parse(response.body)).to eq('url' => '/assets/sample.ics')
+      expect(controller).to have_received(:maybe_compress).with(file)
+      expect(Asset).to have_received(:create).with(asset: file, caption: '')
+    end
+
+    it 'returns unsupported media type for disallowed content types' do
+      file = Rack::Test::UploadedFile.new(fixtures_path.join('sample.txt'), 'text/plain')
+
+      expect(Asset).not_to receive(:create)
+
+      post :uploader, params: { upload: file }, format: :json
+
+      expect(response).to have_http_status(:unsupported_media_type)
+      expect(JSON.parse(response.body)['error']).to eq('Unsupported file type.')
+      expect(flash[:error]).to eq('Unsupported file type.')
+    end
+
+    it 'returns unprocessable entity when no file is provided' do
+      post :uploader, params: {}, format: :json
+
+      expect(response).to have_http_status(:unprocessable_entity)
+      expect(JSON.parse(response.body)['error']).to eq('No file uploaded.')
+      expect(flash[:error]).to eq('No file uploaded.')
+    end
+  end
+end

data/spec/dummy/config/application.rb

@@ -3,7 +3,6 @@ require File.expand_path('../boot', __FILE__)
 require 'rails/all'
 require 'acts_as_tree'
 require "trusty_cms"
-require 'ckeditor'
 require 'radius'
 require 'trusty_cms/extension_loader'
 require 'trusty_cms/initializer'
@@ -93,6 +92,7 @@ module TrustyCms
                           :allow_revalidate => false
     config.middleware.insert_before(Rack::ConditionalGet, Rack::Cache)
     config.assets.enabled = true
+    config.active_storage.service = :test
     config.filter_parameters += [:password, :password_confirmation]
 
     # Use the database for sessions instead of the cookie-based default,

data/spec/dummy/config/storage.yml

@@ -0,0 +1,7 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>