PD-3859

cryptalith · cryptalith · commit a5945059e694 · 2025-12-15T11:32:49.000-06:00
diff --git a/src/app/core/record-affiliations/record-affiliations.service.ts b/src/app/core/record-affiliations/record-affiliations.service.ts
@@ -292,21 +292,51 @@ export class RecordAffiliationService {
       )
   }
 
-  updateFeatured(putCode: string): Observable<any> {
+  updateFeatured(
+    affiliation: Affiliation,
+    togglingOn: boolean
+  ): Observable<any> {
+    const targetPutCode = togglingOn ? affiliation.putCode.value : ''
+    const previousState = cloneDeep(this.lastEmittedValue)
+
+    // Optimistically update the shared affiliations observable so all consumers
+    // see the featured change immediately.
+    if (this.lastEmittedValue && this.$affiliations) {
+      this.lastEmittedValue.forEach((uiGroup) => {
+        uiGroup.affiliationGroup?.forEach((group) => {
+          group.affiliations?.forEach((item) => {
+            if (item.affiliationType?.value !== 'employment') {
+              return
+            }
+            item.featured =
+              togglingOn && item.putCode?.value === affiliation.putCode.value
+          })
+        })
+      })
+      this.$affiliations.next(this.lastEmittedValue)
+    }
+
     this._$loading.next(true)
     return this._http
       .put(
         runtimeEnvironment.API_WEB + 'affiliations/featuredAffiliation.json',
         {
-          putCode: putCode,
+          putCode: targetPutCode,
         },
         {
           headers: this.headers,
         }
       )
       .pipe(
         retry(3),
-        catchError((error) => this._errorHandler.handleError(error)),
+        catchError((error) => {
+          // Revert optimistic update on failure
+          if (previousState && this.$affiliations) {
+            this.lastEmittedValue = previousState
+            this.$affiliations.next(this.lastEmittedValue)
+          }
+          return this._errorHandler.handleError(error)
+        }),
         tap(() => this.getAffiliations({ forceReload: true })),
         finalize(() => this._$loading.next(false))
       )
diff --git a/src/app/record/components/affiliation-stack/affiliation-stack.component.ts b/src/app/record/components/affiliation-stack/affiliation-stack.component.ts
@@ -267,14 +267,15 @@ export class AffiliationStackComponent implements OnInit, OnDestroy {
   }>()
 
   toggleFeatured(affiliation: Affiliation) {
-    const putCode = affiliation.featured ? '' : affiliation.putCode.value
     const wasFeatured = affiliation.featured
-    this.loadingFeatured[affiliation.putCode.value] = true
+    const togglingOn = !wasFeatured
     this._affiliationService
-      .updateFeatured(putCode)
+      .updateFeatured(affiliation, togglingOn)
       .pipe(
         finalize(() => {
-          this.loadingFeatured[affiliation.putCode.value] = false
+          this.affiliationStack.affiliations.forEach((item) => {
+            this.loadingFeatured[item.putCode.value] = false
+          })
         })
       )
       .subscribe({
