alchemy_cms 6.1.5 → 6.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a020fff31bc399c4927b5f6c4757d3f8ec8c24b76e42d6f352a5687e1feb0924
-  data.tar.gz: ae7367b2543dbfde31a5a7f09418e68bb94e2d40626eebd650aca7f14d5bd0cb
+  metadata.gz: c206131e66f00492aae9a12eb8529e2eea17003d80ce3e5180d11c582ba792be
+  data.tar.gz: 92758271855a8dc77a9a280c19f7f68a15379642e96224508b0b47f977ebc0eb
 SHA512:
-  metadata.gz: 7c572d21fa3d5adb4de20649bfe1e8fa127805a82b2852f310ed6dd850797094e7cbbac5c8d5e8061600d88e54548f14753a543c8af6dc2cd0c227bb45e22818
-  data.tar.gz: 0e75de36f74f9b1c7c37cf12785c154dc2ed987e377fe355a9b98c3821f63302a60f8ee03e06e6bc84e04703a20d8f200236f4370ecbb6f599c0c89f3bb10389
+  metadata.gz: 5276f7cd7996f2df21360bc33fe37daa1b3752d45379c784a0713f76406eea4a4de439a26468eec3f5f57462ba6af07b3fbf380021c53dc3bf29e9991bb1f531
+  data.tar.gz: f4c3965d47c54c7035531de68c7ae05ac69bb11cb5f402ba00b1716cb59d90cb03bbb29d22efc926b01968e71aeaaf5e802de4f444ca378baed11464f9538c42

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 6.1.7 (2023-07-07)
+
+- [6.1] Add task(s) to visualize element and page usage [#2514](https://github.com/AlchemyCMS/alchemy_cms/pull/2514) ([tvdeyen](https://github.com/tvdeyen))
+
+## 6.1.6 (2023-06-30)
+
+- [6.1] Allow to create element with warning in definition [#2508](https://github.com/AlchemyCMS/alchemy_cms/pull/2508) ([tvdeyen](https://github.com/tvdeyen))
+- [6.1] Allow authors to link to all pages again [#2505](https://github.com/AlchemyCMS/alchemy_cms/pull/2505) ([tvdeyen](https://github.com/tvdeyen))
+- install generator: Add option to force patched babel config [#2495](https://github.com/AlchemyCMS/alchemy_cms/pull/2495) ([tvdeyen](https://github.com/tvdeyen))
+- Remove memory leak in ingredients migrator [#2493](https://github.com/AlchemyCMS/alchemy_cms/pull/2493) ([tvdeyen](https://github.com/tvdeyen))
+
 ## 6.1.5 (2023-05-26)
 
 - [6.1] Fix page seeder [#2482](https://github.com/AlchemyCMS/alchemy_cms/pull/2482) ([tvdeyen](https://github.com/tvdeyen))

data/Rakefile

@@ -48,7 +48,7 @@ namespace :alchemy do
           bin/rake db:create && \
           bin/rake db:environment:set && \
           bin/rake db:migrate:reset && \
-          bin/rails g alchemy:install --skip --skip-demo-files --auto-accept --skip-db-create && \
+          bin/rails g alchemy:install --skip --skip-demo-files --auto-accept --skip-db-create --force-babel-config && \
           yarn link @alchemy_cms/admin && \
           RAILS_ENV=test bin/webpack && \
           cd -

data/app/controllers/alchemy/api/pages_controller.rb

@@ -8,9 +8,7 @@ module Alchemy
     # Returns all pages as json object
     #
     def index
-      language = Alchemy::Language.find_by(id: params[:language_id]) || Alchemy::Language.current
       @pages = Alchemy::Page.accessible_by(current_ability, :index)
-      @pages = @pages.where(language: language)
       @pages = @pages.includes(*page_includes)
       @pages = @pages.ransack(params[:q]).result
 

data/app/models/alchemy/element.rb

@@ -46,6 +46,7 @@ module Alchemy
       "compact",
       "message",
       "deprecated",
+      "warning",
     ].freeze
 
     # All Elements that share the same page version and parent element and are fixed or not are considered a list.

data/lib/alchemy/permissions.rb

@@ -45,8 +45,8 @@ module Alchemy
           e.public? && !e.restricted?
         end
 
-        can :read, Alchemy::Page, Alchemy::Page.published.not_restricted do |p|
-          p.public? && !p.restricted?
+        can :read, Alchemy::Page, Alchemy::Page.published.not_restricted.from_current_site do |p|
+          p.public? && !p.restricted? && p.site == Alchemy::Site.current
         end
       end
     end
@@ -72,8 +72,8 @@ module Alchemy
           e.public?
         end
 
-        can :read, Alchemy::Page, Alchemy::Page.published do |p|
-          p.public?
+        can :read, Alchemy::Page, Alchemy::Page.published.from_current_site do |p|
+          p.public? && p.site == Alchemy::Site.current
         end
       end
     end

data/lib/alchemy/tasks/usage.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Alchemy
+  module Tasks
+    module Usage
+      extend self
+
+      def elements_count_by_name
+        res = Alchemy::Element.all
+          .select("name, COUNT(*) AS count")
+          .group(:name)
+          .order("count DESC, name ASC")
+          .map { |e| {"name" => e.name, "count" => e.count} }
+        Alchemy::Element.definitions.reject { |definition| res.map { |e| e["name"] }.include? definition["name"] }.sort_by { |d| d["name"] }.each do |definition|
+          res << {"name" => definition["name"], "count" => 0}
+        end
+        res
+      end
+
+      def pages_count_by_type
+        res = Alchemy::Page.all
+          .select("page_layout, COUNT(*) AS count")
+          .group(:page_layout)
+          .order("count DESC, page_layout ASC")
+          .map { |p| {"page_layout" => p.page_layout, "count" => p.count} }
+        Alchemy::PageLayout.all.reject { |page_layout| res.map { |p| p["page_layout"] }.include? page_layout["name"] }.sort_by { |d| d["name"] }.each do |page_layout|
+          res << {"page_layout" => page_layout["name"], "count" => 0}
+        end
+        res
+      end
+    end
+  end
+end

data/lib/alchemy/upgrader/tasks/ingredients_migrator.rb

@@ -8,28 +8,27 @@ module Alchemy::Upgrader::Tasks
 
     no_tasks do
       def create_ingredients(verbose: !Rails.env.test?)
-        Alchemy::Deprecation.silence do
-          elements_with_ingredients = Alchemy::ElementDefinition.all.select { |d| d.key?(:ingredients) }
-          if ENV["ONLY"]
-            elements_with_ingredients = elements_with_ingredients.select { |d| d[:name].in? ENV["ONLY"].split(",") }
-          end
-          # eager load all elements that have ingredients defined but no ingredient records yet.
-          all_elements = Alchemy::Element
-            .named(elements_with_ingredients.map { |d| d[:name] })
-            .preload(contents: :essence)
-            .left_outer_joins(:ingredients).where(alchemy_ingredients: { id: nil })
-            .to_a
-          elements_with_ingredients.map do |element_definition|
-            elements = all_elements.select { |e| e.name == element_definition[:name] }
-            if elements.any?
-              puts "-- Creating ingredients for #{elements.count} #{element_definition[:name]}(s)" if verbose
-              elements.each do |element|
-                MigrateElementIngredients.call(element)
-                print "." if verbose
+        Rails.logger.silence do
+          Alchemy::Deprecation.silence do
+            elements_with_ingredients = Alchemy::ElementDefinition.all.select { |d| d.key?(:ingredients) }
+            if ENV["ONLY"]
+              elements_with_ingredients = elements_with_ingredients.select { |d| d[:name].in? ENV["ONLY"].split(",") }
+            end
+            elements_with_ingredients.each do |element_definition|
+              elements = Alchemy::Element
+                .named(element_definition[:name])
+                .left_outer_joins(:ingredients).where(alchemy_ingredients: { id: nil })
+              count = elements.count
+              if count.positive?
+                puts "-- Creating ingredients for #{elements.count} #{element_definition[:name]}(s)" if verbose
+                elements.preload(contents: :essence).find_each.with_index(1) do |element, index|
+                  MigrateElementIngredients.call(element)
+                  puts "\e[H\e[2J #{index}/#{count}" if verbose
+                end
+                puts "\n" if verbose
+              elsif verbose
+                puts "-- No #{element_definition[:name]} elements found for migration."
               end
-              puts "\n" if verbose
-            elsif verbose
-              puts "-- No #{element_definition[:name]} elements found for migration."
             end
           end
         end

data/lib/alchemy/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Alchemy
-  VERSION = "6.1.5"
+  VERSION = "6.1.7"
 
   def self.version
     VERSION

data/lib/generators/alchemy/install/files/babel.config.js

@@ -0,0 +1,64 @@
+module.exports = function (api) {
+  var validEnv = ["development", "test", "production"]
+  var currentEnv = api.env()
+  var isDevelopmentEnv = api.env("development")
+  var isProductionEnv = api.env("production")
+  var isTestEnv = api.env("test")
+
+  if (!validEnv.includes(currentEnv)) {
+    throw new Error(
+      "Please specify a valid `NODE_ENV` or " +
+        '`BABEL_ENV` environment variables. Valid values are "development", ' +
+        '"test", and "production". Instead, received: ' +
+        JSON.stringify(currentEnv) +
+        "."
+    )
+  }
+
+  return {
+    presets: [
+      isTestEnv && [
+        "@babel/preset-env",
+        {
+          targets: {
+            node: "current"
+          }
+        }
+      ],
+      (isProductionEnv || isDevelopmentEnv) && [
+        "@babel/preset-env",
+        {
+          forceAllTransforms: true,
+          useBuiltIns: "entry",
+          corejs: 3,
+          modules: false,
+          exclude: ["transform-typeof-symbol"]
+        }
+      ]
+    ].filter(Boolean),
+    plugins: [
+      "babel-plugin-macros",
+      "@babel/plugin-syntax-dynamic-import",
+      isTestEnv && "babel-plugin-dynamic-import-node",
+      "@babel/plugin-transform-destructuring",
+      [
+        "@babel/plugin-proposal-object-rest-spread",
+        {
+          useBuiltIns: true
+        }
+      ],
+      [
+        "@babel/plugin-transform-runtime",
+        {
+          helpers: false
+        }
+      ],
+      [
+        "@babel/plugin-transform-regenerator",
+        {
+          async: false
+        }
+      ]
+    ].filter(Boolean)
+  }
+}

data/lib/generators/alchemy/install/install_generator.rb

@@ -23,6 +23,11 @@ module Alchemy
         default: false,
         desc: "Skip running the webpacker installer."
 
+      class_option :force_babel_config,
+        type: :boolean,
+        default: false,
+        desc: "Force installing a patched babel config."
+
       class_option :skip_db_create,
         type: :boolean,
         default: false,
@@ -113,6 +118,13 @@ module Alchemy
         end
       end
 
+      # We need to force the babel.config.js file, because webpacker has an invalid one
+      def copy_babel_config
+        if options[:force_babel_config]
+          copy_file "babel.config.js", app_root.join("babel.config.js"), force: true
+        end
+      end
+
       def add_npm_package
         run "yarn add @alchemy_cms/admin@~#{Alchemy.version}"
       end

data/lib/tasks/alchemy/usage.rake

@@ -0,0 +1,40 @@
+require "alchemy/tasks/usage"
+
+namespace :alchemy do
+  desc "List Alchemy elements and pages usage"
+  task usage: [:page_usage, :element_usage]
+
+  desc "List Alchemy elements usage"
+  task page_usage: :environment do
+    include ActionView::Helpers::NumberHelper
+    puts "\n  Alchemy pages usage"
+    results = Alchemy::Tasks::Usage.pages_count_by_type
+    if results.any?
+      puts "  ----------------------"
+      puts "\n"
+      results.each do |row|
+        puts "  #{number_with_delimiter(row["count"])} 𝗑 #{row["page_layout"]}"
+      end
+      puts "\n  = #{number_with_delimiter(Alchemy::Page.count)} pages in total."
+    else
+      puts "  > No pages found!"
+    end
+  end
+
+  desc "List Alchemy elements usage"
+  task element_usage: :environment do
+    include ActionView::Helpers::NumberHelper
+    puts "\n  Alchemy elements usage"
+    results = Alchemy::Tasks::Usage.elements_count_by_name
+    if results.any?
+      puts "  ----------------------"
+      puts "\n"
+      results.each do |row|
+        puts "  #{number_with_delimiter(row["count"])} 𝗑 #{row["name"]}"
+      end
+      puts "\n  = #{number_with_delimiter(Alchemy::Element.count)} elements in total."
+    else
+      puts "  > No elements found!"
+    end
+  end
+end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy_cms/admin",
-  "version": "6.1.5",
+  "version": "6.1.7",
   "description": "AlchemyCMS",
   "browser": "package/admin.js",
   "files": [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alchemy_cms
 version: !ruby/object:Gem::Version
-  version: 6.1.5
+  version: 6.1.7
 platform: ruby
 authors:
 - Thomas von Deyen
@@ -13,7 +13,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-26 00:00:00.000000000 Z
+date: 2023-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1333,6 +1333,7 @@ files:
 - lib/alchemy/shell.rb
 - lib/alchemy/taggable.rb
 - lib/alchemy/tasks/tidy.rb
+- lib/alchemy/tasks/usage.rb
 - lib/alchemy/test_support.rb
 - lib/alchemy/test_support/config_stubbing.rb
 - lib/alchemy/test_support/essence_shared_examples.rb
@@ -1393,6 +1394,7 @@ files:
 - lib/generators/alchemy/install/files/all.js
 - lib/generators/alchemy/install/files/application.html.erb
 - lib/generators/alchemy/install/files/article.scss
+- lib/generators/alchemy/install/files/babel.config.js
 - lib/generators/alchemy/install/install_generator.rb
 - lib/generators/alchemy/install/templates/dragonfly.rb.tt
 - lib/generators/alchemy/install/templates/elements.yml.tt
@@ -1424,6 +1426,7 @@ files:
 - lib/tasks/alchemy/thumbnails.rake
 - lib/tasks/alchemy/tidy.rake
 - lib/tasks/alchemy/upgrade.rake
+- lib/tasks/alchemy/usage.rake
 - package.json
 - package/admin.js
 - package/src/__tests__/i18n.spec.js
@@ -1525,7 +1528,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - ImageMagick (libmagick), v6.6 or greater.
-rubygems_version: 3.4.12
+rubygems_version: 3.4.15
 signing_key:
 specification_version: 4
 summary: A powerful, userfriendly and flexible CMS for Rails