feat add delete Todoinstitution functionality, protected by authGuard

frontend/src/app/add-institution/add-institution.component.html

@@ -105,10 +105,15 @@ <h4>Add Organization(s)</h4>
 
     <input
       type="submit"
-      value="Save Institution"
+      value="Save/Update Institution"
       class="submit-btn"
       [disabled]="!reactiveForm.valid"
     />
+
+    <button type="button" class="delete-btn" (click)="DeleteInst()">
+      Delete Whole Institution
+    </button>
+
   </form>
 </section>
 

frontend/src/app/add-institution/add-institution.component.scss

@@ -98,9 +98,28 @@
     transition: all 0.2s ease;
     background: #888;
   }
+
   .form .submit-btn:hover {
     background: #555;
   }
+
+  .form .delete-btn {
+    height: 55px;
+    width: 100%;
+    color: #fff;
+    font-size: 1rem;
+    font-weight: 400;
+    margin-top: 30px;
+    border: none;
+    border-radius: 5px;
+    cursor: pointer;
+    transition: all 0.2s ease;
+    background: #d82222;
+  }
+
+  .form .delete-btn:hover {
+    background: #da6565;
+  }
   /*Responsive*/
   @media screen and (max-width: 500px) {
     .form .column {

frontend/src/app/add-institution/add-institution.component.ts

@@ -13,12 +13,20 @@ export class AddInstitutionComponent implements OnInit {
   formdata: any = {};
   reactiveForm: FormGroup;
   dataSource: any;
-  displayedColumns: string[] = ['name_de','uuid', 'sector', 'shortname',  'ts','orgs', 'edit'];
+  displayedColumns: string[] = [
+    'name_de',
+    'uuid',
+    'sector',
+    'shortname',
+    'ts',
+    'orgs',
+    'edit',
+  ];
 
   constructor(private dataService: DataService) {}
 
   ngOnInit() {
-    this.dataService.LoadTodoInstitutions().then(data => {
+    this.dataService.LoadTodoInstitutions().then((data) => {
       this.dataSource = data;
     });
 
@@ -51,9 +59,7 @@ export class AddInstitutionComponent implements OnInit {
 
   async OnFormSubmitted() {
     this.formdata = this.reactiveForm.value;
-    await this.dataService.createNewTodoInstitution(
-      this.formdata,
-    );
+    await this.dataService.createNewTodoInstitution(this.formdata);
     this.reactiveForm.reset({
       name_de: null,
       shortNnme: null,
@@ -82,33 +88,47 @@ export class AddInstitutionComponent implements OnInit {
     const controls = <FormArray>this.reactiveForm.get('orgs');
     controls.removeAt(index);
   }
-  editTodoInstitution(institution) {
 
-
+  editTodoInstitution(institution) {
     // Add additional FormGroups for the organizations if there are more in the institution than in the form
     const orgsControl = <FormArray>this.reactiveForm.get('orgs');
     while (orgsControl.length < institution.orgs.length) {
       this.AddOrg();
     }
-  
+
     // Remove additional FormGroups for the organizations if there are more in the form than in the institution
     while (orgsControl.length > institution.orgs.length) {
       this.DeleteOrg(orgsControl.length - 1);
     }
-// write values from chosen institution to the form
+    // write values from chosen institution to the form
     this.reactiveForm.patchValue({
       name_de: institution.name_de,
       shortname: institution.shortname,
       uuid: institution.uuid,
       sector: institution.sector,
       ts: institution.ts,
-      orgs: institution.orgs.map(org => ({
+      orgs: institution.orgs.map((org) => ({
         name: org.name,
-        ts_org: org.ts
-      }))
+        ts_org: org.ts,
+      })),
     });
   }
 
-
-
+  async DeleteInst() {
+    this.formdata = this.reactiveForm.value;
+    await this.dataService.DeleteTodoInstitution(this.formdata);
+    this.reactiveForm.reset({
+      name_de: null,
+      shortNnme: null,
+      uuid: null,
+      sector: null,
+      ts: null,
+      orgs: [
+        {
+          name: null,
+          ts_org: null,
+        },
+      ],
+    });
+  }
 }

frontend/src/app/data.service.ts

@@ -35,6 +35,22 @@ export class DataService {
       .toPromise();
   }
 
+  async DeleteTodoInstitution(institution) {
+    if (!institution ) {
+      throw new Error('Invalid institution object');
+    }
+    const token = this.tokenService.getAccessToken(); 
+  const headers = new HttpHeaders().set('Authorization', `Bearer ${token}`);
+  const options = {
+    headers: headers,
+    body: { institution }
+  };
+  return await this.http
+    .delete<TodoInstitution>(`${environment.api}api/institution`, options)
+    .toPromise();
+
+  }
+
   async LoadTodoInstitutions() {
     this.TodoInstitutions = await this.http
       .get<TodoInstitution>(`${environment.api}api/institution`)

frontend/src/app/nav/nav.component.html

@@ -22,7 +22,7 @@
     </button>
     <button mat-button routerLink="/add-institution" *ngIf="isLoggedIn()">
       <mat-icon>note_add</mat-icon>
-      <span>Add an Institution</span>
+      <span>Add/Edit an Institution</span>
     </button>
     <!-- <button mat-button routerLink="/visualization">
       <mat-icon>pie_chart</mat-icon>

oss-api/src/api/api.controller.ts

@@ -9,6 +9,7 @@ import {
   Query,
   UsePipes,
   ValidationPipe,
+  Delete,
 } from '@nestjs/common';
 import { InstitutionQueryPipe } from 'src/institution-query.pipe';
 import {
@@ -106,6 +107,12 @@ export class ApiController {
     return this.mongoDbService.createNewTodoInstitution(institution);
   }
 
+  @UseGuards(AuthGuard)
+  @Delete('institution')
+  async deleteInstitution(@Body('institution') institution: TodoInstitution) {
+    return this.mongoDbService.deleteTodoInstitution(institution);
+  }
+
   @UseGuards(AuthGuard)
   @Get('institution')
   async findTodoInstitution() {

oss-api/src/auth/auth.module.ts

@@ -10,7 +10,7 @@ import { AuthController } from './auth.controller';
     JwtModule.register({
       global: true,
       secret: jwtConstants.secret,
-      signOptions: { expiresIn: '300s' },
+      signOptions: { expiresIn: '900s' },
     }),
     AddInstitutionModule,
   ],

oss-api/src/mongo-db/mongo-db.service.ts

@@ -521,6 +521,13 @@ export class MongoDbService implements OnApplicationShutdown, OnModuleInit {
       .replaceOne({ uuid: institution.uuid }, institution, { upsert: true });
   }
 
+  async deleteTodoInstitution(institution: TodoInstitution) {
+    return await this.client
+      .db(this.database)
+      .collection<TodoInstitution>(Tables.todoInstitutions)
+      .deleteOne({ uuid: institution.uuid });
+  }
+
   /**
    * Count all users with the given condtions
    * @param conditions The conditions to filter with