feat: [esbanarangoGH-356] allow-to-use-if-with-realtions

Author: ixxvivxxi

addon/decorators/core-validator.js

@@ -470,15 +470,17 @@ function coreValidator(constructor) {
       }
     }
     _validateRelations(property, validation) {
-      if (validation.relations.indexOf('hasMany') !== -1) {
+      const relationType = Array.isArray(validation.relations) ? validation.relations : validation.relations.value;
+
+      if (relationType.indexOf('hasMany') !== -1) {
         if (get(this, `${property}.content`)) {
           get(this, `${property}.content`).forEach((objRelation) => {
             if (!objRelation.validate()) {
               set(this, 'isValidNow', false);
             }
           });
         }
-      } else if (validation.relations.indexOf('belongsTo') !== -1) {
+      } else if (relationType.indexOf('belongsTo') !== -1) {
         if (get(this, `${property}.content`) && !get(this, `${property}.content`).validate()) {
           set(this, 'isValidNow', false);
         }

tests/dummy/app/models/fake-model.ts

@@ -52,6 +52,9 @@ class FakeModel extends Model {
   @belongsTo('other-model', { async: true, inverse: null }) declare otherFake: AsyncBelongsTo<OtherModel>;
   @belongsTo('async-model', { async: true, inverse: 'fakeModel' }) declare asyncModel: AsyncModel;
 
+  @belongsTo('other-model', { async: true, inverse: null }) declare ifOtherFake: AsyncBelongsTo<OtherModel>;
+  @hasMany('other-model', { async: true, inverse: null }) declare ifOtherFakes: AsyncHasMany<OtherModel>;
+
   @attr('date', {
     defaultValue() {
       return new Date();
@@ -235,6 +238,22 @@ class FakeModel extends Model {
       presence: true,
       relations: ['belongsTo'],
     },
+    ifOtherFake: {
+      relations: {
+        if: function (key: string, value: any, _this: FakeModel) {
+          return 'gallery' === _this.get('condType');
+        },
+        value: ['belongsTo'],
+      },
+    },
+    ifOtherFakes: {
+      relations: {
+        if: function (key: string, value: any, _this: FakeModel) {
+          return 'gallery' === _this.get('condType');
+        },
+        value: ['hasMany'],
+      },
+    },
     otherCustomValidation: {
       custom: {
         validation: function (key: string, value: any) {

tests/unit/models/fake-model-test.js

@@ -619,6 +619,44 @@ module('Unit | Model | fake-model', function (hooks) {
 
         assert.false(model.validate({ only: ['otherFakes'] }));
       });
+
+      module('conditional option', function () {
+        test('it validates only if `if function` returns true', async function (assert) {
+          assert.expect(1);
+
+          const store = this.owner.lookup('service:store');
+          const model = store.createRecord('fake-model', { condType: 'gallery' });
+
+          let ifOtherFakes = await model.ifOtherFakes;
+          const otherFake = store.createRecord('other-model');
+          if (ifOtherFakes.push) {
+            ifOtherFakes.push(otherFake);
+          } else {
+            ifOtherFakes.pushObject(otherFake);
+          }
+
+          assert.false(model.validate({ only: ['ifOtherFakes'] }));
+        });
+
+        test('skips validation if `if function` returns false', async function (assert) {
+          assert.expect(1);
+
+          const store = this.owner.lookup('service:store');
+          const model = store.createRecord('fake-model', { condType: 'chancuncha' });
+
+          let ifOtherFakes = await model.ifOtherFakes;
+          const otherFake = store.createRecord('other-model');
+          if (ifOtherFakes.push) {
+            ifOtherFakes.push(otherFake);
+          } else {
+            ifOtherFakes.pushObject(otherFake);
+          }
+
+          model.validate();
+
+          assert.strictEqual(model.get('errors').errorsFor('ifOtherFakes').length, 0);
+        });
+      });
     });
 
     module('`belongsTo` relations', function () {
@@ -635,6 +673,32 @@ module('Unit | Model | fake-model', function (hooks) {
           Messages.presenceMessage
         );
       });
+
+      module('conditional option', function () {
+        test('it validates only if `if function` returns true', async function (assert) {
+          assert.expect(1);
+
+          const store = this.owner.lookup('service:store');
+          const model = store.createRecord('fake-model', { condType: 'gallery' });
+
+          model.set('ifOtherFake', store.createRecord('other-model'));
+
+          assert.false(model.validate({ only: ['ifOtherFake'] }));
+        });
+
+        test('skips validation if `if function` returns false', async function (assert) {
+          assert.expect(1);
+
+          const store = this.owner.lookup('service:store');
+          const model = store.createRecord('fake-model', { condType: 'chancuncha' });
+
+          model.set('ifOtherFake', store.createRecord('other-model'));
+
+          model.validate();
+
+          assert.strictEqual(model.get('errors').errorsFor('ifOtherFake').length, 0);
+        });
+      });
     });
   });