workarea-admin 3.5.0.beta.1 → 3.5.0

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

@@ -0,0 +1,12 @@
+module Workarea
+  module Admin
+    class SegmentablesController < Admin::ApplicationController
+      required_permissions :people
+
+      def index
+        @segment = Admin::SegmentViewModel.new(Segment.find(params[:segment_id]))
+        @search = @segment.segmentables_search
+      end
+    end
+  end
+end

data/app/helpers/workarea/admin/activities_helper.rb

@@ -56,7 +56,7 @@ module Workarea
       end
 
       def activity_model_name(entry)
-        entry.audited_type.gsub(/Workarea::/, '').gsub(/::/, ' ')
+        entry.audited_type.gsub(/Workarea::/, '').gsub(/::/, ' ').titleize
       end
 
       def link_to_restore_for(entry)

data/app/helpers/workarea/admin/application_helper.rb

@@ -160,6 +160,21 @@ module Workarea
       def s3?
         Configuration::S3.configured?
       end
+
+      def workarea_release_notes_url(version)
+        version_path = "workarea-#{version.gsub('.', '-')}.html"
+        "https://developer.workarea.com/release-notes/#{version_path}"
+      end
+
+      def duration_in_words(duration)
+        parts = duration.parts
+        return t('workarea.duration.seconds', count: 0) if parts.empty?
+
+        parts
+          .sort_by { |unit,  _ | ActiveSupport::Duration::PARTS.index(unit) }
+          .map     { |unit, val| t("workarea.duration.#{unit}", count: val) }
+          .to_sentence
+      end
     end
   end
 end

data/app/helpers/workarea/admin/facets_helper.rb

@@ -6,6 +6,9 @@ module Workarea
           value
         elsif facet.system_name == 'upcoming_changes'
           Release.where(id: value).pluck(:name).first
+        elsif facet.system_name == 'active_by_segment'
+          Segment.where(id: value).pluck(:name).first ||
+          t('workarea.admin.segments.missing', id: value[0..4])
         else
           value.titleize
         end

data/app/helpers/workarea/admin/icons_helper.rb

@@ -107,14 +107,23 @@ module Workarea
         )
       end
 
-      def segments_icon_for(model)
-        return unless model.active_segment_ids.present?
+      def segments_icons_for(model)
+        return unless model.segmented?
 
-        inline_svg(
+        result = inline_svg(
           'workarea/admin/icons/user.svg',
           title: t('workarea.admin.insights.icons.segments'),
           class: 'svg-icon svg-icon--small svg-icon--link-color'
         )
+
+        if model.segments.blank?
+          result += inline_svg(
+            'workarea/admin/icons/alert.svg',
+            class: 'svg-icon svg-icon--small svg-icon--red'
+          )
+        end
+
+        result
       end
     end
   end

data/app/helpers/workarea/admin/segments_helper.rb

@@ -10,13 +10,17 @@ module Workarea
 
       def traffic_referrer_medium_options
         {
-          t('workarea.admin.segment_rules.unknown') => 'unknown',
+          t('workarea.admin.segment_rules.select_a_medium') => nil,
           t('workarea.admin.segment_rules.email') => 'email',
           t('workarea.admin.segment_rules.social') => 'social',
           t('workarea.admin.segment_rules.search') => 'search'
         }
       end
 
+      def traffic_referrer_source_options
+        Workarea.referrer_parser.sources
+      end
+
       def segments
         @segments ||= Segment.all
       end
@@ -63,6 +67,13 @@ module Workarea
           t('workarea.admin.segment_rules.platform.windows') => 'windows'
         }
       end
+
+      def last_order_options
+        {
+          t('workarea.admin.segment_rules.last_order.ordered') => true,
+          t('workarea.admin.segment_rules.last_order.not_ordered') => false
+        }
+      end
     end
   end
 end

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

@@ -11,12 +11,14 @@ module Workarea
           :show_products_missing_categories?,
           :show_products_low_inventory?,
           :show_products_variants_missing_details?,
-          :show_products_inconsistent_variant_details?
+          :show_products_inconsistent_variant_details?,
+          :show_missing_segments?
         ]
 
         result = 0
         predicate_alerts.each { |m| result += 1 if send(m) }
         result += empty_upcoming_releases.length
+        result += 1 if workarea_version_outdated?
         result
       end
 
@@ -55,6 +57,15 @@ module Workarea
       def show_products_inconsistent_variant_details?
         products_inconsistent_variant_details > 0
       end
+
+      def workarea_version_outdated?
+        latest_workarea_version.present? &&
+          Gem::Version.new(latest_workarea_version) > Gem::Version.new(Workarea::VERSION::STRING)
+      end
+
+      def show_missing_segments?
+        missing_segments.length > 0
+      end
     end
   end
 end

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

@@ -4,13 +4,47 @@ module Workarea
       class TimelineViewModel < ApplicationViewModel
         include GroupByTime
 
+        class Event
+          def self.build(releases, custom_events)
+            result = Hash.new { |h, k| h[k] = [] }
+
+            releases.each do |release|
+              result[release.published_at.to_date] << new(
+                Workarea::Admin::ReleaseViewModel.wrap(release),
+                type: 'release',
+                occurred_at: release.published_at
+              )
+            end
+
+            custom_events.each do |event|
+              result[event.occurred_at.to_date] << new(
+                event,
+                type: 'custom_event',
+                occurred_at: event.occurred_at
+              )
+            end
+
+            result.sort.to_h
+          end
+
+          delegate_missing_to :@model
+          attr_reader :model, :type, :occurred_at
+
+          def initialize(model, type:, occurred_at:)
+            @model = model
+            @type = type
+            @occurred_at = occurred_at
+          end
+        end
+
         def summary
           {
-            revenue: summarize(data_for('revenue')),
-            orders: summarize(data_for('orders')),
-            units_sold: summarize(data_for('units_sold')),
-            customers: summarize(data_for('customers')),
-            releases: summarize(release_data)
+            revenue: summarize(graph_data_for('revenue')),
+            orders: summarize(graph_data_for('orders')),
+            units_sold: summarize(graph_data_for('units_sold')),
+            customers: summarize(graph_data_for('customers')),
+            releases: summarize(graph_data_for('releases')),
+            custom_events: summarize(graph_data_for('custom_events'))
           }
         end
 
@@ -18,15 +52,30 @@ module Workarea
           {
             labels: grouped_data.keys.reverse,
             datasets: {
-              revenue: transform(data_for('revenue')),
-              orders: transform(data_for('orders')),
-              units_sold: transform(data_for('units_sold')),
-              customers: transform(data_for('customers')),
-              releases: transform(release_data)
+              # Note: Order is important. Chart.js layers chart data from the
+              # top down.
+              releases: transform(graph_data_for('releases')),
+              custom_events: transform(graph_data_for('custom_events')),
+              revenue: transform(graph_data_for('revenue')),
+              orders: transform(graph_data_for('orders')),
+              units_sold: transform(graph_data_for('units_sold')),
+              customers: transform(graph_data_for('customers'))
             }
           }
         end
 
+        def events
+          @events ||= begin
+            Event
+              .build(releases, custom_events)
+              .each_with_object({}) do |(date, events), group|
+                group[date] = events.sort_by(&:occurred_at)
+              end
+          end
+        end
+
+        private
+
         def releases
           @releases ||= Release.published_between(
             starts_at: starts_at,
@@ -34,7 +83,12 @@ module Workarea
           ).to_a
         end
 
-        private
+        def custom_events
+          @custom_events ||= Workarea::Reports::CustomEvent.occurred_between(
+            starts_at: starts_at.to_date,
+            ends_at: ends_at.to_date
+          ).to_a
+        end
 
         def date_range
           starts_at.to_date..ends_at.to_date
@@ -46,19 +100,29 @@ module Workarea
           end
         end
 
-        def data_for(type)
+        def graph_data_for(type)
+          return release_graph_data if type == 'releases'
+          return custom_event_graph_data if type == 'custom_events'
+
           grouped_data.transform_values do |values|
             (values || []).map { |v| v[type] }
           end
         end
 
-        def release_data
+        def release_graph_data
           date_range.each_with_object({}) do |date, group|
             data = releases.select { |r| r.published_at.to_date == date }
             group[date] = [data.count]
           end
         end
 
+        def custom_event_graph_data
+          date_range.each_with_object({}) do |date, group|
+            data = custom_events.select { |r| r.occurred_at.to_date == date }
+            group[date] = [data.count]
+          end
+        end
+
         def transform(data)
           data.map { |k, v| Hash[x: k.to_time, y: v.first] }.reverse
         end

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

@@ -14,6 +14,21 @@ module Workarea
       def insights
         @insights ||= Insights::SegmentViewModel.wrap(model, options)
       end
+
+      def segmentables_count
+        segmentables_search.total
+      end
+
+      def segmentables
+        segmentables_search.results
+      end
+
+      def segmentables_search
+        @segmentables_search ||= begin
+          query = Search::AdminSearch.new(active_by_segment: [model.id])
+          SearchViewModel.new(query, options)
+        end
+      end
     end
   end
 end

data/app/views/layouts/workarea/admin/application.html.haml

@@ -71,6 +71,7 @@
                   %span.menu__heading= t('workarea.admin.layout.handy_links')
                 %li.menu__item= link_to t('workarea.admin.layout.visit_storefront'), storefront.root_path, class: 'menu__link'
                 %li.menu__item= link_to t('workarea.admin.layout.your_account_on_the_storefront'), storefront.users_account_path, class: 'menu__link'
+                %li.menu__item= link_to t('workarea.admin.layout.browse_storefront_as_guest'), guest_browsing_path, class: 'menu__link', data: { method: :post }
                 %li.menu__item= link_to t('workarea.admin.layout.edit_the_home_page'), edit_content_path(current_system_page_content_for(:home_page)), class: 'menu__link'
                 %li.menu__item.menu__item--heading
                   %span.menu__heading= t('workarea.admin.layout.most_visited')
@@ -117,8 +118,12 @@
                   %li.menu__item= link_to t('workarea.admin.layout.alert.variants_missing_details', product: "#{pluralize(@alerts.products_variants_missing_details, t('workarea.admin.layout.alert.product'))}"), catalog_products_path(issues: [t('workarea.alerts.issues.variants_missing_details')]), class: 'menu__link'
                 - if @alerts.show_products_inconsistent_variant_details?
                   %li.menu__item= link_to t('workarea.admin.layout.alert.inconsistent_variant_details', product: "#{pluralize(@alerts.products_inconsistent_variant_details, t('workarea.admin.layout.alert.product'))}"), catalog_products_path(issues: [t('workarea.alerts.issues.inconsistent_variant_details')]), class: 'menu__link'
+                - if @alerts.show_missing_segments?
+                  %li.menu__item= link_to t('workarea.admin.layout.alert.missing_segments', count: @alerts.missing_segments.length), search_path(active_by_segment: @alerts.missing_segments), class: 'menu__link'
                 - @alerts.empty_upcoming_releases.each do |release|
                   %li.menu__item= link_to t('workarea.admin.layout.alert.publishes_on_and_has_no_changes', release_name: release.name, release_publish_date: release.publish_at.to_date.to_s(:long)), release_path(release) , class: 'menu__link'
+                - if @alerts.workarea_version_outdated?
+                  %li.menu__item= link_to t('workarea.admin.layout.alert.workarea_version_outdated'), workarea_release_notes_url(@alerts.latest_workarea_version), class: 'menu__link'
 
           .header__action
             %button#help_menu{ type: 'button', class: 'header__action-link', data: { tooltip: { menu: true, content_id: '#help', interactive: true, arrow: false, distance: 0, multiple: false, trigger: 'hover' }.to_json, turbolinks: false } }
@@ -133,7 +138,8 @@
             .header__action
               .header__user-menu
                 .header__user-menu-cell
-                  = form_tag guest_browsing_path, method: 'delete', data: { disable_delete_confirmation: '' } do
+                  = form_tag guest_browsing_path, method: 'delete', data: { disable_delete_confirmation: '', impersonation_notification: t('workarea.admin.actions.guest_browsing_confirmation') } do
+                    = hidden_field_tag :return_to, request.path
                     = button_tag t('workarea.admin.toolbar.stop_guest_browsing'), class: 'text-button text-button--destroy'
           - elsif impersonating?
             .header__action
@@ -143,7 +149,7 @@
                   %strong
                     = link_to current_impersonation.email, user_path(current_impersonation)
                   %br
-                  = form_tag impersonations_path, method: 'delete', data: { disable_delete_confirmation: '', impersonation_notification: current_impersonation.name } do
+                  = form_tag impersonations_path, method: 'delete', data: { disable_delete_confirmation: '', impersonation_notification: t('workarea.admin.actions.impersonation_confirmation', name: current_impersonation.name) } do
                     = button_tag t('workarea.admin.toolbar.stop_impersonation'), class: 'text-button text-button--destroy'
           - else
             .header__action

data/app/views/workarea/admin/activities/_create.html.haml

@@ -6,4 +6,4 @@
     %h3.activity__name= link_to_modifier(entry)
     %p.activity__time= activity_time(entry.created_at)
   .activity__message
-    = t('workarea.admin.activities.generic_create_html', model: activity_model_name(entry), id: entry.audited_id)
+    = t('workarea.admin.activities.generic_create_html', model: activity_model_name(entry))

data/app/views/workarea/admin/activities/_destroy.html.haml

@@ -6,4 +6,4 @@
     %h3.activity__name= link_to_modifier(entry)
     %p.activity__time= activity_time(entry.created_at)
   .activity__message
-    = t('workarea.admin.activities.generic_destroy_html', model: activity_model_name(entry), id: entry.audited_id)
+    = t('workarea.admin.activities.generic_destroy_html', model: activity_model_name(entry))

data/app/views/workarea/admin/activities/_update.html.haml

@@ -6,4 +6,4 @@
     %h3.activity__name= link_to_modifier(entry)
     %p.activity__time= activity_time(entry.created_at)
   .activity__message
-    = t('workarea.admin.activities.generic_update_html', model: activity_model_name(entry), id: entry.audited_id)
+    = t('workarea.admin.activities.generic_update_html', model: activity_model_name(entry))

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

@@ -11,7 +11,7 @@
             %li
               %strong= t('workarea.admin.fields.active')
               = check_box_tag 'category', 'active', model.active, disabled: true
-              = inline_svg('workarea/admin/icons/user.svg', class: 'svg-icon svg-icon--small svg-icon--blue') if model.active? && model.segments.any?
+              = segments_icons_for(model)
             %li
               %strong #{t('workarea.admin.fields.client_id')}:
               = model.client_id.presence || t('workarea.admin.cards.attributes.no_value')

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

@@ -63,7 +63,7 @@
                 = upcoming_changesets_icon_for(result)
                 = comments_icon_for(result)
                 = top_icon_for(result)
-                = segments_icon_for(result)
+                = segments_icons_for(result)
               %td
                 - if result.breadcrumbs.blank?
                   %em= t('workarea.admin.fields.no_taxonomy')

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

@@ -14,7 +14,7 @@
             %li
               %strong= t('workarea.admin.fields.active')
               = check_box_tag 'product', 'active', model.active?, disabled: true
-              = inline_svg('workarea/admin/icons/user.svg', class: 'svg-icon svg-icon--small svg-icon--blue') if model.active? && model.segments.any?
+              = segments_icons_for(model)
             %li
               %strong= t('workarea.admin.fields.template')
               = model.template.try(:titleize)

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

@@ -73,7 +73,7 @@
                 = comments_icon_for(result)
                 = top_icon_for(result)
                 = trending_icon_for(result)
-                = segments_icon_for(result)
+                = segments_icons_for(result)
               %td.align-center= result.id
               %td= result.template.humanize
               %td.align-center

data/app/views/workarea/admin/content/_card.html.haml

@@ -15,6 +15,9 @@
             %li.content-block-list__item
               = content_block_icon(block.icon, title: block.name, class: 'content-block-list__icon')
               %span.content-block-list__name= block.name
+              - if block.segments.any?
+                %span.content-block-list__segments
+                  = inline_svg('workarea/admin/icons/user.svg', class: 'svg-icon svg-icon--small svg-icon--blue')
 
           - if content.blocks.length > 5
             %li.content-block-list__item.align-center

data/app/views/workarea/admin/content/_edit.html.haml

@@ -75,8 +75,16 @@
                 = content_block_icon(block.icon, title: block.name, class: 'content-block-list__icon')
                 %span.content-block-list__name= block.name
 
-                - if block.segments.any?
+                - if block.segmented?
                   = link_to "##{dom_id(block, :segments_tooltip)}", data: { tooltip: { interactive: true } }, class: 'content-block-list__segments' do
-                    = inline_svg('workarea/admin/icons/user.svg', class: 'svg-icon svg-icon--small svg-icon--blue')
+                    - if block.segments.any?
+                      = inline_svg('workarea/admin/icons/user.svg', class: 'svg-icon svg-icon--small svg-icon--blue')
+                    - else
+                      = inline_svg('workarea/admin/icons/alert.svg', class: 'svg-icon svg-icon--small svg-icon--red')
+
                   .tooltip-content{ id: dom_id(block, :segments_tooltip) }
-                    %span= t('workarea.admin.content.edit.active_for_html', segments: block.segments.map(&:name).to_sentence)
+                    %span
+                      - if block.segments.any?
+                        = t('workarea.admin.content.edit.active_for_html', segments: block.segments.map(&:name).to_sentence)
+                      - else
+                        = t('workarea.admin.shared.active_field.no_segments')

data/app/views/workarea/admin/content/_form.html.haml

@@ -28,7 +28,14 @@
     .tabs__panel
       %h2.tabs__heading= t('workarea.admin.content.form.display')
       .section
-        %span.heading.heading--4= t('workarea.admin.content.form.segments')
+        %span.heading.heading--4
+          = t('workarea.admin.content.form.segments')
+          - if block.segmented? && block.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')
+
         .property
           = label_tag 'block_active_segment_ids', t('workarea.admin.content.form.exclusive_segments'), class: 'property__name'
           = select_tag 'block[active_segment_ids]', options_from_collection_for_select(segments, :id, :name, block.active_segment_ids), multiple: true, data: { select: { placeholder: t('workarea.admin.shared.active_field.select_segments'), allowClear: true } }, id: nil