Merge branch...

Merge branch '584-carto-bouton-modifier-la-structure-ne-fonctionne-pas-apres-une-recherche' into 'dev'

fix(carto): refresh structure-details should leave the panel open

See merge request !847

src/app/profile/structure-edition-summary/structure-edition-summary.component.ts

@@ -40,7 +40,7 @@ export class StructureEditionSummaryComponent implements OnInit {
   public structureFormStep = structureFormStep;
   public equipmentEnum = Equipment;
   public trainingCategories: Map<string, Category>;
-  public freeWorkshopName = FreeWorkshop;
+  public freeWorkshopName: FreeWorkshop = null;
 
   // Digital learning
   public categories: Category[] = [];
@@ -73,8 +73,8 @@ export class StructureEditionSummaryComponent implements OnInit {
 
         this.structureService.getStructureWithOwners(data.structure._id).subscribe((result) => {
           this.members = result.owners;
-          if (result.structure.categories?.freeWorkShop.length) {
-            const freeWorkShop = result.structure.categories?.freeWorkShop as unknown as string;
+          const freeWorkShop = result.structure.categories?.freeWorkShop as unknown as FreeWorkshop;
+          if (freeWorkShop) {
             this.freeWorkshopName = FreeWorkshop[freeWorkShop];
           }
         });

src/app/structure-list/components/card/card.component.ts

@@ -70,7 +70,6 @@ export class CardComponent implements OnInit {
         queryParams: {
           structure: this.structure.permalink,
         },
-        queryParamsHandling: 'merge',
         state: { isOrientation: this.isOrientation },
       });
     } else {

src/app/structure-list/structure-list.component.ts

@@ -55,7 +55,6 @@ export class StructureListComponent implements OnChanges, OnInit {
         queryParams: {
           structure: this.selectedStructure.permalink,
         },
-        queryParamsHandling: 'merge',
       });
     }
     if (changes.structureList) {