workarea-admin 3.5.0.beta.1 → 3.5.0

data/app/views/workarea/admin/segments/_cards.html.haml

@@ -74,6 +74,27 @@
           = link_to insights_segment_path(model), class: 'card__button' do
             %span.button.button--small= t('workarea.admin.segments.cards.insights.button')
 
+  .grid__cell
+    .card{ class: card_classes(:segmentables, local_assigns[:active]) }
+      = link_to segment_segmentables_path(model), class: 'card__header' do
+        %span.card__header-text= t('workarea.admin.segments.cards.segmentables.header')
+        = inline_svg 'workarea/admin/icons/attributes.svg', class: 'card__icon'
+
+      - if local_assigns[:active].blank?
+        .card__body
+          = t('workarea.admin.segments.cards.segmentables.content_html', count: model.segmentables_count)
+
+          .section
+            %ul
+              - model.segmentables.take(5).each do |model|
+                %li= link_to model.name, model
+              - if model.segmentables_count > 5
+                %li.align-center
+                  = link_to t('workarea.admin.cards.more', amount: model.segmentables_count - 5), segment_segmentables_path(model)
+
+          = link_to segment_segmentables_path(model), class: 'card__button' do
+            %span.button.button--small= t('workarea.admin.segments.cards.segmentables.button')
+
   .grid__cell
     = render 'workarea/admin/timeline/card', timeline: model.timeline, active: local_assigns[:active]
 

data/app/views/workarea/admin/segments/_publish.html.haml

@@ -1,10 +1,10 @@
 .section.align-center
-  %h4.link{ data: { toggle_element: '#segments-table' } }= t('workarea.admin.segments.publish.title')
+  %h4.link{ id: 'publish-segments', data: { toggle_element: '#segments-table' } }= t('workarea.admin.segments.publish.title')
 
   #segments-table.hidden
     %p= t('workarea.admin.segments.publish.description')
 
     .property
       = label_tag 'active_segment_ids', t('workarea.admin.shared.active_field.only_for'), class: 'property__name'
-      = select_tag 'active_segment_ids', options_from_collection_for_select(segments, :id, :name, model.active_segment_ids), multiple: true, data: { select: { placeholder: t('workarea.admin.shared.active_field.select_segments'), allowClear: true, dropdownParent: '#active-by-segment' } }
+      = select_tag 'active_segment_ids', options_from_collection_for_select(segments, :id, :name, model.active_segment_ids), multiple: true, data: { select: { placeholder: t('workarea.admin.shared.active_field.select_segments'), allowClear: true } }
       %span.property__note= t('workarea.admin.shared.active_field.only_these_segments')

data/app/views/workarea/admin/shared/_active_field.html.haml

@@ -5,6 +5,11 @@
         .active-field__segments-message
           - haml_tag_if model.segments.present?, :strong do
             = t('workarea.admin.shared.active_field.by_segment', name: model.segments.map(&:name).first, count: model.segments.size, more_count: model.segments.size - 1)
+          - if model.segmented? && model.segments.blank?
+            = link_to '#missing-segments-tooltip', data: { tooltip: '' } do
+              = inline_svg('workarea/admin/icons/alert.svg', class: 'svg-icon svg-icon--small svg-icon--red')
+            #missing-segments-tooltip.tooltip-content
+              %p= t('workarea.admin.shared.active_field.no_segments')
 
       #active-by-segment.tooltip-content
         %h3

data/app/views/workarea/admin/status_report_mailer/report.html.haml

@@ -78,6 +78,11 @@
               = link_to catalog_products_url(issues: [t('workarea.alerts.issues.inconsistent_variant_details')]) do
                 = @alerts.products_inconsistent_variant_details
                 = t('workarea.admin.status_report_mailer.alerts.products_with_inconsistent_variant_details')
+          - if @alerts.show_missing_segments?
+            %li
+              = link_to search_url(active_by_segment: @alerts.missing_segments) do
+                = @alerts.missing_segments.length
+                = t('workarea.admin.status_report_mailer.alerts.segmented_resoures_missing_segments')
           - if @alerts.empty_upcoming_releases.any?
             %li
               = link_to releases_url do

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

@@ -68,6 +68,7 @@
                 .header__user-menu
                   .header__user-menu-cell
                     = form_tag guest_browsing_path, method: 'delete', data: { disable_delete_confirmation: '' } do
+                      = hidden_field_tag :return_to, root_path
                       = button_tag t('workarea.admin.toolbar.stop_guest_browsing'), class: 'text-button text-button--destroy'
             - elsif impersonating?
               .header__action

data/app/views/workarea/admin/users/index.html.haml

@@ -86,6 +86,7 @@
           - if admin_browsing_as_guest?
             .grid__cell
               = form_tag guest_browsing_path, method: 'delete', data: { disable_delete_confirmation: '' } do
+                = hidden_field_tag :return_to, users_path
                 = button_tag t('workarea.admin.users.index.stop_guest_browsing'), class: 'workflow-bar__button workflow-bar__button--delete'
           - else
             .grid__cell= link_to t('workarea.admin.users.index.browse_as_guest'), guest_browsing_path, class: 'workflow-bar__button', data: { method: :post }

data/config/locales/en.yml

@@ -7,6 +7,7 @@ en:
         delete: Delete
         delete_confirmation: Are you sure you want to delete?
         impersonation_confirmation: You are currently impersonating %{name}. Would you like to continue as this user?
+        guest_browsing_confirmation: You are currently browsing as a guest. Would you like to continue guest browsing?
         drag: Drag
         edit: Edit
         remove: Remove
@@ -65,9 +66,9 @@ en:
         fulfillment_sku_create_html: created %{name}
         fulfillment_sku_destroy_html: removed %{name}
         fulfillment_sku_update_html: updated %{fields} on %{name}
-        generic_create_html: created %{model} %{id}
-        generic_update_html: updated %{model} %{id}
-        generic_destroy_html: removed %{model} %{id}
+        generic_create_html: created %{model}
+        generic_update_html: updated %{model}
+        generic_destroy_html: removed %{model}
         help_article_create_html: created the %{name} help article
         help_article_destroy_html: removed the %{name} help article
         help_article_update_html: updated %{fields} on the %{name} help article
@@ -169,7 +170,7 @@ en:
           confirm: Confirm and delete
           confirmation: Are you sure you want to delete %{count}, including the ones below?
         flash_messages:
-          created: Your deletion request is being processed and will complete shortly.
+          created: Your deletion is being processed.
         generic_name: Item
       bulk_action_product_edits:
         details:
@@ -738,7 +739,7 @@ en:
             button: View Original
             title: Original
         edit:
-          alt_text_note: Used as default Alt text in Content
+          alt_text_note: Used as default alt text in content blocks
           file_label: Choose File
           name_label: Name
           page_title: Attributes for %{asset}
@@ -746,6 +747,20 @@ en:
           save_asset: Save Asset
           tags_label: Tags
           tags_note: 'Comma separated: just, like, this'
+          tags_tooltip_html: |
+            <p>Use the following tags to set an asset as a favicon or Open Graph image for your site:</p>
+
+            <ul>
+              <li><code>favicon</code> - The default favicon</li>
+              <li><code>favicon-WxH</code>, e.g. "favicon-32x32" - The favicon for the given size</li>
+              <li><code>og-default</code> - The default Open Graph image</li>
+            </ul>
+
+            <p>
+              The default favicon is used when a device does not request a specific size or when the requested size is not available.
+              <br/>
+              The default Open Graph image is used when sharing a content page that does not specify an Open Graph image.
+            </p>
           type_label: Type
         flash_messages:
           created: Asset has been created.
@@ -765,7 +780,7 @@ en:
           page_title: Choose an Asset
           title: Select Asset
         new:
-          alt_text_note: Used as default Alt text in Content
+          alt_text_note: Used as default alt text in content blocks
           create_asset: Create Asset
           create_asset_disabled_text: Creating Asset...
           file_label: Choose File
@@ -782,7 +797,8 @@ en:
           clear_asset: Clear asset
           name_missing: "(none)"
           select_an_asset: Select an asset
-          alt_text_note: Leave alt text blank to default to the asset's alt text
+          alt_text_note_html: "Default alt text: <strong>%{text}</strong>"
+          no_default_alt_text: "No default alt text"
         category:
           select_placeholder: Choose a category...
         flash_messages:
@@ -1588,6 +1604,7 @@ en:
         allow_sale_items: Allow Sale Items
         alt_text: Alt Text
         amount: Amount
+        auto_deactivate: Auto Deactivate
         aov: AOV
         automate_metadata: Automate Metadata
         available: Available Units
@@ -2369,13 +2386,18 @@ en:
           missing_images: "%{product} missing images"
           missing_prices: "%{product} missing prices"
           missing_variants: "%{product} missing variants"
+          missing_segments:
+            one: "1 segmented thing with no matching segments"
+            other: "%{count} segmented things with no matching segments"
           low_inventory: "%{product} with low inventory"
           variants_missing_details: "%{product} with variants missing details"
           inconsistent_variant_details: "%{product} with inconsistent variant details"
           product: product
           publishes_on_and_has_no_changes: "%{release_name} publishes on %{release_publish_date} and has no changes"
           variant: variant
+          workarea_version_outdated: A newer version of Workarea is available! Contact your implementer about upgrading.
         avatar_title: Avatar for %{name}
+        browse_storefront_as_guest: Browse the Storefront as a Guest
         close_primary_menu: Close Primary Menu
         current_page: Current Page
         help: Help
@@ -2867,6 +2889,7 @@ en:
             list_help: You can allow more than one user tag for this discount by separating them with commas, e.g. vip, employee.
         edit:
           page_title: Attributes for %{name}
+          auto_deactivate_info: A discount that can be auto-deactivated will becomes inactive automatically if it has not been updated or redeemed in the last %{duration}.
         flash_messages:
           removed: These changes have been removed
           saved: Your changes have been saved
@@ -3339,14 +3362,22 @@ en:
           title: Searches
         unknown: Unknown
         timeline:
+          add_custom: Add Custom
+          add_custom_event: Add Custom Event
           chart_title: Timeline Report
+          custom_events: Custom Events
+          customers: Customers
           date: Date
-          title: Timeline
-          revenue: Revenue
+          events: Events
+          no_events: There are no events for this date range.
+          no_planned_changes: There are no changes planned for this release
           orders: Orders
-          units_sold: Units Sold
-          customers: Customers
           releases: Releases
+          revenue: Revenue
+          title: Timeline
+          units_sold: Units Sold
+          update_event: Update Event
+          view_release: View Release
           summary:
             intro_html:
               one: Over the last <strong>3 Months</strong> there has been <strong>%{count} Release</strong> with
@@ -3355,6 +3386,10 @@ en:
             orders_html: <strong>%{orders}</strong> orders
             units_sold_html: <strong>%{units_sold}</strong> units sold
             customers_html: <strong>%{customers}</strong> new customers
+          flash_messages:
+            created: Custom Event created successfully
+            success: Custom Event updated successfully
+            error: Custom Event failed to save
       reports_mailer:
         export:
           subject: Here's your %{name} export
@@ -3489,7 +3524,7 @@ en:
           sort_by: Sort by
           title: Search results
       segment_rules:
-        unknown: Unknown
+        select_a_medium: Select a medium
         email: Email
         social: Social
         search: Search
@@ -3520,8 +3555,9 @@ en:
           geolocation:
             note: You can enter countries, regions, states, or postal codes here.
           traffic_referrer:
-            source_notes: You can use a regular expression here.
-            source_notes_html: You can use a regular expression syntax in this field. For instance <code>twitter|facebook</code> will match either Twitter or Facebook. Matches are case-insensitive. Learn more about regular expressions <a href="https://en.wikipedia.org/wiki/Regular_expression" target="_blank" rel="noopener">here</a>.
+            note_html: Any selections made below will cause a match.
+            url_notes: You can use a regular expression here.
+            url_notes_html: You can use a regular expression syntax in this field. For instance <code>twitter|facebook</code> will match either Twitter or Facebook. Matches are case-insensitive. Learn more about regular expressions <a href="https://en.wikipedia.org/wiki/Regular_expression" target="_blank" rel="noopener">here</a>.
         flash_messages:
           destroyed: Your rule has been removed.
           error: There was a problem saving your rule.
@@ -3532,6 +3568,9 @@ en:
           no_edit: Why can't I edit these?
           no_edit_description_html: Changing the rules for a segment changes who's in that segment, and invalidates all data and insights collected for those people. Try %{link} instead.
           creating_a_new_segment: creating a new segment
+        last_order:
+          not_ordered: Not ordered
+          ordered: Ordered
         platform:
           android: Android
           blackberry: BlackBerry
@@ -3545,9 +3584,12 @@ en:
           geolocation:
             description_html: "Browsing from <strong>%{locations}</strong>"
           last_order:
-            description_html:
-              one: Ordered within <strong>1</strong> day ago
-              other: Ordered within <string>%{count}</strong> days ago
+            within_description_html:
+              one: Ordered within the last <strong>1</strong> day
+              other: Ordered within the last <string>%{count}</strong> days
+            not_within_description_html:
+              one: Not ordered within the last <strong>1</strong> day
+              other: Not ordered within the last <string>%{count}</strong> days
           logged_in:
             logged_in_html: "The visitor is <strong>logged in</strong>."
             logged_out_html: "The visitor is <strong>not logged in</strong>."
@@ -3566,6 +3608,11 @@ en:
               other: "Has visited <strong>%{count}</strong> times"
           tags:
             description_html: "Tagged with any of <strong>%{tags}</strong>"
+      segmentables:
+        index:
+          title: Content Active for "%{name}"
+          no_content: There's no content setup specifically for this segment.
+          no_content_instructions_html: Throughout the admin, you can setup personalized experiences for this segment. Anywhere you see an <strong>Active</strong> field, you can click the "by segment" link next set active only for a selection of segments. For content blocks, you can do this in the "Display" tab on the right in the block editing screen.
       segments:
         cards:
           attributes:
@@ -3574,6 +3621,13 @@ en:
           rules:
             header: Rules
             button: View Rules
+          segmentables:
+            button: View
+            content_html:
+              zero: There's <strong>no content</strong> setup specifically for this segment.
+              one: "There's <strong>1</strong> piece of content setup specifically for this segment:"
+              other: "There are <strong>%{count}</strong> pieces of content setup specifically for this segment:"
+            header: Content
           insights:
             header: Insights
             button: View Insights
@@ -3601,6 +3655,7 @@ en:
           orders: Orders
           revenue: Revenue
           average_order_value: Average Order Value
+        missing: Missing Segment %{id}...
         publish:
           title: Publish by segment?
           description: You can control which segments this publishes for below. If you leave these blank, it will show for everyone.
@@ -3621,6 +3676,7 @@ en:
             one: "only for %{name}"
             other: "only for %{name} and %{more_count} more..."
           description_html: 'If you select segments here this will only show for visitors in one of those segments.'
+          no_segments: Set up for segmentation, but no current segments found. This won't display in the storefront.
           only_for: Only for
           select_segments: Select segments...
           only_these_segments: Only these segments will see this.
@@ -3774,6 +3830,7 @@ en:
           products_with_low_inventory: Products with low inventory
           products_with_variants_missing_details: Products with variants missing details
           products_with_inconsistent_variant_details: Products with inconsistent variant details
+          segmented_resoures_missing_segments: Segmented resources with no matching segments
           title: Alerts
           upcoming_empty_releases: Upcoming empty releases
         orders:

data/config/routes.rb

@@ -148,6 +148,8 @@ Workarea::Admin::Engine.routes.draw do
       get :searches
       get :timeline
 
+      resources :custom_events, only: [:create, :update, :destroy]
+
       post :export
       get '/:id/download', action: :download, as: :download
     end
@@ -366,6 +368,7 @@ Workarea::Admin::Engine.routes.draw do
 
     resources :segments, except: [:new, :create] do
       resources :rules, except: [:show, :new, :edit], controller: 'segment_rules'
+      resources :segmentables, only: [:index]
 
       member do
         get :insights

data/test/helpers/workarea/admin/application_helper_test.rb

@@ -78,6 +78,30 @@ module Workarea
         result = pagination_path_for(page: 2)
         assert_equal('/foo?asdf=blah&page=2', result)
       end
+
+      def test_workarea_release_notes_url
+        result = workarea_release_notes_url('3.5.0')
+        assert_equal(
+          'https://developer.workarea.com/release-notes/workarea-3-5-0.html',
+          result
+        )
+      end
+
+      def test_duration_in_words
+        assert_equal(
+          t('workarea.duration.days', count: 2),
+          duration_in_words(2.days)
+        )
+
+        assert_equal(
+          [
+            t('workarea.duration.years', count: 1),
+            t('workarea.duration.months', count: 2),
+            t('workarea.duration.days', count: 12),
+          ].to_sentence,
+          duration_in_words(2.months + 1.years + 12.days)
+        )
+      end
     end
   end
 end

data/test/helpers/workarea/admin/facets_helper_test.rb

@@ -0,0 +1,28 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class FacetsHelperTest < ViewTest
+      def test_facet_value_display_name
+        facet = Workarea::Search::Facet.new(nil, 'tags')
+        assert_equal('bar_baz', facet_value_display_name(facet, 'bar_baz'))
+
+        facet = Workarea::Search::Facet.new(nil, 'colors')
+        assert_equal('Bar Baz', facet_value_display_name(facet, 'bar_baz'))
+
+        facet = Workarea::Search::Facet.new(nil, 'upcoming_changes')
+        release = create_release(name: 'Foo Release')
+        assert_equal('Foo Release', facet_value_display_name(facet, release.id))
+        assert_nil(facet_value_display_name(facet, 'bar_baz'))
+
+        facet = Workarea::Search::Facet.new(nil, 'active_by_segment')
+        segment = create_segment(name: 'Foo Segment')
+        assert_equal('Foo Segment', facet_value_display_name(facet, segment.id))
+        assert_equal(
+          t('workarea.admin.segments.missing', id: 'bar'),
+          facet_value_display_name(facet, 'bar')
+        )
+      end
+    end
+  end
+end

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

@@ -6,13 +6,15 @@ module Workarea
       include Admin::IntegrationTest
 
       def test_ensures_cors_policy_for_bulk_upload
-        DirectUpload.expects(:ensure_cors!).once
+        Workarea.s3.expects(:put_bucket_cors).once
         get admin.content_assets_path
         assert(response.ok?)
 
-        DirectUpload.expects(:ensure_cors!).never
         get admin.content_assets_path, xhr: true
         assert(response.ok?)
+
+        get admin.content_assets_path
+        assert(response.ok?)
       end
 
       def test_can_create_an_asset

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

@@ -0,0 +1,54 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class CustomEventsIntegrationTest < Workarea::IntegrationTest
+      include Admin::IntegrationTest
+
+      def test_creation
+        freeze_time
+
+        assert_difference 'Workarea::Reports::CustomEvent.count', 1 do
+          post admin.report_custom_events_path,
+            params: {
+              custom_event: {
+                name: 'Foo',
+                occurred_at: 1.week.ago
+              }
+            }
+        end
+
+        custom_event = Workarea::Reports::CustomEvent.first
+        assert_equal('Foo', custom_event.name)
+        assert_equal(1.week.ago, custom_event.occurred_at)
+      end
+
+      def test_updating
+        event = Workarea::Reports::CustomEvent.create!(
+          name: 'Foo',
+          occurred_at: 1.week.ago
+        )
+
+        patch admin.report_custom_event_path(id: event.id),
+          params: {
+            custom_event: {
+              name: 'Bar'
+            }
+          }
+
+        assert_equal('Bar', Workarea::Reports::CustomEvent.first.name)
+      end
+
+      def test_deletion
+        event = Workarea::Reports::CustomEvent.create!(
+          name: 'Foo',
+          occurred_at: 1.week.ago
+        )
+
+        delete admin.report_custom_event_path(id: event.id)
+
+        assert_equal(0, Workarea::Reports::CustomEvent.count)
+      end
+    end
+  end
+end