Merge pull request #2507 from intersective/2.4.y.z/CORE-7970/double-pulsecheck

[CORE-7970] 2.4.y.z/double-pulsecheck

Author: trtshen

projects/v3/src/app/components/fast-feedback/fast-feedback.component.ts

@@ -204,12 +204,17 @@ export class FastFeedbackComponent implements OnInit {
     }
   }
 
-  dismiss(data) {
-    // change the flag to false
+  async dismiss(data): Promise<void> {
     this.storage.set("fastFeedbackOpening", false);
-    this.modalController.dismiss(data);
-    this.homeService.getPulseCheckStatuses().subscribe();
-    this.homeService.getPulseCheckSkills().subscribe();
+    await this.modalController.dismiss(data);
+    await new Promise(resolve => setTimeout(resolve, 500));
+
+    try {
+      await firstValueFrom(this.homeService.getPulseCheckStatuses());
+      await firstValueFrom(this.homeService.getPulseCheckSkills());
+    } catch (error) {
+      console.error('Error refreshing pulse check data:', error);
+    }
   }
 
   get isRedColor(): boolean {

projects/v3/src/app/pages/assessment-mobile/assessment-mobile.page.ts

@@ -6,7 +6,7 @@ import { BrowserStorageService } from '@v3/app/services/storage.service';
 import { ActivityService, Task } from '@v3/services/activity.service';
 import { AssessmentService, Assessment, Submission, AssessmentReview } from '@v3/services/assessment.service';
 import { UtilsService } from '@v3/app/services/utils.service';
-import { BehaviorSubject, firstValueFrom, Subject, Subscription } from 'rxjs';
+import { BehaviorSubject, filter, firstValueFrom, Subject, Subscription } from 'rxjs';
 import { ReviewService } from '@v3/app/services/review.service';
 import { AssessmentComponent } from '@v3/app/components/assessment/assessment.component';
 import { debounceTime } from 'rxjs/operators';
@@ -87,17 +87,20 @@ export class AssessmentMobilePage implements OnInit, OnDestroy {
     });
     this.subscriptions.add(paramsSub);
 
-    const assessmentSub = this.assessmentService.assessment$.subscribe(res => {
-      if (!res && this.assessmentDataLoaded) {
-        this.goBack();
-        return;
-      }
+    const assessmentSub = this.assessmentService.assessment$.
+      pipe(
+        filter(res => res && this.assessmentDataLoaded), // only proceed if assessment data is loaded
+      ).subscribe(res => {
+        if (!res) {
+          this.goBack();
+          return;
+        }
 
-      if (res) {
-        this.assessment = res;
-        this.utils.setPageTitle(this.assessment?.name);
-      }
-    });
+        if (res) {
+          this.assessment = res;
+          this.utils.setPageTitle(this.assessment?.name);
+        }
+      });
     this.subscriptions.add(assessmentSub);
 
     const taskSub = this.activityService.currentTask$.subscribe(res => this.currentTask = res);
@@ -169,10 +172,6 @@ export class AssessmentMobilePage implements OnInit, OnDestroy {
           console.error('Asmt submission error:', saved);
           throw new Error("Error submitting assessment");
         }
-
-        if (this.assessment.pulseCheck === true && event.autoSave === false) {
-          await this.assessmentService.pullFastFeedback();
-        }
       } else if (this.action === 'review' && submission.status === 'pending review') {
         const saved = await firstValueFrom(this.assessmentService.submitReview(
           event.assessmentId,
@@ -197,13 +196,13 @@ export class AssessmentMobilePage implements OnInit, OnDestroy {
         await this.assessmentService.pullFastFeedback();
       }
 
-      this.savingText$.next($localize `Last saved ${this.utils.getFormatedCurrentTime()}`);
+      this.savingText$.next($localize`Last saved ${this.utils.getFormatedCurrentTime()}`);
       if (!event.autoSave) {
         // show toast message
         if (hasSubmission === true) {
           this.notificationsService.assessmentSubmittedToast({ isDuplicated: true });
         } else {
-          this.notificationsService.assessmentSubmittedToast({ isReview: this.action === 'review'});
+          this.notificationsService.assessmentSubmittedToast({ isReview: this.action === 'review' });
         }
 
         await this.assessmentService.fetchAssessment(
@@ -232,7 +231,7 @@ export class AssessmentMobilePage implements OnInit, OnDestroy {
     } catch (err) {
       this.btnDisabled$.next(false);
       this.saving = false;
-      this.notificationsService.assessmentSubmittedToast({isFail: true});
+      this.notificationsService.assessmentSubmittedToast({ isFail: true });
     }
   }
 
@@ -246,7 +245,7 @@ export class AssessmentMobilePage implements OnInit, OnDestroy {
       return this.activityService.getActivity(this.activityId, true, this.task, () => {
         this.btnDisabled$.next(false);
       });
-    } catch(err) {
+    } catch (err) {
       this.btnDisabled$.next(false);
       console.error(err);
     }

projects/v3/src/app/pages/home/home.page.ts

@@ -53,8 +53,8 @@ export class HomePage implements OnInit, OnDestroy, AfterViewChecked {
   unsubscribe$ = new Subject();
   milestones$: Observable<Milestone[]>;
 
-  @ViewChild('activityCol') activityCol: {el: HTMLIonColElement};
-  @ViewChild('activities', {static: false}) activities!: ElementRef;
+  @ViewChild('activityCol') activityCol: { el: HTMLIonColElement };
+  @ViewChild('activities', { static: false }) activities!: ElementRef;
   pulseCheckSkills: PulseCheckSkill[] = [];
 
   // Expose Math to template