From d9853e1d918cc429d135b0218e47f1e39e11305f Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Thu, 11 Aug 2022 15:46:55 +0300
Subject: [PATCH] [Connect Admin | Library | new-theme]: Updated call for
 purging browser cache - through admin tools api. 1. environment.ts &
 environment.beta.ts: Updated property "deleteBrowserCacheUrl" to call admin
 tools api. 2. clear-cache.service.ts: Used updated property
 "deleteBrowserCacheUrl" and in GET request added
 CustomOptions.registryOptions(). 3. connect-admin-customization.component.ts:
 Deleted unnecessary code for deleting layout.

---
 .../connect-admin-customization.component.ts   | 18 ------------------
 src/environments/environment.beta.ts           |  2 +-
 src/environments/environment.ts                |  2 +-
 3 files changed, 2 insertions(+), 20 deletions(-)

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 3a82430..8b7d4f2 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,17 +31,6 @@ 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,13 +100,6 @@ export class ConnectAdminCustomizationComponent implements OnInit {
       }));
     }));
   }
-  deleteLayout(){
-    if(this.community && this.community.length > 0) {
-      this.subscriptions.push(this.customizationService.deleteLayout(properties, this.community,  "community").subscribe(data => {
-
-      }));
-    }
-  }
 
   purgeBrowserCache() {
     this.subscriptions.push(this.communitiesService.getCommunities(this.properties, this.properties.communityAPI + 'communities').subscribe(
diff --git a/src/environments/environment.beta.ts b/src/environments/environment.beta.ts
index 7f13177..5429074 100644
--- a/src/environments/environment.beta.ts
+++ b/src/environments/environment.beta.ts
@@ -46,7 +46,7 @@ export let properties: EnvProperties = {
   feedbackmailForMissingEntities: "feedback@openaire.eu",
   cacheUrl: "https://demo.openaire.eu/cache/get?url=",
   deleteCacheUrl: 'https://demo.openaire.eu/cache/clear',
-  deleteBrowserCacheUrl: 'https://beta.{pid}.openaire.eu/purge/',
+  deleteBrowserCacheUrl: 'https://beta.services.openaire.eu/uoa-admin-tools/cache',
   adminToolsAPIURL: "https://beta.services.openaire.eu/uoa-admin-tools/",
   adminToolsCommunity: "openaire",
   communityAPI: "https://beta.services.openaire.eu/openaire/community/",
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 46146ed..3003403 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -51,7 +51,7 @@ export let properties: EnvProperties = {
   feedbackmailForMissingEntities: 'feedback@openaire.eu',
   cacheUrl: 'http://scoobydoo.di.uoa.gr:3000/get?url=',
   deleteCacheUrl: 'http://duffy.di.uoa.gr:3000/clear',
-  deleteBrowserCacheUrl: 'https://beta.{pid}.openaire.eu/purge/',
+  deleteBrowserCacheUrl: 'http://duffy.di.uoa.gr:8080/uoa-admin-tools/cache',
   adminToolsAPIURL: 'http://duffy.di.uoa.gr:8080/uoa-admin-tools/',
   adminToolsCommunity: 'openaire',
   communityAPI: 'https://dev-openaire.d4science.org/openaire/community/',