refactor (overview component): remove unnecessary code and tests (#1286)

dasch-swiss · Nov 28, 2023 · 15522fb · 15522fb
1 parent 3ee211c
commit 15522fb
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 682 deletions.
diff --git a/apps/dsp-app/src/app/main/action/login-form/login-form.component.ts b/apps/dsp-app/src/app/main/action/login-form/login-form.component.ts
@@ -25,7 +25,8 @@ import { map, take, takeLast } from 'rxjs/operators';
 import { ActivatedRoute, Router } from '@angular/router';
 import { Subject } from 'rxjs';
 import { Location } from '@angular/common';
-import { UserStateModel } from '@dasch-swiss/vre/shared/app-state';
+import { LoadProjectsAction, UserStateModel } from '@dasch-swiss/vre/shared/app-state';
+import { Store } from '@ngxs/store';
 
 @Component({
     selector: 'app-login-form',
@@ -105,9 +106,9 @@ export class LoginFormComponent implements OnInit {
             required: 'password is required',
         },
     };
-    
+
     returnUrl: string;
-    
+
     constructor(
         private _componentCommsService: ComponentCommunicationEventService,
         private _fb: UntypedFormBuilder,
@@ -161,7 +162,7 @@ export class LoginFormComponent implements OnInit {
                         this._componentCommsService.emit(
                             new EmitEvent(Events.loginSuccess, true)
                         );
-                        
+
                         return this._authService.loadUser(identifier)
                             .pipe(take(1))
                             .pipe(map((result: any) => result.user))

diff --git a/apps/dsp-app/src/app/system/project-tile/project-tile.component.html b/apps/dsp-app/src/app/system/project-tile/project-tile.component.html
@@ -19,7 +19,7 @@
                 class="settings">
                 <button color="primary" class="settings-button"
                     mat-icon-button
-                    (click)="emitButtonClicked(project.id, 'settings')"
+                    (click)="navigateToSettings(project.id)"
                 >
                     <mat-icon>settings</mat-icon>
                 </button>
@@ -39,7 +39,7 @@
                 class="workspace-button"
                 mat-flat-button
                 [color]="'primary'"
-                (click)="emitButtonClicked(project.id, 'workspace')">
+                (click)="navigateToProject(project.id)">
                 Browse Data
             </button>
         </div>

diff --git a/apps/dsp-app/src/app/system/project-tile/project-tile.component.spec.ts b/apps/dsp-app/src/app/system/project-tile/project-tile.component.spec.ts
diff --git a/apps/dsp-app/src/app/system/project-tile/project-tile.component.ts b/apps/dsp-app/src/app/system/project-tile/project-tile.component.ts
@@ -1,6 +1,8 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { StoredProject } from '@dasch-swiss/dsp-js';
-import { TileLinks, routeParams } from '@dsp-app/src/app/user/overview/overview.component';
+import { RouteConstants } from '@dasch-swiss/vre/shared/app-config';
+import { Router } from '@angular/router';
+import { ProjectService } from '@dsp-app/src/app/workspace/resource/services/project.service';
 
 @Component({
     selector: 'app-project-tile',
@@ -10,12 +12,21 @@ import { TileLinks, routeParams } from '@dsp-app/src/app/user/overview/overview.
 export class ProjectTileComponent {
     @Input() project: StoredProject;
     @Input() sysAdmin: boolean; // used to show settings button
-    @Output() buttonClicked = new EventEmitter<routeParams>();
 
-    constructor() {}
+    constructor(
+        private _router: Router,
+        private _projectService: ProjectService,
+    ) {}
 
-    emitButtonClicked(id: string, path: TileLinks) {
-        const params: routeParams = { id, path };
-        this.buttonClicked.emit(params);
+    navigateToProject(id: string) {
+        const uuid = this._projectService.iriToUuid(id);
+        this._router.navigate([RouteConstants.project, uuid]);
+    }
+
+    navigateToSettings(id: string) {
+        const uuid = this._projectService.iriToUuid(id);
+        this._router.navigate([
+            RouteConstants.project, uuid, RouteConstants.settings, RouteConstants.collaboration
+        ]);
     }
 }
diff --git a/apps/dsp-app/src/app/user/overview/overview.component.html b/apps/dsp-app/src/app/user/overview/overview.component.html
@@ -28,13 +28,12 @@
                     <app-project-tile
                         [project]="proj"
                         [sysAdmin]="true"
-                        (buttonClicked)="navigateTo($event)"
                     ></app-project-tile>
                 </div>
             </div>
         </div>
         <!-- user is logged in and not a system admin -->
-        <div *ngIf="(isSysAdmin$ | async) === false && (isLoggedIn$ | async) === true">
+        <div *ngIf="(isSysAdmin$ | async) === false && !!(user$ | async)">
             <div class="title-bar">
                 <div class="title">
                     <p>My Projects</p>
@@ -48,7 +47,6 @@
                     <app-project-tile
                         [project]="userProj"
                         [sysAdmin]="false"
-                        (buttonClicked)="navigateTo($event)"
                     ></app-project-tile>
                 </div>
             </div>
@@ -65,14 +63,13 @@
                     <app-project-tile
                         [project]="otherProj"
                         [sysAdmin]="false"
-                        (buttonClicked)="navigateTo($event)"
                     ></app-project-tile>
                 </div>
             </div>
         </div>
 
         <!-- user is not logged in -->
-        <div *ngIf="((isProjectsLoading$ | async) === false) && ((isLoggedIn$ | async) === false)">
+        <div *ngIf="((isProjectsLoading$ | async) === false) && !((user$ | async))">
             <!-- list all projects -->
             <div class="title-bar admin">
                 <div class="title">
@@ -87,7 +84,6 @@
                     <app-project-tile
                         [project]="proj"
                         [sysAdmin]="false"
-                        (buttonClicked)="navigateTo($event)"
                     ></app-project-tile>
                 </div>
             </div>