Fix: Preview reload after synchronizing (#42)

Fediseer · Sep 14, 2023 · b521874 · b521874
1 parent 37dcd3f
commit b521874
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/src/app/synchronization/pages/synchronize-lemmy/synchronize-lemmy.component.html b/src/app/synchronization/pages/synchronize-lemmy/synchronize-lemmy.component.html
@@ -61,7 +61,7 @@ <h3>Preview</h3>
 
             <ng-template #previewTable>
               <app-blacklist-diff
-                [originalList]="originallyBlockedInstances"
+                [originalList]="sourceBlockedInstances"
                 [newList]="instancesToBanPreview!"
                 [purgeMode]="purgeMode ?? false"
               />

diff --git a/src/app/synchronization/pages/synchronize-lemmy/synchronize-lemmy.component.ts b/src/app/synchronization/pages/synchronize-lemmy/synchronize-lemmy.component.ts
@@ -38,6 +38,7 @@ export class SynchronizeLemmyComponent implements OnInit {
   public currentMode: SynchronizationMode | null = null;
   public purgeMode: boolean | null = null;
   public originallyBlockedInstances: string[] = [];
+  public sourceBlockedInstances: string[] = [];
   public instancesToBanPreview: InstanceDetailResponse[] | null = null;
 
   public saveSettingsCallback: SaveSettingsCallback<LemmySynchronizationSettings> = (database, settings) => {
@@ -75,6 +76,7 @@ export class SynchronizeLemmyComponent implements OnInit {
       return;
     }
     this.originallyBlockedInstances = instances;
+    this.sourceBlockedInstances = instances;
 
     this.form.valueChanges.pipe(
       debounceTime(500),
@@ -202,6 +204,13 @@ export class SynchronizeLemmyComponent implements OnInit {
       }
 
       this.messageService.createSuccess('The list was successfully synchronized');
+
+      const newBlockedInstances = await this.getBlockedInstancesFromSource(this.authManager.currentInstanceSnapshot.name);
+      if (newBlockedInstances === null) {
+        this.messageService.createError('Failed to fetch the updated list from your instance, please refresh the page');
+      } else {
+        this.sourceBlockedInstances = newBlockedInstances;
+      }
     } finally {
       this.loading = false;
     }

diff --git a/src/app/synchronization/pages/synchronize-mastodon/synchronize-mastodon.component.html b/src/app/synchronization/pages/synchronize-mastodon/synchronize-mastodon.component.html
@@ -111,7 +111,7 @@ <h3>Preview</h3>
 
           <ng-template #previewTable>
             <app-blacklist-diff
-              [originalList]="originallyBlockedInstances"
+              [originalList]="sourceBlockedInstances"
               [newList]="instancesToBanPreview!"
               [purgeMode]="purgeMode ?? false"
               [originalToStringCallback]="instanceToStringCallback"

diff --git a/src/app/synchronization/pages/synchronize-mastodon/synchronize-mastodon.component.ts b/src/app/synchronization/pages/synchronize-mastodon/synchronize-mastodon.component.ts
@@ -42,6 +42,7 @@ export class SynchronizeMastodonComponent implements OnInit {
   });
 
   public originallyBlockedInstances: MastodonBlacklistItem[] = [];
+  public sourceBlockedInstances: MastodonBlacklistItem[] = [];
 
   public loading: boolean = true;
   public oauthSetupFinished: boolean = true;
@@ -121,6 +122,7 @@ export class SynchronizeMastodonComponent implements OnInit {
       return;
     }
     this.originallyBlockedInstances = instances;
+    this.sourceBlockedInstances = instances;
   }
 
   public async saveOauth(): Promise<void> {
@@ -244,6 +246,13 @@ export class SynchronizeMastodonComponent implements OnInit {
     } catch (e) {
       this.messageService.createError('Failed to update the blacklist.')
     }
+
+    const newBlockedInstances = await this.getBlockedInstancesFromSource(this.authManager.currentInstanceSnapshot.name);
+    if (newBlockedInstances === null) {
+      this.messageService.createError('Failed to fetch the updated list from your instance, please refresh the page');
+    } else {
+      this.sourceBlockedInstances = newBlockedInstances;
+    }
     this.loading = false;
   }