Merge branch 'dev' into feat/post-details

src/app/admin/components/claim-structure/claim-structure.component.ts

@@ -17,14 +17,18 @@ export class ClaimStructureComponent implements OnInit {
   }
 
   public acceptDemand(demand: DemandAttachment): void {
-    this.adminService.acceptStructureClaim(demand.userEmail, demand.structureId).subscribe((data) => {
-      this.demandsAttachment = data;
-    });
+    this.adminService
+      .acceptStructureClaim(demand.userEmail, demand.structureId, demand.structureName)
+      .subscribe((data) => {
+        this.demandsAttachment = data;
+      });
   }
 
   public refuseDemand(demand: DemandAttachment): void {
-    this.adminService.refuseStructureClaim(demand.userEmail, demand.structureId).subscribe((data) => {
-      this.demandsAttachment = data;
-    });
+    this.adminService
+      .refuseStructureClaim(demand.userEmail, demand.structureId, demand.structureName)
+      .subscribe((data) => {
+        this.demandsAttachment = data;
+      });
   }
 }

src/app/admin/services/admin.service.ts

@@ -15,11 +15,27 @@ export class AdminService {
     return this.http.get<DemandAttachment[]>(`${this.baseUrl}/pendingStructures`);
   }
 
-  public acceptStructureClaim(userEmail: string, structureId: number): Observable<DemandAttachment[]> {
-    return this.http.post<DemandAttachment[]>(`${this.baseUrl}/validatePendingStructure`, { userEmail, structureId });
+  public acceptStructureClaim(
+    userEmail: string,
+    structureId: number,
+    structureName: string
+  ): Observable<DemandAttachment[]> {
+    return this.http.post<DemandAttachment[]>(`${this.baseUrl}/validatePendingStructure`, {
+      userEmail,
+      structureId,
+      structureName,
+    });
   }
 
-  public refuseStructureClaim(userEmail: string, structureId: number): Observable<DemandAttachment[]> {
-    return this.http.post<DemandAttachment[]>(`${this.baseUrl}/rejectPendingStructure`, { userEmail, structureId });
+  public refuseStructureClaim(
+    userEmail: string,
+    structureId: number,
+    structureName: string
+  ): Observable<DemandAttachment[]> {
+    return this.http.post<DemandAttachment[]>(`${this.baseUrl}/rejectPendingStructure`, {
+      userEmail,
+      structureId,
+      structureName,
+    });
   }
 }

src/app/structure-list/components/search/search.component.html

@@ -91,7 +91,7 @@
     </div>
   </div>
   <div class="footerSearchSection isntPhoneContent" fxLayout="row" fxLayoutAlign="space-between center">
-    <div class="checkbox">
+    <div class="checkbox no-width">
       <div class="checkboxItem">
         <label>
           <input

src/app/structure-list/components/search/search.component.scss

@@ -118,7 +118,6 @@
 }
 a {
   @include hyperlink;
-  width: 100%;
   text-align: right;
 }
 

src/assets/scss/_buttons.scss

@@ -7,7 +7,7 @@
   height: 40px;
   width: 190px;
   border: 1px solid $grey-4;
-  padding: 3px 16px 3px 16px;
+  padding: 3px 8px 3px 16px;
   outline: none;
   border-radius: 4px;
   cursor: pointer;

src/styles.scss

@@ -159,6 +159,9 @@ button {
       -ms-transform: rotate(45deg);
     }
   }
+  &.no-width {
+    width: unset;
+  }
 }
 
 // Layout