[Library | explore-redesign]: Fixes in usage counts iframes, bip iframe, orcid buttons in search results, filters button in small screens and fos/sdgs vocabulary calls.

1. dataProvider.component.html & project.component.html & resultLanding.component.html: [Bug fix] Updated checks for usage counts iframes and changed the order they appear (first views, then downloads).
2. dataProvider.component.ts & project.component.ts:
   a. [Bug fix] Added fields public hasViews: boolean = false; and public hasDownloads: boolean = false; - used in checks for displaying usage counts iframes.
   b. [Bug fix] Updated parsing of dataProviderInfo.measure.counts when querying external usage counts api.
3. resultLanding.component.ts:
   a. [Bug fix] Added fields public hasViews: boolean = false; and public hasDownloads: boolean = false; - used in checks for displaying usage counts iframes.
   b. [Bug fix] In bipFrameUrl, when environment == "beta", add "&src=beta" parameter.
4. orcid-work.component.ts:
   a. [Bug fix] Updated disabled class checks, to enable orcid buttons in search too when there are identifiers.
   b. When loading - action is in progress, show loading icon next to the label.
   c. In my orcid links page: renamed "Add to ORCID" to "Claim" and "Delete from ORCID" to "Remove".
5. newSearchPage.component.html: [Bug fix] Updated checks for "filters" floating button in mobile/ small screens.
6. Added method "detectChanges()" to be called by html.
7. navigationBar.component.html: Updated placeholder of search-input to align with the generic search form (Home page).
8. ISVocabularies.service.ts: [Bug fix] In methods getFos() and getSDGs(), removed check and call to cache - these files are always local.

landingPages/dataProvider/dataProvider.component.html

@@ -842,15 +842,15 @@
             </ng-container>
           </div>
           <ng-container *ngIf="viewsFrameUrl || downloadsFrameUrl">
-            <div *ngIf="metricsClicked && downloadsFrameUrl && totalDownloads" class="uk-margin-large-right">
+            <div *ngIf="metricsClicked && viewsFrameUrl && hasViews" class="uk-margin-large-right">
+              <i-frame [height]="300" [url]="viewsFrameUrl" [addClass]="false"
+                       customContainerClass="uk-background-default" customIframeClass="uk-blend-multiply uk-height-1-1">
+              </i-frame>
+            </div>
+            <div *ngIf="metricsClicked && downloadsFrameUrl && hasDownloads" class="uk-margin-large-right">
               <i-frame [height]="300" [url]="downloadsFrameUrl" [addClass]="false" 
                 customContainerClass="uk-background-default" customIframeClass="uk-blend-multiply uk-height-1-1"></i-frame>
             </div>
-            <div *ngIf="metricsClicked && viewsFrameUrl && totalViews" class="uk-margin-large-right">
-              <i-frame [height]="300" [url]="viewsFrameUrl" [addClass]="false" 
-                customContainerClass="uk-background-default" customIframeClass="uk-blend-multiply uk-height-1-1">
-              </i-frame>
-            </div>
           </ng-container>
         </div>
         <div class="uk-text-center uk-margin-large-top">

landingPages/dataProvider/dataProvider.component.ts

@@ -68,8 +68,12 @@ export class DataProviderComponent {
   public metricsClicked: boolean;
   public viewsFrameUrl: string;
   public downloadsFrameUrl: string;
-  public totalViews: number;
+  /** @deprecated*/
-  public totalDownloads: number;
+  public totalViews: number = null;
+  /** @deprecated*/
+  public totalDownloads: number = null;
+  public hasViews: boolean = false;
+  public hasDownloads: boolean = false;
   // public pageViews: number;
 
   // Statistics tab variables
@@ -408,9 +412,21 @@ export class DataProviderComponent {
 
           this.showLoading = false;
 
+          this.hasViews = false;
+          this.hasDownloads = false;
+
           // ensure that if the API call to index does not have metrics, we get them from old metrics service call
           if(this.dataProviderInfo && !this.dataProviderInfo.measure) {
             this.getMetrics();
+          } else if(this.dataProviderInfo && this.dataProviderInfo.measure && this.dataProviderInfo.measure.counts) {
+            this.dataProviderInfo.measure.counts.forEach(measure => {
+              if(measure.name == "views" && measure.value > 0) {
+                this.hasViews = true;
+              }
+              if(measure.name == "downloads" && measure.value > 0) {
+                this.hasDownloads = true;
+              }
+            });
           }
           this.cdr.detectChanges();
 
@@ -719,10 +735,16 @@ export class DataProviderComponent {
 		obs = zip(this.metricsService.getMetricsNumber(this.datasourceId, "usagestats.views.repository.local", this.properties),
           this.metricsService.getMetricsNumber(this.datasourceId, "usagestats.downloads.repository.local", this.properties));
 		this.sub = obs.subscribe(data => {
-      if(data[0] && data[1] && data[0] > 0 && data[1] > 0) {
+      if((data[0] && data[0] > 0) || (data[1] && data[1] > 0)) {
         this.dataProviderInfo.measure = {counts: []};
-        this.dataProviderInfo.measure.counts.push({name: 'views', order: 0, icon: 'visibility', value: data[0]});
+        if(data[0] && data[0] > 0) {
-        this.dataProviderInfo.measure.counts.push({name: 'downloads', order: 1, icon: 'downloads', value: data[1]});
+          this.dataProviderInfo.measure.counts.push({name: 'views', order: 0, icon: 'visibility', value: data[0]});
+          this.hasViews = true;
+        }
+        if(data[1] && data[1] > 0) {
+          this.dataProviderInfo.measure.counts.push({name: 'downloads', order: 1, icon: 'downloads', value: data[1]});
+          this.hasDownloads = true;
+        }
         this.cdr.detectChanges();
       }
 		});

landingPages/project/project.component.html

@@ -906,15 +906,15 @@
             </ng-container>
           </div>
           <ng-container *ngIf="viewsFrameUrl || downloadsFrameUrl">
-            <div *ngIf="metricsClicked && downloadsFrameUrl && totalDownloads" class="uk-margin-large-right">
+            <div *ngIf="metricsClicked && viewsFrameUrl && hasViews" class="uk-margin-large-right">
+              <i-frame [height]="300" [url]="viewsFrameUrl" [addClass]="false"
+                       customContainerClass="uk-background-default" customIframeClass="uk-blend-multiply uk-height-1-1">
+              </i-frame>
+            </div>
+            <div *ngIf="metricsClicked && downloadsFrameUrl && hasDownloads" class="uk-margin-large-right">
               <i-frame [height]="300" [url]="downloadsFrameUrl" [addClass]="false" 
                 customContainerClass="uk-background-default" customIframeClass="uk-blend-multiply uk-height-1-1"></i-frame>
             </div>
-            <div *ngIf="metricsClicked && viewsFrameUrl && totalViews" class="uk-margin-large-right">
-              <i-frame [height]="300" [url]="viewsFrameUrl" [addClass]="false" 
-                customContainerClass="uk-background-default" customIframeClass="uk-blend-multiply uk-height-1-1">
-              </i-frame>
-            </div>
           </ng-container>
         </div>
         <div class="uk-text-center uk-margin-large-top">

landingPages/project/project.component.ts

@@ -55,8 +55,12 @@ export class ProjectComponent {
   public metricsClicked: boolean;
   public viewsFrameUrl: string;
   public downloadsFrameUrl: string;
-  public totalViews: number;
+  /** @deprecated*/
-  public totalDownloads: number;
+  public totalViews: number = null;
+  /** @deprecated*/
+  public totalDownloads: number = null;
+  public hasViews: boolean = false;
+  public hasDownloads: boolean = false;
   // public pageViews: number;
 
   // Statistics tab variables
@@ -534,9 +538,21 @@ export class ProjectComponent {
       endDate: this.projectInfo.endDate
     };
 
+    this.hasViews = false;
+    this.hasDownloads = false;
+
     // ensure that if the API call to index does not have metrics, we get them from old metrics service call
     if(this.projectInfo && !this.projectInfo.measure) {
       this.getMetrics();
+    } else if(this.projectInfo && this.projectInfo.measure && this.projectInfo.measure.counts) {
+      this.projectInfo.measure.counts.forEach(measure => {
+        if(measure.name == "views" && measure.value > 0) {
+          this.hasViews = true;
+        }
+        if(measure.name == "downloads" && measure.value > 0) {
+          this.hasDownloads = true;
+        }
+      })
     }
     //old
     // this.viewsFrameUrl = this.properties.framesAPIURL + 'merge.php?com=query&data=[{"query":"projRepoViews","projTitle":"' + this.projectId + '","table":"","fields":[{"fld":"sum","agg":"sum","type":"column","yaxis":1,"c":false}],"xaxis":{"name":"month","agg":"sum"},"group":"","color":"","type":"chart","size":200,"sort":"xaxis","xStyle":{"r":-30,"s":"6","l":"-","ft":"-","wt":"-"},"title":"","subtitle":"","xaxistitle":"","yaxisheaders":["Monthly views"],"generalxaxis":"","theme":0,"in":[]}]&info_types=["column"]&stacking=&steps=false&fontFamily=Courier&spacing=[5,0,0,0]&style=[{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"rgba(0, 0, 0, 1)","size":"18"},{"color":"000000","size":""},{"color":"000000","size":""}]&backgroundColor=rgba(255,255,255,1)&colors[]=rgba(124, 181, 236, 1)&colors[]=rgba(67, 67, 72, 1)&colors[]=rgba(144, 237, 125, 1)&colors[]=rgba(247, 163, 92, 1)&colors[]=rgba(128, 133, 233, 1)&colors[]=rgba(241, 92, 128, 1)&colors[]=rgba(228, 211, 84, 1)&colors[]=rgba(43, 144, 143, 1)&colors[]=rgba(244, 91, 91, 1)&colors[]=rgba(145, 232, 225, 1)&xlinew=0&ylinew=1&legends=true&tooltips=true&persistent=false';
@@ -603,10 +619,17 @@ export class ProjectComponent {
 		obs = zip(this.metricsService.getMetricsNumber(this.projectId, "usagestats.projects.views", this.properties),
           this.metricsService.getMetricsNumber(this.projectId, "usagestats.projects.downloads", this.properties));
 		this.sub = obs.subscribe(data => {
-      if(data[0] && data[1] && data[0] > 0 && data[1] > 0) {
+      if((data[0] && data[0] > 0) || (data[1] && data[1] > 0)) {
         this.projectInfo.measure = {counts: []};
-        this.projectInfo.measure.counts.push({name: 'views', order: 0, icon: 'visibility', value: data[0]});
+        if(data[0] && data[0] > 0) {
-        this.projectInfo.measure.counts.push({name: 'downloads', order: 1, icon: 'downloads', value: data[1]});
+          this.projectInfo.measure.counts.push({name: 'views', order: 0, icon: 'visibility', value: data[0]});
+          this.hasViews = true;
+        }
+        if(data[1] && data[1] > 0) {
+          this.projectInfo.measure.counts.push({name: 'downloads', order: 1, icon: 'downloads', value: data[1]});
+          this.hasDownloads = true;
+        }
+
         this.cdr.detectChanges();
       }
 			// this.totalViews = data[0];

landingPages/result/resultLanding.component.html

@@ -1178,15 +1178,15 @@
             </ng-container>
           </div>
           <ng-container *ngIf="viewsFrameUrl || downloadsFrameUrl">
-            <div *ngIf="metricsClicked && downloadsFrameUrl && resultLandingInfo.measure.downloads" class="uk-margin-large-right">
+            <div *ngIf="metricsClicked && viewsFrameUrl && hasViews" class="uk-margin-large-right">
-              <i-frame [height]="300" [url]="downloadsFrameUrl" [addClass]="false"
-                       customContainerClass="uk-background-default" customIframeClass="uk-blend-multiply uk-height-1-1"></i-frame>
-            </div>
-            <div *ngIf="metricsClicked && viewsFrameUrl && resultLandingInfo.measure.views" class="uk-margin-large-right">
               <i-frame [height]="300" [url]="viewsFrameUrl" [addClass]="false"
                        customContainerClass="uk-background-default" customIframeClass="uk-blend-multiply uk-height-1-1">
               </i-frame>
             </div>
+            <div *ngIf="metricsClicked && downloadsFrameUrl && hasDownloads" class="uk-margin-large-right">
+              <i-frame [height]="300" [url]="downloadsFrameUrl" [addClass]="false"
+                       customContainerClass="uk-background-default" customIframeClass="uk-blend-multiply uk-height-1-1"></i-frame>
+            </div>
           </ng-container>
         </div>
         <div class="uk-text-center uk-margin-large-top">

landingPages/result/resultLanding.component.ts

@@ -79,8 +79,12 @@ export class ResultLandingComponent {
   public hasAltMetrics: boolean = false;
   public viewsFrameUrl: string;
   public downloadsFrameUrl: string;
+  /** @deprecated*/
   public totalViews: number = null;
+  /** @deprecated*/
   public totalDownloads: number = null;
+  public hasViews: boolean = false;
+  public hasDownloads: boolean = false;
   public pageViews: number = null;
 	public bipFrameUrl: string;
 
@@ -502,7 +506,7 @@ export class ResultLandingComponent {
         this.viewsFrameUrl = this.properties.statisticsFrameNewAPIURL + 'chart?json='  + encodeURIComponent('{"library":"HighCharts","chartDescription":{"queries":[{"name":"Monthly views","type":"column","query":{"name":"usagestats.results.views.monthly", "parameters":["' + this.id + '"], "profile":"OpenAIRE All-inclusive" }}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Monthly views"},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":true,"text":""}}}');
         this.downloadsFrameUrl = this.properties.statisticsFrameNewAPIURL + 'chart?json='  +
           encodeURIComponent('{"library":"HighCharts","chartDescription":{"queries":[{"name":"Monthly downloads","type":"column","query":{"name":"usagestats.results.downloads.monthly", "parameters":["' + this.id + '"], "profile":"OpenAIRE All-inclusive" }}],"chart":{"backgroundColor":"#FFFFFFFF","borderColor":"#335cadff","borderRadius":0,"borderWidth":0,"plotBorderColor":"#ccccccff","plotBorderWidth":0},"title":{"text":"Monthly downloads"},"subtitle":{},"yAxis":{"title":{"text":""}},"xAxis":{"title":{}},"lang":{"noData":"No Data available for the Query"},"exporting":{"enabled":false},"plotOptions":{"series":{"dataLabels":{"enabled":false}}},"legend":{"enabled":false},"credits":{"href":null,"enabled":true,"text":""}}}');
-				this.bipFrameUrl = this.properties.bipFrameAPIURL + this.id;
+				this.bipFrameUrl = this.properties.bipFrameAPIURL + this.id + (properties.environment == "beta" ? "&src=beta" : "");
         let pid:Identifier = Identifier.getPIDFromIdentifiers(this.resultLandingInfo.identifiers);
         if (this.type == "result") { // no type was specified - update URL based this.resultLandingInfo.resultType
           this.updateUrlWithType(pid);
@@ -559,6 +563,19 @@ export class ResultLandingComponent {
         this.relatedClassSelected = "";
         this.filteredRelatedResults = this.resultLandingInfo.relatedResults;
 
+        this.hasViews = false;
+        this.hasDownloads = false;
+        if(this.resultLandingInfo.measure && this.resultLandingInfo.measure.counts) {
+          this.resultLandingInfo.measure.counts.forEach(measure => {
+            if(measure.name == "views" && measure.value > 0) {
+              this.hasViews = true;
+            }
+            if(measure.name == "downloads" && measure.value > 0) {
+              this.hasDownloads = true;
+            }
+          })
+        }
+
         this.showLoading = false;
         this.setActiveTab();
 

orcid/orcid-work.component.ts

@@ -21,38 +21,38 @@ declare var UIkit: any;
     <ng-container *ngIf="pageType == 'landing' || pageType == 'search'">
       <span *ngIf="!putCodes || putCodes.length == 0"
             [attr.uk-tooltip]="'pos: bottom; cls: uk-active uk-text-small uk-padding-small'"
-            [title]="(!pids || !isLoggedIn)  ? (!pids ? tooltipNoPid : tooltipNoLoggedInUser) : tooltipAdd">
+            [title]="((!pids && (!identifiers || identifiers.size == 0)) || !isLoggedIn)  ? ((!pids && (!identifiers || identifiers.size == 0)) ? tooltipNoPid : tooltipNoLoggedInUser) : tooltipAdd">
-        <a *ngIf="!showLoading" (click)="currentAction='add'; saveWorkPreparation();"
+        <a (click)="currentAction='add'; saveWorkPreparation();"
            class="uk-flex uk-flex-middle uk-flex-center uk-button-link"
            [class.uk-text-bolder]="!(isMobile && pageType == 'landing')"
-           [class.uk-disabled]="showLoading || !isLoggedIn || !pids"
+           [class.uk-disabled]="showLoading || !isLoggedIn || (!pids && (!identifiers || identifiers.size == 0))"
-           [class.uk-text-muted]="showLoading || !isLoggedIn || !pids"
+           [class.uk-text-muted]="showLoading || !isLoggedIn || (!pids && (!identifiers || identifiers.size == 0))"
            (mouseover)="hoverEvent($event)" (mouseout)="hoverEvent($event)">
-          <icon [class.text-orcid]="!showLoading && isLoggedIn && pids"
+          <icon *ngIf="!showLoading" [class.text-orcid]="!showLoading && isLoggedIn && (pids || identifiers?.size > 0)"
-                [class.uk-text-muted]="showLoading || !isLoggedIn || !pids" name="orcid_add" ratio="1"
+                [class.uk-text-muted]="showLoading || !isLoggedIn || (!pids && (!identifiers || identifiers.size == 0))" name="orcid_add" ratio="1"
                 visuallyHidden="add"></icon>
+          <span *ngIf="showLoading" class="uk-icon"><loading
+                [top_margin]="false" [size]="'small'"></loading></span>
 					<span [ngClass]="(isMobile && pageType == 'landing') ? 'uk-margin-small-left' : 'uk-margin-xsmall-left'">Claim</span>
         </a>
-        <span *ngIf="showLoading" class="uk-icon icon-button uk-icon-button-small"><loading
-            [top_margin]="false" [size]="'small'"></loading></span>
       </span>
 
       <span *ngIf="putCodes && putCodes.length > 0"
             [attr.uk-tooltip]="'pos: bottom; cls: uk-active uk-text-small uk-padding-small'"
-            [title]="(!pids || !isLoggedIn)  ? (!pids ? tooltipNoPid : tooltipNoLoggedInUser) : tooltipDelete">
+            [title]="((!pids && (!identifiers || identifiers.size == 0)) || !isLoggedIn)  ? ((!pids && (!identifiers || identifiers.size == 0)) ? tooltipNoPid : tooltipNoLoggedInUser) : tooltipDelete">
-        <a *ngIf="!showLoading" (click)="currentAction='delete'; deleteWorks();"
+        <a (click)="currentAction='delete'; deleteWorks();"
            class="uk-flex uk-flex-middle uk-flex-center uk-button-link"
            [class.uk-text-bolder]="!(isMobile && pageType == 'landing')"
-           [class.uk-disabled]="showLoading || !isLoggedIn || !pids"
+           [class.uk-disabled]="showLoading || !isLoggedIn || (!pids && (!identifiers || identifiers.size == 0))"
-           [class.uk-text-muted]="showLoading || !isLoggedIn || !pids"
+           [class.uk-text-muted]="showLoading || !isLoggedIn || (!pids && (!identifiers || identifiers.size == 0))"
            (mouseover)="hoverEvent($event, 'delete')" (mouseout)="hoverEvent($event, 'delete')">
-          <icon [class.text-orcid]="!showLoading && isLoggedIn && pids"
+          <icon *ngIf="!showLoading" [class.text-orcid]="!showLoading && isLoggedIn && (pids || identifiers?.size > 0)"
-                [class.uk-text-muted]="showLoading || !isLoggedIn || !pids" name="orcid_bin" ratio="1"
+                [class.uk-text-muted]="showLoading || !isLoggedIn || (!pids && (!identifiers || identifiers.size == 0))" name="orcid_bin" ratio="1"
                 visuallyHidden="delete"></icon>
+          <span *ngIf="showLoading" class="uk-icon"><loading
+                [top_margin]="false" [size]="'small'"></loading></span>
 					<span [ngClass]="(isMobile && pageType == 'landing') ? 'uk-margin-small-left' : 'uk-margin-xsmall-left'">Remove</span>
         </a>
-        <span *ngIf="showLoading" class="uk-icon icon-button uk-icon-button-small"><loading
-            [top_margin]="false" [size]="'small'"></loading></span>
       </span>
 
       <!-- Old 'remove' code -->
@@ -143,7 +143,7 @@ declare var UIkit: any;
           <icon *ngIf="!showLoading || currentAction!='add'" name="add" ratio="1" flex="true"></icon>
           <span *ngIf="showLoading && currentAction=='add'" class="uk-icon icon-button"><loading [top_margin]="false"
                                                                                                  [size]="'small'"></loading></span>
-          <span class="uk-margin-small-left">Add to ORCID</span>
+          <span class="uk-margin-small-left">Claim</span>
         </a>
       </span>
 
@@ -154,7 +154,7 @@ declare var UIkit: any;
           <icon *ngIf="!showLoading || currentAction!='delete'" name="delete" ratio="1" flex="true"></icon>
           <span *ngIf="showLoading && currentAction=='delete'" class="uk-icon icon-button"><loading [top_margin]="false"
                                                                                                     [size]="'small'"></loading></span>
-          <span class="uk-margin-small-left">Delete from ORCID</span>
+          <span class="uk-margin-small-left">Remove</span>
         </a>
       </span>
     </ng-container>

searchPages/searchUtils/newSearchPage.component.html

@@ -166,10 +166,13 @@
   </div>
 </ng-template>
 <ng-template #main let-mobile="mobile">
-  <div *ngIf="mobile" class="filters-toggle-button">
+  <div *ngIf="mobile && showRefine && (searchUtils.refineStatus != errorCodes.LOADING || existingFiltersWithValues !== 0)"
+       class="filters-toggle-button">
     <button href="#mobile-filters" uk-toggle="target: #mobile-filters"
             class="uk-icon-button uk-button-secondary uk-flex uk-flex-middle"
-            (click)="showOffCanvas = true" [disabled]="disabled" [class.uk-disabled]="disabled">
+            (click)="showOffCanvas = true; detectChanges()"
+            [disabled]="disabled"
+            [class.uk-disabled]="disabled">
       <icon name="filters" [flex]="true" ratio="1.2" visuallyHidden="filters"></icon>
     </button>
   </div>
@@ -235,7 +238,7 @@
             <div *ngIf="showRefine && mobile">
               <div #mobileFilters id="mobile-filters" uk-offcanvas="overlay: true">
                 <div class="uk-offcanvas-bar uk-padding-remove-horizontal">
-                  <a class="uk-offcanvas-close uk-icon uk-close" (click)="showOffCanvas=false">
+                  <a class="uk-offcanvas-close uk-icon uk-close" (click)="showOffCanvas=false; detectChanges()">
                     <icon name="close" ratio="1.5" visuallyHidden="close filters"></icon>
                   </a>
                   <div *ngIf="showOffCanvas" class="uk-padding-small uk-padding-remove-vertical">

searchPages/searchUtils/newSearchPage.component.ts

@@ -1724,4 +1724,8 @@ export class NewSearchPageComponent implements OnInit, OnDestroy, OnChanges {
   public getFilterById(filterId: string): Filter {
     return this.filters.find(filter => filter.filterId == filterId);
   }
+
+  detectChanges() {
+    this.cdr.detectChanges();
+  }
  }

sharedComponents/navigationBar.component.html

@@ -170,7 +170,7 @@
                 <ng-container *ngIf="!activeHeader.menuPosition || activeHeader.menuPosition === 'center'">
                   <ng-container *ngTemplateOutlet="mainMenu"></ng-container>
                 </ng-container>
-                <div *ngIf="searchMode" #search_input search-input [(value)]="keyword" placeholder="Search by name, description, subject..."
+                <div *ngIf="searchMode" #search_input search-input [(value)]="keyword" placeholder="Search in Explore"
                      [searchInputClass]="'flat background small-vertical'" (searchEmitter)="goTo()"
                      class="uk-width-large@l uk-width-medium uk-width-xlarge@xl"></div>
               </div>

utils/staticAutoComplete/ISVocabularies.service.ts

@@ -122,12 +122,12 @@ export class ISVocabulariesService {
   
   getFos(properties: EnvProperties): Observable<any> {
     let url = "/assets/common-assets/vocabulary/fos.json";
-    return this.http.get((properties.useLongCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
+    return this.http.get(url);
   }
   
   getSDGs(properties: EnvProperties): Observable<any> {
     let url = "/assets/common-assets/vocabulary/sdg.json";
-    return this.http.get((properties.useLongCache) ? (properties.cacheUrl + encodeURIComponent(url)) : url)
+    return this.http.get(url);
   }
 
   parseSDGs(data: any): AutoCompleteValue[] {