From 411cc1b5d5b38ddcee4317d195261294194f108a Mon Sep 17 00:00:00 2001
From: Florian Eisenmenger <floeis@MacBook-Pro-von-Florian.fritz.box>
Date: Wed, 19 Jun 2024 10:39:06 +0200
Subject: [PATCH] fixes and beautifying

---
 .../_views/documents/documents.component.html |  2 +-
 .../_views/documents/documents.component.ts   | 16 +------
 .../src/app/_views/home/home.component.html   |  2 +-
 .../src/app/_views/home/home.component.ts     |  4 +-
 .../new-partner/new-partner.component.html    |  3 +-
 .../new-partner/new-partner.component.ts      | 15 ++-----
 .../partner-list/partner-list.component.html  |  2 +-
 .../partners-detail.component.ts              | 42 +++++++++----------
 .../_views/partners/partners.component.html   |  2 +-
 .../new-comment/new-comment.component.html    |  1 -
 .../new-comment/new-comment.component.ts      |  9 ++--
 .../posts/new-post/new-post.component.html    |  1 -
 .../posts/post-list/post-list.component.html  |  2 +-
 13 files changed, 33 insertions(+), 68 deletions(-)

diff --git a/matsen-tool/src/app/_views/documents/documents.component.html b/matsen-tool/src/app/_views/documents/documents.component.html
index 91db718..0dc482c 100644
--- a/matsen-tool/src/app/_views/documents/documents.component.html
+++ b/matsen-tool/src/app/_views/documents/documents.component.html
@@ -5,4 +5,4 @@
     <app-document-list #documentList
 
     ></app-document-list>
-</div>
\ No newline at end of file
+</div>
diff --git a/matsen-tool/src/app/_views/documents/documents.component.ts b/matsen-tool/src/app/_views/documents/documents.component.ts
index 6639083..92289da 100644
--- a/matsen-tool/src/app/_views/documents/documents.component.ts
+++ b/matsen-tool/src/app/_views/documents/documents.component.ts
@@ -1,18 +1,4 @@
-import {ChangeDetectorRef, Component, ViewChild} from '@angular/core';
-import {MatSort, MatSortModule, Sort} from "@angular/material/sort";
-import {MatPaginator, MatPaginatorIntl, MatPaginatorModule, PageEvent} from "@angular/material/paginator";
-import {Subscription} from "rxjs";
-import {DocumentJsonld, DocumentService} from "@app/core/api/v1";
-import {Router, RouterLink, RouterLinkActive} from "@angular/router";
-import {MatTableDataSource, MatTableModule} from "@angular/material/table";
-import {OrderFilter} from "@app/_models/orderFilter";
-import {DatePipe, NgIf} from "@angular/common";
-import {NgbModal, NgbModalOptions} from "@ng-bootstrap/ng-bootstrap";
-import {NewDocumentComponent} from "@app/_views/documents/new-document/new-document.component";
-import {TranslateModule} from "@ngx-translate/core";
-import {ModalStatus} from "@app/_helpers/modal.states";
-import {AppHelperService} from "@app/_helpers/app-helper.service";
-import {ProductListComponent} from "@app/_views/products/product-list/product-list.component";
+import {Component, ViewChild} from '@angular/core';
 import {DocumentListComponent} from "@app/_views/documents/document-list/document-list.component";
 
 @Component({
diff --git a/matsen-tool/src/app/_views/home/home.component.html b/matsen-tool/src/app/_views/home/home.component.html
index 6c37ba8..93d61ea 100644
--- a/matsen-tool/src/app/_views/home/home.component.html
+++ b/matsen-tool/src/app/_views/home/home.component.html
@@ -75,4 +75,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/matsen-tool/src/app/_views/home/home.component.ts b/matsen-tool/src/app/_views/home/home.component.ts
index 0c6927c..f42e9ab 100644
--- a/matsen-tool/src/app/_views/home/home.component.ts
+++ b/matsen-tool/src/app/_views/home/home.component.ts
@@ -1,10 +1,8 @@
-import {AfterViewInit, ChangeDetectorRef, Component, OnInit, ViewChild} from '@angular/core';
+import {AfterViewInit, Component, OnInit} from '@angular/core';
 
 import {User} from '@app/_models';
 import {AccountService} from '@app/_services';
 import {AppHelperService} from "@app/_helpers/app-helper.service";
-import {ToggleComponent} from "@app/_components/toggle/toggle.component";
-import {TaskListComponent} from "@app/_views/tasks/task-list/task-list.component";
 
 @Component({
     templateUrl: 'home.component.html',
diff --git a/matsen-tool/src/app/_views/partners/new-partner/new-partner.component.html b/matsen-tool/src/app/_views/partners/new-partner/new-partner.component.html
index 8a676a1..feac108 100644
--- a/matsen-tool/src/app/_views/partners/new-partner/new-partner.component.html
+++ b/matsen-tool/src/app/_views/partners/new-partner/new-partner.component.html
@@ -52,7 +52,7 @@
 
         <div class="mb-3" *ngIf="partnerForm.get('logoUrl')?.value !== null">
             <div class="delete-image" (click)="onDeleteImage()">
-                <img  src="{{partner.logoUrl}}" width="40" height="40"  />
+                <img src="{{partner.logoUrl}}" width="40" height="40" alt="{{partner.name}}"/>
                 <p class="mb-0 ms-3">{{ 'system.delete-image' | translate }}</p>
             </div>
         </div>
@@ -61,4 +61,3 @@
         </button>
     </form>
 </div>
-
diff --git a/matsen-tool/src/app/_views/partners/new-partner/new-partner.component.ts b/matsen-tool/src/app/_views/partners/new-partner/new-partner.component.ts
index 3332121..0a3d018 100644
--- a/matsen-tool/src/app/_views/partners/new-partner/new-partner.component.ts
+++ b/matsen-tool/src/app/_views/partners/new-partner/new-partner.component.ts
@@ -3,7 +3,6 @@ import {partnerForm} from "@app/_forms/apiForms";
 import {MediaObjectService, PartnerJsonld, PartnerService} from "@app/core/api/v1";
 import {ModalStatus} from "@app/_helpers/modal.states";
 import {FormGroup} from "@angular/forms";
-import {Subscription} from "rxjs";
 import {TranslateService} from "@ngx-translate/core";
 import {FormGroupInitializer} from "@app/_helpers/formgroup.initializer";
 import {AppHelperService} from "@app/_helpers/app-helper.service";
@@ -18,11 +17,7 @@ export class NewPartnerComponent implements OnInit {
     @Output() public submit: EventEmitter<ModalStatus> = new EventEmitter<ModalStatus>();
 
     protected partnerForm: FormGroup;
-    protected partnerSub: Subscription;
-
     protected selectedImage: File | null;
-    protected mediaSub: Subscription;
-
     protected partnerNameOne: string;
 
     constructor(
@@ -33,10 +28,6 @@ export class NewPartnerComponent implements OnInit {
     ) {
         this.partnerForm = partnerForm;
         this.selectedImage = null;
-
-        this.partnerSub = new Subscription();
-        this.mediaSub = new Subscription();
-
         this.partnerNameOne = "";
     }
 
@@ -50,7 +41,7 @@ export class NewPartnerComponent implements OnInit {
     // On submit form: Check if image is set
     onSubmit() {
         if (this.selectedImage !== null) {
-            this.mediaSub = this.mediaObjectService.mediaObjectsPost(
+            this.mediaObjectService.mediaObjectsPost(
                 this.selectedImage
             ).subscribe(
                 data => {
@@ -68,7 +59,7 @@ export class NewPartnerComponent implements OnInit {
         if (this.partnerForm.valid) {
             if (this.partner.id === null || this.partner.id === undefined) {
                 // Create new contact
-                this.partnerSub = this.partnerService.partnersPost(
+                this.partnerService.partnersPost(
                     this.partnerForm.value as PartnerJsonld
                 ).subscribe(
                     data => {
@@ -78,7 +69,7 @@ export class NewPartnerComponent implements OnInit {
                 );
             } else {
                 // Edit contact
-                this.partnerSub = this.partnerService.partnersIdPatch(
+                this.partnerService.partnersIdPatch(
                     this.appHelperService.extractId(this.partner.id),
                     this.partnerForm.value as PartnerJsonld
                 ).subscribe(
diff --git a/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.html b/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.html
index 201ebfd..a47a172 100644
--- a/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.html
+++ b/matsen-tool/src/app/_views/partners/partner-list/partner-list.component.html
@@ -9,4 +9,4 @@
               [onRemoveItemFunction]="unassignPartner"
               [listColDefinitions]="listColDefinitions"
     ></app-list>
-</div>
\ No newline at end of file
+</div>
diff --git a/matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.ts b/matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.ts
index aac9ef9..430828d 100644
--- a/matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.ts
+++ b/matsen-tool/src/app/_views/partners/partners-detail/partners-detail.component.ts
@@ -1,8 +1,10 @@
 import {AfterViewInit, Component, OnInit, ViewChild} from '@angular/core';
 import {ActivatedRoute} from "@angular/router";
 import {
-    PartnerFollowJsonld, PartnerFollowService,
-    PartnerJsonld, PartnerService
+    PartnerFollowJsonld,
+    PartnerFollowService,
+    PartnerJsonld,
+    PartnerService
 } from "@app/core/api/v1";
 import {Subscription} from "rxjs";
 import {environment} from "@environments/environment";
@@ -25,25 +27,22 @@ import {DocumentListComponent} from "@app/_views/documents/document-list/documen
 })
 export class PartnersDetailComponent implements OnInit, AfterViewInit {
 
-    @ViewChild("toggleProducts", { static: true }) toggleProducts!: ToggleComponent;
-    @ViewChild("productListComponent", { static: false }) productsComponent!: ProductListComponent;
-    @ViewChild("toggleContacts", { static: true }) toggleContacts!: ToggleComponent;
-    @ViewChild("contactListComponent", { static: false }) contactsComponent!: ContactListComponent;
-    @ViewChild("toggleTasks", { static: true }) toggleTasks!: ToggleComponent;
-    @ViewChild("taskListComponent", { static: false }) taskListComponent!: TaskListComponent;
-    @ViewChild("togglePosts", { static: true }) togglePosts!: ToggleComponent;
-    @ViewChild("postListComponent", { static: false }) postsComponent!: PostListComponent;
-    @ViewChild("toggleSales", { static: true }) toggleSales!: ToggleComponent;
-    @ViewChild("salesListComponent", { static: false }) salesListComponent!: SaleListComponent;
-    @ViewChild("toggleDocuments", { static: true }) toggleDocuments!: ToggleComponent;
-    @ViewChild("documentsListComponent", { static: false }) documentsListComponent!: DocumentListComponent;
-
-    protected user: User | null;
+    @ViewChild("toggleProducts", {static: true}) toggleProducts!: ToggleComponent;
+    @ViewChild("productListComponent", {static: false}) productsComponent!: ProductListComponent;
+    @ViewChild("toggleContacts", {static: true}) toggleContacts!: ToggleComponent;
+    @ViewChild("contactListComponent", {static: false}) contactsComponent!: ContactListComponent;
+    @ViewChild("toggleTasks", {static: true}) toggleTasks!: ToggleComponent;
+    @ViewChild("taskListComponent", {static: false}) taskListComponent!: TaskListComponent;
+    @ViewChild("togglePosts", {static: true}) togglePosts!: ToggleComponent;
+    @ViewChild("postListComponent", {static: false}) postsComponent!: PostListComponent;
+    @ViewChild("toggleSales", {static: true}) toggleSales!: ToggleComponent;
+    @ViewChild("salesListComponent", {static: false}) salesListComponent!: SaleListComponent;
+    @ViewChild("toggleDocuments", {static: true}) toggleDocuments!: ToggleComponent;
+    @ViewChild("documentsListComponent", {static: false}) documentsListComponent!: DocumentListComponent;
 
     protected readonly environment = environment;
+    protected user: User | null;
     protected partnerId!: string;
-
-    protected partnerDetailSub: Subscription;
     protected partner!: PartnerJsonld;
     protected partnerFollowSub: Subscription;
     protected partnerFollow: PartnerFollowJsonld | null;
@@ -55,11 +54,8 @@ export class PartnersDetailComponent implements OnInit, AfterViewInit {
         private partnerFollowService: PartnerFollowService,
         protected appHelperService: AppHelperService
     ) {
-        this.partnerDetailSub = new Subscription();
-
         this.partnerFollowSub = new Subscription();
         this.partnerFollow = null;
-
         this.user = this.accountService.userValue;
     }
 
@@ -80,7 +76,7 @@ export class PartnersDetailComponent implements OnInit, AfterViewInit {
     }
 
     getPartnerData = () => {
-        this.partnerDetailSub = this.partnerService.partnersIdGet(
+        this.partnerService.partnersIdGet(
             this.partnerId
         ).subscribe(
             data => {
@@ -130,6 +126,6 @@ export class PartnersDetailComponent implements OnInit, AfterViewInit {
     }
 
     openModalEditPartner() {
-        this.appHelperService.openModal(NewPartnerComponent, { 'partner': this.partner }, this.getData);
+        this.appHelperService.openModal(NewPartnerComponent, {'partner': this.partner}, this.getData);
     }
 }
diff --git a/matsen-tool/src/app/_views/partners/partners.component.html b/matsen-tool/src/app/_views/partners/partners.component.html
index 3badb39..3b1d59b 100644
--- a/matsen-tool/src/app/_views/partners/partners.component.html
+++ b/matsen-tool/src/app/_views/partners/partners.component.html
@@ -5,4 +5,4 @@
     <app-partner-list #partnerList
         [partnerType]="partnerType"
     ></app-partner-list>
-</div>
\ No newline at end of file
+</div>
diff --git a/matsen-tool/src/app/_views/posts/new-comment/new-comment.component.html b/matsen-tool/src/app/_views/posts/new-comment/new-comment.component.html
index f812585..f7cc48b 100644
--- a/matsen-tool/src/app/_views/posts/new-comment/new-comment.component.html
+++ b/matsen-tool/src/app/_views/posts/new-comment/new-comment.component.html
@@ -13,4 +13,3 @@
         <button type="submit" class="btn btn-primary" [disabled]="commentForm.invalid">{{'form.send' | translate}}</button>
     </form>
 </div>
-
diff --git a/matsen-tool/src/app/_views/posts/new-comment/new-comment.component.ts b/matsen-tool/src/app/_views/posts/new-comment/new-comment.component.ts
index 460d43a..3025795 100644
--- a/matsen-tool/src/app/_views/posts/new-comment/new-comment.component.ts
+++ b/matsen-tool/src/app/_views/posts/new-comment/new-comment.component.ts
@@ -1,7 +1,6 @@
 import {Component, EventEmitter, Input, OnInit, Output} from '@angular/core';
 import {ModalStatus} from "@app/_helpers/modal.states";
-import {CommentJsonld, CommentService, PostJsonld} from "@app/core/api/v1";
-import {Subscription} from "rxjs";
+import {CommentJsonld, CommentService} from "@app/core/api/v1";
 import {FormGroupInitializer} from "@app/_helpers/formgroup.initializer";
 import {FormGroup} from "@angular/forms";
 import {commentForm} from "@app/_forms/apiForms";
@@ -17,14 +16,12 @@ export class NewCommentComponent implements OnInit {
     @Output() public submit: EventEmitter<ModalStatus> = new EventEmitter<ModalStatus>();
 
     protected commentForm: FormGroup;
-    protected commentSub: Subscription;
 
     constructor(
         private commentService: CommentService,
         protected appHelperService: AppHelperService,
     ) {
         this.commentForm = commentForm;
-        this.commentSub = new Subscription();
     }
 
     ngOnInit(): void {
@@ -35,7 +32,7 @@ export class NewCommentComponent implements OnInit {
         if (this.commentForm.valid) {
             if (this.comment.id === null || this.comment.id === undefined) {
                 // Create new comment
-                this.commentSub = this.commentService.commentsPost(
+                this.commentService.commentsPost(
                     this.commentForm.value as CommentJsonld
                 ).subscribe(
                     data => {
@@ -45,7 +42,7 @@ export class NewCommentComponent implements OnInit {
                 );
             } else {
                 // Edit comment
-                this.commentSub = this.commentService.commentsIdPatch(
+                this.commentService.commentsIdPatch(
                     this.appHelperService.extractId(this.comment.id),
                     this.commentForm.value as CommentJsonld
                 ).subscribe(
diff --git a/matsen-tool/src/app/_views/posts/new-post/new-post.component.html b/matsen-tool/src/app/_views/posts/new-post/new-post.component.html
index 1793df7..d8bd574 100644
--- a/matsen-tool/src/app/_views/posts/new-post/new-post.component.html
+++ b/matsen-tool/src/app/_views/posts/new-post/new-post.component.html
@@ -45,4 +45,3 @@
         </button>
     </form>
 </div>
-
diff --git a/matsen-tool/src/app/_views/posts/post-list/post-list.component.html b/matsen-tool/src/app/_views/posts/post-list/post-list.component.html
index f323d49..54462c7 100644
--- a/matsen-tool/src/app/_views/posts/post-list/post-list.component.html
+++ b/matsen-tool/src/app/_views/posts/post-list/post-list.component.html
@@ -67,4 +67,4 @@
             </div>
         </app-paging>
     </div>
-</div>
\ No newline at end of file
+</div>