Merge branch 'v3.5-stable'

Author: Ben Crouse

CHANGELOG.md

@@ -1,3 +1,86 @@
+Workarea 3.5.25 (2020-12-23)
+--------------------------------------------------------------------------------
+
+*   Fix admin indexing for embedded model changes
+
+    When embedded models are changed, their root documents weren't being
+    reindexed for admin search. This PR ensures admin indexing happens
+    correctly.
+
+    Ben Crouse
+
+*   Index search customizations, handle missing search models for changeset releasables
+
+    WORKAREA-322
+
+    Matt Duffy
+
+*   Move release undo changeset building to sidekiq for large changesets
+
+    WORKAREA-316
+
+    Matt Duffy
+
+*   Fix undo releases not causing models to reindex
+
+    Because the changeset is the only getting saved when building an undo,
+    admin reindexing for the affected models isn't happening. This change
+    triggers callbacks to ensure any related side-effects happen.
+
+    Ben Crouse
+
+*   Use inline_svg fallback for missing releasable icons
+
+    WORKAREA-310
+
+    Matt Duffy
+
+*   Simplify undo releases, allow multiple undo releases from a single release
+
+    WORKAREA-316
+
+    Matt Duffy
+
+*   Update display of release changeset to handle large changesets
+
+    WORKAREA-310
+
+    Matt Duffy
+
+*   Allow admin config array fields to define a values type
+
+    WORKAREA-311
+
+    Matt Duffy
+
+*   Check if a releasable has a localized active field before redefining it
+
+    If Workarea.config.localized_active_field is set to false, the active
+    field is redefined for each Releasable model to ensure the configuration
+    is honored. With inherited models like discounts, this can cause the
+    redefintion of active multiple times causing it to override custom active
+    behaviors for segments. Only redefining the method if its currently in
+    the models localized_fields list should ensure this does not happen.
+
+    WORKAREA-309
+
+    Matt Duffy
+
+*   Update releasable active test to work without localized active fields
+
+    WORKAREA-309
+
+    Matt Duffy
+
+
+
+Workarea 3.5.24 (2020-12-22)
+--------------------------------------------------------------------------------
+
+Due to a mistake releasing this gem, it has been yanked. See v3.5.25 instead.
+
+
+
 Workarea 3.5.23 (2020-11-25)
 --------------------------------------------------------------------------------
 

admin/app/controllers/workarea/admin/create_release_undos_controller.rb

@@ -13,12 +13,20 @@ def create
         @undo_release.attributes = params[:release]
 
         if @undo_release.save
-          @release.changesets.each do |changeset|
-            changeset.build_undo(release: @undo_release.model).save!
+          @release.changesets.limit(Workarea.config.per_page).each do |changeset|
+            if changeset.releasable.present?
+              changeset.build_undo(release: @undo_release.model).save!
+              changeset.releasable.run_callbacks(:save)
+            end
           end
 
+          BuildReleaseUndoChangesets.perform_async(
+            @undo_release.id,
+            @release.id
+          ) if @release.changeset_count > Workarea.config.per_page
+
           flash[:success] = t('workarea.admin.create_release_undos.flash_messages.saved')
-          redirect_to review_release_undo_path(@release)
+          redirect_to review_release_undo_path(@release, @undo_release)
         else
           render :new, status: :unprocessable_entity
         end
@@ -35,8 +43,14 @@ def find_release
       end
 
       def find_undo_release
-        model = @release.model.undo || @release.build_undo(params[:release])
-        @undo_release = ReleaseViewModel.new(model, view_model_options)
+        model =
+          if params[:id].present?
+            @release.model.undos.find(params[:id])
+          else
+            @release.build_undo
+          end
+
+        @undo_release = ReleaseViewModel.wrap(model, view_model_options)
       end
     end
   end

admin/app/controllers/workarea/admin/releases_controller.rb

@@ -43,9 +43,6 @@ def update
         end
       end
 
-      def original
-      end
-
       def publish
         self.current_release = nil
         PublishRelease.perform_async(@release.id)
@@ -59,7 +56,7 @@ def destroy
         @release.destroy
 
         flash[:success] = t('workarea.admin.releases.flash_messages.removed')
-        redirect_to releases_path
+        redirect_back_or releases_path
       end
 
       def calendar_feed

admin/app/helpers/workarea/admin/changesets_helper.rb

@@ -2,22 +2,30 @@ module Workarea
   module Admin::ChangesetsHelper
     def changeset_icon(changeset, options = {})
       type = changeset.root.model_name.element
-      inline_svg_tag(releasable_icon_path(type), options)
+
+      inline_svg_tag(
+        releasable_icon_path(type),
+        options.reverse_merge(fallback: default_releasable_icon_path)
+      )
     end
 
     def releaseable_icon(model, options = {})
       type = model.model_name.element
-      inline_svg(releasable_icon_path(type), options)
+      inline_svg_tag(
+        releasable_icon_path(type),
+        options.reverse_merge(fallback: default_releasable_icon_path)
+      )
     end
 
     def releasable_icon_path(type)
-      default = 'workarea/admin/icons/release.svg'
-      return default unless type.present?
+      return default_releasable_icon_path unless type.present?
 
-      path = Workarea.config.releasable_icons[type.to_sym] ||
-             "workarea/admin/icons/#{type}.svg"
+      Workarea.config.releasable_icons[type.to_sym] ||
+      "workarea/admin/icons/#{type}.svg"
+    end
 
-      Rails.application.assets.find_asset(path).present? ? path : default
+    def default_releasable_icon_path
+      'workarea/admin/icons/release.svg'
     end
   end
 end

admin/app/view_models/workarea/admin/changeset_summary_view_model.rb

@@ -12,18 +12,28 @@ def type
       end
 
       def type_filter
-        Search::Admin.for(model_class.new).type
+        search_model&.type || model_name.param_key
       end
 
       def label
         type_filter.titleize.pluralize(count)
       end
 
+      def searchable?
+        search_model.present?
+      end
+
       private
 
       def model_class
         @model_class ||= type.constantize
       end
+
+      def search_model
+        return @search_model if defined?(@serch_model)
+
+        @search_model = Search::Admin.for(model_class.new)
+      end
     end
   end
 end

admin/app/view_models/workarea/admin/release_view_model.rb

@@ -11,6 +11,10 @@ def changeset_count
         @changeset_count ||= model.changesets.count
       end
 
+      def additional_changesets_count
+        [changeset_count - Workarea.config.per_page, 0].max
+      end
+
       def show_changeset_summary?
         changeset_count > Workarea.config.per_page
       end
@@ -39,9 +43,8 @@ def calendar_on
         calendar_at&.to_date
       end
 
-      def undo
-        return unless undo?
-        @undo ||= ReleaseViewModel.wrap(model.undo, options)
+      def undos
+        @undos ||= ReleaseViewModel.wrap(model.undos, options)
       end
 
       def undoes

admin/app/views/workarea/admin/changesets/index.html.haml

@@ -30,10 +30,16 @@
             .grid.grid--center.grid--auto
               - @release.changeset_summary.each do |summary|
                 .grid__cell
-                  .card.card--button
-                    = link_to search_path(type: [summary.type_filter], upcoming_changes: [@release.id]), class: 'card__header' do
-                      .card__header-text #{summary.count} #{summary.label}
-                      = releaseable_icon summary, { class: 'card__icon'}
+                  - if summary.searchable?
+                    .card.card--button
+                      = link_to search_path(type: [summary.type_filter], upcoming_changes: [@release.id]), class: 'card__header' do
+                        .card__header-text #{summary.count} #{summary.label}
+                        = releaseable_icon summary, { class: 'card__icon'}
+                  - else
+                    .card
+                      .card__header
+                        .card__header-text #{summary.count} #{summary.label}
+                        = releaseable_icon summary, { class: 'card__icon'}
 
         .grid__cell.grid__cell--80-at-medium
           %h2.align-center= t('workarea.admin.changesets.recent')
@@ -64,4 +70,4 @@
 
           - if @release.show_changeset_summary?
             %li.text.text--large.align-center
-              = link_to t('workarea.admin.cards.more', amount: @release.changeset_count - Workarea.config.per_page ), search_path(upcoming_changes: [@release.id])
+              = link_to t('workarea.admin.cards.more', amount: @release.additional_changesets_count ), search_path(upcoming_changes: [@release.id])

admin/app/views/workarea/admin/create_release_undos/new.html.haml

@@ -9,7 +9,7 @@
     - @undo_release.errors.full_messages.each do |message|
       = render_message 'error', message
 
-    = form_tag release_undo_path(@release), method: 'post' do
+    = form_tag release_undos_path(@release), method: 'post' do
       .section
         .property.property--required
           = label_tag 'release_name', t('workarea.admin.fields.name'), class: 'property__name'
@@ -26,12 +26,15 @@
               .grid__cell.grid__cell--50-at-medium
                 .property
                   = label_tag 'release_publish_at', t('workarea.admin.fields.undo_at'), class: 'property__name'
-                  .box.box--rounded= hidden_field_tag 'release[publish_at]', @undo_release.publish_at, data: { datetimepicker_field: { inline: true } }
+                  .box.box--rounded= hidden_field_tag 'release[publish_at]', @undo_release.publish_at, data: { datetimepicker_field: { inline: true, uiOptions: { minDate: (@release.publish_at.present? ? @release.publish_at.to_s(:date_only) : 0) } } }
 
       .workflow-bar
         .grid.grid--middle
           .grid__cell.grid__cell--20
-            = link_to t('workarea.admin.form.cancel'), undo_release_path(@release), class: 'workflow-bar__button workflow-bar__button--delete'
+            - if @undo_release.persisted?
+              = link_to t('workarea.admin.form.cancel'), release_path(@undo_release, return_to: release_path(@release)), class: 'workflow-bar__button workflow-bar__button--delete', data: { method: 'delete', confirm: t('workarea.admin.create_release_undos.workflow.delete_confirmation') }
+            - else
+              = link_to t('workarea.admin.form.cancel'), release_path(@release), class: 'workflow-bar__button workflow-bar__button--delete'
 
           .grid__cell.grid__cell--60
             %ol.workflow-bar__steps

admin/app/views/workarea/admin/create_release_undos/review.html.haml

@@ -34,15 +34,21 @@
                   - changeset.changed_fields.each do |field|
                     = render_changeset_field(changeset, field)
 
+          - if @release.show_changeset_summary?
+            %li.text.text--large.align-center
+              = t('workarea.admin.cards.more', amount: @release.additional_changesets_count )
+
+              %p= t('workarea.admin.create_release_undos.review.change_count_message')
+
     .workflow-bar
       .grid.grid--middle
         .grid__cell.grid__cell--20
-          = link_to t('workarea.admin.form.cancel'), release_path(@undo_release), class: 'workflow-bar__button workflow-bar__button--delete', data: { method: 'delete', confirm: t('workarea.admin.create_release_undos.workflow.delete_confirmation') }
+          = link_to t('workarea.admin.form.cancel'), release_path(@undo_release, return_to: release_path(@release)), class: 'workflow-bar__button workflow-bar__button--delete', data: { method: 'delete', confirm: t('workarea.admin.create_release_undos.workflow.delete_confirmation') }
 
         .grid__cell.grid__cell--60
           %ol.workflow-bar__steps
             %li.workflow-bar__step
-              1) #{link_to t('workarea.admin.create_release_undos.workflow.setup'), new_release_undo_path(@release)}
+              1) #{link_to t('workarea.admin.create_release_undos.workflow.setup'), new_release_undo_path(@release, id: @undo_release.id)}
             %li.workflow-bar__step
               %strong 2) #{t('workarea.admin.create_release_undos.workflow.review')}
 

admin/app/views/workarea/admin/releases/_cards.html.haml

@@ -78,55 +78,5 @@
             = link_to release_changesets_path(model), class: 'card__button' do
               %span.button.button--small= t('workarea.admin.releases.cards.planned_changes.button')
 
-  .grid__cell
-    - if model.undoes?
-      .card{ class: card_classes(:original, local_assigns[:active]) }
-        = link_to original_release_path(model), class: 'card__header' do
-          %span.card__header-text= t('workarea.admin.releases.cards.original.title')
-          = inline_svg_tag 'workarea/admin/icons/planned_changes.svg', class: 'card__icon'
-
-        - if local_assigns[:active].blank?
-          .card__body
-            .card__empty-note
-              %p= t('workarea.admin.releases.cards.original.undoes_html', link: link_to(model.undoes.name, release_path(model.undoes)))
-
-              - if model.undoes.publish_at.present? && model.undoes.publish_at.future?
-                %p= t('workarea.admin.releases.cards.undo.set_to_publish_html', link: link_to(model.undoes.name, release_path(model.undoes)), at: local_time_ago(model.undoes.publish_at))
-              - elsif model.undoes.published_at.present?
-                %p= t('workarea.admin.releases.cards.undo.published_html', link: link_to(model.undoes.name, release_path(model.undoes)), at: local_time_ago(model.undoes.published_at))
-              - else
-                %p= t('workarea.admin.releases.cards.undo.unscheduled_html', link: link_to(model.undoes.name, release_path(model.undoes)))
-
-            = link_to original_release_path(model), class: 'card__button' do
-              %span.button.button--small= t('workarea.admin.releases.cards.original.learn_more')
-
-    - else
-      .card{ class: card_classes(:undo, local_assigns[:active]) }
-        = link_to undo_release_path(model), class: 'card__header' do
-          %span.card__header-text= t('workarea.admin.releases.cards.undo.title')
-          = inline_svg_tag 'workarea/admin/icons/planned_changes.svg', class: 'card__icon'
-
-        - if local_assigns[:active].blank?
-          .card__body
-            .card__empty-note
-              - if model.undo.blank?
-                %p= t('workarea.admin.releases.cards.undo.not_setup')
-
-                = link_to undo_release_path(model), class: 'card__button' do
-                  %span.button.button--small= t('workarea.admin.releases.cards.undo.build_an_undo')
-
-              - else
-                %p= t('workarea.admin.releases.cards.undo.undo_html', link: link_to(model.undo.name, release_path(model.undo)), at: local_time_ago(model.undo.created_at))
-
-                - if model.undo.publish_at.present? && model.undo.publish_at.future?
-                  %p= t('workarea.admin.releases.cards.undo.set_to_publish_html', link: link_to(model.undo.name, release_path(model.undo)), at: local_time_ago(model.undo.publish_at))
-                - elsif model.undo.published_at.present?
-                  %p= t('workarea.admin.releases.cards.undo.published_html', link: link_to(model.undo.name, release_path(model.undo)), at: local_time_ago(model.undo.published_at))
-                - else
-                  %p= t('workarea.admin.releases.cards.undo.unscheduled_html', link: link_to(model.undo.name, release_path(model.undo)))
-
-                = link_to undo_release_path(model), class: 'card__button' do
-                  %span.button.button--small= t('workarea.admin.releases.cards.undo.learn_more')
-
   .grid__cell
     = render 'workarea/admin/comments/card', commentable: model, active: local_assigns[:active]