From e56a6effd8f42a2779c9f456eba1ad941b2c98be Mon Sep 17 00:00:00 2001
From: argirok <argirokokogiannaki@gmail.com>
Date: Fri, 12 Aug 2022 16:18:36 +0300
Subject: [PATCH] add back remove layout method in admin-customization

Customization: first create css, then save the layout and purge cache (to avoid file not found) - add timeout to load the iframe (to avoid file not found)
---
 src/app/openaireLibrary                       |  2 +-
 .../connect-admin-customization.component.ts  | 20 +++++++++++++++++++
 .../customization/customization.component.ts  | 16 +++++++--------
 3 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/src/app/openaireLibrary b/src/app/openaireLibrary
index 27d7c7c..561c15b 160000
--- a/src/app/openaireLibrary
+++ b/src/app/openaireLibrary
@@ -1 +1 @@
-Subproject commit 27d7c7c118a363c2db3deb8ee13ff8801ebed3a8
+Subproject commit 561c15b8cd52f45ab6d3aa1d125ef69478a81038
diff --git a/src/app/pages/connect-admin-customization/connect-admin-customization.component.ts b/src/app/pages/connect-admin-customization/connect-admin-customization.component.ts
index 8b7d4f2..c286cb1 100644
--- a/src/app/pages/connect-admin-customization/connect-admin-customization.component.ts
+++ b/src/app/pages/connect-admin-customization/connect-admin-customization.component.ts
@@ -31,6 +31,18 @@ declare var UIkit;
         </div>
         <button (click)="updateCss()" class="uk-button uk-button-danger" [class.uk-disabled]="savingChanges"> Update CSS</button>
         <button (click)="purgeBrowserCache()" class="uk-button uk-button-danger uk-margin-left" [class.uk-disabled]="savingChanges"> Purge Browser Cache</button>
+
+        <ng-container *ngIf="properties.domain != 'production'">
+          <hr>
+          <div class="uk-alert uk-alert-danger uk-margin-top ">
+            Delete after next deployment
+          </div>
+          <div class="uk-alert uk-alert-warning uk-margin-top ">
+            <div class="uk-text-large">Use to clean up multiple layouts of a community id.</div>
+          </div>
+          <div input [(value)]="community" [placeholder]="'e.g. galaxy'"></div>
+          <button (click)="deleteLayout()" class="uk-button uk-button-danger" [class.uk-disabled]="!community"> Delete layout</button>
+        </ng-container>
       </div>
     </div>
     
@@ -111,4 +123,12 @@ export class ConnectAdminCustomizationComponent implements OnInit {
     ));
     this._clearCacheService.purgeBrowserCache("Layout added/ updated", "connect");
   }
+
+  deleteLayout(){
+    if(this.community && this.community.length > 0) {
+      this.subscriptions.push(this.customizationService.deleteLayout(properties, this.community,  "community").subscribe(data => {
+
+      }));
+    }
+  }
 }
diff --git a/src/app/pages/customization/customization.component.ts b/src/app/pages/customization/customization.component.ts
index bad626d..bf6a124 100644
--- a/src/app/pages/customization/customization.component.ts
+++ b/src/app/pages/customization/customization.component.ts
@@ -172,13 +172,13 @@ sidebarItems = [{name:"Identity", id : "identity", icon: "desktop_windows" },
     this.publishedLayout.layoutOptions =  this.copyObject(this.draftCustomizationOptions);
     this.publishedCustomizationOptions =  this.copyObject(this.publishedLayout.layoutOptions)
     this.publishedLayout.date = new Date();
-    this.subscriptions.push(this.layoutService.saveLayout(this.properties, this.communityId, this.publishedLayout).subscribe(layout => {
-      this.publishedLayout._id = layout._id;
-      this._clearCacheService.purgeBrowserCache("Layout added/ updated", this.communityId);
-
-      this.subscriptions.push(this.layoutService.createCSS(this.communityId,this.properties.connectPortalUrl, this.publishedLayout.date.valueOf(), this.publishedLayout.layoutOptions).subscribe(data => {
-        console.log(data)
-        this.initializeCustomizationOptions(JSON.stringify(this.publishedCustomizationOptions) != this.previewCustomization);
+    this.subscriptions.push(this.layoutService.createCSS(this.communityId,this.properties.connectPortalUrl, this.publishedLayout.date.valueOf(), this.publishedLayout.layoutOptions).subscribe(data => {
+      this.subscriptions.push(this.layoutService.saveLayout(this.properties, this.communityId, this.publishedLayout).subscribe(layout => {
+        this.publishedLayout._id = layout._id;
+        this._clearCacheService.purgeBrowserCache("Layout added/ updated", this.communityId);
+        setTimeout(() => {
+          this.initializeCustomizationOptions(JSON.stringify(this.publishedCustomizationOptions) != this.previewCustomization);
+        }, 4000);
         this.deleteOldImages();
         UIkit.notification("Customizations was successfully saved!", {
           status: 'success',
@@ -240,7 +240,7 @@ sidebarItems = [{name:"Identity", id : "identity", icon: "desktop_windows" },
 
         setTimeout(() => {
           this.previewUrl = this.getCommunityUrlSatinized(this.communityId + prefix);
-        }, 1500);
+        }, 4000);
 
       }, error => {