Issue #SB-15678 merge: Merge pull request #2850 from yravinderkumar33/release-2.6.0-15678-2

Issue #SB-15678 feat : Handling User Profile on Portal when Tenant's …

src/app/client/src/app/modules/shared-feature/components/profile-framework-popup/profile-framework-popup.component.spec.data.ts

@@ -855,5 +855,55 @@ export const Response = {
       'visibility': null,
       'compatibilityLevel': null
     }
+  ],
+  formWithoutBoard: [
+    {
+      'code': 'medium',
+      'visible': true,
+      'displayProperty': 'Editable',
+      'editable': true,
+      'dataType': 'text',
+      'renderingHints': {
+        'semanticColumnWidth': 'four'
+      },
+      'name': 'Medium',
+      'description': 'Mediumofinstruction',
+      'index': 1,
+      'inputType': 'select',
+      'label': 'Medium',
+      'required': true
+    },
+    {
+      'code': 'gradeLevel',
+      'visible': true,
+      'displayProperty': 'Editable',
+      'editable': true,
+      'dataType': 'text',
+      'renderingHints': {
+        'semanticColumnWidth': 'four'
+      },
+      'name': 'Class',
+      'description': 'Grade',
+      'index': 2,
+      'inputType': 'select',
+      'label': 'Class',
+      'required': true
+    },
+    {
+      'code': 'subject',
+      'visible': true,
+      'displayProperty': 'Editable',
+      'editable': true,
+      'dataType': 'text',
+      'renderingHints': {
+        'semanticColumnWidth': 'four'
+      },
+      'name': 'Subject',
+      'description': 'SubjectoftheContenttousetoteach',
+      'index': 3,
+      'inputType': 'select',
+      'label': 'Subject',
+      'required': false
+    }
   ]
 };

src/app/client/src/app/modules/shared-feature/components/profile-framework-popup/profile-framework-popup.component.spec.ts

@@ -122,5 +122,44 @@ describe('ProfileFrameworkPopupComponent', () => {
     expect(component.formFieldOptions[3].range).toBeUndefined();
     expect(toasterService.warning).not.toHaveBeenCalled();
   });
+
+  describe('enable/disable submit button based on required fields in form API', () => {
+
+    beforeEach(() => {
+      component['_formFieldProperties'] = Response.formWithoutBoard;
+    });
+
+    it('should enable submit button if board value is not there in framework' , () => {
+      component.selectedOption = {
+        gradeLevel: ['Class 2'],
+        medium: ['English'],
+        subject: []
+      };
+      component['enableSubmitButton']();
+      expect(component.showButton).toBeTruthy();
+    });
+    it('should disable submit button if any of board, medium or gradeLevel is not present', () => {
+      component.selectedOption = {
+        gradeLevel: ['Class 1'],
+        medium: ['English'],
+        subject: ['Hindi'],
+        board: []
+      };
+      component['enableSubmitButton']();
+      expect(component.showButton).toBeFalsy();
+    });
+    it('should submit board value in form as null when board value is not present in the framework', () => {
+      const selectedOptions = {
+        gradeLevel: ['Class 1'],
+        medium: ['English'],
+        subject: ['Hindi']
+      };
+      component.selectedOption = selectedOptions;
+      component['frameWorkId'] = 'NCFCOPY2';
+      const submitEventEmitter = spyOn(component.submit, 'emit');
+      component.onSubmitForm();
+      expect(submitEventEmitter).toHaveBeenCalledWith({...selectedOptions, ...{board: null, id: 'NCFCOPY2' }});
+    });
+  });
 });
 

src/app/client/src/app/modules/shared-feature/components/profile-framework-popup/profile-framework-popup.component.ts

@@ -205,13 +205,16 @@ export class ProfileFrameworkPopupComponent implements OnInit, OnDestroy {
   }
   onSubmitForm() {
     const selectedOption = _.cloneDeep(this.selectedOption);
-    selectedOption.board = [this.selectedOption.board];
+    selectedOption.board = _.get(this.selectedOption, 'board') ? [this.selectedOption.board] : null;
     selectedOption.id = this.frameWorkId;
     this.submit.emit(selectedOption);
   }
   private enableSubmitButton() {
-    if (_.get(this.selectedOption, 'board.length') && _.get(this.selectedOption, 'medium.length')
-      && _.get(this.selectedOption, 'gradeLevel.length')) {
+    const optionalFields = _.map(_.filter(this._formFieldProperties, formField => !_.get(formField, 'required')), 'code');
+    const enableSubmitButton = _.every(this.selectedOption, (value, index) => {
+      return _.includes(optionalFields, index) ? true : value.length;
+    });
+    if (enableSubmitButton) {
       this.showButton = true;
     } else {
       this.showButton = false;