Merge branch 'develop'

toastercup · toastercup · commit ac961dced2e8 · 2017-03-28T11:15:08.000-05:00
diff --git a/Gemfile b/Gemfile
@@ -12,7 +12,7 @@ gem 'rails', '~> 5.0.1'
 
 # Cortex-specific
 gem 'cortex-exceptions', '= 0.0.4'
-gem 'cortex-plugins-core', '= 0.11.0'
+gem 'cortex-plugins-core', '= 0.11.1'
 
 # API
 gem 'grape', '~> 0.17'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -137,7 +137,7 @@ GEM
     concurrent-ruby (1.0.4)
     connection_pool (2.2.1)
     cortex-exceptions (0.0.4)
-    cortex-plugins-core (0.11.0)
+    cortex-plugins-core (0.11.1)
       cells (~> 4.1)
       cells-haml (~> 0.0.10)
       cells-rails (~> 0.0.6)
@@ -723,7 +723,7 @@ DEPENDENCIES
   cells-rails (~> 0.0.7)
   codeclimate-test-reporter (~> 0.6)
   cortex-exceptions (= 0.0.4)
-  cortex-plugins-core (= 0.11.0)
+  cortex-plugins-core (= 0.11.1)
   database_cleaner (~> 1.5)
   devise (~> 4.2.0)
   dialog-polyfill-rails (~> 0.4.5)
@@ -814,4 +814,4 @@ RUBY VERSION
    ruby 2.4.0p0
 
 BUNDLED WITH
-   1.14.3
+   1.14.6
diff --git a/Procfile.dev b/Procfile.dev
@@ -1,2 +1,3 @@
 web: bundle exec rails s -p 3000
+worker: bundle exec sidekiq -e development --config ./config/sidekiq.yml
 client: rake assets:clobber react_on_rails:assets:clobber cortex:assets:webpack:build
diff --git a/app/assets/legacy_templates/media/bulk.html b/app/assets/legacy_templates/media/bulk.html
@@ -3,7 +3,7 @@
     <div class="panel panel-default">
       <div class="panel-heading">Select CSV detailing assets' metadata</div>
       <div class="panel-body">
-        Please <a href="/bulk_templates/media.csv">click here</a> for a Bulk Media Upload CSV template, which includes some basic examples.
+        Please <a href="/bulk_templates/media.csv">click here</a> for a Bulk Media Upload CSV template, which includes some basic examples. Empty cell values will be ignored, while cell values of 'N/A' will clear out existing record values.
         <file-selector ng-model="data.mediaBulk.metadata"
                        required>
         </file-selector>
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
@@ -14,6 +14,7 @@
 @import 'layout';
 
 @import 'components/card';
+@import 'components/confetti';
 @import 'components/content';
 @import 'components/dialog';
 @import 'components/flash';
diff --git a/app/assets/stylesheets/components/confetti.scss b/app/assets/stylesheets/components/confetti.scss
@@ -0,0 +1,40 @@
+@include keyframes(bang) {
+  from {
+    @include transform( translate3d(0,0,0) );
+    opacity: 1;
+  }
+}
+
+.confetti {
+  width: 100%;
+  position: absolute;
+
+  i {
+    position: absolute;
+    display: block;
+    width: 5px;
+    height: 7px;
+    opacity: 0;
+  }
+
+  @for $i from 1 through 50 {
+    i:nth-of-type(#{$i}) {
+      @include transform( translate3d(random(190) - 100 + px,random(50) - 100 + px,0) rotate(random(360) + deg) );
+      background: hsla(random(360),100%,50%,1);
+      @include animation(bang 2500ms ease-out forwards);
+      opacity: 0;
+    }
+  }
+}
+
+.confetti--left i {
+  left: 0;
+}
+
+.confetti--center i {
+  left: 50%;
+}
+
+.confetti--right i {
+  right: 0;
+}
diff --git a/app/cells/wizard/field/show.haml b/app/cells/wizard/field/show.haml
@@ -25,3 +25,6 @@
 
   - if field_item.field.field_type_instance.class == ContentItemFieldType
     = cell(Plugins::Core::ContentItemCell, field_item, form: field_item_form).(:popup)
+
+  - if field_item.field.field_type_instance.class == AuthorFieldType
+    = cell(Plugins::Core::AuthorCell, field_item, form: field_item_form).(:input)
diff --git a/app/controllers/content_items_controller.rb b/app/controllers/content_items_controller.rb
@@ -30,27 +30,40 @@ def edit
   end
 
   def update
-    if content_item.update
-      flash[:success] = "ContentItem updated"
+    begin
+      content_item.update
+    rescue => e
+      flash[:warning] = validation_message(e.message)
+      @content_item = content_item_reload(content_type.content_items.find_by_id(params[:id]))
+      @wizard = WizardDecoratorService.new(content_item: @content_item)
+
+      title = @content_item.field_items.find { |field_item| field_item.field.name == 'Title' }.data['text']
+      add_breadcrumb content_type.name.pluralize, :content_type_content_items_path
+      add_breadcrumb title
+      add_breadcrumb 'Edit'
+
+      render :edit
     else
-      flash[:warning] = "ContentItem failed to update! Reason: #{@content_item.errors.full_messages}"
+      flash[:success] = "Hooray! #{content_type.name} Updated!"
+      redirect_to content_type_content_items_path
     end
-
-    redirect_to content_type_content_items_path
   end
 
   def create
     begin
       content_item.create
     rescue => e
-      flash[:warning] = e.message
-      @content_item = content_item_reload
+      flash[:warning] = validation_message(e.message)
+      @content_item = content_item_reload(content_type.content_items.new)
       @wizard = WizardDecoratorService.new(content_item: @content_item)
 
+      add_breadcrumb content_type.name.pluralize, :content_type_content_items_path
+      add_breadcrumb 'New'
+
       render :new
     else
-     flash[:success] = 'ContentItem created'
-     redirect_to content_type_content_items_path
+      flash[:success] = "Hooray! #{content_type.name} Created!"
+      redirect_to content_type_content_items_path
    end
   end
 end
diff --git a/app/helpers/content_item_helper.rb b/app/helpers/content_item_helper.rb
@@ -7,8 +7,8 @@ def content_item
     @content_item ||= ContentItemService.new(id: params[:id], content_item_params: content_item_params, current_user: current_user, state: params[:content_item][:state])
   end
 
-  def content_item_reload
-    @content_item = content_type.content_items.new
+  def content_item_reload(content_item)
+    @content_item = content_item
     content_type.fields.each do |field|
       @content_item.field_items << FieldItem.new(field: field, data: field_item_param_data(params_lookup[field.id]))
     end
@@ -51,7 +51,7 @@ def permit_param(param)
     if param.values[0].is_a?(Hash)
       { param.keys[0].to_sym => param.values[0].keys }
     else
-      param.keys[0]
+      param.keys
     end
   end
 
@@ -83,4 +83,8 @@ def field_item_param_data(field_item_params)
     params_hash['data'] || {}
   end
 
+  def validation_message(base_message)
+    msg_array = base_message.gsub('Validation failed:', '').gsub('Field items', '').split(',')
+    msg_array.map { |message| message.strip.titleize }
+  end
 end
diff --git a/app/jobs/bulk_create_media_job.rb b/app/jobs/bulk_create_media_job.rb
@@ -54,6 +54,8 @@ def generate_media_attributes(zip_file, row_hash)
       type: row_hash['Type (Media, Youtube)']
     }
 
+    media_attributes = strip_attributes(media_attributes)
+
     if row_hash['Type (Media, Youtube)'] == 'Media'
       begin
         media_attachment = zip_file.get_entry(row_hash['Filename'])
@@ -76,4 +78,11 @@ def write_status(message)
 
     @bulk_job.save!
   end
+
+  def strip_attributes(attributes)
+    # Don't update nil attributes, but do clear out attributes with a value of 'N/A'
+    attributes.compact.transform_values do |attribute_value|
+      attribute_value == 'N/A' ? nil : attribute_value
+    end
+  end
 end
diff --git a/app/models/field_item.rb b/app/models/field_item.rb
@@ -26,6 +26,8 @@ def field_type_instance(data_hash = nil)
     field_type_class = FieldType.get_subtype_constant(field.field_type)
     # data_before_typecast will give us a non-mutilated hash with Objects intact, just in case validations get called first
     @field_type_instance ||= field_type_class.new(field_type_instance_params(data_hash))
+    @field_type_instance.save
+    @field_type_instance
   end
 
   def field_is_present
diff --git a/app/services/content_item_service.rb b/app/services/content_item_service.rb
@@ -7,10 +7,14 @@ class ContentItemService < ApplicationService
   attribute :creator, User
   attribute :field_items, Array[FieldItem]
   attribute :state, String
+  class_attribute :form_fields
 
   def create
     transact_and_refresh do
       @content_item = ContentItem.new
+      ContentItemService.form_fields = field_items_attributes.to_h.values.each_with_object({}) do |param, hash_object|
+        hash_object[param['field_id']] = param['data']
+      end
       content_item_params["field_items_attributes"].to_hash.each do |key, value|
         value.delete("id")
         @content_item.field_items << FieldItem.new(value)
@@ -21,6 +25,10 @@ def create
     end
   end
 
+  def field_items_attributes
+    content_item_params["field_items_attributes"]
+  end
+
   def update
     @content_item = ContentItem.find(id)
 
diff --git a/app/views/dashboards/index.html.haml b/app/views/dashboards/index.html.haml
@@ -0,0 +1 @@
+
diff --git a/app/views/partials/_flash.html.haml b/app/views/partials/_flash.html.haml
@@ -1,26 +1,41 @@
 - flash.each do |key, value|
   - unless value == 'You need to sign in or sign up before continuing.'
     - if flash["warning"]
-      .mdl-snackbar.mdl-js-snackbar.mdl-snackbar--active.flash--warning{"aria-atomic" => "true", "aria-live" => "assertive", "aria-relevant" => "text"}
+      .mdl-snackbar.mdl-js-snackbar.snackbar__error.mdl-snackbar--active.flash--warning{"aria-atomic" => "true", "aria-live" => "assertive", "aria-relevant" => "text"}
         .mdl-snackbar__text
           %p.flash--header__text
             Oops! Please review the following fields for errors:
-          - value.split(',').each do |err|
-            %i.material-icons error_outline
-            = err
+          %ul
+          - value.each do |err|
+            %li
+              %i.material-icons error_outline
+              = err
         %button.mdl-snackbar__action{:type => "button"}
     - elsif flash["success"]
-      .mdl-snackbar.mdl-js-snackbar.mdl-snackbar--active.flash--success{"aria-atomic" => "true", "aria-live" => "assertive", "aria-relevant" => "text"}
+      .mdl-snackbar.mdl-js-snackbar.snackbar__message.mdl-snackbar--active.flash--success{"aria-atomic" => "true", "aria-live" => "assertive", "aria-relevant" => "text"}
+        .confetti.confetti--left
+          - 50.times do
+            %i
+        .confetti.confetti--center
+          - 50.times do
+            %i
+        .confetti.confetti--right
+          - 50.times do
+            %i
         .mdl-snackbar__text
           = image_tag("check.svg", size: "18x18")
           = value
         %button.mdl-snackbar__action{:type => "button"}
     - else
-      .mdl-snackbar.mdl-js-snackbar.mdl-snackbar--active{"aria-atomic" => "true", "aria-live" => "assertive", "aria-relevant" => "text"}
+      .mdl-snackbar.mdl-js-snackbar.snackbar__message.mdl-snackbar--active{"aria-atomic" => "true", "aria-live" => "assertive", "aria-relevant" => "text"}
         .mdl-snackbar__text
           = value
         %button.mdl-snackbar__action{:type => "button"}
     :javascript
       setTimeout(function(){
-        $('.mdl-js-snackbar').toggleClass('mdl-snackbar--active');
+        $('.snackbar__message').toggleClass('mdl-snackbar--active');
       }, 2500);
+
+      setTimeout(function(){
+        $('.snackbar__error').toggleClass('mdl-snackbar--active');
+      }, 15000);
diff --git a/config/environments/development.rb b/config/environments/development.rb
@@ -64,6 +64,10 @@
     config.redis = { :namespace => ENV['REDIS_NAMESPACE'] || 'cortex_dev' } unless ENV['DEPLOYED']
   end
 
+  Sidekiq.configure_client do |config|
+    config.redis = { :namespace => ENV['REDIS_NAMESPACE'] || 'cortex_dev' } unless ENV['DEPLOYED']
+  end
+
   Yt.configure do |config|
     config.log_level = :debug
     config.api_key = ENV['YOUTUBE_API_KEY']
diff --git a/config/sidekiq.yml b/config/sidekiq.yml
@@ -1,6 +1,9 @@
 ---
+:concurrency: 5
 :queues:
   - default
   - mailers
 development:
   :verbose: true
+production:
+  :concurrency: 10
diff --git a/lib/tasks/employer/blog.rake b/lib/tasks/employer/blog.rake
@@ -59,24 +59,24 @@ namespace :employer do
       blog.save!
 
       puts "Creating Fields..."
-      blog.fields.new(name: 'Body', field_type: 'text_field_type', metadata: {parse_widgets: true})
-      blog.fields.new(name: 'Title', field_type: 'text_field_type', validations: {presence: true})
-      blog.fields.new(name: 'Description', field_type: 'text_field_type', validations: {presence: true})
-      blog.fields.new(name: 'Slug', field_type: 'text_field_type', validations: {presence: true, uniqueness: true})
-      blog.fields.new(name: 'Author', field_type: 'user_field_type', validations: {presence: true})
+      blog.fields.new(name: 'Body', field_type: 'text_field_type', metadata: {parse_widgets: true}, validations: { presence: true, length: { minimum: 50} })
+      blog.fields.new(name: 'Title', field_type: 'text_field_type', validations: {presence: true, length: { maximum: 100, minimum: 60} })
+      blog.fields.new(name: 'Description', field_type: 'text_field_type', validations: {presence: true, length: { maximum: 200, minimum: 50} })
+      blog.fields.new(name: 'Slug', field_type: 'text_field_type', validations: {presence: true, uniqueness: true, length: { maximum: 75, minimum: 30} })
+      blog.fields.new(name: 'Author', field_type: 'author_field_type')
       blog.fields.new(name: 'Tags', field_type: 'tag_field_type')
       blog.fields.new(name: 'Publish Date', field_type: 'date_time_field_type')
       blog.fields.new(name: 'Expiration Date', field_type: 'date_time_field_type')
-      blog.fields.new(name: 'SEO Title', field_type: 'text_field_type')
-      blog.fields.new(name: 'SEO Description', field_type: 'text_field_type')
+      blog.fields.new(name: 'SEO Title', field_type: 'text_field_type', validations: {presence: true, length: {maximum: 70}, uniqueness: true })
+      blog.fields.new(name: 'SEO Description', field_type: 'text_field_type', validations: {presence: true, length: {maximum: 160} })
       blog.fields.new(name: 'SEO Keywords', field_type: 'tag_field_type')
       blog.fields.new(name: 'No Index', field_type: 'boolean_field_type')
       blog.fields.new(name: 'No Follow', field_type: 'boolean_field_type')
       blog.fields.new(name: 'No Snippet', field_type: 'boolean_field_type')
       blog.fields.new(name: 'No ODP', field_type: 'boolean_field_type')
       blog.fields.new(name: 'No Archive', field_type: 'boolean_field_type')
       blog.fields.new(name: 'No Image Index', field_type: 'boolean_field_type')
-      blog.fields.new(name: 'Categories', field_type: 'tree_field_type', metadata: {allowed_values: category_tree}, validations: {maximum: 2, minimum: 1})
+      blog.fields.new(name: 'Categories', field_type: 'tree_field_type', metadata: {allowed_values: category_tree}, validations: {maximum: 1, minimum: 1})
       blog.fields.new(name: 'Research', field_type: 'tree_field_type', metadata: {allowed_values: research_tree}, validations: {minimum: 1})
       blog.fields.new(name: 'Persona', field_type: 'tree_field_type', metadata: {allowed_values: persona_tree})
       blog.fields.new(name: 'Featured Image', field_type: 'content_item_field_type',
diff --git a/spec/helpers/content_item_helper_spec.rb b/spec/helpers/content_item_helper_spec.rb
@@ -53,12 +53,16 @@
       let (:param) { { one: "two" } }
       let (:outcome) { permit_param(param) }
 
-      it 'should return a Symbol' do
-        expect(outcome).to be_a_kind_of(Symbol)
+      it 'should return an Array' do
+        expect(outcome).to be_a_kind_of(Array)
       end
 
-      it 'should the first key of the given param' do
-        expect(outcome).to eq(param.keys[0])
+      it 'should contain Symbols' do
+        expect(outcome.sample).to be_a_kind_of(Symbol)
+      end
+
+      it 'should match the given param' do
+        expect(outcome).to eq(param.keys)
       end
     end
   end
@@ -107,4 +111,26 @@
       expect(sanitize_parameters({})).to be_a_kind_of(Array)
     end
   end
+
+  describe '#validation_message' do
+    let(:base_message) { "Validation failed: Field items This is a test, Field items Second thing" }
+    let(:result) { validation_message(base_message) }
+
+    it 'should return an Array' do
+      expect(result).to be_a_kind_of(Array)
+    end
+
+    it 'should contain Strings' do
+      expect(result.sample).to be_a_kind_of(String)
+    end
+
+    it 'should not contain unwanted words' do
+      expect(result.sample).to_not include("Validation failed:")
+      expect(result.sample).to_not include("Field items")
+    end
+
+    it 'should return an array of the correct length' do
+      expect(result.length).to eq(base_message.split(",").length)
+    end
+  end
 end

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`web: bundle exec rails s -p 3000`
	`2`	`+worker: bundle exec sidekiq -e development --config ./config/sidekiq.yml`
`2`	`3`	`client: rake assets:clobber react_on_rails:assets:clobber cortex:assets:webpack:build`