@osovitny/anatoly 2.14.46 → 2.14.48

package/fesm2020/osovitny-anatoly.mjs

@@ -1422,11 +1422,7 @@ class AppContextService extends BaseApiService {
         this.subscription.unsubscribe();
         this.subscription = null;
     }
-    //Public
-    getLatestCurrent(success = null) {
-        this.getCurrent(success, false);
-    }
-    getCurrent(success = null, getCachedIfExist = true) {
+    getCurrentPrivate(success = null, getCachedIfExist = true) {
         if (getCachedIfExist) {
             let context = this.getCurrentFromSession();
             if (context != null) {
@@ -1449,6 +1445,13 @@ class AppContextService extends BaseApiService {
             }
         });
     }
+    //Public
+    getLatestCurrent(success = null) {
+        this.getCurrentPrivate(success, false);
+    }
+    getCurrent(success = null) {
+        this.getCurrentPrivate(success, true);
+    }
     updateCurrent(success = null) {
         this.clearCurrent();
         this.getLatestCurrent(success);
@@ -3503,7 +3506,9 @@ class ContactUsForm extends BaseEditComponent {
     }
     ngOnInit() {
         this.createFormGroup();
-        this.init();
+        this.appContext.getCurrent(context => {
+            this.setContext(context);
+        });
     }
     createFormGroup() {
         this.formGroup = this.fb.group({
@@ -3515,17 +3520,15 @@ class ContactUsForm extends BaseEditComponent {
             message: new FormControl('', [Validators.required])
         });
     }
-    init() {
-        this.appContext.getCurrent(context => {
-            this.isUserSignedIn = context.isUserSignedIn;
-            this.siteKey = context.reCaptchaSiteKey;
-            this.selectedTopic = this.topicList[3].value;
-            this.setFormValue('topic', this.selectedTopic);
-            if (this.isUserSignedIn) {
-                this.setFormValue('name', context.user.displayNameOrFullName);
-                this.setFormValue('email', context.user.email);
-            }
-        }, false);
+    setContext(context) {
+        this.isUserSignedIn = context.isUserSignedIn;
+        this.siteKey = context.reCaptchaSiteKey;
+        this.selectedTopic = this.topicList[3].value;
+        this.setFormValue('topic', this.selectedTopic);
+        if (this.isUserSignedIn) {
+            this.setFormValue('name', context.user.displayNameOrFullName);
+            this.setFormValue('email', context.user.email);
+        }
     }
     isValid() {
         return this.formGroup.valid;