Merge pull request #647 from noesya/feature/website-default-language-filter

SebouChu · web-flow · commit d5f961231280 · 2022-12-20T10:47:30.000+01:00
Langue par défaut obligatoire + filtre en JS dans le formulaire d'un website
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -0,0 +1,24 @@
+version: "2"
+plugins:
+  duplication:
+    enabled: true
+    config:
+      languages:
+        javascript:
+          mass_threshold: 50
+  sass-lint:
+    enabled: true
+    config:
+      config: .sass-lint.yml
+  eslint:
+    enabled: true
+    channel: "eslint-5"
+    config:
+      config: .eslintrc.yml
+exclude_patterns:
+  - "node_modules/**"
+  - "vendor/**"
+  - "db/**"
+  - "config/**"
+  - "docs/**"
+  - "test/**"
diff --git a/app/assets/javascripts/admin/appstack.js b/app/assets/javascripts/admin/appstack.js
@@ -16,6 +16,7 @@
 //= require_tree ./commons
 //= require_tree ../application/plugins
 //= require_tree ./plugins
+//= require_tree ./utils
 //= require ./communication/init
 
 window.osuny = {};
diff --git a/app/assets/javascripts/admin/communication/init.js b/app/assets/javascripts/admin/communication/init.js
@@ -1,5 +1,6 @@
 //= require_self
 //= require ./menu_items
 //= require ./preview
+//= require ./websites
 
 window.osuny.communication = {};
diff --git a/app/assets/javascripts/admin/communication/menu_items.js b/app/assets/javascripts/admin/communication/menu_items.js
@@ -73,10 +73,7 @@ window.osuny.communication.menuItems = {
 
 window.addEventListener('DOMContentLoaded', function () {
     'use strict';
-    if (document.body.classList.contains('items-new') ||
-            document.body.classList.contains('items-edit') ||
-            document.body.classList.contains('items-create') ||
-            document.body.classList.contains('items-update')) {
+    if (window.osuny.isInControllerForm('items')) {
         window.osuny.communication.menuItems.init();
     }
 });
diff --git a/app/assets/javascripts/admin/communication/websites.js b/app/assets/javascripts/admin/communication/websites.js
@@ -0,0 +1,52 @@
+/* global $ */
+window.osuny.communication.websites = {
+    init: function () {
+        'use strict';
+        this.languagesCheckboxes = document.querySelectorAll('.js-languages input[type="checkbox"]');
+        this.defaultLanguageSelect = document.querySelector('.js-default-language');
+        this.defaultLanguageOptions = this.defaultLanguageSelect.querySelectorAll('option');
+        this.initEvents();
+        this.onChangeCheckbox();
+    },
+
+    initEvents: function () {
+        'use strict';
+        var i;
+        for (i = 0 ; i < this.languagesCheckboxes.length ; i += 1) {
+            this.languagesCheckboxes[i].addEventListener('change', this.onChangeCheckbox.bind(this));
+        }
+    },
+
+    onChangeCheckbox: function () {
+        'use strict';
+        var languageCheckbox,
+            languageOption,
+            i;
+
+        // Clean options
+        this.defaultLanguageSelect.innerHTML = "";
+
+        // Re-hydrate options
+        for (i = 0; i < this.defaultLanguageOptions.length; i += 1) {
+            languageOption = this.defaultLanguageOptions[i];
+            languageCheckbox = document.querySelector('.js-languages input[type="checkbox"][value="' + languageOption.value + '"]')
+            if (languageOption.value === "" || languageCheckbox.checked) {
+                this.defaultLanguageSelect.appendChild(languageOption);
+            }
+        }
+    },
+
+    invoke: function () {
+        'use strict';
+        return {
+            init: this.init.bind(this)
+        };
+    }
+}.invoke();
+
+window.addEventListener('DOMContentLoaded', function () {
+    'use strict';
+    if (window.osuny.isInControllerForm('websites')) {
+        window.osuny.communication.websites.init();
+    }
+});
diff --git a/app/assets/javascripts/admin/pure.js b/app/assets/javascripts/admin/pure.js
@@ -16,6 +16,7 @@
 //= require_tree ./commons
 //= require_tree ../application/plugins
 //= require_tree ./plugins
+//= require_tree ./utils
 //= require ./communication/init
 
 window.osuny = {};
diff --git a/app/assets/javascripts/admin/utils/controller_form.js b/app/assets/javascripts/admin/utils/controller_form.js
@@ -0,0 +1,6 @@
+window.osuny.isInControllerForm = function (controllerName) {
+    return document.body.classList.contains(controllerName + '-new') ||
+        document.body.classList.contains(controllerName + '-edit') ||
+        document.body.classList.contains(controllerName + '-create') ||
+        document.body.classList.contains(controllerName + '-update');
+}
diff --git a/app/models/communication/website.rb b/app/models/communication/website.rb
@@ -18,7 +18,7 @@
 #  created_at          :datetime         not null
 #  updated_at          :datetime         not null
 #  about_id            :uuid             indexed => [about_type]
-#  default_language_id :uuid             indexed
+#  default_language_id :uuid             not null, indexed
 #  university_id       :uuid             not null, indexed
 #
 # Indexes
@@ -52,7 +52,7 @@ class Communication::Website < ApplicationRecord
     gitlab: 1
   }
 
-  belongs_to :default_language, class_name: "Language", optional: true
+  belongs_to :default_language, class_name: "Language"
   has_and_belongs_to_many :languages,
                           class_name: 'Language',
                           join_table: 'communication_websites_languages',
diff --git a/app/models/communication/website/configs/default_languages.rb b/app/models/communication/website/configs/default_languages.rb
@@ -18,7 +18,7 @@
 #  created_at          :datetime         not null
 #  updated_at          :datetime         not null
 #  about_id            :uuid             indexed => [about_type]
-#  default_language_id :uuid             indexed
+#  default_language_id :uuid             not null, indexed
 #  university_id       :uuid             not null, indexed
 #
 # Indexes
diff --git a/app/models/communication/website/configs/default_permalinks.rb b/app/models/communication/website/configs/default_permalinks.rb
@@ -18,7 +18,7 @@
 #  created_at          :datetime         not null
 #  updated_at          :datetime         not null
 #  about_id            :uuid             indexed => [about_type]
-#  default_language_id :uuid             indexed
+#  default_language_id :uuid             not null, indexed
 #  university_id       :uuid             not null, indexed
 #
 # Indexes
diff --git a/app/models/communication/website/configs/development_config.rb b/app/models/communication/website/configs/development_config.rb
@@ -18,7 +18,7 @@
 #  created_at          :datetime         not null
 #  updated_at          :datetime         not null
 #  about_id            :uuid             indexed => [about_type]
-#  default_language_id :uuid             indexed
+#  default_language_id :uuid             not null, indexed
 #  university_id       :uuid             not null, indexed
 #
 # Indexes
diff --git a/app/models/communication/website/configs/production_config.rb b/app/models/communication/website/configs/production_config.rb
@@ -18,7 +18,7 @@
 #  created_at          :datetime         not null
 #  updated_at          :datetime         not null
 #  about_id            :uuid             indexed => [about_type]
-#  default_language_id :uuid             indexed
+#  default_language_id :uuid             not null, indexed
 #  university_id       :uuid             not null, indexed
 #
 # Indexes
diff --git a/app/views/admin/communication/websites/_form.html.erb b/app/views/admin/communication/websites/_form.html.erb
@@ -12,8 +12,8 @@
           <%= f.input :name %>
           <%= f.input :url %>
           <%= render 'admin/communication/abouts', f: f, i18n_key: 'activerecord.attributes.communication/website.about_' %>
-          <%= f.association :languages, as: :check_boxes %>
-          <%= f.association :default_language %>
+          <%= f.association :languages, as: :check_boxes, required: true, wrapper_html: { class: "js-languages" } %>
+          <%= f.association :default_language, include_blank: t('simple_form.include_blanks.defaults.language'), input_html: { class: "js-default-language" } %>
           <%= f.input :in_production %>
         </div>
       </div>
diff --git a/config/locales/communication/en.yml b/config/locales/communication/en.yml
@@ -701,7 +701,4 @@ en:
         description: If this field is empty, the "lead text" field will be used. If also emty the main text's begining will be used.
         full_width: On large screens, a full width page uses all available space for the content. This is good for landing pages, or to make them spectacular. If the page is not full width, the content column will be smaller to make reading easier. The unused space might be used for a table of contents.
       communication_website_post:
-        description: If this field is empty, the "lead text" field will be used. If also emty the main text's begining will be used.
-  include_blanks:
-    communication_website:
-      default_language: "Select a language"
+        description: If this field is empty, the "lead text" field will be used. If also emty the main text's begining will be used.
diff --git a/config/locales/communication/fr.yml b/config/locales/communication/fr.yml
@@ -701,7 +701,4 @@ fr:
         description: Si ce champ est vide le "chapô" sera utilisé. Si il est également vide le début du texte principal sera utilisé.
         full_width: Sur de grands écrans, la page en pleine largeur utilisera tout l'espace disponible, ce qui est pertinent pour événementialiser une page. Si la page n'est pas en pleine largeur, l'espace dédié au contenu sera réduit pour faciliter la lecture, et l'espace libre pourra être utilisé pour une table des matières facilitant la navigation.
       communication_website_post:
-        description: Si ce champ est vide le "chapô" sera utilisé. Si il est également vide le début du texte principal sera utilisé.
-  include_blanks:
-    communication_website:
-      default_language: "Sélectionnez une langue"
+        description: Si ce champ est vide le "chapô" sera utilisé. Si il est également vide le début du texte principal sera utilisé.
diff --git a/db/migrate/20221219174414_set_required_default_language_to_communication_websites.rb b/db/migrate/20221219174414_set_required_default_language_to_communication_websites.rb
@@ -0,0 +1,5 @@
+class SetRequiredDefaultLanguageToCommunicationWebsites < ActiveRecord::Migration[7.0]
+  def change
+    change_column_null :communication_websites, :default_language_id, false
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
diff --git a/test/fixtures/communication/websites.yml b/test/fixtures/communication/websites.yml
@@ -18,7 +18,7 @@
 #  created_at          :datetime         not null
 #  updated_at          :datetime         not null
 #  about_id            :uuid             indexed => [about_type]
-#  default_language_id :uuid             indexed
+#  default_language_id :uuid             not null, indexed
 #  university_id       :uuid             not null, indexed
 #
 # Indexes

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`# created_at :datetime not null`
`19`	`19`	`# updated_at :datetime not null`
`20`	`20`	`# about_id :uuid indexed => [about_type]`
`21`		`-# default_language_id :uuid indexed`
	`21`	`+# default_language_id :uuid not null, indexed`
`22`	`22`	`# university_id :uuid not null, indexed`
`23`	`23`	`#`
`24`	`24`	`# Indexes`