Set role to none if user has been removed from the project

Author: RaymondLuong3

src/SIL.XForge.Scripture/ClientApp/src/app/shared/share/share-control.component.ts

@@ -1,18 +1,9 @@
-import {
-  ChangeDetectorRef,
-  Component,
-  DestroyRef,
-  ElementRef,
-  EventEmitter,
-  Input,
-  Output,
-  ViewChild
-} from '@angular/core';
+import { Component, DestroyRef, ElementRef, EventEmitter, Input, Output, ViewChild } from '@angular/core';
 import { FormControl, FormGroup, FormGroupDirective, Validators } from '@angular/forms';
 import { Operation } from 'realtime-server/lib/esm/common/models/project-rights';
 import { SF_PROJECT_RIGHTS, SFProjectDomain } from 'realtime-server/lib/esm/scriptureforge/models/sf-project-rights';
 import { SFProjectRole } from 'realtime-server/lib/esm/scriptureforge/models/sf-project-role';
-import { BehaviorSubject, combineLatest } from 'rxjs';
+import { BehaviorSubject, combineLatest, startWith } from 'rxjs';
 import { CommandError } from 'xforge-common/command.service';
 import { I18nService } from 'xforge-common/i18n.service';
 import { NoticeService } from 'xforge-common/notice.service';
@@ -58,7 +49,6 @@ export class ShareControlComponent extends ShareBaseComponent {
     private readonly noticeService: NoticeService,
     private readonly projectService: SFProjectService,
     private readonly onlineStatusService: OnlineStatusService,
-    private readonly changeDetector: ChangeDetectorRef,
     userService: UserService,
     private destroyRef: DestroyRef
   ) {
@@ -80,7 +70,7 @@ export class ShareControlComponent extends ShareBaseComponent {
           .pipe(quietTakeUntilDestroyed(this.destroyRef, { logWarnings: false }))
           .subscribe(() => this.updateFormEnabledStateAndLinkSharingKey());
       });
-    combineLatest([this.onlineStatusService.onlineStatus$, this.roleControl.valueChanges])
+    combineLatest([this.onlineStatusService.onlineStatus$, this.roleControl.valueChanges.pipe(startWith(null))])
       .pipe(quietTakeUntilDestroyed(this.destroyRef))
       .subscribe(() => this.updateFormEnabledStateAndLinkSharingKey());
   }
@@ -201,8 +191,6 @@ export class ShareControlComponent extends ShareBaseComponent {
       this.sendInviteForm.enable({ emitEvent: false });
     } else {
       this.sendInviteForm.disable({ emitEvent: false });
-      // Workaround for angular/angular#17793 (ExpressionChangedAfterItHasBeenCheckedError after form disabled)
-      this.changeDetector.detectChanges();
     }
   }
 }

src/SIL.XForge.Scripture/ClientApp/src/app/users/collaborators/collaborators.component.spec.ts

@@ -589,7 +589,8 @@ class TestEnvironment {
       { username: 'User A', opaqueUserId: 'opaqueA', role: SFProjectRole.ParatextObserver },
       { username: 'User B', opaqueUserId: 'opaqueB', role: SFProjectRole.ParatextTranslator },
       { username: 'User C', opaqueUserId: 'opaqueC', role: SFProjectRole.ParatextAdministrator },
-      { username: 'User No Role', opaqueUserId: 'opaqueNoRole' }
+      { username: 'User No Role', opaqueUserId: 'opaqueNoRole' },
+      { username: 'User Not Member', opaqueUserId: 'opaqueNotMember', role: SFProjectRole.None }
     ];
     paratextUsers.push(...ptMembersNotConnected);
     return createTestProject({

src/SIL.XForge.Scripture/Models/SFProjectRole.cs

@@ -9,6 +9,7 @@ public static class SFProjectRole
     public const string Commenter = "sf_commenter";
     public const string CommunityChecker = "sf_community_checker";
     public const string Viewer = "sf_observer";
+    public const string None = "none";
 
     public static bool IsParatextRole(string role) =>
         role switch

src/SIL.XForge.Scripture/Services/ParatextSyncRunner.cs

@@ -1907,7 +1907,7 @@ await _projectDoc.SubmitJson0OpAsync(op =>
                             userIdsAdded.Add(updatedSFUserId);
                         }
 
-                        string paratextRole = ptUserInRegistry?.Role;
+                        string paratextRole = ptUserInRegistry?.Role ?? SFProjectRole.None;
                         if (paratextRole != existingUser.Role)
                         {
                             op.Set(pd => pd.ParatextUsers[index].Role, paratextRole);

test/SIL.XForge.Scripture.Tests/Services/ParatextSyncRunnerTests.cs

@@ -1963,7 +1963,9 @@ public async Task SyncAsync_UpdatesExistingParatextUser()
         await env.Runner.RunAsync("project01", "user01", "project01", false, CancellationToken.None);
         project = env.GetProject();
         Assert.That(project.ParatextUsers.Select(u => u.Username), Is.EquivalentTo(new[] { "User 1", "User 2" }));
-        Assert.That(project.ParatextUsers.Single(u => u.Username == "User 1").SFUserId, Is.EqualTo(null));
+        ParatextUserProfile ptUser1 = project.ParatextUsers.Single(u => u.Username == "User 1");
+        Assert.That(ptUser1.SFUserId, Is.EqualTo(null));
+        Assert.That(ptUser1.Role, Is.EqualTo(SFProjectRole.None));
         ParatextUserProfile ptUser2 = project.ParatextUsers.Single(u => u.Username == "User 2");
         Assert.That(ptUser2.SFUserId, Is.EqualTo(user2.Id));
         Assert.That(ptUser2.Role, Is.EqualTo(user2.Role));
@@ -1986,7 +1988,7 @@ public async Task SyncAsync_UpdatesRoleIfUserNoLongerAMember()
         Assert.That(project.ParatextUsers.Select(u => u.Username), Is.EquivalentTo(new[] { "User 1", "User 2" }));
 
         ParatextUserProfile ptUser2 = project.ParatextUsers.Single(u => u.Username == "User 2");
-        Assert.That(ptUser2.Role, Is.Null);
+        Assert.That(ptUser2.Role, Is.EqualTo(SFProjectRole.None));
     }
 
     [Test]