workarea-admin 3.5.0.beta.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aec0b614d6b570076fb116adfeed5287de5b426980c35c94f00381231847ad16
-  data.tar.gz: dc19afbd0f72de145970af4efbc99f7c41cdaaa9eec64364205e288df7c372a9
+  metadata.gz: 5341f457a231d57f8903f5300d3ba014713adb1ae1b18a0497fed5215812e272
+  data.tar.gz: 6bd7f5868b117fd2b837e8020cfda2422fb38e0e21fc3a2f3992d1d9e77cd774
 SHA512:
-  metadata.gz: a79a8040de72e78e71b21dcac49fc92c8942c04963b20f3c233d7cc137dd1ff7c453c6e6bfc2385563a4c0955a979e0da69f628c0a547cb11da9c67ce910cb37
-  data.tar.gz: e00445f06304a00ed467c976f63d4d652ebe032eccc394c4fc9661e154ecb969e54ea9b55f62656a49ad1e8e5c8402bbac9f754603453b1fec7350c310131d98
+  metadata.gz: f9aaf000aced6215c42222f10b4b925e1037b18b5782538be8244589194b23f6bc3f4e2ecb6b417459d98427392caa64aff7a4c8a1a1aed029ff7aec45aa544f
+  data.tar.gz: 59934acecd3201289f6346ac94fae1381968137672e41f1dce637a94b958152e9d2104e7f86f39376adcb1df9cea6d25021b26e864f7efb958d47e666d89b1a8

data/app/assets/javascripts/workarea/admin/config.js.erb

@@ -685,7 +685,8 @@
     WORKAREA.config.timelineReportChart = {
         initiallyActive: {
             'Revenue': true,
-            'Releases': true
+            'Releases': true,
+            'Custom Events': true
         },
 
         datasets: {
@@ -698,7 +699,8 @@
             orders: '#011eff',
             units_sold: '#ff4070',
             customers: '#ff8100',
-            releases: '#303541'
+            releases: '#303541',
+            custom_events: '#999999'
         },
 
         options: {
@@ -715,8 +717,14 @@
             tooltips: {
                 mode: 'index',
                 filter: function (item, data) {
-                    var label = data.datasets[item.datasetIndex].label;
-                    return label !== I18n.t('workarea.admin.reports.timeline.releases');
+                    var label = data.datasets[item.datasetIndex].label,
+                        dataset = data.datasets[item.datasetIndex],
+                        blockedLabels = [
+                            I18n.t('workarea.admin.reports.timeline.releases'),
+                            I18n.t('workarea.admin.reports.timeline.custom_events')
+                        ];
+
+                    return ! (dataset.hidden || _.includes(blockedLabels, label));
                 }
             },
             scales: {

data/app/assets/javascripts/workarea/admin/modules/impersonation_notification.js

@@ -14,9 +14,7 @@ WORKAREA.registerModule('impersonationNotification', (function () {
 
         confirm = function ($form) {
             var confirmed = window.confirm(
-                I18n.t('workarea.admin.actions.impersonation_confirmation', {
-                    name: $form.data('impersonationNotification')
-                })
+                $form.data('impersonationNotification')
             );
 
             if (confirmed) { return; }

data/app/assets/javascripts/workarea/admin/modules/selects.js

@@ -20,7 +20,17 @@ WORKAREA.registerModule('selects', (function () {
         },
 
         setup = function(index, select) {
-            $(select).select2(getConfig(select));
+            var config = getConfig(select),
+                $select = $(select);
+
+            if (config.allowClear) {
+                $select.before(JST['workarea/core/templates/hidden_input']({
+                    name: $select.attr('name'),
+                    value: ''
+               }));
+            }
+
+            $select.select2(config);
         },
 
         init = function ($scope) {

data/app/assets/javascripts/workarea/admin/modules/timeline_report_chart.js

@@ -8,6 +8,12 @@ WORKAREA.registerModule('timelineReportChart', (function () {
             var $item = $(event.target).closest('.chart-legend__list-item'),
                 dataset = chart.data.datasets[event.target.value];
 
+            if ($item.is('.chart-legend__list-item--no-interact')) {
+                event.preventDefault();
+                event.stopPropagation();
+                return;
+            }
+
             if (event.target.checked) {
                 dataset.hidden = false;
                 $item.removeClass('chart-legend__list-item--disabled');
@@ -19,10 +25,59 @@ WORKAREA.registerModule('timelineReportChart', (function () {
             chart.update();
         },
 
+        closeTooltip = function (chart) {
+            chart.tooltip._active = [];
+        },
+
+        showTooltip = function (chart, indiciesGroup) {
+            var activeElements = chart.tooltip._active || [];
+
+            _.forEach(indiciesGroup, function (indicies) {
+                activeElements.push(
+                    chart.getDatasetMeta(indicies[0]).data[indicies[1]]
+                );
+            });
+
+            chart.tooltip._active = activeElements;
+        },
+
+        toggleTooltip = function (toggle, chart, event) {
+            var $target = $(event.currentTarget),
+                dateChunks = $target.data('timelineReportChartEvent'),
+                date = new Date(dateChunks[0], dateChunks[1] - 1, dateChunks[2]),
+                indiciesGroup = [];
+
+            _.forEach(chart.data.datasets, function (dataset, datasetIndex) {
+                _.forEach(dataset.data, function (data, pointIndex) {
+                    if (data.x.getTime() === date.getTime()) {
+                        indiciesGroup.push([datasetIndex, pointIndex]);
+                    }
+                });
+            });
+
+            if (toggle === 'open') {
+                showTooltip(chart, indiciesGroup);
+            } else if (toggle === 'close') {
+                closeTooltip(chart);
+            }
+
+            chart.tooltip.update(true);
+            chart.draw();
+        },
+
+        setupSidebar = function (chart) {
+            $(chart.canvas)
+                .closest('.view')
+                    .find('[data-timeline-report-chart-event]')
+                    .on('mouseenter', _.partial(toggleTooltip, 'open', chart))
+                    .on('mouseleave', _.partial(toggleTooltip, 'close', chart));
+        },
+
         setupLegend = function (chart) {
             var legend = JST['workarea/admin/templates/chart_legend']({
                 datasets: chart.data.datasets,
-                enabled: WORKAREA.config.timelineReportChart.initiallyActive
+                enabled: WORKAREA.config.timelineReportChart.initiallyActive,
+                noInteract: ['Releases', 'Custom Events']
             });
 
             $('#timeline-report-chart-legend')
@@ -36,9 +91,8 @@ WORKAREA.registerModule('timelineReportChart', (function () {
             return _.map(dataset, function (item) {
                 var data = { x: new Date(item.x) };
 
-                if (type === 'releases') {
+                if (type === 'releases' || type === 'custom_events') {
                     data.y = item.y > 0 ? 0 : null;
-                    data.releaseCount = item.y;
                 } else {
                     data.y = item.y || 0;
                 }
@@ -63,10 +117,11 @@ WORKAREA.registerModule('timelineReportChart', (function () {
                     dataConfig.yAxisID = 'unit-axis';
                 }
 
-                if (type === 'releases') {
-                    dataConfig.pointStyle = 'triangle';
+                if (_.includes(['releases', 'custom_events'], type)) {
                     dataConfig.radius = 10;
                     dataConfig.hoverRadius = 13;
+                    dataConfig.showLine = false;
+                    dataConfig.pointStyle = 'triangle';
                 }
 
                 dataConfig.data = transformDataset(dataset, type);
@@ -93,12 +148,21 @@ WORKAREA.registerModule('timelineReportChart', (function () {
                 chart = new Chart(canvas.getContext('2d'), getConfig(data));
 
             setupLegend(chart);
+            setupSidebar(chart);
+        },
+
+        destroyEventTooltips = function () {
+            $('[data-tooltip]').each(function (_, trigger) {
+                $(trigger).tooltipster('destroy');
+            });
         },
 
         init = function ($scope) {
             $('[data-timeline-report-chart]', $scope).each(setup);
         };
 
+    $(document).on('turbolinks:before-cache', destroyEventTooltips);
+
     return {
         init: init
     };

data/app/assets/javascripts/workarea/admin/modules/toggle_elements.js

@@ -10,11 +10,11 @@ WORKAREA.registerModule('toggleElement', (function () {
      * @memberof WORKAREA.toggleElement
      */
     var toggle = function (event) {
-            var $target = $(event.target).data('toggle');
+            var target = $(event.target).data('toggleElement');
 
             event.preventDefault();
 
-            $target.toggleClass('hidden');
+            $(target).toggleClass('hidden');
         },
 
         init = function ($scope) {

data/app/assets/javascripts/workarea/admin/modules/tooltips.js

@@ -55,13 +55,28 @@ WORKAREA.registerModule('tooltips', (function () {
         // Otherwise If the trigger is a link with href use that to populate tooltip
         // If neither are present, throw an error.
         getContent = function(trigger, options) {
+            var $content;
+
             if (!_.isEmpty(options.content)) {
-                return options.content;
+                $content = $('<div />').html(options.content);
             } else if (!_.isEmpty(options.content_id)) {
-                return $(options.content_id);
+                $content = $(options.content_id);
             } else if(!_.isEmpty($(trigger).attr('href'))) {
-                return $($(trigger).attr('href'));
+                $content = $($(trigger).attr('href'));
+            } else {
+                $content = $('<div />');
             }
+
+            // Prevent interactive UIs within a tooltip from accidentally
+            // closing the tooltip. A good example of this would be jQuery UI
+            // Datepicker or Datetimepicker being embedded in a tooltip.
+            if (options.interactive && options.trigger === 'click') {
+                $content.on('click', function (event) {
+                    event.stopPropagation();
+                });
+            }
+
+            return $content;
         },
 
         customTriggerToggle = function ($trigger) {

data/app/assets/javascripts/workarea/admin/templates/chart_legend.jst.ejs

@@ -1,7 +1,8 @@
 <div class="chart-legend">
     <ul class="chart-legend__list">
         <% _.forEach(datasets, function (dataset, index) { %>
-            <li class="chart-legend__list-item" style="color: <%= dataset.backgroundColor %>">
+            <% disable = _.includes(noInteract, dataset.label) %>
+            <li class="chart-legend__list-item <%= disable ? 'chart-legend__list-item--no-interact' : '' %>" style="color: <%= dataset.backgroundColor %>">
                 <span class="checkbox">
                     <% checked = !!enabled[dataset.label] %>
                     <input type="checkbox" value="<%= index %>" class="checkbox__input" id="chart_dataset_<%= index %>"<% if (checked) { %> checked="checked"<% } %>>

data/app/assets/stylesheets/workarea/admin/application.scss.erb

@@ -141,6 +141,7 @@
 @import 'workarea/admin/components/dashboard_graphs';
 @import 'workarea/admin/components/jump_to_menu';
 @import 'workarea/admin/components/chart_legend';
+@import 'workarea/admin/components/timeline_report';
 <%= append_stylesheets('admin.components') %>
 
 @import 'workarea/admin/trumps/break_word';

data/app/assets/stylesheets/workarea/admin/components/_button.scss

@@ -9,7 +9,9 @@ $button-disabled-opacity: 0.5 !default;
 
 $button-font-size:        16px !default;
 $button-small-font-size:  14px !default;
+$button-tiny-font-size:   12px !default;
 $button-padding:          0.58em 1em !default;
+$button-tiny-padding:     0.3em 0.6em !default;
 
 $button-create-bg-color:        $green !default;
 $button-create-hover-bg-color:  $bright-green !default;
@@ -58,6 +60,11 @@ $button-destroy-hover-bg-color:  $bright-red !default;
     font-size: $button-small-font-size;
 }
 
+.button--tiny {
+    padding: $button-tiny-padding;
+    font-size: $button-tiny-font-size;
+}
+
 .button--create {
     background: $button-create-bg-color;
 

data/app/assets/stylesheets/workarea/admin/components/_chart_legend.scss

@@ -2,7 +2,8 @@
     #CHART-LEGEND
 \*------------------------------------*/
 
-$chart-legend-list-item-disabled-opacity: .25 !default;
+$chart-legend-list-item-disabled-opacity: 0.25 !default;
+$chart-legend-item-border-color: $border-color !default;
 
 .chart-legend {}
 
@@ -12,8 +13,24 @@ $chart-legend-list-item-disabled-opacity: .25 !default;
 
         .chart-legend__list-item {
             margin: 0 $spacing-unit;
+            border: 1px solid $chart-legend-item-border-color;
+            border-radius: $global-border-radius;
+            padding: ($spacing-unit / 2) $spacing-unit;
         }
 
         .chart-legend__list-item--disabled {
             opacity: $chart-legend-list-item-disabled-opacity;
         }
+
+        .chart-legend__list-item--no-interact {
+            cursor: not-allowed;
+
+            .checkbox__label {
+                cursor: not-allowed;
+            }
+
+            .checkbox__label::before,
+            .checkbox__label::after {
+                display: none;
+            }
+        }

data/app/assets/stylesheets/workarea/admin/components/_timeline_report.scss

@@ -0,0 +1,30 @@
+/*------------------------------------*\
+    #TIMELINE-REPORT
+\*------------------------------------*/
+
+$timeline-report-add-new-color: $green !default;
+
+.timeline-report {}
+
+
+    .timeline-report__sidebar-header {
+        margin-bottom: $spacing-unit;
+        padding-bottom: $spacing-unit;
+        border-bottom: 1px solid $border-color;
+    }
+
+
+    .timeline-report__event-group {
+        transition: opacity 0.2s ease;
+        opacity: 0.75;
+    }
+
+    .timeline-report__event-group:hover {
+        opacity: 1;
+    }
+
+
+    .timeline-report__events-list {
+        margin-left: $spacing-unit / 2;
+    }
+

data/app/assets/stylesheets/workarea/admin/settings/_grid.scss

@@ -19,6 +19,7 @@ $av-enable-grid-right:  true;
 $av-enable-grid-flush:  true;
 $av-enable-grid-auto:   true;
 $av-enable-grid-middle: true;
+$av-enable-grid-tiny:   true;
 $av-enable-grid-large:  true;
 $av-enable-grid-huge:   true;
 $av-enable-grid-rev:    true;

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

@@ -7,9 +7,7 @@ module Workarea
     after_action :track_index_filters, only: :index
 
     def index
-      if Configuration::S3.configured? && !request.xhr?
-        DirectUpload.ensure_cors!(request.url)
-      end
+      DirectUpload.ensure_cors!(request.url) if Configuration::S3.configured?
 
       search = Search::AdminAssets.new(params)
       @search = Admin::SearchViewModel.new(search, view_model_options)

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

@@ -0,0 +1,41 @@
+module Workarea
+  module Admin
+    class CustomEventsController < Admin::ApplicationController
+      before_action :find_event
+
+      def create
+        @custom_event.save!
+        flash[:success] = t('workarea.admin.reports.timeline.flash_messages.created')
+        redirect_back fallback_location: root_path
+      end
+
+      def update
+        if @custom_event.update(params[:custom_event])
+          flash[:success] =
+            t('workarea.admin.reports.timeline.flash_messages.success')
+        else
+          flash[:error] =
+            t('workarea.admin.reports.timeline.flash_messages.error')
+        end
+
+        redirect_back fallback_location: root_path
+      end
+
+      def destroy
+        @custom_event.destroy
+        flash[:success] = t('workarea.admin.reports.timeline.flash_messages.success')
+        redirect_back fallback_location: root_path
+      end
+
+      private
+
+      def find_event
+        @custom_event = if params[:id].present?
+          Workarea::Reports::CustomEvent.find_by(id: params[:id])
+        else
+          Workarea::Reports::CustomEvent.new(params[:custom_event])
+        end
+      end
+    end
+  end
+end

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

@@ -9,7 +9,7 @@ module Workarea
 
       def sample
         filename = "#{@import.name.downcase.underscore}.#{@import.file_type}"
-        send_data @import.sample_file_content, filename: filename, type: @import.file_type
+        send_data @import.sample_file_content, filename: filename, type: @import.mime_type, disposition: :attachment
       end
 
       def create

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

@@ -2,7 +2,6 @@ module Workarea
   module Admin
     class GuestBrowsingsController < Admin::ApplicationController
       include Storefront::CurrentCheckout
-      required_permissions :people
 
       def create
         admin_browse_as_guest
@@ -18,7 +17,7 @@ module Workarea
         clear_current_order
 
         flash[:success] = t('workarea.admin.guest_browsing.flash_messages.stopped')
-        redirect_to users_path
+        redirect_back_or root_path
       end
     end
   end