From 7a18b65b40c151cabbee93998f8ced4683ed0a90 Mon Sep 17 00:00:00 2001
From: "konstantina.galouni" <kgalouni@di.uoa.gr>
Date: Thu, 11 Jul 2024 16:35:19 +0300
Subject: [PATCH] [develop | DONE | CHANGED]: parsingFunctions.class.ts &
 showSubjects.component.ts: Removed checks for production environment - now
 show everything under keywords.

---
 .../landing-utils/parsingFunctions.class.ts   | 10 ++--
 .../landing-utils/showSubjects.component.ts   | 53 +++++++++----------
 2 files changed, 31 insertions(+), 32 deletions(-)

diff --git a/landingPages/landing-utils/parsingFunctions.class.ts b/landingPages/landing-utils/parsingFunctions.class.ts
index 8e631278..240c7093 100644
--- a/landingPages/landing-utils/parsingFunctions.class.ts
+++ b/landingPages/landing-utils/parsingFunctions.class.ts
@@ -698,11 +698,11 @@ export class ParsingFunctions {
             if (!classifiedSubjects.has(subject.classname)) {
               classifiedSubjects.set(subject.classname, new Array<string>());
             }
-            if(properties.environment == "production") {
-              classifiedSubjects.get(subject.classname).push(content);
-            } else {
+            // if(properties.environment == "production") {
+            //   classifiedSubjects.get(subject.classname).push(content);
+            // } else {
               classifiedSubjects.get(subject.classname).push(subject.classid + ": " + content);
-            }
+            // }
             // }
           }
         } else {
@@ -723,7 +723,7 @@ export class ParsingFunctions {
       }
     }
 
-    if(properties.environment != "production" && classifiedSubjects != null) {
+    if(classifiedSubjects != null) {
       if (subjects == undefined) {
         subjects = new Array<string>();
       }
diff --git a/landingPages/landing-utils/showSubjects.component.ts b/landingPages/landing-utils/showSubjects.component.ts
index df8255bd..1dfaa20d 100644
--- a/landingPages/landing-utils/showSubjects.component.ts
+++ b/landingPages/landing-utils/showSubjects.component.ts
@@ -13,20 +13,19 @@ import {properties} from "../../../../environments/environment";
 @Component({
   selector: 'showSubjects',
   template: `     
-    <ng-container *ngIf="properties.environment == 'production' && !viewAllSubjects && ((classifiedSubjects && classifiedSubjects.size > 0) || (eoscSubjects && eoscSubjects.length > 0))">
-      <div *ngIf="!viewAllClassifiedSubjects" class="uk-text-meta">
-        Subjects by Vocabulary
-      </div>
-      <ng-container *ngTemplateOutlet="subjects_by_vocabulary_template; context: {customClasses: (isMobile && viewAllClassifiedSubjects) ? '' : 'multi-line-ellipsis lines-2', id: 'content'}"></ng-container>
-      <ng-container *ngIf="eoscSubjects && eoscSubjects.length > 0"><ng-container *ngTemplateOutlet="eosc_subjects_template"></ng-container></ng-container>
-      <div *ngIf="isClassifiedLarge && !viewAllClassifiedSubjects" class="uk-text-right">
-        <a (click)="viewAllSubjectsByVocabularyClicked()" class="view-more-less-link">View all</a>
-      </div>
-    </ng-container>
+<!--    <ng-container *ngIf="properties.environment == 'production' && !viewAllSubjects && ((classifiedSubjects && classifiedSubjects.size > 0) || (eoscSubjects && eoscSubjects.length > 0))">-->
+<!--      <div *ngIf="!viewAllClassifiedSubjects" class="uk-text-meta">-->
+<!--        Subjects by Vocabulary-->
+<!--      </div>-->
+<!--      <ng-container *ngTemplateOutlet="subjects_by_vocabulary_template; context: {customClasses: (isMobile && viewAllClassifiedSubjects) ? '' : 'multi-line-ellipsis lines-2', id: 'content'}"></ng-container>-->
+<!--      <ng-container *ngIf="eoscSubjects && eoscSubjects.length > 0"><ng-container *ngTemplateOutlet="eosc_subjects_template"></ng-container></ng-container>-->
+<!--      <div *ngIf="isClassifiedLarge && !viewAllClassifiedSubjects" class="uk-text-right">-->
+<!--        <a (click)="viewAllSubjectsByVocabularyClicked()" class="view-more-less-link">View all</a>-->
+<!--      </div>-->
+<!--    </ng-container>-->
     
     <ng-container  *ngIf="!viewAllClassifiedSubjects && ((subjects && subjects.length > 0) || (otherSubjects && otherSubjects.size > 0))">
-      <div *ngIf="!viewAllSubjects" class="uk-text-meta uk-margin-small-bottom" 
-           [class.uk-margin-medium-top]="properties.environment == 'production' && ((classifiedSubjects && classifiedSubjects.size > 0) || (eoscSubjects && eoscSubjects.length > 0))">
+      <div *ngIf="!viewAllSubjects" class="uk-text-meta uk-margin-small-bottom">
         Keywords
       </div>
       <ng-container *ngTemplateOutlet="subjects_template; context: {customClasses: (isMobile && viewAllSubjects) ? '' : 'multi-line-ellipsis lines-2', id: 'content'}"></ng-container>
@@ -35,7 +34,7 @@ import {properties} from "../../../../environments/environment";
       </div>
     </ng-container>
     
-    <ng-container *ngIf="properties.environment != 'production' && !viewAllSubjects && ((eoscSubjects && eoscSubjects.length > 0))">
+    <ng-container *ngIf="!viewAllSubjects && ((eoscSubjects && eoscSubjects.length > 0))">
       <div class="uk-text-meta uk-margin-small-bottom"
            [class.uk-margin-medium-top]="(subjects && subjects.length > 0) || (otherSubjects && otherSubjects.size > 0)">
         EOSC Subjects
@@ -89,21 +88,21 @@ import {properties} from "../../../../environments/environment";
     <ng-template #eosc_subjects_template let-customClasses="customClasses" let-id="id">
       <div class="uk-flex-wrap uk-margin-medium-right"
            [ngClass]="customClasses">
-        <p *ngIf="properties.environment == 'production'" class="uk-flex uk-flex-middle uk-margin-bottom">
-          <span  #classifiedContent [id]="id+'_eosc'">
-            <span class="uk-margin-small-top uk-display-inline-block">
-              <span uk-icon="tag"></span>
-              <span class="uk-text-bold uk-margin-small-right"> EOSC: </span>
-            </span>
-            <span *ngFor="let subject of eoscSubjects; let j=index" class="uk-margin-small-top uk-width-auto uk-display-inline-block">
-              <span class="uk-border-rounded uk-label uk-label-small uk-label-primary uk-text-truncate uk-margin-small-right">
-                {{subject.value}}
-              </span>
-            </span>
-          </span>
-        </p>
+<!--        <p *ngIf="properties.environment == 'production'" class="uk-flex uk-flex-middle uk-margin-bottom">-->
+<!--          <span  #classifiedContent [id]="id+'_eosc'">-->
+<!--            <span class="uk-margin-small-top uk-display-inline-block">-->
+<!--              <span uk-icon="tag"></span>-->
+<!--              <span class="uk-text-bold uk-margin-small-right"> EOSC: </span>-->
+<!--            </span>-->
+<!--            <span *ngFor="let subject of eoscSubjects; let j=index" class="uk-margin-small-top uk-width-auto uk-display-inline-block">-->
+<!--              <span class="uk-border-rounded uk-label uk-label-small uk-label-primary uk-text-truncate uk-margin-small-right">-->
+<!--                {{subject.value}}-->
+<!--              </span>-->
+<!--            </span>-->
+<!--          </span>-->
+<!--        </p>-->
 
-        <p *ngIf="properties.environment != 'production' && eoscSubjects && eoscSubjects.length > 0">
+        <p *ngIf="eoscSubjects && eoscSubjects.length > 0">
           <span #classifiedContent [id]="id+'_eosc'">{{getValue(eoscSubjects).join(', ')}}</span>
         </p>
       </div>