Merge pull request #153 from dealako/feature/standalone-redirect

Added Standalone Redirect Logic

Author: dealako

src/app/core/models/project.ts

@@ -1,66 +1,68 @@
 // Copyright The Linux Foundation and each contributor to CommunityBridge.
 // SPDX-License-Identifier: MIT
+// This is actually a CLA Group model (but we call it ProjectModel for historical reasons)
 export class ProjectModel {
-    date_created: Date;
-    date_modified: Date;
-    foundation_sfid: string;
-    project_acl: string[];
-    project_ccla_enabled: boolean;
-    project_ccla_requires_icla_signature: boolean;
-    project_corporate_documents: ProjectCorporateDocument[];
-    project_icla_enabled: boolean;
-    project_id: string;
-    project_individual_documents: ProjectIndividualDocument[];
-    project_member_documents: any[];
-    project_name: string;
-    project_name_lower: string;
-    version: string;
-    logoUrl: string;
-    projects: Project[];
-    signed_at_foundation_level: boolean;
+  date_created: Date;
+  date_modified: Date;
+  foundation_sfid: string;
+  project_acl: string[];
+  project_ccla_enabled: boolean;
+  project_ccla_requires_icla_signature: boolean;
+  project_corporate_documents: ProjectCorporateDocument[];
+  project_icla_enabled: boolean;
+  project_id: string;
+  project_individual_documents: ProjectIndividualDocument[];
+  project_member_documents: any[];
+  project_name: string;
+  project_name_lower: string;
+  version: string;
+  logoUrl: string;
+  projects: Project[];
+  signed_at_foundation_level: boolean;
 }
 
 export class ProjectCorporateDocument {
-    document_name: string;
-    document_file_id: string;
-    document_content_type: string;
-    document_content?: any;
-    document_author_name: string;
-    document_major_version: number;
-    document_minor_version: number;
-    document_creation_date: Date;
-    document_preamble: string;
-    document_legal_entity_name: string;
-    document_s3_url: string;
-    document_tabs: string[][];
+  document_name: string;
+  document_file_id: string;
+  document_content_type: string;
+  document_content?: any;
+  document_author_name: string;
+  document_major_version: number;
+  document_minor_version: number;
+  document_creation_date: Date;
+  document_preamble: string;
+  document_legal_entity_name: string;
+  document_s3_url: string;
+  document_tabs: string[][];
 }
 
 export class ProjectIndividualDocument {
-    document_name: string;
-    document_file_id: string;
-    document_content_type: string;
-    document_content?: any;
-    document_author_name: string;
-    document_major_version: number;
-    document_minor_version: number;
-    document_creation_date: Date;
-    document_preamble: string;
-    document_legal_entity_name: string;
-    document_s3_url: string;
-    document_tabs: string[][];
+  document_name: string;
+  document_file_id: string;
+  document_content_type: string;
+  document_content?: any;
+  document_author_name: string;
+  document_major_version: number;
+  document_minor_version: number;
+  document_creation_date: Date;
+  document_preamble: string;
+  document_legal_entity_name: string;
+  document_s3_url: string;
+  document_tabs: string[][];
 }
 
-
+// Project CLA Group mapping record/model
 export class Project {
-    cla_group_id: string;
-    cla_group_name: string;
-    date_created: Date;
-    date_modified: Date;
-    foundation_name?: any;
-    foundation_sfid: string;
-    note?: any;
-    project_name: string;
-    project_sfid: string;
-    repositories_count: string;
-    version: string;
+  cla_group_id: string;
+  cla_group_name: string;
+  date_created: Date;
+  date_modified: Date;
+  foundation_name?: any;
+  foundation_sfid: string;
+  note?: any;
+  project_name: string;
+  project_sfid: string;
+  repositories_count: string;
+  standalone_project: boolean;
+  version: string;
 }

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

@@ -173,14 +173,21 @@ export class ClaContributorService {
 
   getLFXCorporateURL(): string {
     let url = '';
+    // Load the CLA Group models from local storage - should only be 1 CLA Group
     const project: ProjectModel = JSON.parse(this.storageService.getItem(AppSettings.PROJECT));
+    // We may have zero or more SF Projects attached to this CLA Group
     const projectDetails = project.projects;
+
+    // No SF Projects for this CLA Group
     if (projectDetails.length === 0) {
       // No SFID associated with project so redirect at corporate console dashboard.
       url = environment.lfxCorporateUrl + 'company/dashboard';
     } else if (project.signed_at_foundation_level) {
       // Signed at foundation level.
       url = environment.lfxCorporateUrl + 'foundation/' + projectDetails[0].foundation_sfid + '/cla';
+    } else if (projectDetails[0].standalone_project) {
+      // Standalone project
+      url = environment.lfxCorporateUrl + 'foundation/LF%20Supported/project/' + projectDetails[0].project_sfid + '/cla';
     } else {
       // Signed at project level.
       url = environment.lfxCorporateUrl + 'foundation/' + projectDetails[0].foundation_sfid + '/project/' + projectDetails[0].project_sfid + '/cla';

tslint.json

@@ -116,7 +116,9 @@
       "options": [
         "ban-keywords",
         "check-format",
-        "allow-pascal-case"
+        "allow-pascal-case",
+        "allow-leading-underscore",
+        "allow-snake-case"
       ]
     },
     "whitespace": {
@@ -145,4 +147,4 @@
   "rulesDirectory": [
     "codelyzer"
   ]
-}
+}