From 7125e8538a7273d67e4549378d25d5d4fbd48193 Mon Sep 17 00:00:00 2001 From: Martin Date: Fri, 30 Sep 2022 09:20:19 +0200 Subject: [PATCH] clean(engagement): remove last pieces of engagement champs --- app/assets/stylesheets/forms.scss | 4 +--- .../editable_champ/engagement_component.rb | 2 -- app/graphql/types/champ_type.rb | 2 +- app/models/champs/engagement_champ.rb | 24 ------------------- .../engagement_type_de_champ.rb | 3 --- config/initializers/zxcvbn_dictionnaries.yaml | 1 - config/locales/models/type_de_champ/fr.yml | 2 -- 7 files changed, 2 insertions(+), 36 deletions(-) delete mode 100644 app/components/editable_champ/engagement_component.rb delete mode 100644 app/models/champs/engagement_champ.rb delete mode 100644 app/models/types_de_champ/engagement_type_de_champ.rb diff --git a/app/assets/stylesheets/forms.scss b/app/assets/stylesheets/forms.scss index 629b2a620..188dcbc8a 100644 --- a/app/assets/stylesheets/forms.scss +++ b/app/assets/stylesheets/forms.scss @@ -81,9 +81,7 @@ } // Move checkbox to the top-left side of the label - &.editable-champ-checkbox, - // TODO: remove after 20220725075951_migrate_champs_engagement_to_checkbox passed - &.editable-champ-engagement { + &.editable-champ-checkbox { p, label { padding-left: 28px; diff --git a/app/components/editable_champ/engagement_component.rb b/app/components/editable_champ/engagement_component.rb deleted file mode 100644 index 829adce26..000000000 --- a/app/components/editable_champ/engagement_component.rb +++ /dev/null @@ -1,2 +0,0 @@ -class EditableChamp::EngagementComponent < EditableChamp::EditableChampBaseComponent -end diff --git a/app/graphql/types/champ_type.rb b/app/graphql/types/champ_type.rb index e9e8900c0..e9be42754 100644 --- a/app/graphql/types/champ_type.rb +++ b/app/graphql/types/champ_type.rb @@ -15,7 +15,7 @@ module Types else Types::Champs::TextChampType end - when ::Champs::EngagementChamp, ::Champs::YesNoChamp, ::Champs::CheckboxChamp + when ::Champs::YesNoChamp, ::Champs::CheckboxChamp Types::Champs::CheckboxChampType when ::Champs::DateChamp Types::Champs::DateChampType diff --git a/app/models/champs/engagement_champ.rb b/app/models/champs/engagement_champ.rb deleted file mode 100644 index c58d825e9..000000000 --- a/app/models/champs/engagement_champ.rb +++ /dev/null @@ -1,24 +0,0 @@ -# TODO: remove after 20220725075951_migrate_champs_engagement_to_checkbox passed -# == Schema Information -# -# Table name: champs -# -# id :integer not null, primary key -# data :jsonb -# fetch_external_data_exceptions :string is an Array -# private :boolean default(FALSE), not null -# rebased_at :datetime -# row :integer -# type :string -# value :string -# value_json :jsonb -# created_at :datetime -# updated_at :datetime -# dossier_id :integer -# etablissement_id :integer -# external_id :string -# parent_id :bigint -# type_de_champ_id :integer -# -class Champs::EngagementChamp < Champs::CheckboxChamp -end diff --git a/app/models/types_de_champ/engagement_type_de_champ.rb b/app/models/types_de_champ/engagement_type_de_champ.rb deleted file mode 100644 index bea7e45a9..000000000 --- a/app/models/types_de_champ/engagement_type_de_champ.rb +++ /dev/null @@ -1,3 +0,0 @@ -# TODO: remove after 20220725075951_migrate_champs_engagement_to_checkbox passed -class TypesDeChamp::EngagementTypeDeChamp < TypesDeChamp::CheckboxTypeDeChamp -end diff --git a/config/initializers/zxcvbn_dictionnaries.yaml b/config/initializers/zxcvbn_dictionnaries.yaml index bb8b8b6b0..b87851a2e 100644 --- a/config/initializers/zxcvbn_dictionnaries.yaml +++ b/config/initializers/zxcvbn_dictionnaries.yaml @@ -4997,6 +4997,5 @@ french: - "vertu" - "permets" - "mafia" - - "engagement" - "lesquelles" - "cachette" diff --git a/config/locales/models/type_de_champ/fr.yml b/config/locales/models/type_de_champ/fr.yml index a38d1439d..37e1260b1 100644 --- a/config/locales/models/type_de_champ/fr.yml +++ b/config/locales/models/type_de_champ/fr.yml @@ -25,8 +25,6 @@ fr: regions: 'Régions' departements: 'Départements' communes: 'Communes' - # TODO: remove after 20220725075951_migrate_champs_engagement_to_checkbox passed - engagement: 'Engagement' header_section: 'Titre de section' explication: 'Explication' dossier_link: 'Lien vers un autre dossier'