workarea-admin 3.4.18 → 3.4.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14d73797f080c9e96f5b59dde83886636b155ab7f7022a378b161eb01c2d3670
-  data.tar.gz: 95987b4b59852ae6feea6d2e349b48174d6f166d41cbb8297bc00ae1110388dc
+  metadata.gz: 2c08425b237953579d29e22a8fbc38b70bedbf3347d293ec3912ed9b6c388800
+  data.tar.gz: 86b06b877c1b0816c15be5df0ea499a6d7abcb3dbce2d0c89f5761c8c147aa5a
 SHA512:
-  metadata.gz: 7b4143771ef560953b1b63ef9dcc3aef3aa8e9f3067f7e4567a9fcfdd5d21fa77d7e375c17133e5e7197e90cf2c27515445e52924e40ae05b0608c53f04b6ccf
-  data.tar.gz: 6a71949b108e7a1fe3a679ff33ba809cede0524b082da5e4a69045a606a607946a099b592281469a79bab1710a246a5b0d2521e7b0c872872d1811a92422f2e5
+  metadata.gz: cc92a2c5fe37b7620d3f6438349038e5749e838175d18031efc4c0a1e023b77b611f00682a7f2219432d0cd00ca5324b65fe435ec36b14679e66d738f709aa5b
+  data.tar.gz: 1e7f31d4a2a7f60a9f1c74e746ac67c7eb1b6ce268aa52d99a378ec841ebc732e8679eda22b194af6c46332df10dc4844f09ea6b6ebc3abeade722aa8961b19e

data/app/controllers/workarea/admin/catalog_categories_controller.rb

@@ -9,7 +9,10 @@ module Workarea
 
       def index
         search = Search::AdminCategories.new(
-          params.merge(autocomplete: request.xhr?)
+          params.merge(
+            autocomplete: request.xhr?,
+            exclude_ids: exclude_ids
+          )
         )
 
         @search = SearchViewModel.new(search, view_model_options)
@@ -44,6 +47,14 @@ module Workarea
 
       private
 
+      def exclude_ids
+        if params[:exclude_ids].blank?
+          []
+        else
+          Catalog::Category.in(id: params[:exclude_ids]).map { |c| Search::Admin.for(c).id }
+        end
+      end
+
       def find_category
         if params[:id].present?
           @category = Catalog::Category.find_by(slug: params[:id])

data/app/view_models/workarea/admin/timeline_view_model.rb

@@ -3,7 +3,15 @@ module Workarea
     class TimelineViewModel < ApplicationViewModel
       def upcoming_changesets
         @upcoming_changesets ||= ChangesetViewModel.wrap(
-          model_changesets + content_changesets
+          (model_changesets + content_changesets)
+            .sort { |c| c.release.publish_at }
+            .reverse
+        )
+      end
+
+      def unscheduled_changesets
+        @unscheduled_changesets ||= ChangesetViewModel.wrap(
+          unscheduled_model_changesets + unscheduled_content_changesets
         )
       end
 
@@ -40,6 +48,12 @@ module Workarea
           .any_in(release_id: upcoming_releases.map(&:id))
       end
 
+      def unscheduled_model_changesets
+        Release::Changeset
+          .by_document_path(model)
+          .any_in(release_id: unscheduled_releases.map(&:id))
+      end
+
       def content_changesets
         return [] unless model.is_a?(Contentable)
 
@@ -49,8 +63,21 @@ module Workarea
           .to_a
       end
 
+      def unscheduled_content_changesets
+        return [] unless model.is_a?(Contentable)
+
+        Workarea::Content.for(model)
+          .changesets
+          .any_in(release_id: unscheduled_releases.map(&:id))
+          .to_a
+      end
+
       def upcoming_releases
-        @upcoming_releases ||= Release.upcoming.to_a
+        @upcoming_releases ||= (Release.upcoming - unscheduled_releases).to_a
+      end
+
+      def unscheduled_releases
+        @unscheduled_releases ||= Release.unscheduled.to_a
       end
     end
   end

data/app/views/workarea/admin/product_rules/fields/_category.html.haml

@@ -2,4 +2,4 @@
 Name
 = select_tag 'product_rule[operator]', options_for_select([['equal', 'equal'], ['not equal', 'not_equal']], rule.operator)
 - categories = Workarea::Catalog::Category.any_in(id: rule.terms)
-= select_tag 'product_rule[value]', options_from_collection_for_select(categories, 'id', 'name', rule.terms), multiple: true, data: { remote_select: { source: catalog_categories_path, options: { placeholder: 'Choose a category...' } }.to_json }
+= select_tag 'product_rule[value]', options_from_collection_for_select(categories, 'id', 'name', rule.terms), multiple: true, data: { remote_select: { source: catalog_categories_path(exclude_ids: rule.product_list.id), options: { placeholder: t('workarea.admin.product_rules.fields.category.choose') } }.to_json }

data/app/views/workarea/admin/timeline/show.html.haml

@@ -19,6 +19,39 @@
       .grid.grid--center
         .grid__cell.grid__cell--80-at-medium
           .grid
+            - @timeline.unscheduled_changesets.each_with_index do |changeset, index|
+              .activity-group.activity-group--bordered
+                .grid__cell.grid__cell--20
+                  - if index == 0
+                    .date-marker
+                      .date-marker__annotation= t('workarea.admin.timeline.unscheduled_changes')
+                      .date-marker__day ?
+                .grid__cell.grid__cell--80
+                  .activity
+                    .activity__header
+                      = inline_svg('workarea/admin/icons/release_timeline.svg', class: 'activity__avatar')
+                      %h3.activity__name= link_to changeset.release.name, release_path(changeset.release)
+                      %p.activity__time
+                        = changeset.publish_humanized
+                      .activity__actions
+                        .grid.grid--auto
+                          .grid__cell
+                            = form_tag release_session_path, method: :post do
+                              = hidden_field_tag :release_id, changeset.release.id
+                              = hidden_field_tag :return_to, url_for(@timeline.subject)
+                              = button_tag value: 'edit_changes', class: 'text-button' do
+                                %span= t('workarea.admin.timeline.edit')
+                                = inline_svg('workarea/admin/icons/edit.svg', class: 'text-button__icon')
+                          .grid__cell
+                            = form_tag release_changeset_path(changeset.release, changeset), method: :delete, class: 'action-group__item', data: { deletion_form: { message: t('workarea.admin.timeline.delete_confirmation') } } do
+                              = button_tag value: 'delete_changeset', class: 'text-button' do
+                                %span= t('workarea.admin.actions.delete')
+                                = inline_svg('workarea/admin/icons/delete.svg', class: 'text-button__icon')
+                    .activity__message
+                      .release-changeset.release-changeset--activity
+                        - changeset.changed_fields.each do |field|
+                          = render_changeset_field(changeset, field)
+
             - @timeline.upcoming_changesets.each_with_index do |changeset, index|
               .activity-group.activity-group--bordered
                 .grid__cell.grid__cell--20

data/config/locales/en.yml

@@ -2801,6 +2801,7 @@ en:
           category:
             name: Category that does
             placeholder: Category A, Category B
+            choose: Choose a category...
       publish_authorization:
         unauthorized: You are not authorized to publish changes now. You may add these changes to a release.
       recommendations:
@@ -3442,6 +3443,7 @@ en:
         no_activity: No activity to show
         timeline_for: Timeline For
         today: Today
+        unscheduled_changes: Unscheduled Changes
         upcoming_changes: Upcoming Changes
       toolbar:
         adjust_order_pricing: Adjust Order Pricing

data/test/integration/workarea/admin/categories_integration_test.rb

@@ -44,6 +44,21 @@ module Workarea
         refute(results['results'].first['top'])
       end
 
+      def test_exclude_categories_from_search_results
+        category = create_category(name: 'Category')
+        ignored = create_category(name: 'Category')
+
+        get admin.catalog_categories_path(exclude_ids: ignored.id, q: category.name, format: :json)
+
+        results = JSON.parse(response.body).with_indifferent_access[:results]
+        values = results.map { |result| result[:value] }
+
+        assert_response(:success)
+        refute_empty(values)
+        assert_includes(values, category.id.to_s)
+        refute_includes(values, ignored.id.to_s)
+      end
+
       def test_returns_breadcrumb_as_title_with_json_response
         category = create_category(name: 'Test')
         create_taxon(

data/test/view_models/workarea/admin/timeline_view_model_test.rb

@@ -15,22 +15,31 @@ module Workarea
         assert_equal(view_model.upcoming_changesets.length, 1)
         assert_equal(view_model.upcoming_changesets.first.release_id, release.id)
 
-        release = create_release(name: 'Bar')
+        release = create_release(name: 'Bar', publish_at: 4.days.from_now)
         release.as_current { @releasable.update_attributes!(name: 'Changed') }
 
         view_model = TimelineViewModel.new(@releasable)
         assert_equal(view_model.upcoming_changesets.length, 2)
         assert_equal(view_model.upcoming_changesets.second.release_id, release.id)
 
+        release = create_release(name: 'Baz')
+        release.as_current { @releasable.update_attributes!(name: 'Changed') }
+
+        view_model = TimelineViewModel.new(@releasable)
+        assert_equal(view_model.upcoming_changesets.length, 2)
+
         release = create_release(name: 'Foo', published_at: 3.days.ago)
         release.as_current { @releasable.update_attributes!(name: 'Changed') }
 
         view_model = TimelineViewModel.new(@releasable)
         assert_equal(view_model.upcoming_changesets.length, 2)
+
+        assert_equal('Foo', view_model.upcoming_changesets.first.release.name)
+        assert_equal('Bar', view_model.upcoming_changesets.last.release.name)
       end
 
       def test_upcoming_changesets_with_content
-        release = create_release
+        release = create_release(publish_at: 1.day.from_now)
         content = Content.for(@releasable)
         release.as_current { content.update_attributes!(browser_title: 'Foo') }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-admin
 version: !ruby/object:Gem::Version
-  version: 3.4.18
+  version: 3.4.19
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-01 00:00:00.000000000 Z
+date: 2019-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea-core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.18
+        version: 3.4.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.18
+        version: 3.4.19
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.18
+        version: 3.4.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.18
+        version: 3.4.19
 description: Provides site administration functionality for the Workarea Commerce
   Platform.
 email: