diff --git a/src/app/core/models/organization.ts b/src/app/core/models/organization.ts index 29889ee3..b4e1fdb7 100644 --- a/src/app/core/models/organization.ts +++ b/src/app/core/models/organization.ts @@ -10,6 +10,7 @@ export class OrganizationModel { signingEntityName: string; created: string; updated: string; + isSanctioned:string; } export class OrganizationListModel { diff --git a/src/app/modules/corporate-contributor/container/corporate-dashboard/corporate-dashboard.component.html b/src/app/modules/corporate-contributor/container/corporate-dashboard/corporate-dashboard.component.html index ed23d196..f3bf7125 100644 --- a/src/app/modules/corporate-contributor/container/corporate-dashboard/corporate-dashboard.component.html +++ b/src/app/modules/corporate-contributor/container/corporate-dashboard/corporate-dashboard.component.html @@ -251,4 +251,4 @@ - + \ No newline at end of file diff --git a/src/app/modules/corporate-contributor/container/corporate-dashboard/corporate-dashboard.component.ts b/src/app/modules/corporate-contributor/container/corporate-dashboard/corporate-dashboard.component.ts index a0cb26c0..2f664cb4 100644 --- a/src/app/modules/corporate-contributor/container/corporate-dashboard/corporate-dashboard.component.ts +++ b/src/app/modules/corporate-contributor/container/corporate-dashboard/corporate-dashboard.component.ts @@ -36,6 +36,7 @@ export class CorporateDashboardComponent implements OnInit, OnDestroy { @ViewChild('signedCLANotFoundModal') signedCLANotFoundModal: TemplateRef; @ViewChild('successModal') successModal: TemplateRef; @ViewChild('warningModal') warningModal: TemplateRef; + @ViewChild('errorModal') errorModal: TemplateRef; selectedCompany: string; searchBoxValue: string; @@ -181,11 +182,19 @@ export class CorporateDashboardComponent implements OnInit, OnDestroy { .subscribe( (response) => { this.organization = response; + if(!this.organization.isSanctioned){ this.storageService.setItem( AppSettings.SELECTED_COMPANY, this.organization ); - this.checkEmployeeeSignature(); + this.checkEmployeeSignature(); + }else { + this.message = + `We're sorry, you are currently unable to acknowledge the Employee Contributor License Agreement (ECLA) for this organization. + If you believe this may be an error, please contact + EasyCLA Support`; + this.openWithDismiss(this.warningModal); + } }, () => { this.storageService.removeItem(AppSettings.SELECTED_COMPANY); @@ -206,7 +215,7 @@ export class CorporateDashboardComponent implements OnInit, OnDestroy { ); } - checkEmployeeeSignature() { + checkEmployeeSignature() { this.alertService.clearAlert(); const data = { project_id: this.projectId,