Skip to content

Commit 2d838a0

Browse files
Revert "Content area upload (#2552)" (#2558)
This reverts commit 96c6e60.
1 parent 96c6e60 commit 2d838a0

File tree

5 files changed

+7
-15
lines changed

5 files changed

+7
-15
lines changed

Gemfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ ruby '3.1.3'
77
# one of these lines:
88
# gem 'metadata_presenter',
99
# github: 'ministryofjustice/fb-metadata-presenter',
10-
# branch: 'content-area-upload'
10+
# branch: 'sort-components-by-order'
1111
# gem 'metadata_presenter', path: '../fb-metadata-presenter'
12-
gem 'metadata_presenter', '3.3.15'
12+
gem 'metadata_presenter', '3.3.14'
1313

1414
gem 'activerecord-session_store'
1515
gem 'administrate'

Gemfile.lock

+2-2
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ GEM
279279
net-smtp
280280
marcel (1.0.2)
281281
matrix (0.4.2)
282-
metadata_presenter (3.3.15)
282+
metadata_presenter (3.3.14)
283283
govspeak (~> 7.1)
284284
govuk_design_system_formbuilder (~> 4.1.1)
285285
json-schema (~> 4.1.1)
@@ -775,7 +775,7 @@ DEPENDENCIES
775775
govuk_design_system_formbuilder
776776
hashie
777777
listen (~> 3.8)
778-
metadata_presenter (= 3.3.15)
778+
metadata_presenter (= 3.3.14)
779779
omniauth-auth0 (~> 3.1.0)
780780
omniauth-rails_csrf_protection (~> 1.0.1)
781781
pg (>= 0.18, < 2.0)

acceptance/features/edit_single_question_page_spec.rb

+1-9
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555

5656
scenario 'when editing upload component' do
5757
given_I_have_a_single_question_page_with_upload
58-
and_I_can_add_a_content_area
5958
and_I_have_optional_section_heading_text
6059
then_the_save_button_should_be_disabled
6160
when_I_update_the_question_name
@@ -190,13 +189,6 @@ def and_I_have_optional_section_heading_text
190189
expect(page).to have_content(I18n.t('default_text.section_heading'))
191190
end
192191

193-
def and_I_can_add_a_content_area
194-
content = 'This upload page is fantastic'
195-
expect(page).to have_content('[Optional content]')
196-
component = editor.page_body
197-
when_I_change_editable_content(component, content:)
198-
when_I_save_my_changes
199-
expect(page).to have_content(content)
200-
end
192+
201193
end
202194

app/javascript/src/question.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ const editableComponent = require('./editable_components').editableComponent;
2121
const QuestionMenu = require('./components/menus/question_menu');
2222

2323
const ATTRIBUTE_DEFAULT_TEXT = "fb-default-text";
24-
const SELECTOR_DISABLED = "input:not(:hidden), textarea:not([data-element]), select";
24+
const SELECTOR_DISABLED = "input:not(:hidden), textarea, select";
2525
const SELECTOR_LABEL_HEADING = "label h1, label h2, legend h1, legend h2";
2626

2727

spec/generators/new_page_generator_spec.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
'section_heading' => '',
3030
'heading' => '',
3131
'lede' => '',
32-
'body' => '',
32+
'body' => 'Body section',
3333
'components' => [
3434
{
3535
'_id' => "#{page_url}_#{component_type}_1",

0 commit comments

Comments
 (0)