Merge branch 'main' into fix-categories-scope

app/assets/config/manifest.js

@@ -3,8 +3,6 @@
 //= link_tree ../fonts
 //= link_directory ../stylesheets .css
 //= link_directory ../javascripts .js
+//= link_directory ../stylesheets/admin .css
+//= link_directory ../javascripts/admin .js
 //= link vue.js
-//= link admin/appstack.css
-//= link admin/pure.css
-//= link admin/appstack.js
-//= link admin/pure.js

app/assets/javascripts/admin/communication/init.js

 //= require_self
-//= require ./menu_items
 //= require ./preview
-//= require ./websites
+//= require ./websites/init
 
 window.osuny.communication = {};

app/assets/javascripts/admin/communication/websites.js → app/assets/javascripts/admin/communication/websites/form.js

-window.osuny.communication.websites = {
+window.osuny.communication.websites.form = {
     init: function () {
         'use strict';
         this.languagesCheckboxes = document.querySelectorAll('.js-languages input[type="checkbox"]');
@@ -48,6 +48,6 @@ window.osuny.communication.websites = {
 window.addEventListener('DOMContentLoaded', function () {
     'use strict';
     if (window.osuny.isInControllerForm('websites')) {
-        window.osuny.communication.websites.init();
+        window.osuny.communication.websites.form.init();
     }
 });

app/assets/javascripts/admin/communication/websites/init.js

+//= require_self
+//= require ./form
+//= require ./lang_switch
+//= require ./menu_items
+
+window.osuny.communication.websites = {};

app/assets/javascripts/admin/communication/websites/lang_switch.js

+window.osuny.communication.websites.langSwitch = {
+    init: function () {
+        'use strict';
+        this.select = document.querySelector('#js-website-lang-switch');
+        if (this.select) {
+            this.select.addEventListener('change', this.onChange.bind(this));
+        }
+    },
+
+    onChange: function () {
+        'use strict';
+        document.location.href = this.select.selectedOptions[0].value;
+    },
+
+    invoke: function () {
+        'use strict';
+        return {
+            init: this.init.bind(this)
+        };
+    }
+}.invoke();
+
+window.addEventListener('DOMContentLoaded', function () {
+    'use strict';
+    window.osuny.communication.websites.langSwitch.init();
+});

app/assets/javascripts/admin/communication/menu_items.js → app/assets/javascripts/admin/communication/websites/menu_items.js

 /* global $ */
-window.osuny.communication.menuItems = {
+window.osuny.communication.websites.menuItems = {
     init: function () {
         'use strict';
         var i,
@@ -74,6 +74,6 @@ window.osuny.communication.menuItems = {
 window.addEventListener('DOMContentLoaded', function () {
     'use strict';
     if (window.osuny.isInControllerForm('items')) {
-        window.osuny.communication.menuItems.init();
+        window.osuny.communication.websites.menuItems.init();
     }
 });

app/models/communication/block.rb

@@ -140,7 +140,7 @@ class Communication::Block < ApplicationRecord
   end
 
   def is_a_translation?
-    about.is_a_translation?
+    about.respond_to?(:is_a_translation?) && about.is_a_translation?
   end
 
   def translate!(about_translation, heading_id = nil)

app/views/admin/communication/websites/_sidebar.html.erb

@@ -9,7 +9,7 @@
         icon: Icon::COMMUNICATION_WEBSITE_HOME,
         ability: can?(:read, @website)
       }
-      
+
       navigation << {
         title: Communication::Website::Post.model_name.human(count: 2),
         path: admin_communication_website_posts_path(website_id: @website),
@@ -59,16 +59,19 @@
       <% end %>
     </ul>
     <% if @website.languages.many? %>
-      <select class="form-control form-select my-5"  onchange="if (this.value) window.location.href=this.value">
-        <% @website.languages.each do |language| %>
-          <%
-          label = language_name(language.iso_code)
-          path = url_for request.params.merge(lang: language.iso_code)
-          selected = current_website_language == language
-          %>
-          <option value="<%= path %>"<% if selected %> selected="selected"<% end %>><%= label %></option>
-        <% end %>
-      </select>
+      <%
+      languages_options = @website.languages.map { |language|
+        [
+          language_name(language.iso_code),
+          url_for(request.params.merge(lang: language.iso_code))
+        ]
+      }
+      selected_option = url_for(request.params.merge(lang: current_website_language.iso_code))
+      %>
+      <%= select_tag  nil,
+                      options_for_select(languages_options, selected_option),
+                      class: "form-control form-select my-5",
+                      id: "js-website-lang-switch" %>
     <% end %>
   </div>
   <div class="col-lg-9">