Merge pull request #157 from amolsontakke3576/bug/gerrit_standalone_project

Author: dealako

src/app/core/models/project.ts

@@ -66,11 +66,12 @@ export class Project {
   standalone_project: boolean;
   lf_supported: boolean;
   version: string;
-  repos: Repository[];
+  github_repos: GithubRepository[];
+  gerrit_repos: GerritRepository[];
 }
 
-// Repository for a SF Project
-export class Repository {
+// Github Repository Model
+export class GithubRepository {
   date_created: string;
   date_modified: string;
   enabled: boolean;
@@ -86,3 +87,20 @@ export class Repository {
   repository_url: string;
   version: string;
 }
+
+
+// Gerrit Repository Model
+export class GerritRepository {
+  date_created: string;
+  date_modified: string;
+  gerrit_id: string;
+  gerrit_name: string;
+  gerrit_url: string;
+  group_id_ccla: string;
+  group_id_icla: string;
+  group_name_ccla: string;
+  group_name_icla: string;
+  project_id: string;
+  project_sfid: string;
+  version: string;
+}

src/app/core/services/cla-contributor.service.ts

@@ -5,7 +5,7 @@ import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { Observable, Subject } from 'rxjs';
 import { environment } from 'src/environments/environment';
-import { ProjectModel } from '../models/project';
+import { Project, ProjectModel } from '../models/project';
 import { UpdateUserModel, UserModel } from '../models/user';
 import { AlertService } from 'src/app/shared/services/alert.service';
 import { ActiveSignatureModel } from '../models/active-signature';
@@ -205,14 +205,26 @@ export class ClaContributorService {
     return url;
   }
 
-  getProjectFromRepo(projects) {
+  getProjectFromRepo(projects: Project[]) {
     const repoURL = JSON.parse(this.storageService.getItem(AppSettings.REDIRECT));
     if (repoURL) {
       for (const project of projects) {
-        const repos = project.repos;
-        for (const repo of repos) {
-          if (repoURL.indexOf(repo.repository_name) >= 0) {
-            return project;
+        // Checked in Github Repo
+        if (project.github_repos.length > 0) {
+          const repos = project.github_repos;
+          for (const repo of repos) {
+            if (repoURL.indexOf(repo.repository_name) >= 0) {
+              return project;
+            }
+          }
+        }
+        // Checked in Gerrit Repo
+        if (project.gerrit_repos.length > 0) {
+          const repos = project.gerrit_repos;
+          for (const repo of repos) {
+            if (repoURL.indexOf(repo.gerrit_url) >= 0) {
+              return project;
+            }
           }
         }
       }

src/app/modules/corporate-contributor/container/corporate-dashboard/corporate-dashboard.component.ts

@@ -255,6 +255,8 @@ export class CorporateDashboardComponent implements OnInit, OnDestroy {
     if (this.hasError) {
       const url = '/individual-dashboard/' + this.projectId + '/' + this.userId;
       this.router.navigate([url]);
+    } else {
+      this.redirectToSource();
     }
   }