Add lines between class members eslint rule (#2849)

client/.eslintrc.js

@@ -61,6 +61,7 @@ module.exports = {
                     'property': 'asObservable',
                     'message': 'Please use a typecast or explicitly instantiate a new Observable.'
                 }],
+                'lines-between-class-members': ['error', 'always', { 'exceptAfterSingleLine': true }],
 
                 'jsdoc/require-example': ['off'],
                 'jsdoc/newline-after-description': ['off'],

client/src/app/domain/models/projector/projection.ts

@@ -13,6 +13,7 @@ export class Projection extends BaseModel<Projection> {
     public options!: {
         [key: string]: any;
     };
+
     public weight!: number;
 
     // Calculated field

client/src/app/gateways/action-worker-watch/action-worker-watch.service.spec.ts

@@ -124,9 +124,11 @@ class MockWaitForActionDialogService {
         delete currentDialogs[workerId];
         this.currentDialogs.next(currentDialogs);
     }
+
     public async openClosingPrompt(snapshot: Partial<ActionWorker> & { closed: number }): Promise<void> {
         this.closingPromptOpenFor.push(snapshot);
     }
+
     public addNewDialog(reason: WaitForActionReason, data: WaitForActionData): void {
         const currentDialogs = copy(this.currentDialogs.value);
         currentDialogs[data.workerId] = { reason, data };
@@ -154,6 +156,7 @@ class MockActionWorkerRepositoryService {
     public set viewModelList(list: ViewActionWorker[]) {
         this._viewModelListSubject.next(list);
     }
+
     public get viewModelList(): ViewActionWorker[] {
         return this._viewModelListSubject.value;
     }

client/src/app/gateways/http-stream/http-stream-endpoint.service.spec.ts

@@ -15,6 +15,7 @@ class MockHttpService {
         header?: HttpHeaders;
         responseType?: ResponseType;
     }[] = [];
+
     public async get<T>(
         path: string,
         data?: any,

client/src/app/gateways/repositories/base-agenda-item-and-list-of-speakers-content-object-repository.ts

@@ -23,6 +23,7 @@ export abstract class BaseAgendaItemAndListOfSpeakersContentObjectRepository<
     ) {
         super(repositoryServiceCollector, baseModelCtor);
     }
+
     public getAgendaListTitle(viewModel: V): AgendaListTitle {
         // Return the agenda title with the model's verbose name appended
         const numberPrefix = this.agendaItemRepo.getItemNumberPrefix(viewModel);

client/src/app/gateways/repositories/point-of-order-category/point-of-order-category-repository.service.ts

@@ -24,6 +24,7 @@ export class PointOfOrderCategoryRepositoryService
 
     public getVerboseName = (plural?: boolean): string =>
         plural ? `Point of order categories` : `Point of order category`;
+
     public getTitle = (viewModel: PointOfOrderCategory): string => viewModel.text;
 
     public create(pointOfOrderCategory: any, meeting_id: Id = this.activeMeetingId): Action<Identifiable> {

client/src/app/gateways/repositories/projector-messages/projector-message-repository.service.ts

@@ -17,6 +17,7 @@ export class ProjectorMessageRepositoryService extends BaseMeetingRelatedReposit
     public constructor(repositoryServiceCollector: RepositoryMeetingServiceCollectorService) {
         super(repositoryServiceCollector, ProjectorMessage);
     }
+
     public getTitle = () => this.getVerboseName();
 
     public getVerboseName = (plural = false) => this.translate.instant(plural ? `Messages` : `Message`);

client/src/app/gateways/repositories/themes/theme-repository.service.ts

@@ -83,13 +83,15 @@ export class ThemeRepositoryService extends BaseRepository<ViewTheme, Theme> {
         const payload = themes;
         return this.sendBulkActionToBackend(ThemeAction.CREATE, payload);
     }
+
     public update(update: any, id: Id): Promise<void> {
         const payload = {
             id,
             ...update
         };
         return this.sendActionToBackend(ThemeAction.UPDATE, payload);
     }
+
     public delete(...ids: Id[]): Promise<void> {
         const payload = ids.map(id => ({ id }));
         return this.sendBulkActionToBackend(ThemeAction.DELETE, payload);

client/src/app/site/base/base-import.service/base-import.service.ts

@@ -178,6 +178,7 @@ export abstract class BaseImportService<MainModel extends Identifiable> implemen
     private _afterImportHandler: {
         [key: string]: { mainHandler: AfterImportHandler; additionalHandlers: AdditionalImportHandler[] };
     } = {};
+
     private _otherMainImportHelper: MainImportHandler[] = [];
 
     private _modelHeadersAndVerboseNames: { [key: string]: string } = {};

client/src/app/site/base/base-view-model.ts

@@ -32,18 +32,23 @@ export abstract class BaseViewModel<M extends BaseModel = any> implements Detail
     public getModel(): M {
         return this._model;
     }
+
     public toString(): string {
         return this.getTitle();
     }
+
     public toJSON(): M {
         return this.getModel();
     }
+
     public getUpdatedModelData(update: Partial<M>): object {
         return this.getModel().getUpdatedData(update);
     }
+
     public canAccess(): boolean {
         return true;
     }
+
     /**
      * Override in children
      */

client/src/app/site/modules/global-headbar/components/global-search/global-search.component.ts

@@ -28,6 +28,7 @@ export class GlobalSearchComponent implements OnDestroy {
         user: _(`Participants`),
         mediafile: _(`Files`)
     };
+
     public currentlyAvailableFilters = [];
 
     public currentFilters = this.formBuilder.group({

client/src/app/site/pages/meetings/base/base-has-meeting-user-view-model.ts

@@ -12,6 +12,7 @@ export abstract class BaseHasMeetingUserViewModel<M extends BaseModel<any> = any
     public get user(): ViewUser {
         return this.meeting_user?.user;
     }
+
     public get user_id(): number {
         return this.meeting_user?.user_id;
     }
@@ -25,6 +26,7 @@ export abstract class BaseHasMeetingUsersViewModel<M extends BaseModel<any> = an
     public get calculated_users(): ViewUser[] {
         return this.meeting_users?.flatMap(user => user.user ?? []);
     }
+
     public get calculated_user_ids(): number[] {
         return this.meeting_users?.flatMap(user => user.user_id ?? []);
     }

client/src/app/site/pages/meetings/modules/meetings-component-collector/attachment-control/components/attachment-control/attachment-control.component.ts

@@ -58,6 +58,7 @@ export class AttachmentControlComponent extends BaseFormControlComponent<ViewMed
     public get empty(): boolean {
         return !this.contentForm.value.length;
     }
+
     public get controlType(): string {
         return `attachment-control`;
     }

client/src/app/site/pages/meetings/modules/projector/components/slide-container/slide-container.component.ts

@@ -20,6 +20,7 @@ export class SlideContainerComponent {
 
     @ViewChild(`slide`, { read: ViewContainerRef, static: true })
     private slide: ViewContainerRef | null = null;
+
     private slideRef!: ComponentRef<BaseSlideComponent<object>>;
 
     /**

client/src/app/site/pages/meetings/modules/projector/modules/slides/components/motions/modules/motion-slide/change-recommendation-unified-change.ts

@@ -20,9 +20,11 @@ export class ChangeRecommendationUnifiedChange implements ChangeRecommendationDa
     public constructor(data: ChangeRecommendationData) {
         Object.assign(this, data);
     }
+
     public getTitle(): string {
         return `Recommendation`;
     }
+
     public getModificationType(): ModificationType {
         throw new Error(`Method not implemented.`);
     }

client/src/app/site/pages/meetings/pages/interaction/services/call-restriction.service.ts

@@ -18,10 +18,12 @@ export class CallRestrictionService {
     public isJitsiActiveInAnotherTab: Observable<boolean> = this.storageMap
         .watch(RTC_LOGGED_STORAGE_KEY, { type: `boolean` })
         .pipe(distinctUntilChanged() as any);
+
     private userClosPosition = this.closService.currentListOfSpeakersObservable.pipe(
         map(los => los?.findUserIndexOnList(this.operator.operatorId!) ?? -1),
         distinctUntilChanged()
     );
+
     private amountNextSpeakerAutoConnect: Observable<number> = this.settingService.get(
         `conference_auto_connect_next_speakers`
     );

client/src/app/site/pages/meetings/pages/interaction/services/interaction-receive.service.ts

@@ -46,11 +46,13 @@ export class InteractionReceiveService {
         }
         return this._showLiveConfObservable;
     }
+
     private _showLiveConfObservable: Observable<boolean>;
 
     public get conferenceState(): ConferenceState {
         return this.conferenceStateSubject.value;
     }
+
     public set conferenceState(state: ConferenceState) {
         this.setConferenceState(state);
     }

client/src/app/site/pages/meetings/pages/interaction/services/interaction.service.ts

@@ -45,6 +45,7 @@ export class InteractionService {
     private get conferenceState(): ConferenceState {
         return this.interactionReceive.conferenceState;
     }
+
     private set conferenceState(state: ConferenceState) {
         this.interactionReceive.conferenceState = state;
     }

client/src/app/site/pages/meetings/pages/motions/pages/categories/components/category-detail/category-detail.component.ts

@@ -44,9 +44,11 @@ export class CategoryDetailComponent extends BaseMeetingComponent {
     public get selectedCategory(): ViewMotionCategory {
         return this._selectedCategory;
     }
+
     public set selectedCategory(category: ViewMotionCategory) {
         this._selectedCategory = category;
     }
+
     private _selectedCategory!: ViewMotionCategory;
 
     /**

client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-detail-diff-summary/motion-detail-diff-summary.component.ts

@@ -33,8 +33,10 @@ export class MotionDetailDiffSummaryComponent extends BaseMeetingComponent imple
 
     @Input()
     public changes: ViewUnifiedChange[] = [];
+
     @Input()
     public scrollToChange: ViewUnifiedChange | null = null;
+
     @Input()
     public elContainer: any;
 

client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-detail-diff/motion-detail-diff.component.ts

@@ -63,22 +63,30 @@ export class MotionDetailDiffComponent extends BaseMeetingComponent implements A
 
     @Input()
     public motion!: ViewMotion;
+
     @Input()
     public changes: ViewUnifiedChange[] = [];
+
     @Input()
     public scrollToChange: ViewUnifiedChange | null = null;
+
     @Input()
     public highlightedLine!: number;
+
     @Input()
     public lineNumberingMode!: LineNumberingMode;
+
     @Input()
     public showAllAmendments = false;
+
     @Input()
     public showSummary = true;
+
     @Input()
     public set showPreamble(value: boolean) {
         this._showPreamble = value;
     }
+
     @Input()
     public lineRange: LineRange | null = null;
 
@@ -95,6 +103,7 @@ export class MotionDetailDiffComponent extends BaseMeetingComponent implements A
     public get showPreamble(): boolean {
         return this.motion.showPreamble ? this._showPreamble : false;
     }
+
     private _showPreamble = true;
 
     public get nativeElement(): any {

client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component.ts

@@ -83,6 +83,7 @@ export class MotionDetailOriginalChangeRecommendationsComponent implements OnIni
         this._changeRecommendations = recos;
         this.setTextChangeRecommendations(recos);
     }
+
     public get changeRecommendations(): ViewUnifiedChange[] {
         return this._changeRecommendations;
     }

client/src/app/site/pages/meetings/pages/motions/services/export/motion-csv-export.service/motion-csv-export.service.ts

@@ -151,6 +151,7 @@ export class MotionCsvExportService {
 
         this.csvExport.export(motions, exportProperties, this.translate.instant(`Motions`) + `.csv`);
     }
+
     /**numberOrTitle
      * Exports the call list.
      *

client/src/app/site/pages/meetings/pages/motions/view-models/view-motion.ts

@@ -238,6 +238,7 @@ export class ViewMotion extends BaseProjectableViewModel<Motion> {
         recoMode: ChangeRecoMode,
         includeUnchanged?: boolean
     ) => DiffLinesInParagraph[] = () => [];
+
     public getParagraphTitleByParagraph!: (paragraph: DiffLinesInParagraph) => string | null;
     // This is set by the repository
     public getNumberOrTitle!: () => string;

client/src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate-list.ts

@@ -10,9 +10,11 @@ export class ViewPollCandidateList extends BaseViewModel<PollCandidateList> impl
     public get entries(): SortedListEntry[] {
         return this.poll_candidates;
     }
+
     public get poll_candidate_list(): PollCandidateList {
         return this._model;
     }
+
     public static COLLECTION = PollCandidateList.COLLECTION;
 
     public getShortenedTitle(length: number): string {

client/src/app/site/pages/meetings/pages/polls/view-models/view-poll-candidate.ts

@@ -10,6 +10,7 @@ export class ViewPollCandidate extends BaseViewModel<PollCandidate> implements S
     public get poll_candidate(): PollCandidate {
         return this._model;
     }
+
     public static COLLECTION = PollCandidate.COLLECTION;
 
     public getSubtitle(): string {

client/src/app/site/pages/meetings/pages/polls/view-models/view-poll.ts

@@ -28,6 +28,7 @@ export class ViewPoll<C extends PollContentObject = any>
     public get poll(): Poll {
         return this._model;
     }
+
     public static COLLECTION = Poll.COLLECTION;
 
     public set hasVoted(value: boolean | undefined) {

client/src/app/site/pages/meetings/services/meeting-component-service-collector.service.ts

@@ -17,9 +17,11 @@ export class MeetingComponentServiceCollectorService {
     public get titleService(): Title {
         return this.componentServiceCollector.titleService;
     }
+
     public get matSnackBar(): MatSnackBar {
         return this.componentServiceCollector.matSnackBar;
     }
+
     public get storage(): StorageService {
         return this.componentServiceCollector.storage;
     }

client/src/app/site/pages/organization/pages/accounts/pages/account-detail/components/account-detail/account-detail.component.ts

@@ -146,6 +146,7 @@ export class AccountDetailComponent extends BaseComponent implements OnInit {
             this.isEditingUser = false;
         }
     }
+
     /**
      * (Re)- send an invitation email for this user after confirmation
      */

client/src/app/site/pages/organization/pages/committees/pages/committee-list/services/committee-list-export.service/committee-export.service.ts

@@ -15,6 +15,7 @@ export class CommitteeExportService {
         private csvExport: CsvExportService,
         private meetingRepo: MeetingControllerService
     ) {}
+
     public export(committees: ViewCommittee[]): void {
         const properties: CsvColumnsDefinition<ViewCommittee> = [
             {

client/src/app/site/services/operator.service.ts

@@ -148,16 +148,20 @@ export class OperatorService {
     private get activeMeetingId(): number | null {
         return this.activeMeetingService.meetingId;
     }
+
     private get activeMeeting(): ViewMeeting | null {
         return this.activeMeetingService.meeting;
     }
+
     private get anonymousEnabled(): boolean {
         return this.activeMeetingService.guestsEnabled;
     }
+
     private get defaultGroupId(): number | null {
         const activeMeeting = this.activeMeetingService.meeting;
         return activeMeeting ? activeMeeting.default_group_id : null;
     }
+
     private get adminGroupId(): number | null {
         const activeMeeting = this.activeMeetingService.meeting;
         return activeMeeting ? activeMeeting.admin_group_id : null;
@@ -171,6 +175,7 @@ export class OperatorService {
     private readonly _operatorShortNameSubject: BehaviorSubject<string | null> = new BehaviorSubject<string | null>(
         null
     );
+
     private readonly _userSubject = new BehaviorSubject<ViewUser | null>(null);
     private readonly _operatorReadySubject = new BehaviorSubject<boolean>(false);
 
@@ -195,6 +200,7 @@ export class OperatorService {
     private set _permissions(perms: Permission[] | undefined) {
         this._permissionsSubject.next(perms);
     }
+
     private get _permissions(): Permission[] | undefined {
         return this._permissionsSubject.value;
     }

client/src/app/ui/base/base-form-control.ts

@@ -80,14 +80,17 @@ export abstract class BaseFormControlComponent<T> implements ControlValueAccesso
     public writeValue(value: T): void {
         this.value = value;
     }
+
     public registerOnChange(fn: any): void {
         this._onChange = fn;
         this.push(this.value);
     }
+
     public registerOnTouched(fn: any): void {
         this._onTouched = fn;
         this.push(this.value);
     }
+
     public setDisabledState?(isDisabled: boolean): void {
         this.disabled = isDisabled;
     }