Merge branch 'develop' into topic/EM-1322-Subscription-FAQ

Author: toastercup

app/api/v1/entities/webpage.rb

@@ -21,6 +21,7 @@ class Webpage < Grape::Entity
       expose :dynamic_yield_category, documentation: { type: 'String', desc: "Dynamic Yield Webpage Category" }
 
       expose :tables_widget_json, documentation:  {type: 'Hash', is_array: true, desc: 'Tables Widget Data as JSON'}
+      expose :charts_widget_json, documentation:  {type: 'Hash', is_array: true, desc: 'Charts Widget Data as JSON'}
       expose :accordion_group_widget_json, documentation:  {type: 'Hash', is_array: true, desc: 'Accordion Group Widget Data as JSON'}
 
       with_options if: { full: true } do
@@ -29,6 +30,7 @@ class Webpage < Grape::Entity
 
         expose :tables_widget_yaml, documentation:  {type: 'Hash', is_array: true, desc: 'Tables Widget Data as YAML'}
         expose :accordion_group_widget_yaml, documentation:  {type: 'Hash', is_array: true, desc: 'Accordion Group Widget Data as YAML'}
+        expose :charts_widget_yaml, documentation:  {type: 'Hash', is_array: true, desc: 'Charts Widget Data as YAML'}
       end
     end
   end

app/assets/legacy_templates/webpages/edit.html

@@ -118,6 +118,12 @@
                       ng-model="data.webpage.accordion_group_widget_yaml"
                       placeholder="YAML-formatted accordion group data"></textarea>
           </div>
+          <div class="form-group">
+            <label for="charts_widget_yaml">Charts Data</label>
+            <textarea id="charts_widget_yaml" name="charts_widget_yaml" class="form-control" rows="15"
+                      ng-model="data.webpage.charts_widget_yaml"
+                      placeholder="YAML-formatted chart data"></textarea>
+          </div>
         </form>
       </div>
     </tab>

app/models/concerns/searchable_webpage.rb

@@ -31,6 +31,7 @@ module SearchableWebpage
       indexes :noimageindex, :type => :boolean, :index => :not_analyzed
       indexes :tables_widget, :type => :nested, :enabled => false
       indexes :accordion_group_widget, :type => :nested, :enabled => false
+      indexes :charts_widget, :type => :nested, :enabled => false
     end
 
     def as_indexed_json(options = {})

app/models/webpage.rb

@@ -3,6 +3,7 @@ class Webpage < ApplicationRecord
   include SearchableWebpage
 
   serialize :tables_widget
+  serialize :charts_widget
 
   scope :find_by_protocol_agnostic_url, ->(suffix) { where('url LIKE :suffix', suffix: "%#{suffix}") }
 
@@ -31,6 +32,22 @@ def tables_widget_json= p
     self.tables_widget = JSON.parse(p, quirks_mode: true) # Quirks mode will let us parse a null JSON object
   end
 
+  def charts_widget_yaml
+    charts_widget.to_yaml
+  end
+
+  def charts_widget_yaml= p
+    self.charts_widget = YAML.load(p)
+  end
+
+  def charts_widget_json
+    charts_widget.to_json
+  end
+
+  def charts_widget_json= p
+    self.charts_widget = JSON.parse(p, quirks_mode: true) # Quirks mode will let us parse a null JSON object
+  end
+
   def accordion_group_widget_yaml
     accordion_group_widget.to_yaml
   end

db/migrate/20170519201648_add_charts_widget_to_webpage.rb

@@ -0,0 +1,5 @@
+class AddChartsWidgetToWebpage < ActiveRecord::Migration[5.0]
+  def change
+    add_column :webpages, :charts_widget, :jsonb
+  end
+end

db/schema.rb

@@ -472,6 +472,7 @@
     t.string   "dynamic_yield_category"
     t.jsonb    "tables_widget"
     t.jsonb    "accordion_group_widget"
+    t.jsonb    "charts_widget"
     t.index ["user_id"], name: "index_webpages_on_user_id", using: :btree
   end