workarea-admin 3.4.45 → 3.5.0.beta.1

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

@@ -0,0 +1,48 @@
+module Workarea
+  module Admin
+    class SegmentsController < Admin::ApplicationController
+      required_permissions :people
+
+      before_action :find_segment, except: :index
+
+      def index
+        query = Search::AdminSegments.new(params)
+        @search = SearchViewModel.new(query, view_model_options)
+        @segments = SegmentViewModel.wrap(Segment.all, view_model_options)
+      end
+
+      def show
+      end
+
+      def edit
+      end
+
+      def update
+        if @segment.update_attributes(params[:segment])
+          flash[:success] = t('workarea.admin.segments.flash_messages.saved')
+          redirect_to segment_path(@segment)
+        else
+          flash[:error] = @segment.errors.full_messages.to_sentence
+          render :edit, status: :unprocessable_entity
+        end
+      end
+
+      def insights
+      end
+
+      def destroy
+        head :unprocessable_entity && return if @segment.life_cycle?
+
+        @segment.destroy
+        flash[:success] = t('workarea.admin.segments.flash_messages.removed')
+        redirect_to segments_path
+      end
+
+      private
+
+      def find_segment
+        @segment = Admin::SegmentViewModel.new(Segment.find(params[:id]))
+      end
+    end
+  end
+end

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

@@ -3,11 +3,72 @@ module Workarea
     class TaxRatesController < Admin::ApplicationController
       required_permissions :catalog
 
+      before_action :find_category
+      before_action :find_rate, only: [:edit, :update, :destroy]
+
       def index
+        @rates = @category.rates.search(params[:q])
+          .page(params[:page])
+          .order_by(find_sort(Tax::Rate))
+      end
+
+      def new
+        @rate = @category.rates.new
+      end
+
+      def create
+        if @category.rates.new(rate_params).save
+          flash[:success] = t('workarea.admin.tax_rates.flash_messages.saved')
+          redirect_to tax_category_rates_path
+        else
+          flash[:error] = t('workarea.admin.tax_rates.flash_messages.changes_error')
+          render :new
+        end
+      end
+
+      def edit
+      end
+
+      def update
+        if @rate.update_attributes(rate_params)
+          flash[:success] = t('workarea.admin.tax_rates.flash_messages.saved')
+          redirect_to tax_category_rates_path
+        else
+          flash[:error] = t('workarea.admin.tax_rates.flash_messages.changes_error')
+          render :edit
+        end
+      end
+
+      def destroy
+        @rate.destroy
+
+        flash[:success] = t('workarea.admin.tax_rates.flash_messages.removed')
+        redirect_to tax_category_rates_path
+      end
+
+      private
+
+      def find_category
         model = Tax::Category.find(params[:tax_category_id])
         @category = TaxCategoryViewModel.wrap(model, view_model_options)
+      end
+
+      def find_rate
+        @rate = @category.rates.find(params[:id])
+      end
+
+      def percentage_fields
+        %w[country_percentage region_percentage postal_code_percentage]
+      end
+
+      def rate_params
+        params[:rate].to_h.map do |field, value|
+          if field.in?(percentage_fields) && value.to_f > 0
+            value = value.to_f / 100
+          end
 
-        @rates = @category.rates.page(params[:page])
+          [field, value]
+        end.to_h
       end
     end
   end

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

@@ -0,0 +1,40 @@
+module Workarea
+  module Admin
+    class UnsubscribesController < Admin::ApplicationController
+      skip_before_action :require_login
+      skip_before_action :require_admin
+      before_action :set_user
+
+      def status_report
+        if @user&.update(status_email_recipient: false)
+          flash[:success] = t('workarea.admin.unsubscribe.flash_messages.status_report_success')
+        else
+          flash[:error] = t('workarea.admin.unsubscribe.flash_messages.status_report_error')
+        end
+
+        redirect_to storefront.root_url
+      end
+
+      def commentable
+        commentable = GlobalID::Locator.locate(params[:commentable_id])
+
+        if @user.present? && commentable&.remove_subscription(@user.id)
+          flash[:success] = t(
+            'workarea.admin.unsubscribe.flash_messages.commentable_success',
+            commentable: commentable.name
+          )
+        else
+          flash[:error] = t('workarea.admin.unsubscribe.flash_messages.commentable_error')
+        end
+
+        redirect_to storefront.root_url
+      end
+
+      private
+
+      def set_user
+        @user ||= User.find_by_token(params[:id])
+      end
+    end
+  end
+end

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

@@ -6,6 +6,7 @@ module Workarea
       required_permissions :people
 
       before_action :find_user, except: :index
+      around_action :inline_metrics_synchronizing
       after_action :track_index_filters, only: :index
 
       def index
@@ -59,6 +60,20 @@ module Workarea
         @insights = InsightViewModel.wrap(models, view_model_options)
       end
 
+      def send_password_reset
+        password_reset = User::PasswordReset.create!(user: @user.model)
+        Storefront::AccountMailer.password_reset(password_reset.id.to_s).deliver_later
+
+        flash[:success] = t('workarea.admin.users.flash_messages.password_reset')
+        redirect_to user_path(@user)
+      end
+
+      def unlock
+        @user.unlock_login!
+        flash[:success] = t('workarea.admin.users.flash_messages.unlocked')
+        redirect_to user_path(@user)
+      end
+
       private
 
       def update_email_signup
@@ -72,6 +87,10 @@ module Workarea
       def find_user
         @user = Admin::UserViewModel.new(User.find(params[:id]))
       end
+
+      def inline_metrics_synchronizing
+        Sidekiq::Callbacks.inline(SynchronizeUserMetrics) { yield }
+      end
     end
   end
 end

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

@@ -157,18 +157,8 @@ module Workarea
         "#{request.path}?#{new_query_string_params.to_query}"
       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
-
-      def navigation_redirects_enabled?
-        !Rails.application.config.consider_all_requests_local
+      def s3?
+        Configuration::S3.configured?
       end
     end
   end

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

@@ -0,0 +1,9 @@
+module Workarea
+  module Admin
+    module ConfigurationsHelper
+      def duration_field_options
+        %w(seconds minutes hours days weeks months years)
+      end
+    end
+  end
+end

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

@@ -34,10 +34,9 @@ module Workarea
       end
 
       def options_for_category(category_id)
-        model = Catalog::Category.where(id: category_id).first
-
-        return '' unless model.present?
+        return nil unless category_id.present?
 
+        model = Catalog::Category.find(category_id)
         options_for_select({ model.name => model.id }, model.id)
       end
 

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

@@ -0,0 +1,10 @@
+module Workarea
+  module Admin::FulfillmentHelper
+    def fulfillment_policies
+      @fullfillment_policies ||=
+        Workarea.config.fulfillment_policies.map do |class_name|
+          [class_name.demodulize.titleize, class_name.demodulize.underscore]
+        end
+    end
+  end
+end

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

@@ -40,6 +40,22 @@ module Workarea
         )
       end
 
+      def fraud_icon_for(model)
+        return unless model.fraud_suspected?
+        svg = inline_svg(
+          'workarea/admin/icons/alert.svg',
+          title: t('workarea.admin.orders.cards.fraud.suspected_fraud'),
+          class: 'svg-icon svg-icon--small svg-icon--link-color'
+        )
+
+        link_to(
+          svg,
+          fraud_order_path(model),
+          title: t('workarea.admin.orders.cards.fraud.suspected_fraud'),
+          class: 'link link--no-underline'
+        )
+      end
+
       def admin_icon_for(model)
         return unless model.admin?
 
@@ -90,6 +106,16 @@ module Workarea
           class: 'svg-icon svg-icon--small svg-icon--gray'
         )
       end
+
+      def segments_icon_for(model)
+        return unless model.active_segment_ids.present?
+
+        inline_svg(
+          'workarea/admin/icons/user.svg',
+          title: t('workarea.admin.insights.icons.segments'),
+          class: 'svg-icon svg-icon--small svg-icon--link-color'
+        )
+      end
     end
   end
 end

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

@@ -31,6 +31,7 @@ module Workarea
         users_path(role: %w(Administrator))
       end
 
+      # TODO remove in v3.6, no longer used
       def todays_signups_path
         users_path(
           created_at_greater_than: Time.current.to_s(:date_only),

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

@@ -2,7 +2,7 @@ module Workarea
   module Admin
     module PricingOverridesHelper
       def allow_pricing_override?
-        current_admin.present? && current_order.items.any?
+        current_admin&.orders_manager? && current_order.items.any?
       end
     end
   end

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

@@ -6,5 +6,18 @@ module Workarea
         "#{content_tag(:strong, name)}: #{joined}"
       end.join(', ').html_safe
     end
+
+    def summary_inventory_status_css_classes(product)
+      status_issue_class =
+        if !product.active?
+          'product-summary--inactive'
+        elsif !product.inventory.available?
+          "product-summary--#{product.inventory.status.to_s.dasherize}"
+        end
+
+      return [] unless status_issue_class.present?
+      return [] if product.inventory.any?(&:displayable_when_out_of_stock?)
+      [status_issue_class, 'product-summary--status-issue']
+    end
   end
 end

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

@@ -99,6 +99,10 @@ module Workarea
       model_links(Pricing::Discount, ids)
     end
 
+    def segment_links(ids)
+      model_links(Segment, ids)
+    end
+
     def for_each_content_block_from_changeset(content, change_hash)
       change_hash.each do |id, changes|
         block = content.blocks.detect { |b| b.id.to_s == id.to_s }
@@ -171,7 +175,7 @@ module Workarea
 
     def calendar_day_classes(day)
       date = Date.parse(day)
-      today = Time.zone.now.to_date
+      today = Date.current
 
       classes = ['calendar__day']
       classes << 'calendar__day--odd-month'     if date.month.odd?
@@ -182,26 +186,6 @@ module Workarea
       classes
     end
 
-    def calendar_release_classes(day, release)
-      date = Date.parse(day)
-
-      classes = ['calendar__release']
-      classes << 'calendar__release--start'   if release.published_on_date?(date)
-      classes << 'calendar__release--end'     if release.ended_on_date?(date)
-      classes << 'calendar__release--content' if release.content_release?
-
-      classes
-    end
-
-    def calendar_release_styles(release)
-      return if release.undo_at.blank?
-
-      color = Digest::MD5.hexdigest(release.name)[0, 6]
-      text_color = release_text_color(color)
-
-      "background-color: ##{color}; color: ##{text_color};"
-    end
-
     private
 
     def model_links(klass, ids)

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

@@ -0,0 +1,68 @@
+module Workarea
+  module Admin
+    module SegmentsHelper
+      def segment_rule_types_options
+        Workarea.config.segment_rule_types.map do |string|
+          rule = string.constantize
+          [t("workarea.admin.fields.#{rule.slug}", default: rule.slug.to_s), rule.slug]
+        end
+      end
+
+      def traffic_referrer_medium_options
+        {
+          t('workarea.admin.segment_rules.unknown') => 'unknown',
+          t('workarea.admin.segment_rules.email') => 'email',
+          t('workarea.admin.segment_rules.social') => 'social',
+          t('workarea.admin.segment_rules.search') => 'search'
+        }
+      end
+
+      def segments
+        @segments ||= Segment.all
+      end
+
+      def selected_segment_geolocation_options(selected)
+        selected.map { |l| [Segment::Rules::GeolocationOption[l]&.name || l, l] }
+      end
+
+      def browser_info_options
+        {
+          t('workarea.admin.segment_rules.browser_info.bot') => 'bot',
+          t('workarea.admin.segment_rules.browser_info.chrome') => 'chrome',
+          t('workarea.admin.segment_rules.browser_info.edge') => 'edge',
+          t('workarea.admin.segment_rules.browser_info.firefox') => 'firefox',
+          t('workarea.admin.segment_rules.browser_info.ie') => 'ie',
+          t('workarea.admin.segment_rules.browser_info.opera') => 'opera',
+          t('workarea.admin.segment_rules.browser_info.safari') => 'safari'
+        }
+      end
+
+      def device_type_options
+        {
+          t('workarea.admin.segment_rules.devices.console') => 'console',
+          t('workarea.admin.segment_rules.devices.ipad') => 'ipad',
+          t('workarea.admin.segment_rules.devices.iphone') => 'iphone',
+          t('workarea.admin.segment_rules.devices.ipod_touch') => 'ipod_touch',
+          t('workarea.admin.segment_rules.devices.kindle') => 'kindle',
+          t('workarea.admin.segment_rules.devices.mobile') => 'mobile',
+          t('workarea.admin.segment_rules.devices.nintendo') => 'nintendo',
+          t('workarea.admin.segment_rules.devices.playstation') => 'playstation',
+          t('workarea.admin.segment_rules.devices.tablet') => 'tablet',
+          t('workarea.admin.segment_rules.devices.tv') => 'tv',
+          t('workarea.admin.segment_rules.devices.xbox') => 'xbox'
+        }
+      end
+
+      def platform_options
+        {
+          t('workarea.admin.segment_rules.platform.android') => 'android',
+          t('workarea.admin.segment_rules.platform.blackberry') => 'blackberry',
+          t('workarea.admin.segment_rules.platform.ios') => 'ios',
+          t('workarea.admin.segment_rules.platform.linux') => 'linux',
+          t('workarea.admin.segment_rules.platform.mac') => 'mac',
+          t('workarea.admin.segment_rules.platform.windows') => 'windows'
+        }
+      end
+    end
+  end
+end

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

@@ -2,15 +2,23 @@ module Workarea
   module Admin
     module SettingsHelper
       def sanitize_config_value(value)
-        return if value.blank?
+        return if value.blank? && value.to_s != 'false'
 
         case value
-        when String, Symbol
-          tag.code html_escape(value.to_s), class: 'code code--block'
+        when ActiveSupport::Duration
+          amount, unit = value.parts.first.reverse
+          duration = pluralize(amount, unit.to_s.singularize)
+          tag.code html_escape(duration), class: 'code code--block'
+        when SwappableList
+          tag.pre data: { expandable: '' } do
+            tag.code JSON.pretty_generate(value.to_a), class: 'code code--block'
+          end
         when Hash, Array
           tag.pre data: { expandable: '' } do
             tag.code JSON.pretty_generate(value), class: 'code code--block'
           end
+        else
+          tag.code html_escape(value.to_s), class: 'code code--block'
         end
       end
     end

data/app/mailers/workarea/admin/comment_mailer.rb

@@ -2,8 +2,8 @@ module Workarea
   module Admin
     class CommentMailer < Admin::ApplicationMailer
       def notify(user_id, comment_id)
-        email = User.where(id: user_id).first.email
-        return false unless email.present?
+        @user = User.find(user_id) rescue nil
+        return false unless @user&.email.present?
 
         model = Comment.where(id: comment_id).first
         return false unless model.present?
@@ -19,7 +19,7 @@ module Workarea
         set_colors
 
         mail(
-          to: email,
+          to: @user.email,
           from: Workarea.config.email_from,
           subject: t(
             'workarea.admin.comment_mailer.notify.subject',

data/app/mailers/workarea/admin/status_report_mailer.rb

@@ -3,15 +3,28 @@ module Workarea
     class StatusReportMailer < Admin::ApplicationMailer
       add_template_helper(InsightsHelper)
 
-      def report(emails, date)
-        @alerts = AlertsViewModel.wrap(Alerts.new)
-        @date = date
-        @dashboard = Dashboards::IndexViewModel.new
+      def self.report_to_many(users)
+        alerts = AlertsViewModel.wrap(Alerts.new)
+        dashboard = Dashboards::IndexViewModel.new
+
+        users.map do |user|
+          report(user.email, user: user, alerts: alerts, dashboard: dashboard)
+        end
+      end
+
+      def report(email, user: nil, alerts: nil, dashboard: nil)
+        @date = Time.current - 1.day
+        @user = user || User.find_by_email(email)
+        @alerts = alerts || AlertsViewModel.wrap(Alerts.new)
+        @dashboard = dashboard || Dashboards::IndexViewModel.new
 
         mail(
-          bcc: emails,
+          to: email,
           from: Workarea.config.email_from,
-          subject: t('workarea.admin.status_report_mailer.title')
+          subject: t(
+            'workarea.admin.status_report_mailer.subject',
+            site: Workarea.config.site_name
+          )
         )
       end
     end

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

@@ -20,6 +20,11 @@ module Workarea
       def pricing_prices
         pricing.fetch('prices', []).first || {}
       end
+
+      def segments
+        return [] if settings['active_segment_ids'].blank?
+        @segments ||= Segment.in(id: settings['active_segment_ids']).to_a
+      end
     end
   end
 end

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

@@ -15,7 +15,8 @@ module Workarea
       end
 
       def root
-        @root ||= Mongoid::DocumentPath.find(model.document_path.take(1))
+        return @root if defined?(@root)
+        @root = Mongoid::DocumentPath.find(model.document_path.take(1)) rescue nil
       end
 
       def localized_change?(field, value)
@@ -39,8 +40,13 @@ module Workarea
       end
 
       def old_value_for(field)
-        return get_localized_value(field, undo[field]) if undo.present?
-        current_releasable.send(field)
+        if release.previous.present?
+          old_value_from_release_for(release.previous, field)
+        elsif release.undoes?
+          old_value_from_release_for(release.undoes, field)
+        else
+          current_releasable.send(field)
+        end
       end
 
       def release_date
@@ -76,6 +82,12 @@ module Workarea
       def current_releasable
         @current_releasable ||= Release.with_current(nil) { releasable.reload }
       end
+
+      def old_value_from_release_for(release, field)
+        release.as_current { current_releasable.reload.send(field) }
+      ensure
+        current_releasable.reload
+      end
     end
   end
 end

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

@@ -10,7 +10,7 @@ module Workarea
       end
 
       def used_count
-        model.promo_codes.count - unused_promo_codes.count
+        model.count - unused_promo_codes.count
       end
 
       def last_used_at

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

@@ -16,6 +16,10 @@ module Workarea
       def comments
         @comments ||= CommentViewModel.wrap(model.comments)
       end
+
+      def subscribed_users
+        @users ||= User.in(id: subscribed_user_ids)
+      end
     end
   end
 end

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

@@ -131,6 +131,8 @@ module Workarea
         @open_graph_asset ||=
           if model.open_graph_asset_id.present?
             Content::Asset.find(model.open_graph_asset_id)
+          elsif (og_default = Content::Asset.open_graph_default).present?
+            og_default
           else
             Content::Asset.open_graph_placeholder
           end

data/app/view_models/workarea/admin/dashboards/marketing_view_model.rb

@@ -37,17 +37,17 @@ module Workarea
                   {
                     '$match' => {
                       'created_at' => {
-                        '$gte' => starts_at.beginning_of_day.utc,
-                        '$lte' => ends_at.end_of_day.utc
+                        '$gte' => starts_at.beginning_of_day,
+                        '$lte' => ends_at.end_of_day
                       }
                     }
                   },
                   {
                     '$group' => {
                       '_id' => {
-                        'day' => { '$dayOfMonth' => created_at_in_time_zone },
-                        'month' => { '$month' => created_at_in_time_zone },
-                        'year' => { '$year' => created_at_in_time_zone }
+                        'day' => { '$dayOfMonth' => '$created_at' },
+                        'month' => { '$month' => '$created_at' },
+                        'year' => { '$year' => '$created_at' }
                       },
                       'created_at' => { '$first' => '$created_at' },
                       'count' => { '$sum' => 1 }
@@ -61,10 +61,6 @@ module Workarea
             end
         end
 
-        def created_at_in_time_zone
-          { 'date' => '$created_at', 'timezone' => Time.zone.tzinfo.name }
-        end
-
         def insights
           @insights ||= InsightViewModel.wrap(
             Workarea::Insights::Base.by_dashboard('marketing').page(options[:page])