Linter fixes

OpenSlides · Aug 15, 2024 · 86db014 · 86db014
1 parent e4895ef
commit 86db014
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 18 deletions.
diff --git a/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/motion-detail.module.ts b/client/src/app/site/pages/meetings/pages/motions/pages/motion-detail/motion-detail.module.ts
@@ -43,7 +43,6 @@ import { MotionForwardDialogModule } from '../../components/motion-forward-dialo
 import { MotionPollModule } from '../../modules/motion-poll';
 import { MotionsExportModule } from '../../services/export/motions-export.module';
 import { MotionsListServiceModule } from '../../services/list/motions-list-service.module';
-import { AmendmentCreateWizardComponent } from './pages/motion-form/components/amendment-create-wizard/amendment-create-wizard.component';
 import { MotionAddPollButtonComponent } from './components/motion-add-poll-button/motion-add-poll-button.component';
 import { MotionCommentComponent } from './components/motion-comment/motion-comment.component';
 import { MotionCommentsComponent } from './components/motion-comments/motion-comments.component';
@@ -52,7 +51,6 @@ import { MotionDetailComponent } from './components/motion-detail/motion-detail.
 import { MotionDetailDiffComponent } from './components/motion-detail-diff/motion-detail-diff.component';
 import { MotionDetailDiffSummaryComponent } from './components/motion-detail-diff-summary/motion-detail-diff-summary.component';
 import { MotionDetailOriginalChangeRecommendationsComponent } from './components/motion-detail-original-change-recommendations/motion-detail-original-change-recommendations.component';
-import { MotionViewComponent } from './pages/motion-view/components/motion-view/motion-view.component';
 import { MotionExtensionFieldComponent } from './components/motion-extension-field/motion-extension-field.component';
 import { MotionFinalVersionComponent } from './components/motion-final-version/motion-final-version.component';
 import { MotionHighlightFormComponent } from './components/motion-highlight-form/motion-highlight-form.component';
@@ -67,6 +65,8 @@ import { ParagraphBasedAmendmentComponent } from './components/paragraph-based-a
 import { MotionDetailDirectivesModule } from './modules/directives/motion-detail-directives.module';
 import { MotionChangeRecommendationDialogModule } from './modules/motion-change-recommendation-dialog/motion-change-recommendation-dialog.module';
 import { MotionDetailRoutingModule } from './motion-detail-routing.module';
+import { AmendmentCreateWizardComponent } from './pages/motion-form/components/amendment-create-wizard/amendment-create-wizard.component';
+import { MotionViewComponent } from './pages/motion-view/components/motion-view/motion-view.component';
 import { MotionDetailServiceModule } from './services/motion-detail-service.module';
 
 @NgModule({

diff --git a/...s/pages/motion-detail/pages/motion-view/components/motion-view/motion-view.component.html b/...s/pages/motion-detail/pages/motion-view/components/motion-view/motion-view.component.html
@@ -1,5 +1,5 @@
 <os-detail-view [collection]="collection" (idFound)="onIdFound($event)">
-    @if (motion && hasLoaded | async) {
+    @if (hasLoaded | async) {
         <os-head-bar
             mainActionTooltip="New amendment"
             [goBack]="motion?.hasLeadMotion"
@@ -8,8 +8,8 @@
             (mainEvent)="createAmendment()"
         >
             <!-- Title -->
-            <div class="title-slot">
-                @if (motion) {
+            @if (motion) {
+                <div class="title-slot">
                     <h2>
                         @if (!vp.isMobile) {
                             <span>{{ 'Motion' | translate }}</span>
@@ -18,8 +18,8 @@ <h2>
                         }
                         <span>{{ motion.number }}</span>
                     </h2>
-                }
-            </div>
+                </div>
+            }
             <!-- Back and forth buttons -->
             @if (showNavigateButtons) {
                 <div class="extra-controls-slot prev-next-motion-controls">
@@ -31,7 +31,7 @@ <h2>
                         [ngClass]="{ 'motion-detail-nav-button': isMobile === false }"
                         (click)="navigateToMotion(previousMotion)"
                     >
-                        <os-icon-container icon="chevron_left" [hide]="vp.isMobileSubject | async">
+                        <os-icon-container icon="chevron_left" [hide]="isMobile">
                             {{ previousMotion ? previousMotion.number : '' }}
                         </os-icon-container>
                     </button>
@@ -42,20 +42,20 @@ <h2>
                         [ngClass]="{ 'motion-detail-nav-button': isMobile === false }"
                         (click)="navigateToMotion(nextMotion)"
                     >
-                        <os-icon-container icon="chevron_right" [hide]="vp.isMobileSubject | async" [swap]="true">
+                        <os-icon-container icon="chevron_right" [hide]="isMobile" [swap]="true">
                             {{ nextMotion ? nextMotion.number : '' }}
                         </os-icon-container>
                     </button>
                 </div>
             }
             <!-- Menu -->
-            <ng-container class="menu-slot">
-                @if (motion) {
+            @if (motion) {
+                <ng-container class="menu-slot">
                     <button mat-icon-button type="button" [matMenuTriggerFor]="motionExtraMenu">
                         <mat-icon>more_vert</mat-icon>
                     </button>
-                }
-            </ng-container>
+                </ng-container>
+            }
             <mat-menu #motionExtraMenu="matMenu">
                 <!-- List of speakers -->
                 <os-speaker-button [menuItem]="true" [object]="motion"></os-speaker-button>
@@ -188,8 +188,5 @@ <h2>
 <ng-template #contentTemplate>
     <os-motion-highlight-form #highlightForm [motion]="motion"></os-motion-highlight-form>
 
-    <os-motion-content
-        #content
-        [motion]="motion"
-    ></os-motion-content>
+    <os-motion-content #content [motion]="motion"></os-motion-content>
 </ng-template>
diff --git a/...ons/pages/motion-detail/pages/motion-view/components/motion-view/motion-view.component.ts b/...ons/pages/motion-detail/pages/motion-view/components/motion-view/motion-view.component.ts
@@ -362,7 +362,6 @@ export class MotionViewComponent extends BaseMeetingComponent implements OnInit,
      */
     private destroy(): void {
         this.cd.detach();
-        this.motion = null;
         this._hasModelSubscriptionInitiated = false;
         this.subscriptions.delete(`sorted-motions`);
         this.viewService.reset();