fix: changes after code review

Author: pcg-kk

src/app/collection-page/collection-page.component.html

@@ -23,12 +23,12 @@
             </ds-comcol-page-handle>
             <!-- Introductory text -->
             <ds-comcol-page-content
-                [content]="collection.introductoryText(translateService.currentLang)"
+                [content]="collection.introductoryText(currentLanguage)"
                 [hasInnerHtml]="true">
             </ds-comcol-page-content>
             <!-- News -->
             <ds-comcol-page-content
-                [content]="collection.sidebarText(translateService.currentLang)"
+                [content]="collection.sidebarText(currentLanguage)"
                 [hasInnerHtml]="true"
                 [title]="'collection.page.news'">
             </ds-comcol-page-content>
@@ -44,10 +44,10 @@
 
           <router-outlet></router-outlet>
         </section>
-        <footer *ngIf="collection.copyrightText" class="border-top my-5 pt-4">
+        <footer *ngIf="collection.copyrightText(currentLanguage) as copyrightText" class="border-top my-5 pt-4">
           <!-- Copyright -->
           <ds-comcol-page-content
-              [content]="collection.copyrightText"
+              [content]="copyrightText"
               [hasInnerHtml]="true">
           </ds-comcol-page-content>
         </footer>

src/app/collection-page/collection-page.component.ts

@@ -55,6 +55,7 @@ import { PaginationComponentOptions } from '../shared/pagination/pagination-comp
 import { VarDirective } from '../shared/utils/var.directive';
 import { ViewTrackerComponent } from '../statistics/angulartics/dspace/view-tracker.component';
 import { getCollectionPageRoute } from './collection-page-routing-paths';
+import { environment } from '../../environments/environment';
 
 @Component({
   selector: 'ds-base-collection-page',
@@ -100,6 +101,11 @@ export class CollectionPageComponent implements OnInit {
    */
   collectionPageRoute$: Observable<string>;
 
+  /**
+   * The current language of the page
+   */
+  currentLanguage: string = environment.defaultLanguage;
+
   constructor(
     protected route: ActivatedRoute,
     protected router: Router,
@@ -111,6 +117,8 @@ export class CollectionPageComponent implements OnInit {
   }
 
   ngOnInit(): void {
+    this.currentLanguage = this.translateService.currentLang;
+
     this.collectionRD$ = this.route.data.pipe(
       map((data) => data.dso as RemoteData<Collection>),
       redirectOn4xx(this.router, this.authService),

src/app/community-page/community-page.component.html

@@ -13,10 +13,10 @@
           <ds-comcol-page-handle [content]="communityPayload.handle" [title]="'community.page.handle'">
           </ds-comcol-page-handle>
           <!-- Introductory text -->
-          <ds-comcol-page-content [content]="communityPayload.introductoryText(translateService.currentLang)" [hasInnerHtml]="true">
+          <ds-comcol-page-content [content]="communityPayload.introductoryText(currentLanguage)" [hasInnerHtml]="true">
           </ds-comcol-page-content>
           <!-- News -->
-          <ds-comcol-page-content [content]="communityPayload.sidebarText(translateService.currentLang)" [hasInnerHtml]="true"
+          <ds-comcol-page-content [content]="communityPayload.sidebarText(currentLanguage)" [hasInnerHtml]="true"
                                   [title]="'community.page.news'">
           </ds-comcol-page-content>
         </header>
@@ -30,9 +30,9 @@
 
         <router-outlet></router-outlet>
       </section>
-      <footer *ngIf="communityPayload.copyrightText" class="border-top my-5 pt-4">
+      <footer *ngIf="communityPayload.copyrightText(currentLanguage) as copyrightText" class="border-top my-5 pt-4">
         <!-- Copyright -->
-        <ds-comcol-page-content [content]="communityPayload.copyrightText(translateService.currentLang)" [hasInnerHtml]="true">
+        <ds-comcol-page-content [content]="copyrightText" [hasInnerHtml]="true">
         </ds-comcol-page-content>
       </footer>
     </div>

src/app/community-page/community-page.component.ts

@@ -48,6 +48,7 @@ import { ViewTrackerComponent } from '../statistics/angulartics/dspace/view-trac
 import { getCommunityPageRoute } from './community-page-routing-paths';
 import { ThemedCollectionPageSubCollectionListComponent } from './sections/sub-com-col-section/sub-collection-list/themed-community-page-sub-collection-list.component';
 import { ThemedCommunityPageSubCommunityListComponent } from './sections/sub-com-col-section/sub-community-list/themed-community-page-sub-community-list.component';
+import { environment } from '../../environments/environment';
 
 @Component({
   selector: 'ds-base-community-page',
@@ -95,6 +96,11 @@ export class CommunityPageComponent implements OnInit {
    */
   logoRD$: Observable<RemoteData<Bitstream>>;
 
+  /**
+   * The current language of the page
+   */
+  currentLanguage: string = environment.defaultLanguage;
+
   /**
    * Route to the community page
    */
@@ -112,6 +118,8 @@ export class CommunityPageComponent implements OnInit {
   }
 
   ngOnInit(): void {
+    this.currentLanguage = this.translateService.currentLang;
+
     this.communityRD$ = this.route.data.pipe(
       map((data) => data.dso as RemoteData<Community>),
       redirectOn4xx(this.router, this.authService),

src/app/shared/comcol/comcol-forms/comcol-form/comcol-form.component.ts

@@ -292,7 +292,7 @@ export class ComColFormComponent<T extends Collection | Community> implements On
 
           const key = `/metadata/${fieldModel.name}`;
 
-          const keyExistAndAtLeastOneValueIsNotNull: boolean = (fieldModel.value !== null || this.dso.firstMetadataValue(fieldModel.name, { language }) !== null);
+          const keyExistAndAtLeastOneValueIsNotNull: boolean = (hasValue(fieldModel.value) || hasValue(this.dso.firstMetadataValue(fieldModel.name, { language })));
 
           if ( keyExistAndAtLeastOneValueIsNotNull) {
             if (operations.has(key)) {
@@ -354,7 +354,7 @@ export class ComColFormComponent<T extends Collection | Community> implements On
     this.defaultLanguageCode = environment.defaultLanguage;
     this.defaultLanguage = environment.languages.find(lang => lang.code === this.defaultLanguageCode).label;
 
-    this.languages = environment.languages.filter(lang => lang.code !== this.defaultLanguageCode);
+    this.languages = environment.languages.filter(lang => lang.code !== this.defaultLanguageCode && (lang.active === true));
     this.currentLanguageCode = this.languages.length > 0 ? this.languages[0].code : null;
   }