Minor fixes from PR checks

Author: pmachapman

src/RealtimeServer/scriptureforge/services/sf-project-migrations.spec.ts

@@ -661,6 +661,20 @@ describe('SFProjectMigrations', () => {
       expect(projectDoc.data.editingRequires).toBe(2);
     });
 
+    it('migrates editable to editingRequires when null', async () => {
+      const env = new TestEnvironment(25);
+      const conn = env.server.connect();
+      await createDoc(conn, SF_PROJECTS_COLLECTION, 'project01', {});
+      let projectDoc = await fetchDoc(conn, SF_PROJECTS_COLLECTION, 'project01');
+      expect(projectDoc.data.editable).toBeUndefined();
+
+      await env.server.migrateIfNecessary();
+
+      projectDoc = await fetchDoc(conn, SF_PROJECTS_COLLECTION, 'project01');
+      expect(projectDoc.data.editable).toBe(false);
+      expect(projectDoc.data.editingRequires).toBe(3);
+    });
+
     it('does not remigrate editingRequires', async () => {
       const env = new TestEnvironment(25);
       const conn = env.server.connect();

src/SIL.XForge.Scripture/ClientApp/src/app/shared/test-utils.ts

@@ -145,7 +145,7 @@ export function getPoetryVerseTextDoc(id: TextDocId, modelHasBlanks: boolean = f
 \p
 \v 3
 */
-export function getEmptyChapterDoc(id: TextDocId, modelHasBlanks: boolean = false): TextData {
+export function getEmptyChapterDoc(id: TextDocId, modelHasBlanks: boolean): TextData {
   const delta = new Delta();
   if (modelHasBlanks) delta.insert({ blank: true }, { segment: 's_1' });
   delta.insert('\n', { para: { style: 's' } });
@@ -163,7 +163,7 @@ export function getEmptyChapterDoc(id: TextDocId, modelHasBlanks: boolean = fals
   if (modelHasBlanks) delta.insert({ blank: true }, { segment: 'p_2' });
   delta.insert({ verse: { number: '3', style: 'v' } });
   if (modelHasBlanks) delta.insert({ blank: true }, { segment: 'verse_1_3' });
-  delta.insert('\n', { para: { style: 'p' } });
+  delta.insert('\n\n', { para: { style: 'p' } });
   return delta;
 }
 

src/SIL.XForge.Scripture/ClientApp/src/app/shared/text/text-view-model.ts

@@ -784,19 +784,17 @@ export class TextViewModel implements OnDestroy, LynxTextModelConverter {
           if ((op.insert as any)?.blank === false) {
             const position: number = curIndex + curSegment.length - 1;
             const id = `blank_${position}`;
-            let embedPosition: EmbedPosition | undefined = id == null ? undefined : embeddedElements.get(id);
-            if (embedPosition == null && id != null) {
+            let embedPosition: EmbedPosition | undefined = embeddedElements.get(id);
+            if (embedPosition == null) {
               embedPosition = { position };
               embeddedElements.set(id, embedPosition);
             } else {
-              if (embedPosition != null) {
-                if (embedPosition.duplicatePosition != null) {
-                  console.warn(
-                    'Warning: text-view-model.updateSegments() did not expect to encounter an embed with >2 positions'
-                  );
-                }
-                embedPosition.duplicatePosition = position;
+              if (embedPosition.duplicatePosition != null) {
+                console.warn(
+                  'Warning: text-view-model.updateSegments() did not expect to encounter an embed with >2 positions'
+                );
               }
+              embedPosition.duplicatePosition = position;
             }
           }