Publish Moments/Strategies by default instead of draft

Author: julianguyen

app/helpers/moments_form_helper.rb

@@ -10,7 +10,7 @@ def new_moment_props
   end
 
   def edit_moment_props
-    edit_form_props(moment_form_inputs, moment_path(@moment))
+    edit_form_props(moment_form_inputs(true), moment_path(@moment))
   end
 
   private
@@ -75,10 +75,11 @@ def moment_comment
              info: t('comment.hint'), dark: true)
   end
 
-  def moment_publishing
+  def moment_publishing(edit)
     { id: 'moment_publishing', type: 'switch',
       label: t('moments.form.draft_question'), dark: true, name: 'publishing',
-      value: '0', uncheckedValue: '1', checked: !@moment.published? }
+      value: '0', uncheckedValue: '1',
+      checked: edit ? !@moment.published? : @moment.published? }
   end
 
   def moment_bookmarked
@@ -97,12 +98,12 @@ def moment_display_resources
              checked: @moment.resource_recommendations, dark: true)
   end
 
-  def moment_form_inputs
+  def moment_form_inputs(edit = false)
     [
       moment_name, moment_why, moment_fix, moment_category, moment_mood,
       moment_strategy, get_viewers_input(
         @viewers, 'moment', 'moments', @moment
-      ), moment_comment, moment_publishing,
+      ), moment_comment, moment_publishing(edit),
       Rails.env.development? ? moment_bookmarked : {}, moment_display_resources
     ]
   end

app/helpers/strategies_form_helper.rb

@@ -62,9 +62,12 @@ def build_strategy_comment(strategy)
     )
   end
 
-  def build_strategy_publishing(strategy)
-    build_switch_input('0',
-                       params[:bookmarked] ? false : !strategy.published?, '1')
+  def build_strategy_publishing(strategy, edit)
+    checked = strategy.published?
+    checked = !strategy.published? if edit
+    checked = false if params[:bookmarked]
+
+    build_switch_input('0', checked, '1')
       .merge(
         id: 'strategy_publishing', name: 'publishing',
         label: t('strategies.form.draft_question')

app/helpers/strategies_helper.rb

@@ -21,18 +21,19 @@ def quick_create_strategy_props
 
   def edit_strategy_props(strategy, viewers)
     edit_form_props(
-      strategy_form_inputs(strategy, viewers),
+      strategy_form_inputs(strategy, viewers, true),
       strategy_path(strategy)
     )
   end
 
   private
 
-  def strategy_form_inputs(strategy, viewers)
+  def strategy_form_inputs(strategy, viewers, edit = false)
     [build_strategy_name(strategy), build_strategy_description(strategy),
      build_strategy_category,
      get_viewers_input(viewers, 'strategy', 'strategies', strategy),
-     build_strategy_comment(strategy), build_strategy_publishing(strategy),
+     build_strategy_comment(strategy),
+     build_strategy_publishing(strategy, edit),
      build_strategy_visible(strategy),
      build_strategy_bookmarked(strategy),
      build_strategy_reminder(strategy).merge(type: 'checkbox'),

spec/features/user_creates_a_draft_moment_spec.rb

@@ -11,6 +11,7 @@
     it 'is not successful' do
       login_as user
       visit new_moment_path
+      find('#moment_publishing_switch').click
       find('#submit').click
       expect(page).to have_content('New Moment')
       expect(page).to have_css('.labelError')
@@ -85,6 +86,7 @@
       end
 
       find('#moment_comment_switch').click
+      find('#moment_publishing_switch').click
       find('#submit').click
 
       # VIEWING AS OWNER

spec/features/user_creates_a_draft_strategy_spec.rb

@@ -9,6 +9,7 @@
     it 'is not successful' do
       login_as user
       visit new_strategy_path
+      find('#strategy_publishing_switch').click
       find('#submit').click
       expect(page).to have_content('New Strategy')
       expect(page).to have_css('.labelError')
@@ -55,6 +56,7 @@
 
       find('#strategy_comment_switch').click
       find('#strategy_perform_strategy_reminder').click
+      find('#strategy_publishing_switch').click
       find('#submit').click
 
       # VIEWING

spec/features/user_creates_a_published_moment_spec.rb

@@ -10,7 +10,6 @@
     it 'is not successful' do
       login_as user
       visit new_moment_path
-      find('#moment_publishing_switch').click
       find('#submit').click
       expect(page).to have_content('New Moment')
       expect(page).to have_css('.labelError')
@@ -89,7 +88,6 @@
       end
 
       find('#moment_comment_switch').click
-      find('#moment_publishing_switch').click
       find('#submit').click
 
       # VIEWING

spec/features/user_creates_a_published_strategy_spec.rb

@@ -8,7 +8,6 @@
     it 'is not successful' do
       login_as user
       visit new_strategy_path
-      find('#strategy_publishing_switch').click
       find('#submit').click
       expect(page).to have_content('New Strategy')
       expect(page).to have_css('.labelError')
@@ -59,7 +58,6 @@
 
       find('#strategy_comment_switch').click
       find('#strategy_perform_strategy_reminder').click
-      find('#strategy_publishing_switch').click
       find('#submit').click
 
       # VIEWING

spec/helpers/moments_form_helper_spec.rb

@@ -228,7 +228,7 @@
               value: true
             },
             {
-              checked: true,
+              checked: false,
               dark: true,
               id: 'moment_publishing',
               label: 'Do you want to save your moment as draft?',
@@ -462,7 +462,7 @@
               value: true
             },
             {
-              checked: true,
+              checked: false,
               dark: true,
               id: 'moment_publishing',
               label: 'Do you want to save your moment as draft?',

spec/helpers/strategies_form_helper.spec.rb

@@ -114,6 +114,14 @@
       label: t('strategies.form.draft_question')
     )
   end
+  let(:build_strategy_publishing_edit_res) do
+    build_switch_input_strategy_publishing_res.merge(
+      id: 'strategy_publishing',
+      name: 'publishing',
+      label: t('strategies.form.draft_question'),
+      checked: !strategy.published?
+    )
+  end
   let(:build_strategy_bookmarked_res) do
     build_switch_input_strategy_bookmarked_res.merge(
       id: 'strategy_bookmarked',
@@ -136,7 +144,7 @@
       type: 'switch',
       value: '0',
       uncheckedValue: '1',
-      checked: !strategy.published?,
+      checked: strategy.published?,
       dark: true
     }
   end
@@ -214,18 +222,37 @@
   end
 
   describe '#build_strategy_publishing' do
-    subject { build_strategy_publishing(strategy) }
+    context 'when edit is false' do
+      subject { build_strategy_publishing(strategy, false) }
 
-    context 'when there are no custom URL params' do
-      it 'builds correct object' do
-        expect(subject).to eq(build_strategy_publishing_res)
+      context 'when there are no custom URL params' do
+        it 'builds correct object' do
+          expect(subject).to eq(build_strategy_publishing_res)
+        end
+      end
+
+      context 'when there are custom URL params' do
+        it 'builds correct object' do
+          params[:bookmarked] = true
+          expect(subject).to eq(build_strategy_publishing_res.merge(checked: false))
+        end
       end
     end
 
-    context 'when there are custom URL params' do
-      it 'builds correct object' do
-        params[:bookmarked] = true
-        expect(subject).to eq(build_strategy_publishing_res.merge(checked: false))
+    context 'when edit is true' do
+      subject { build_strategy_publishing(strategy, true) }
+
+      context 'when there are no custom URL params' do
+        it 'builds correct object' do
+          expect(subject).to eq(build_strategy_publishing_edit_res)
+        end
+      end
+
+      context 'when there are custom URL params' do
+        it 'builds correct object' do
+          params[:bookmarked] = true
+          expect(subject).to eq(build_strategy_publishing_edit_res.merge(checked: false))
+        end
       end
     end
   end

spec/helpers/strategies_helper_spec.rb

@@ -50,6 +50,96 @@
     }
   end
   let(:strategy_form_inputs_res) do
+    [
+      {
+        id: 'strategy_name',
+        type: 'text',
+        name: 'strategy[name]',
+        label: t('common.name'),
+        value: strategy.name || nil,
+        placeholder: t('strategies.form.name_hint'),
+        required: true,
+        dark: true
+      },
+      {
+        id: 'strategy_description',
+        type: 'textarea',
+        name: 'strategy[description]',
+        label: t('strategies.form.describe'),
+        value: strategy.description || nil,
+        required: true,
+        dark: true
+      },
+      {
+        id: 'strategy_category',
+        type: 'quickCreate',
+        name: 'strategy[category][]',
+        label: t('categories.plural'),
+        placeholder: t('common.form.search_by_keywords'),
+        checkboxes: category_checkboxes,
+        formProps: category_form_inputs_res
+      },
+      get_viewers_input(viewers, 'strategy', 'strategies', strategy),
+      {
+        id: 'strategy_comment',
+        type: 'switch',
+        name: 'strategy[comment]',
+        label: t('comment.allow_comments'),
+        value: true,
+        uncheckedValue: false,
+        checked: strategy.comment,
+        info: t('comment.hint'),
+        dark: true
+      },
+      {
+        id: 'strategy_publishing',
+        type: 'switch',
+        label: t('strategies.form.draft_question'),
+        dark: true,
+        name: 'publishing',
+        value: '0',
+        uncheckedValue: '1',
+        checked: strategy.published?
+      },
+      { id: 'strategy_visible',
+        type: 'switch',
+        label: t('shared.stats.make_visible_in_stats'),
+        dark: true,
+        name: 'strategy[visible]',
+        value: true,
+        uncheckedValue: false,
+        checked: strategy.visible
+      },
+      {
+        checked: false,
+        dark: true,
+        id: 'strategy_bookmarked',
+        info: 'Bookmarked strategies appear in your Care Plan', label: 'Bookmark this strategy?',
+        name: 'strategy[bookmarked]',
+        type: 'switch',
+        uncheckedValue: false,
+        value: true
+      },
+      {
+        id: 'strategy_perform_strategy_reminder',
+        type: 'checkbox',
+        name: 'strategy[perform_strategy_reminder_attributes][active]',
+        label: t('common.daily_reminder'),
+        info: t('strategies.form.daily_reminder_hint'),
+        value: true,
+        uncheckedValue: false,
+        checked: strategy&.perform_strategy_reminder&.active,
+        dark: true
+      },
+      {
+        id: 'strategy_perform_strategy_reminder_attributes_id',
+        name: 'strategy[perform_strategy_reminder_attributes][id]',
+        type: 'hidden',
+        value: strategy&.perform_strategy_reminder&.id
+      }
+    ]
+  end
+  let(:strategy_form_inputs_edit_res) do
     [
       {
         id: 'strategy_name',
@@ -177,7 +267,7 @@
     it 'returns correct props' do
       expect(subject).to eq(
         edit_form_props(
-          strategy_form_inputs_res,
+          strategy_form_inputs_edit_res,
           "/strategies/#{strategy.slug}"
         )
       )