From 1da553ec684d860db1a57b874150564190a45c14 Mon Sep 17 00:00:00 2001
From: Amol Sontakke <amols@proximabiz.com>
Date: Thu, 8 May 2025 13:27:28 +0530
Subject: [PATCH 1/4] Added restricted organization

Signed-off-by: Amol Sontakke <amols@proximabiz.com>
---
 src/app/core/models/organization.ts           |  1 +
 .../corporate-dashboard.component.html        | 19 +++++++++++++++++++
 .../corporate-dashboard.component.ts          |  9 +++++++++
 3 files changed, 29 insertions(+)

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..a33b8be8 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
@@ -252,3 +252,22 @@
     </div>
   </div>
 </ng-template>
+
+<ng-template #errorModal let-modal>
+  <div class="model">
+      <div class="modal-body">
+          <div class="row justify-content-center success-dialog">
+              <div class="col-auto">
+                  <i class="fas fa-exclamation-circle logo red"></i>
+              </div>
+              <div class="col-12 title">{{title}}</div>
+              <p class="col-11 success-message" [innerHTML]="message"></p>
+              <div class="col-4">
+                  <button tabindex="-1" type="button" class="success-btn" (click)="onClickExitCLA()">
+                      Go Back
+                  </button>
+              </div>
+          </div>
+      </div>
+  </div>
+</ng-template>
\ 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..c95cd963 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<any>;
   @ViewChild('successModal') successModal: TemplateRef<any>;
   @ViewChild('warningModal') warningModal: TemplateRef<any>;
+  @ViewChild('errorModal') errorModal: TemplateRef<any>;
 
   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();
+        }else {
+          this.title = 'Restricted Organization';
+          this.message =
+            'We’re sorry, but you are currently unable to sign the Corporate Contributor License Agreement (CCLA).'+
+            ' If you believe this may be an error, please reach out to support';
+          this.openWithDismiss(this.errorModal);
+        }
         },
         () => {
           this.storageService.removeItem(AppSettings.SELECTED_COMPANY);

From 95cc0fc8ed47a8d7ac7e85c85180cea4185d3f62 Mon Sep 17 00:00:00 2001
From: Amol Sontakke <amols@proximabiz.com>
Date: Fri, 9 May 2025 12:28:49 +0530
Subject: [PATCH 2/4] added support link

Signed-off-by: Amol Sontakke <amols@proximabiz.com>
---
 .../corporate-dashboard/corporate-dashboard.component.ts     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 c95cd963..d69bf2d6 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
@@ -191,8 +191,9 @@ export class CorporateDashboardComponent implements OnInit, OnDestroy {
         }else {
           this.title = 'Restricted Organization';
           this.message =
-            'We’re sorry, but you are currently unable to sign the Corporate Contributor License Agreement (CCLA).'+
-            ' If you believe this may be an error, please reach out to support';
+            `We're sorry, but you are currently unable to sign the Employee Contributor License Agreement (ECLA).
+             If you believe this may be an error, please reach out to
+             <a href="https://jira.linuxfoundation.org/servicedesk/customer/portal/4" target="_blank">support</a>`;
           this.openWithDismiss(this.errorModal);
         }
         },

From a9f8b20046db7654d9dec6b3fb97228606e9e7ab Mon Sep 17 00:00:00 2001
From: Amol Sontakke <amols@proximabiz.com>
Date: Fri, 9 May 2025 12:59:44 +0530
Subject: [PATCH 3/4] change message

Signed-off-by: Amol Sontakke <amols@proximabiz.com>
---
 .../corporate-dashboard.component.html        | 19 -------------------
 .../corporate-dashboard.component.ts          |  9 ++++-----
 2 files changed, 4 insertions(+), 24 deletions(-)

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 a33b8be8..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,23 +251,4 @@
       </div>
     </div>
   </div>
-</ng-template>
-
-<ng-template #errorModal let-modal>
-  <div class="model">
-      <div class="modal-body">
-          <div class="row justify-content-center success-dialog">
-              <div class="col-auto">
-                  <i class="fas fa-exclamation-circle logo red"></i>
-              </div>
-              <div class="col-12 title">{{title}}</div>
-              <p class="col-11 success-message" [innerHTML]="message"></p>
-              <div class="col-4">
-                  <button tabindex="-1" type="button" class="success-btn" (click)="onClickExitCLA()">
-                      Go Back
-                  </button>
-              </div>
-          </div>
-      </div>
-  </div>
 </ng-template>
\ 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 d69bf2d6..6cf70249 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
@@ -187,14 +187,13 @@ export class CorporateDashboardComponent implements OnInit, OnDestroy {
             AppSettings.SELECTED_COMPANY,
             this.organization
           );
-          this.checkEmployeeeSignature();
+          this.checkEmployeeSignature();
         }else {
-          this.title = 'Restricted Organization';
           this.message =
-            `We're sorry, but you are currently unable to sign the Employee Contributor License Agreement (ECLA).
+            `We're sorry, but you are currently unable to acknowledge the Employee Contributor License Agreement (ECLA) for this organization.
              If you believe this may be an error, please reach out to
              <a href="https://jira.linuxfoundation.org/servicedesk/customer/portal/4" target="_blank">support</a>`;
-          this.openWithDismiss(this.errorModal);
+          this.openWithDismiss(this.warningModal);
         }
         },
         () => {
@@ -216,7 +215,7 @@ export class CorporateDashboardComponent implements OnInit, OnDestroy {
       );
   }
 
-  checkEmployeeeSignature() {
+  checkEmployeeSignature() {
     this.alertService.clearAlert();
     const data = {
       project_id: this.projectId,

From 12a73802c3daf97176e4a2a408c30e517fd9b54d Mon Sep 17 00:00:00 2001
From: Amol Sontakke <amols@proximabiz.com>
Date: Fri, 9 May 2025 13:03:03 +0530
Subject: [PATCH 4/4] change message and support link

Signed-off-by: Amol Sontakke <amols@proximabiz.com>
---
 .../corporate-dashboard/corporate-dashboard.component.ts    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 6cf70249..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
@@ -190,9 +190,9 @@ export class CorporateDashboardComponent implements OnInit, OnDestroy {
           this.checkEmployeeSignature();
         }else {
           this.message =
-            `We're sorry, but you are currently unable to acknowledge the Employee Contributor License Agreement (ECLA) for this organization.
-             If you believe this may be an error, please reach out to
-             <a href="https://jira.linuxfoundation.org/servicedesk/customer/portal/4" target="_blank">support</a>`;
+            `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
+             <a href="https://jira.linuxfoundation.org/plugins/servlet/desk/portal/4/create/143" target="_blank">EasyCLA Support</a>`;
           this.openWithDismiss(this.warningModal);
         }
         },