From d66cf881fb0d79c1741dcf34fdc52598917c8484 Mon Sep 17 00:00:00 2001
From: Davide Negretti <davide.negretti@4science.it>
Date: Thu, 2 Sep 2021 16:05:22 +0200
Subject: [PATCH] [CST-4058] 'colspan' removed from table header; code cleanup

---
 .../group-registry/group-form/group-form.component.spec.ts  | 2 +-
 .../group-registry/group-form/group-form.component.ts       | 6 ------
 .../group-registry/groups-registry.component.html           | 3 ++-
 .../group-registry/groups-registry.component.spec.ts        | 1 -
 src/assets/i18n/en.json5                                    | 2 ++
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/app/access-control/group-registry/group-form/group-form.component.spec.ts b/src/app/access-control/group-registry/group-form/group-form.component.spec.ts
index 9ad864f041..5f0f570044 100644
--- a/src/app/access-control/group-registry/group-form/group-form.component.spec.ts
+++ b/src/app/access-control/group-registry/group-form/group-form.component.spec.ts
@@ -3,7 +3,7 @@ import { HttpClient } from '@angular/common/http';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { BrowserModule, By } from '@angular/platform-browser';
+import { BrowserModule } from '@angular/platform-browser';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { Store } from '@ngrx/store';
diff --git a/src/app/access-control/group-registry/group-form/group-form.component.ts b/src/app/access-control/group-registry/group-form/group-form.component.ts
index 6cbadef88c..1a4d6c92ce 100644
--- a/src/app/access-control/group-registry/group-form/group-form.component.ts
+++ b/src/app/access-control/group-registry/group-form/group-form.component.ts
@@ -189,7 +189,6 @@ export class GroupFormComponent implements OnInit, OnDestroy {
       });
       this.formModel = [
         this.groupName,
-        // this.groupCommunity,
         this.groupDescription,
       ];
       this.formGroup = this.formBuilderService.createFormGroup(this.formModel);
@@ -205,11 +204,6 @@ export class GroupFormComponent implements OnInit, OnDestroy {
             this.groupBeingEdited = activeGroup;
 
             if (linkedObject?.name) {
-              // this.formModel = [
-              //   this.groupName,
-              //   this.groupCommunity,
-              //   this.groupDescription,
-              // ];
               this.formBuilderService.insertFormGroupControl(1, this.formGroup, this.formModel, this.groupCommunity);
               this.formGroup.patchValue({
                 groupName: activeGroup != null ? activeGroup.name : '',
diff --git a/src/app/access-control/group-registry/groups-registry.component.html b/src/app/access-control/group-registry/groups-registry.component.html
index b91479ee63..e791b7f2a0 100644
--- a/src/app/access-control/group-registry/groups-registry.component.html
+++ b/src/app/access-control/group-registry/groups-registry.component.html
@@ -47,7 +47,8 @@
             <thead>
             <tr>
               <th scope="col">{{messagePrefix + 'table.id' | translate}}</th>
-              <th scope="col" colspan="2">{{messagePrefix + 'table.name' | translate}}</th>
+              <th scope="col">{{messagePrefix + 'table.name' | translate}}</th>
+              <th scope="col">{{messagePrefix + 'table.collectionOrCommunity' | translate}}</th>
               <th scope="col">{{messagePrefix + 'table.members' | translate}}</th>
               <th>{{messagePrefix + 'table.edit' | translate}}</th>
             </tr>
diff --git a/src/app/access-control/group-registry/groups-registry.component.spec.ts b/src/app/access-control/group-registry/groups-registry.component.spec.ts
index 1b915fe945..0b30a551fd 100644
--- a/src/app/access-control/group-registry/groups-registry.component.spec.ts
+++ b/src/app/access-control/group-registry/groups-registry.component.spec.ts
@@ -149,7 +149,6 @@ describe('GroupRegistryComponent', () => {
     };
     dsoDataServiceStub = {
       findByHref(href: string): Observable<RemoteData<DSpaceObject>> {
-        console.warn(href);
         return createSuccessfulRemoteDataObject$(undefined);
       }
     };
diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5
index b016eb12a3..35847a31e6 100644
--- a/src/assets/i18n/en.json5
+++ b/src/assets/i18n/en.json5
@@ -322,6 +322,8 @@
 
   "admin.access-control.groups.table.name": "Name",
 
+  "admin.access-control.groups.table.collectionOrCommunity": "Collection/Community",
+
   "admin.access-control.groups.table.members": "Members",
 
   "admin.access-control.groups.table.edit": "Edit",