- | {{ 'PROJECT.GRANT.ROLENAMESLIST' | translate }} |
-
-
- {{ 'PROJECT.GRANT.ROLENAMESLIST' | translate }}
+ | {{ 'PROJECT.GRANT.ROLENAMESLIST' | translate }}
+ |
+
+
+ {{ 'PROJECT.GRANT.ROLENAMESLIST' | translate }}
{{role.key}}
-
+
|
@@ -75,6 +75,11 @@
+
+
+ {{'PROJECT.GRANT.EMPTY' | translate}}
+
+
diff --git a/console/src/app/pages/projects/owned-projects/owned-project-detail/project-grants/project-grants.component.scss b/console/src/app/pages/projects/owned-projects/owned-project-detail/project-grants/project-grants.component.scss
index bd754cd3d9..3f48607765 100644
--- a/console/src/app/pages/projects/owned-projects/owned-project-detail/project-grants/project-grants.component.scss
+++ b/console/src/app/pages/projects/owned-projects/owned-project-detail/project-grants/project-grants.component.scss
@@ -39,11 +39,6 @@
tr.detail-row {
height: 0;
}
-
- .selection {
- width: 50px;
- max-width: 50px;
- }
}
}
@@ -51,3 +46,19 @@
outline: none;
cursor: pointer;
}
+
+.role-row {
+ min-width: 100px;
+}
+
+.date-block {
+ margin: .5rem 0;
+ display: block;
+ min-width: 120px;
+
+ .date-sub {
+ font-size: 13px;
+ color: var(--grey);
+ display: block;
+ }
+}
diff --git a/console/src/app/pages/projects/owned-projects/owned-project-detail/project-grants/project-grants.component.ts b/console/src/app/pages/projects/owned-projects/owned-project-detail/project-grants/project-grants.component.ts
index 895943fc31..74e89876f9 100644
--- a/console/src/app/pages/projects/owned-projects/owned-project-detail/project-grants/project-grants.component.ts
+++ b/console/src/app/pages/projects/owned-projects/owned-project-detail/project-grants/project-grants.component.ts
@@ -34,7 +34,7 @@ export class ProjectGrantsComponent implements OnInit, AfterViewInit {
public memberRoleOptions: ProjectRoleView.AsObject[] = [];
/** Columns displayed in the table. Columns IDs can be added, removed, or reordered. */
- public displayedColumns: string[] = ['select', 'grantedOrgName', 'creationDate', 'changeDate', 'roleNamesList'];
+ public displayedColumns: string[] = ['select', 'grantedOrgName', 'dates'];
constructor(private mgmtService: ManagementService, private toast: ToastService) { }
diff --git a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-grid/owned-project-grid.component.html b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-grid/owned-project-grid.component.html
index 5b87846dd3..fa9b85661b 100644
--- a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-grid/owned-project-grid.component.html
+++ b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-grid/owned-project-grid.component.html
@@ -1,5 +1,5 @@
-
diff --git a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.html b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.html
index 649ecaf830..be42b7f795 100644
--- a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.html
+++ b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.html
@@ -4,7 +4,8 @@
-
@@ -77,6 +78,10 @@
[routerLink]="['/projects', row.projectId]">
+
+
+ {{'PROJECT.TABLE.EMPTY' | translate}}
+
diff --git a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.scss b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.scss
index f78e21b880..a2aa3ea710 100644
--- a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.scss
+++ b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.scss
@@ -40,11 +40,6 @@ h1 {
padding-right: 0;
}
}
-
- .selection {
- width: 50px;
- max-width: 50px;
- }
}
}
diff --git a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.ts b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.ts
index 4cb9d30dc4..86d510c845 100644
--- a/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.ts
+++ b/console/src/app/pages/projects/owned-projects/owned-project-list/owned-project-list.component.ts
@@ -73,7 +73,6 @@ export class OwnedProjectListComponent implements OnInit, OnDestroy {
public ngOnInit(): void {
this.route.queryParams.pipe(take(1)).subscribe(params => {
- console.log(params);
this.getData();
if (params.deferredReload) {
setTimeout(() => {
diff --git a/console/src/app/pages/projects/owned-projects/owned-projects.module.ts b/console/src/app/pages/projects/owned-projects/owned-projects.module.ts
index 63fc30ca76..1debf45fa9 100644
--- a/console/src/app/pages/projects/owned-projects/owned-projects.module.ts
+++ b/console/src/app/pages/projects/owned-projects/owned-projects.module.ts
@@ -4,9 +4,7 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatChipsModule } from '@angular/material/chips';
-import { MatFormFieldModule } from '@angular/material/form-field';
import { MatIconModule } from '@angular/material/icon';
-import { MatInputModule } from '@angular/material/input';
import { MatPaginatorModule } from '@angular/material/paginator';
import { MatProgressBarModule } from '@angular/material/progress-bar';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
@@ -17,6 +15,7 @@ import { TranslateModule } from '@ngx-translate/core';
import { HasRoleModule } from 'src/app/directives/has-role/has-role.module';
import { AvatarModule } from 'src/app/modules/avatar/avatar.module';
import { CardModule } from 'src/app/modules/card/card.module';
+import { InputModule } from 'src/app/modules/input/input.module';
import { RefreshTableModule } from 'src/app/modules/refresh-table/refresh-table.module';
import { SharedModule } from 'src/app/modules/shared/shared.module';
import { UserGrantsModule } from 'src/app/modules/user-grants/user-grants.module';
@@ -48,8 +47,7 @@ import { OwnedProjectsComponent } from './owned-projects.component';
HasRoleModule,
MatTableModule,
MatPaginatorModule,
- MatFormFieldModule,
- MatInputModule,
+ InputModule,
MatChipsModule,
MatIconModule,
WarnDialogModule,
diff --git a/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.component.html b/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.component.html
index c9872fb86e..6e72151365 100644
--- a/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.component.html
+++ b/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.component.html
@@ -25,14 +25,14 @@
-
- {{ 'PROJECT.GRANT.ROLENAMESLIST' | translate }}
+
+ {{ 'PROJECT.GRANT.ROLENAMESLIST' | translate }}
{{role.key}}
-
+
diff --git a/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.module.ts b/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.module.ts
index 5ec566c2c6..78c7fa49f6 100644
--- a/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.module.ts
+++ b/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-detail.module.ts
@@ -6,7 +6,6 @@ import { MatButtonModule } from '@angular/material/button';
import { MatCheckboxModule } from '@angular/material/checkbox';
import { MatChipsModule } from '@angular/material/chips';
import { MatDialogModule } from '@angular/material/dialog';
-import { MatFormFieldModule } from '@angular/material/form-field';
import { MatIconModule } from '@angular/material/icon';
import { MatPaginatorModule } from '@angular/material/paginator';
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
@@ -16,6 +15,7 @@ import { MatTooltipModule } from '@angular/material/tooltip';
import { TranslateModule } from '@ngx-translate/core';
import { HasRoleModule } from 'src/app/directives/has-role/has-role.module';
import { DetailLayoutModule } from 'src/app/modules/detail-layout/detail-layout.module';
+import { InputModule } from 'src/app/modules/input/input.module';
import { MembersTableModule } from 'src/app/modules/members-table/members-table.module';
import { HasRolePipeModule } from 'src/app/pipes/has-role-pipe/has-role-pipe.module';
@@ -39,7 +39,7 @@ import {
MatIconModule,
MatTableModule,
MatPaginatorModule,
- MatFormFieldModule,
+ InputModule,
MatTooltipModule,
ReactiveFormsModule,
MatProgressSpinnerModule,
diff --git a/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-members-create-dialog/project-grant-members-create-dialog.component.html b/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-members-create-dialog/project-grant-members-create-dialog.component.html
index 90d58baa8c..639b0915dd 100644
--- a/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-members-create-dialog/project-grant-members-create-dialog.component.html
+++ b/console/src/app/pages/projects/owned-projects/project-grant-detail/project-grant-members-create-dialog/project-grant-members-create-dialog.component.html
@@ -6,14 +6,14 @@
-
- {{ 'PROJECT.MEMBER.ROLES' | translate }}
+
+ {{ 'PROJECT.MEMBER.ROLES' | translate }}
{{ key }}
-
+
{{'PROJECT.PAGES.CREATE_DESC' | translate}}
- |
+