#785 - Schema fields are getting required automatically- fixed

Sunbird-RC · Sep 8, 2023 · 33c8ab3 · 33c8ab3
1 parent 3951824
commit 33c8ab3
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/app/admin/create-entity/create-entity.component.ts b/src/app/admin/create-entity/create-entity.component.ts
@@ -685,7 +685,7 @@ export class CreateEntityComponent implements OnInit, AfterContentChecked {
 
 
           let required: any = [];
-          required = (self.required != undefined) ? self.required.includes(key) : false;
+          required = propertyObj[key]?.hasOwnProperty('required') ? propertyObj[key].required : (self.required ?? []).includes(key);
 
           if (!self.usecaseSchema[self.activeMenuNo].hasOwnProperty('isRefSchema') && !self.usecaseSchema[self.activeMenuNo].isRefSchema) {
             if (!required && self.usecaseSchema[self.activeMenuNo].definitions[self.usecaseSchema[self.activeMenuNo].title].hasOwnProperty('required')) {
@@ -1295,7 +1295,9 @@ export class CreateEntityComponent implements OnInit, AfterContentChecked {
 
         let requiredSecFields = [];
         for (let j = 0; j < formioJson[i].components.length; j++) {
+          if(formioJson[i].components[j].hasOwnProperty('validate') && formioJson[i].components[j].validate.required){
                      requiredSecFields.push(formioJson[i].components[j].key);
+          }
         }