fix circular refs

Author: siltomato

src/SIL.XForge.Scripture/ClientApp/src/app/checking/checking/checking-text/checking-text.component.ts

@@ -8,7 +8,8 @@ import { quietTakeUntilDestroyed } from 'xforge-common/util/rxjs-util';
 import { SFProjectProfileDoc } from '../../../core/models/sf-project-profile-doc';
 import { TextDocId } from '../../../core/models/text-doc';
 import { TextComponent } from '../../../shared/text/text.component';
-import { verseRefFromMouseEvent } from '../../../shared/utils';
+import { verseRefFromMouseEvent } from '../../../shared/verse-utils';
+
 @Component({
   selector: 'app-checking-text',
   templateUrl: './checking-text.component.html',

src/SIL.XForge.Scripture/ClientApp/src/app/checking/checking/checking.component.ts

@@ -47,7 +47,7 @@ import { PermissionsService } from '../../core/permissions.service';
 import { SFProjectService } from '../../core/sf-project.service';
 import { BookChapterChooserComponent } from '../../shared/book-chapter-chooser/book-chapter-chooser.component';
 import { ShareButtonComponent } from '../../shared/share/share-button.component';
-import { getVerseStrFromSegmentRef } from '../../shared/utils';
+import { getVerseStrFromSegmentRef } from '../../shared/verse-utils';
 import { ChapterAudioDialogData } from '../chapter-audio-dialog/chapter-audio-dialog.component';
 import { ChapterAudioDialogService } from '../chapter-audio-dialog/chapter-audio-dialog.service';
 import { BookChapter, CheckingUtils, isQuestionScope, QuestionScope } from '../checking.utils';

src/SIL.XForge.Scripture/ClientApp/src/app/checking/import-questions-dialog/import-questions-dialog.component.spec.ts

@@ -22,15 +22,12 @@ import { ChildViewContainerComponent, configureTestingModule, getTestTranslocoMo
 import { TestingRetryingRequestService } from 'xforge-common/testing-retrying-request.service';
 import { QuestionDoc } from '../../core/models/question-doc';
 import { TextsByBookId } from '../../core/models/texts-by-book-id';
+import { TransceleratorQuestion } from '../../core/models/transcelerator-question';
 import { SFProjectService } from '../../core/sf-project.service';
 import { ScriptureChooserDialogComponent } from '../../scripture-chooser-dialog/scripture-chooser-dialog.component';
 import { CheckingQuestionsService } from '../checking/checking-questions.service';
 import { ImportQuestionsConfirmationDialogComponent } from './import-questions-confirmation-dialog/import-questions-confirmation-dialog.component';
-import {
-  ImportQuestionsDialogComponent,
-  ImportQuestionsDialogData,
-  TransceleratorQuestion
-} from './import-questions-dialog.component';
+import { ImportQuestionsDialogComponent, ImportQuestionsDialogData } from './import-questions-dialog.component';
 
 const mockedProjectService = mock(SFProjectService);
 const mockedQuestionsService = mock(CheckingQuestionsService);

src/SIL.XForge.Scripture/ClientApp/src/app/checking/import-questions-dialog/import-questions-dialog.component.ts

@@ -37,6 +37,7 @@ import { ngfModule } from 'angular-file';
 import { Question } from 'realtime-server/lib/esm/scriptureforge/models/question';
 import { fromVerseRef, toVerseRef } from 'realtime-server/lib/esm/scriptureforge/models/verse-ref-data';
 import { Subject } from 'rxjs';
+import { TransceleratorQuestion } from 'src/app/core/models/transcelerator-question';
 import { CsvService } from 'xforge-common/csv-service.service';
 import { DialogService } from 'xforge-common/dialog.service';
 import { ExternalUrlService } from 'xforge-common/external-url.service';
@@ -63,16 +64,6 @@ import {
   ImportQuestionsConfirmationDialogResult
 } from './import-questions-confirmation-dialog/import-questions-confirmation-dialog.component';
 
-export interface TransceleratorQuestion {
-  book: string;
-  startChapter: string;
-  startVerse: string;
-  endChapter?: string;
-  endVerse?: string;
-  text: string;
-  id: string;
-}
-
 export interface SourceQuestion {
   verseRef: VerseRef;
   text: string;

src/SIL.XForge.Scripture/ClientApp/src/app/connect-project/connect-project.component.spec.ts

@@ -18,10 +18,11 @@ import { provideTestRealtime } from 'xforge-common/test-realtime-providers';
 import { TestRealtimeService } from 'xforge-common/test-realtime.service';
 import { configureTestingModule, getTestTranslocoModule } from 'xforge-common/test-utils';
 import { ParatextProject } from '../core/models/paratext-project';
+import { SelectableProjectWithLanguageCode } from '../core/models/selectable-project';
 import { SFProjectCreateSettings } from '../core/models/sf-project-create-settings';
 import { SFProjectDoc } from '../core/models/sf-project-doc';
 import { SF_TYPE_REGISTRY } from '../core/models/sf-type-registry';
-import { ParatextService, SelectableProjectWithLanguageCode } from '../core/paratext.service';
+import { ParatextService } from '../core/paratext.service';
 import { ProjectNotificationService } from '../core/project-notification.service';
 import { SFProjectService } from '../core/sf-project.service';
 import { ProjectSelectComponent } from '../project-select/project-select.component';

src/SIL.XForge.Scripture/ClientApp/src/app/connect-project/connect-project.component.ts

@@ -16,9 +16,10 @@ import { OnlineStatusService } from 'xforge-common/online-status.service';
 import { quietTakeUntilDestroyed } from 'xforge-common/util/rxjs-util';
 import { hasStringProp } from '../../type-utils';
 import { ParatextProject } from '../core/models/paratext-project';
+import { SelectableProject } from '../core/models/selectable-project';
 import { SFProjectCreateSettings } from '../core/models/sf-project-create-settings';
 import { SFProjectDoc } from '../core/models/sf-project-doc';
-import { ParatextService, SelectableProject } from '../core/paratext.service';
+import { ParatextService } from '../core/paratext.service';
 import { SFProjectService } from '../core/sf-project.service';
 import { ProjectSelectComponent } from '../project-select/project-select.component';
 import { compareProjectsForSorting, projectLabel } from '../shared/utils';

src/SIL.XForge.Scripture/ClientApp/src/app/core/models/invitee-status.ts

@@ -0,0 +1,6 @@
+/** Status information for a user who has been invited to a project. */
+export interface InviteeStatus {
+  email: string;
+  role: string;
+  expired?: boolean;
+}

src/SIL.XForge.Scripture/ClientApp/src/app/core/models/selectable-project.ts

@@ -0,0 +1,15 @@
+/**
+ * Defines the minimum information needed to list a project (connected or not) for a user to select. This includes
+ * enough human identifiable information to allow the user to select the project (name and shortName), as well as
+ * Paratext project ID.
+ */
+export interface SelectableProject {
+  name: string;
+  shortName: string;
+  paratextId: string;
+}
+
+/** Like {@link SelectableProject}, but includes the language code. */
+export interface SelectableProjectWithLanguageCode extends SelectableProject {
+  languageTag: string;
+}

src/SIL.XForge.Scripture/ClientApp/src/app/core/models/share-link-type.ts

@@ -0,0 +1,5 @@
+/** Types of share links that can be generated for a project. */
+export enum ShareLinkType {
+  Anyone = 'anyone',
+  Recipient = 'recipient'
+}

src/SIL.XForge.Scripture/ClientApp/src/app/core/models/text-doc.ts

@@ -10,7 +10,7 @@ import {
 import { RealtimeDoc } from 'xforge-common/models/realtime-doc';
 import { RealtimeDocAdapter } from 'xforge-common/realtime-remote-store';
 import { RealtimeService } from 'xforge-common/realtime.service';
-import { getVerseStrFromSegmentRef } from '../../shared/utils';
+import { getVerseStrFromSegmentRef } from '../../shared/verse-utils';
 
 export type TextDocSource = 'Draft' | 'Editor' | 'History' | 'Paratext';