chore: merge master into beta

DrRaider · web-flow · commit 9fa0442f31a9 · 2021-02-05T11:16:44.000+01:00
diff --git a/.travis.yml b/.travis.yml
@@ -22,7 +22,7 @@ jobs:
       # NOTICE: Handles code coverage reporting to Code Climate
       before_install:
         - gem install bundler -v '1.17.3'
-        - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+        - curl -L $CC_TEST_REPORTER_URL > ./cc-test-reporter
         - chmod +x ./cc-test-reporter
       after_script:
         - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,24 @@
+## [5.4.3](https://github.com/ForestAdmin/forest-rails/compare/v5.4.2...v5.4.3) (2021-01-28)
+
+
+### Bug Fixes
+
+* use update instead of update_attribute to ensure rails 6.1 compatibility ([#417](https://github.com/ForestAdmin/forest-rails/issues/417)) ([41f9afb](https://github.com/ForestAdmin/forest-rails/commit/41f9afb8b2e45b2c26147f5f7bfe1941a38b3fd7))
+
+## [5.4.2](https://github.com/ForestAdmin/forest-rails/compare/v5.4.1...v5.4.2) (2021-01-27)
+
+
+### Bug Fixes
+
+* **stripe:** fix serialization issues on invoices ([#412](https://github.com/ForestAdmin/forest-rails/issues/412)) ([d9595bf](https://github.com/ForestAdmin/forest-rails/commit/d9595bfc79a46a9471f87154a023e35c4fd7d423))
+
+## [5.4.1](https://github.com/ForestAdmin/forest-rails/compare/v5.4.0...v5.4.1) (2021-01-21)
+
+
+### Bug Fixes
+
+* **smart-action-hook:** value injected to an enum field of type is now correctly handled ([#414](https://github.com/ForestAdmin/forest-rails/issues/414)) ([ef90105](https://github.com/ForestAdmin/forest-rails/commit/ef90105659f57c4c8531b0c4d576f345bc976b33))
+
 # [6.0.0-beta.4](https://github.com/ForestAdmin/forest-rails/compare/v6.0.0-beta.3...v6.0.0-beta.4) (2021-01-15)
 
 
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ This project has been designed with scalability in mind to fit requirements from
 ## How it works
 
 <p align="center" style="margin: 60px 0">
-  <img width="100%" src="https://www.forestadmin.com/public/img/illustrations-dev/schema-1.png" alt="Howitworks">
+  <img width="100%" src="https://www.forestadmin.com/public/img/rails/schemas/schema-1.png" alt="Howitworks">
 </p>
 
 Forest Admin consists of two components:
diff --git a/app/controllers/forest_liana/actions_controller.rb b/app/controllers/forest_liana/actions_controller.rb
@@ -55,10 +55,20 @@ def handle_result(result, formatted_fields, action)
       # Apply result on fields (transform the object back to an array), preserve order.
       fields = action.fields.map do |field|
         updated_field = result[field[:field]]
+
         # Reset `value` when not present in `enums` (which means `enums` has changed).
-        if updated_field[:enums].is_a?(Array) && !updated_field[:enums].include?(updated_field[:value])
-          updated_field[:value] = nil
+        if updated_field[:enums].is_a?(Array)
+          # `value` can be an array if the type of fields is `[x]`
+          if updated_field[:type].is_a?(Array) && updated_field[:value].is_a?(Array) && !(updated_field[:value] - updated_field[:enums]).empty?
+            updated_field[:value] = nil
+          end
+
+          # `value` can be any other value
+          if !updated_field[:type].is_a?(Array) && !updated_field[:enums].include?(updated_field[:value])
+            updated_field[:value] = nil
+          end
         end
+
         updated_field
       end
 
diff --git a/app/serializers/forest_liana/stripe_invoice_serializer.rb b/app/serializers/forest_liana/stripe_invoice_serializer.rb
@@ -3,20 +3,20 @@ class StripeInvoiceSerializer
     include JSONAPI::Serializer
 
     attribute :amount_due
+    attribute :amount_paid
+    attribute :amount_remaining
+    attribute :application_fee_amount
     attribute :attempt_count
     attribute :attempted
-    attribute :closed
     attribute :currency
-    attribute :date
-    attribute :forgiven
+    attribute :due_date
     attribute :paid
     attribute :period_end
     attribute :period_start
+    attribute :status
     attribute :subtotal
     attribute :total
-    attribute :application_fee
     attribute :tax
-    attribute :tax_percent
 
     has_one :customer
 
diff --git a/app/services/forest_liana/resource_creator.rb b/app/services/forest_liana/resource_creator.rb
@@ -53,7 +53,7 @@ def set_has_many_relationships
     end
 
     def has_strong_parameter
-      Rails::VERSION::MAJOR > 5 || @resource.instance_method(:update_attributes!).arity == 1
+      Rails::VERSION::MAJOR > 5 || @resource.instance_method(:update!).arity == 1
     end
   end
 end
diff --git a/app/services/forest_liana/resource_updater.rb b/app/services/forest_liana/resource_updater.rb
@@ -14,9 +14,9 @@ def perform
         @record = @resource.find(@params[:id])
 
         if has_strong_parameter
-          @record.update_attributes(resource_params)
+          @record.update(resource_params)
         else
-          @record.update_attributes(resource_params, without_protection: true)
+          @record.update(resource_params, without_protection: true)
         end
       rescue ActiveRecord::StatementInvalid => exception
         # NOTICE: SQL request cannot be executed properly
@@ -33,7 +33,7 @@ def resource_params
     end
 
     def has_strong_parameter
-      Rails::VERSION::MAJOR > 5 || @resource.instance_method(:update_attributes!).arity == 1
+      Rails::VERSION::MAJOR > 5 || @resource.instance_method(:update!).arity == 1
     end
   end
 end
diff --git a/app/services/forest_liana/stripe_invoice_getter.rb b/app/services/forest_liana/stripe_invoice_getter.rb
@@ -11,7 +11,7 @@ def perform
       query = {}
       @record = ::Stripe::Invoice.retrieve(@params[:invoice_id])
 
-      @record.date = Time.at(@record.date).to_datetime
+      @record.due_date = Time.at(@record.due_date).to_datetime unless @record.due_date.nil?
       @record.period_start = Time.at(@record.period_start).to_datetime
       @record.period_end = Time.at(@record.period_end).to_datetime
       @record.subtotal /= 100.00
diff --git a/app/services/forest_liana/stripe_invoices_getter.rb b/app/services/forest_liana/stripe_invoices_getter.rb
@@ -32,7 +32,7 @@ def perform
         end
 
         @records = @invoices.data.map do |d|
-          d.date = Time.at(d.date).to_datetime
+          d.date = Time.at(d.created).to_datetime
           d.period_start = Time.at(d.period_start).to_datetime
           d.period_end = Time.at(d.period_end).to_datetime
           d.subtotal /= 100.00
diff --git a/app/services/forest_liana/stripe_source_getter.rb b/app/services/forest_liana/stripe_source_getter.rb
@@ -12,7 +12,7 @@ def perform
       customer = resource[field]
 
       @record = ::Stripe::Customer
-        .retrieve(customer)
+        .retrieve({ id: customer, expand: ['sources'] })
         .sources.retrieve(@params[:objectId])
 
       query = {}
diff --git a/app/services/forest_liana/stripe_sources_getter.rb b/app/services/forest_liana/stripe_sources_getter.rb
@@ -32,7 +32,7 @@ def perform
 
     def fetch_bank_accounts(customer, params)
       begin
-        @cards = ::Stripe::Customer.retrieve(customer).sources.list(params)
+        @cards = ::Stripe::Customer.retrieve({ id: customer, expand: ['sources'] }).sources.list(params)
         if @cards.blank?
           @records = []
           return
diff --git a/lib/forest_liana/bootstrapper.rb b/lib/forest_liana/bootstrapper.rb
@@ -430,19 +430,19 @@ def setup_stripe_integration(collection_name_and_field)
         fields: [
           { field: :id, type: 'String', is_filterable: false },
           { field: :amount_due, type: 'Number', is_filterable: false },
+          { field: :amount_paid, type: 'Number', is_filterable: false },
+          { field: :amount_remaining, type: 'Number', is_filterable: false },
+          { field: :application_fee_amount, type: 'Number', is_filterable: false },
           { field: :attempt_count, type: 'Number', is_filterable: false },
           { field: :attempted, type: 'Boolean', is_filterable: false },
-          { field: :closed, type: 'Boolean', is_filterable: false },
           { field: :currency, type: 'String', is_filterable: false },
-          { field: :date, type: 'Date', is_filterable: false },
-          { field: :forgiven, type: 'Boolean', is_filterable: false },
+          { field: :due_date, type: 'Date', is_filterable: false },
           { field: :period_start, type: 'Date', is_filterable: false },
           { field: :period_end, type: 'Date', is_filterable: false },
+          { field: :status, type: 'String', enums: ['draft', 'open', 'paid', 'uncollectible', 'void'], is_filterable: false },
           { field: :subtotal, type: 'Number', is_filterable: false },
           { field: :total, type: 'Number', is_filterable: false },
-          { field: :application_fee, type: 'Number', is_filterable: false },
           { field: :tax, type: 'Number', is_filterable: false },
-          { field: :tax_percent, type: 'Number', is_filterable: false },
           {
             field: :customer,
             type: 'String',
diff --git a/spec/requests/actions_controller_spec.rb b/spec/requests/actions_controller_spec.rb
@@ -35,6 +35,11 @@
         type: 'Enum',
         enums: %w[a b c],
     }
+    multiple_enum = {
+        field: 'multipleEnum',
+        type: ['Enum'],
+        enums: %w[a b c],
+    }
 
     action_definition = {
         name: 'my_action',
@@ -95,12 +100,28 @@
         }
       }
     }
+
+    multiple_enums_action_definition = {
+        name: 'multiple_enums_action',
+        fields: [foo, multiple_enum],
+        hooks: {
+            :change => {
+                'foo' => -> (context) {
+                  fields = context[:fields]
+                  fields['multipleEnum'][:enums] = %w[c d z]
+                  return fields
+                }
+            }
+        }
+    }
+
     action = ForestLiana::Model::Action.new(action_definition)
     fail_action = ForestLiana::Model::Action.new(fail_action_definition)
     cheat_action = ForestLiana::Model::Action.new(cheat_action_definition)
     enums_action = ForestLiana::Model::Action.new(enums_action_definition)
+    multiple_enums_action = ForestLiana::Model::Action.new(multiple_enums_action_definition)
     island = ForestLiana.apimap.find {|collection| collection.name.to_s == ForestLiana.name_for(Island)}
-    island.actions = [action, fail_action, cheat_action, enums_action]
+    island.actions = [action, fail_action, cheat_action, enums_action, multiple_enums_action]
 
     describe 'call /load' do
       params = {recordIds: [1], collectionName: 'Island'}
@@ -169,6 +190,33 @@
         expect(JSON.parse(response.body)).to eq({'fields' => [expected_foo.stringify_keys, expected_enum.stringify_keys]})
       end
 
+      it 'should not reset value when every enum values are in the enums definition' do
+        updated_multiple_enum = multiple_enum.clone.merge({:previousValue => nil, :value => %w[c]})
+        p = {recordIds: [1], fields: [foo, updated_multiple_enum], collectionName: 'Island', changedField: 'foo'}
+        post '/forest/actions/multiple_enums_action/hooks/change', params: JSON.dump(p), headers: { 'CONTENT_TYPE' => 'application/json' }
+        expect(response.status).to eq(200)
+
+        expected_multiple_enum = updated_multiple_enum.clone.merge({ :enums => %w[c d z], :widgetEdit => nil, :value => %w[c]})
+        expected_multiple_enum.delete(:widget)
+        expected_foo = foo.clone.merge({ :widgetEdit => nil})
+        expected_foo.delete(:widget)
+
+        expect(JSON.parse(response.body)).to eq({'fields' => [expected_foo.stringify_keys, expected_multiple_enum.stringify_keys]})
+      end
+
+      it 'should reset value when one of the enum values is not in the enums definition' do
+        wrongly_updated_multiple_enum = multiple_enum.clone.merge({:previousValue => nil, :value => %w[a b]})
+        p = {recordIds: [1], fields: [foo, wrongly_updated_multiple_enum], collectionName: 'Island', changedField: 'foo'}
+        post '/forest/actions/multiple_enums_action/hooks/change', params: JSON.dump(p), headers: { 'CONTENT_TYPE' => 'application/json' }
+        expect(response.status).to eq(200)
+
+        expected_multiple_enum = wrongly_updated_multiple_enum.clone.merge({ :enums => %w[c d z], :widgetEdit => nil, :value => nil })
+        expected_multiple_enum.delete(:widget)
+        expected_foo = foo.clone.merge({ :widgetEdit => nil})
+        expected_foo.delete(:widget)
+
+        expect(JSON.parse(response.body)).to eq({'fields' => [expected_foo.stringify_keys, expected_multiple_enum.stringify_keys]})
+      end
     end
   end
 end
diff --git a/test/services/forest_liana/resources_getter_test.rb b/test/services/forest_liana/resources_getter_test.rb
@@ -106,7 +106,7 @@ class ResourcesGetterTest < ActiveSupport::TestCase
           conditions: [{
             field: 'created_at',
             operator: 'after',
-            value: '2015-06-18 08:00:00',
+            value: "#{Time.now.year - 5}-06-18 08:00:00",
           }, {
             field: 'owner:name',
             operator: 'equal',
@@ -119,8 +119,8 @@ class ResourcesGetterTest < ActiveSupport::TestCase
       records = getter.records
       count = getter.count
 
-      assert records.count == 2
-      assert count = 2
+      assert records.count == 1
+      assert count = 1
       assert records.first.id == 4
       assert records.first.name == 'Oak'
       assert records.first.owner.name == 'Arnaud Besnier'
