Issue #SB-19244 merge: Merge pull request #1029 from raghav14/release…

…-3.0.1

Issue #SB-19244 feat: Other Issue fix, text changes

main.js

@@ -53,6 +53,16 @@ var formRequestArray = [{
         'type': 'user',
         'subType': 'manageduser',
         'action': 'create'
+    },{
+        'type': 'dynamicform',
+        'subType': 'support',
+        'action': 'get',
+        'component': 'app'
+    },{
+        'type': 'form',
+        'subType': 'boardContactInfo',
+        'action': 'get',
+        'component': 'app'
     }
 ];
 

package.json

@@ -55,7 +55,7 @@
     "com.jjdltc.cordova.plugin.zip": "https://github.com/swayangjit/jjdltc-cordova-plugin-zip.git",
     "com.telerik.plugins.nativepagetransitions": "^0.6.5",
     "common-consumption-styles": "0.0.14",
-    "common-form-elements": "0.0.4",
+    "common-form-elements": "0.0.5",
     "cordova-android": "^8.1.0",
     "cordova-android-support-gradle-release": "^3.0.1",
     "cordova-plugin-advanced-http": "^2.4.1",
@@ -250,4 +250,4 @@
     },
     "transformIgnorePatterns": []
   }
-}
+}

src/app/faq-report-issue/faq-report-issue.page.ts

@@ -30,7 +30,7 @@ import { AppVersion } from '@ionic-native/app-version/ngx';
 import { map, tap, switchMap, distinctUntilChanged, catchError } from 'rxjs/operators';
 import { TranslateService } from '@ngx-translate/core';
 import { FormControl } from '@angular/forms';
-import { Subscription, defer, of, EMPTY } from 'rxjs';
+import { defer, of, EMPTY } from 'rxjs';
 import { AppHeaderService, FormAndFrameworkUtilService } from '@app/services';
 import { Location } from '@angular/common';
 import { FieldConfigOptionsBuilder, FieldConfigOption } from 'common-form-elements';
@@ -292,9 +292,12 @@ export class FaqReportIssuePage implements OnInit, OnDestroy {
   }
 
   submit() {
+    if (!this.isFormValid) {
+      return false;
+    }
     this.prepareEmailContent(this.formValues);
 
-    if (this.formValues && this.formValues.subcategory) {
+    if (this.formValues) {
       if (Object.prototype.hasOwnProperty.call(this.callToAction, this.formValues.subcategory)) {
         this.takeAction(this.callToAction[this.formValues.subcategory]);
       } else if (Object.prototype.hasOwnProperty.call(this.callToAction, this.formValues.category)) {
@@ -368,15 +371,19 @@ export class FaqReportIssuePage implements OnInit, OnDestroy {
     const stateContactList = await this.formAndFrameworkUtilService.getStateContactList();
     this.supportEmail = undefined;
     stateContactList.forEach(element => {
-      if (this.formValues.children.subcategory.board.code === element.id) {
+      if (this.formValues.children.subcategory && this.formValues.children.subcategory.board && this.formValues.children.subcategory.board.code === element.id) {
         this.supportEmail = element.contactinfo && element.contactinfo.email ? element.contactinfo.email : undefined;
       }
     });
     if (!this.showSupportContact && this.isFormValid) {
       this.value = {};
       this.value.action = 'initiate-email-clicked';
       this.value.value = {};
-      this.value.initiateEmailBody = this.formValues.children.subcategory.details;
+      if (this.formValues.children && this.formValues.children.subcategory && this.formValues.children.subcategory) {
+        this.value.initiateEmailBody = this.formValues.children.subcategory.details
+      } else if (this.formValues.children && this.formValues.children.category && this.formValues.children.category) {
+        this.value.initiateEmailBody = this.formValues.children.category.details;
+      }
       window.parent.postMessage(this.value, '*');
     }
   }
@@ -756,16 +763,12 @@ export class FaqReportIssuePage implements OnInit, OnDestroy {
     switch (type) {
       case 'board':
         return boardClosure;
-        break;
       case 'medium':
         return mediumClosure;
-        break;
       case 'grade':
         return gradeClosure;
-        break;
       case 'subject':
         return subjectClosure;
-        break;
     }
   }
 
@@ -779,12 +782,17 @@ export class FaqReportIssuePage implements OnInit, OnDestroy {
       }
   }
 
-  prepareEmailContent($event) {
+  prepareEmailContent(formValue) {
     this.bmgsString = null;
     this.categories = null;
     const bmgskeys = ['board', 'medium', 'grade', 'subject', 'contentname'];
     const categorykeys = ['category', 'subcategory'];
-    const fields = $event.children.subcategory;
+    let fields = [];
+    if (formValue.children.subcategory) {
+      fields = formValue.children.subcategory;
+    } else if (formValue.children) {
+      fields = formValue.children;
+    }
     bmgskeys.forEach(element => {
       if (Object.prototype.hasOwnProperty.call(fields, element)) {
         if (!this.bmgsString) {
@@ -795,11 +803,11 @@ export class FaqReportIssuePage implements OnInit, OnDestroy {
       }
     });
     categorykeys.forEach(element => {
-      if (Object.prototype.hasOwnProperty.call($event, element)) {
+      if (Object.prototype.hasOwnProperty.call(formValue, element)) {
         if (!this.categories) {
-          $event[element] ? this.categories = $event[element]: null;
+          formValue[element] ? this.categories = formValue[element]: null;
         } else {
-          $event[element] ? this.categories += " - " + $event[element]: null;
+          formValue[element] ? this.categories += " - " + formValue[element]: null;
         }
       }
     });
@@ -837,7 +845,6 @@ export class FaqReportIssuePage implements OnInit, OnDestroy {
   responseSubmitted() {
     if (this.formContext !== FormConfigSubcategories.CONTENT_AVAILABILITY) {
       this.location.back();
-      this.location.back();
     }
   }
 }

src/assets/i18n/en.json

@@ -383,7 +383,7 @@
   "NO_ASSESSMENT": "No assessment available",
   "NO_BATCHES_AVAILABLE": "No batches available",
   "NO_BOOKS_AVAILABLE": "Board is adding books",
-  "NO_BOOKS_DEFINITION": "Your board is yet to add more books. Tap the button to see more books and content on {{%s}}",
+  "NO_BOOKS_DEFINITION": "Your board is yet to add more books. Tap the button below to request for content on {{%s}}",
   "NO_CONTENTS": "No {{%s}} ",
   "NO_CONTENTS_FOUND": "Could not find content",
   "NO_CONTENTS_MESSAGE": "Select another content type ",