Merge pull request #1338 from Crown-Commercial-Service/p3sprint8

P3sprint8 release to production on 11-05-2023 at 2130 PM

.github/codeclimate.yml

@@ -0,0 +1,24 @@
+version: "2"
+checks:
+  argument-count:
+    enabled: true
+  complex-logic:
+    enabled: true
+  file-lines:
+    enabled: false
+  method-complexity:
+    enabled: true
+    config:
+      threshold: 20
+  method-count:
+    enabled: false
+  method-lines:
+    enabled: false
+  nested-control-flow:
+    enabled: true
+  return-statements:
+    enabled: true
+  similar-code:
+    enabled: false
+  identical-code:
+    enabled: true

.github/workflows/secrets-scan.yml

@@ -0,0 +1,64 @@
+name: Git Secrets Scan
+
+on:
+  schedule:
+    - cron: "0 0 * * *" 
+  push:
+    branches: [main, feature/*, p3sprint/*]
+
+jobs:
+  git-secrets-scan:
+    name: Git Secrets Scan
+    runs-on: ubuntu-latest
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Install git secrets
+      run: sudo apt-get update && sudo apt-get install git-secrets -y
+
+    - name: Add custom secrets patterns
+      run: git secrets --add '(\bBEGIN\b).*(PRIVATE KEY\b)'
+           && git secrets --add 'AKIA[0-9A-Z]{16}'
+           && git secrets --add '^([A-Za-z0-9/+=]{40,})$'
+           && git secrets --add '^ghp_[a-zA-Z0-9]{36}'
+           && git secrets --add '^github_pat_[a-zA-Z0-9]{22}_[a-zA-Z0-9]{59}'
+           && git secrets --add '^v[0-9]\\.[0-9a-f]{40}'
+           && git secrets --add '[A-Za-z0-9+/]{88}=='
+           && git secrets --add '[A-Za-z0-9_-]{32}$'           
+           && git secrets --add 'conclavesso[0-9a-z-]{84}'
+           && git secrets --add '\\b[a-z0-9]{80}\\b'
+           && git secrets --add '\\b[A-Z0-9]{50}\\b'
+           && git secrets --add '\\b[A-Z0-9]{58}\\b'
+           && git secrets --add '^[a-zA-Z0-9_-]{32,64}$'
+
+    - name: Run git secrets scan
+      run: |      
+        git secrets --scan
+         
+    - name: Send email notification
+      uses: 
+        dawidd6/[email protected]
+      if: always()
+
+      with: 
+         server_address: ${{ secrets.SERVER_ADDRESS }}
+         server_port: ${{ secrets.SERVER_PORT }}
+         username: ${{ secrets.USER_NAME }}
+         password: ${{ secrets.PASSWORD }}
+         subject: Git Secrets Scan Results
+         to: "[email protected]"
+         from: "[email protected]"
+         body: |
+           
+           Hi,
+           
+            The Git Secrets scan has completed for "${{ github.repository }}". Please review the results below:
+                      
+            Scan Job URL: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}
+
+            Scan Status: **${{ job.status }}**              
+           
+           Thank You.           
+           Brickendon SecOps

src/app/components/govuk-table/govuk-table.component.html

@@ -91,8 +91,8 @@
             </div>
           </fieldset>
         </td>
-        <td class="tablular govuk-table__cell" *ngIf="!isHyperLinkVisible">
-          <a class="tablular" tabindex="0">.</a>
+        <td class="tablular" *ngIf="!isHyperLinkVisible">
+          <a class="tablular govuk-table__cell" tabindex="0">.</a>
         </td>
       </tr>
     </tbody>

src/app/components/govuk-table/govuk-table.component.scss

@@ -100,7 +100,6 @@ a {
 .role_group_table {
   padding: 0px 0px 0px 0 !important;
 }
-
 .hide_dots{
   display: none;
 }

src/app/models/organisationGroup.ts

@@ -1,86 +1,98 @@
 export interface Group {
-    groupId: number;
-    mfaEnabled: boolean;
-    groupName: string;
-    createdDate?: string;
+  groupId: number;
+  mfaEnabled: boolean;
+  groupName: string;
+  createdDate?: string;
 }
 
 export interface GroupList {
-    organisationId: string;
-    groupList: Group[]
+  organisationId: string;
+  groupList: Group[];
 }
 
 export interface OrganisationGroupNameInfo {
-    groupName?: string;
+  groupName?: string;
 }
 
-export interface OrganisationGroupRequestInfo extends OrganisationGroupNameInfo {
-    roleInfo?: OrganisationGroupRolePatchInfo,
-    serviceRoleGroupInfo?: OrganisationGroupRolePatchInfo,
-    userInfo?: OrganisationGroupUserPatchInfo
+export interface OrganisationGroupRequestInfo
+  extends OrganisationGroupNameInfo {
+  roleInfo?: OrganisationGroupRolePatchInfo;
+  serviceRoleGroupInfo?: OrganisationGroupRolePatchInfo;
+  userInfo?: OrganisationGroupUserPatchInfo;
 }
 
-
 export interface OrganisationGroupRolePatchInfo {
-    addedRoleIds?: number[],
-    removedRoleIds?: number[]
-    addedServiceRoleGroupIds?: number[],
-    removedServiceRoleGroupIds?: number[]
+  addedRoleIds?: number[];
+  removedRoleIds?: number[];
+  addedServiceRoleGroupIds?: number[];
+  removedServiceRoleGroupIds?: number[];
 }
 
 export interface OrganisationGroupServicePatchInfo {
-    addedRoleIds: number[],
-    removedRoleIds: number[]
+  addedRoleIds: number[];
+  removedRoleIds: number[];
 }
 
 export interface OrganisationGroupUserPatchInfo {
-    addedUserIds: string[],
-    removedUserIds: string[]
+  addedUserIds: string[];
+  removedUserIds: string[];
 }
 
 export interface RoleDetail {
-    orgTypeEligibility?: number;
-    description?: string | undefined;
-    subscriptionTypeEligibility?: number;
-    tradeEligibility?: number;
-    enabled?: boolean;
-    serviceName?: string | null;
-    isDeleted?: boolean;
+  orgTypeEligibility?: number;
+  description?: string | undefined;
+  subscriptionTypeEligibility?: number;
+  tradeEligibility?: number;
+  enabled?: boolean;
+  serviceName?: string | null;
+  isDeleted?: boolean;
 }
 
 export interface Role extends RoleDetail {
-    pendingStatus?: boolean;
-    roleId: number;
-    roleKey: string;
-    roleName: string;
+  pendingStatus?: boolean;
+  roleId: number;
+  roleKey: string;
+  roleName: string;
 }
 
 export interface ServiceRoleGroup extends RoleDetail {
-    id: number;
-    key: string;
-    name: string;
+  id: number;
+  key: string;
+  name: string;
 }
 
-
 export interface CheckBoxRoleListGridSource extends Role {
-    isChecked?: boolean
-    isDisable?: any
-
+  isChecked?: boolean;
+  isDisable?: any;
 }
 
 export interface OrganisationGroupResponseInfo extends Group {
-    roles: GroupRole[],
-    users: GroupUser[]
-    serviceRoleGroups: GroupRole[],
+  roles: GroupRole[];
+  users: GroupUser[];
+  serviceRoleGroups: GroupRole[];
 }
 
 export interface GroupRole {
-    id: number;
-    name: string;
+  id: number;
+  name: string;
 }
 
 export interface GroupUser {
-    userId: string;
-    name: string;
-    isAdmin: boolean;
-}
+  userId: string;
+  name: string;
+  isAdmin: boolean;
+}
+
+export interface pendingApprovalResponce {
+  currentPage: number;
+  groupUser: pendingApprovalGroupRole[];
+  pageCount: number;
+  rowCount: number;
+}
+
+export interface pendingApprovalGroupRole {
+  isAdmin: boolean;
+  userPendingRoleStatus: number;
+  name: string;
+  userId: string;
+}

src/app/pages/buyer/details/details.component.html

@@ -43,7 +43,7 @@ <h2 class="govuk-heading-s">Registries</h2>
       </tr>
       <tr class="govuk-table__row" *ngFor="let row of additionalIdentifiers">
         <th scope="row" class="govuk-table__header">{{ getSchemaName(row.scheme) }}</th>
-        <td class="govuk-table__cell">{{ row.id }}</td>
+        <td class="govuk-table__cell">{{ getId(row.id, row.scheme) }}</td>
         <td class="govuk-table__cell"></td>
       </tr>
     </tbody>
@@ -54,4 +54,4 @@ <h2 class="govuk-heading-s">Registries</h2>
     <button type="button" class="govuk-button govuk-button--secondary" data-module="govuk-button"
       (click)="onCancelClick()">Cancel</button>
   </div>
-</div>
+</div>

src/app/pages/buyer/details/details.component.ts

@@ -47,18 +47,34 @@ export class BuyerDetailsComponent extends BaseComponent implements OnInit {
   }
 
   public getSchemaName(schema: string): string {
-    let selecedScheme = this.schemeData.find(s => s.scheme === schema);
-    if(selecedScheme?.schemeName) {
-      return selecedScheme?.schemeName;
-    }
-    else if (schema === 'GB-CCS') {
+    let selecedScheme = this.schemeData.find(s => s.scheme === schema);    
+    if (schema === 'GB-CCS') {
       return 'Internal Identifier';
     }
+    else if(selecedScheme?.schemeName) {
+      return selecedScheme?.schemeName;
+    }
     else {
       return '';
     }
   }
 
+  public getId(id:string, schema: string): string {
+    if (schema === 'GB-PPG') {
+      return this.convertIdToHyphenId(id);
+    }
+    else {
+      return id;
+    }
+  }
+
+  public convertIdToHyphenId(id:string): string {    
+    if (id != null)  {
+      return [id.slice(0, 3), '-', id.slice(3,6), '-', id.slice(6,9)].join('')
+    }
+    return id;
+  }
+
   public onContinueClick() {
     if(environment.appSetting.hideAutoValidation){
      this.router.navigateByUrl(`buyer/confirm/${this.selectedOrgId}`);

src/app/pages/manage-buyer-and-both-requests/view-pending-verification/view-pending-verification.component.html

@@ -80,7 +80,7 @@ <h2 class="govuk-heading-m">Organisation registries</h2>
                                     </tr>
                                     <tr class="govuk-table__row" *ngFor="let row of additionalIdentifiers">
                                         <th scope="row" class="govuk-table__header">{{ getSchemaName(row.scheme) }}</th>
-                                        <td class="govuk-table__cell">{{ row.id }}</td>
+                                        <td class="govuk-table__cell">{{ getId(row.id, row.scheme) }}</td>
                                         <td class="govuk-table__cell"></td>
                                     </tr>
                                 </tbody>

src/app/pages/manage-buyer-and-both-requests/view-pending-verification/view-pending-verification.component.ts

@@ -236,16 +236,34 @@ export class ViewPendingVerificationComponent implements OnInit {
   }
 
   public getSchemaName(schema: string): string {
-    let selecedScheme = this.schemeData.find((s) => s.scheme === schema);
-    if (selecedScheme?.schemeName) {
-      return selecedScheme?.schemeName;
-    } else if (schema === 'GB-CCS') {
+    let selecedScheme = this.schemeData.find(s => s.scheme === schema);    
+    if (schema === 'GB-CCS') {
       return 'Internal Identifier';
-    } else {
+    }
+    else if(selecedScheme?.schemeName) {
+      return selecedScheme?.schemeName;
+    }
+    else {
       return '';
     }
   }
 
+  public getId(id:string, schema: string): string {
+    if (schema === 'GB-PPG') {
+      return this.convertIdToHyphenId(id);
+    }
+    else {
+      return id;
+    }
+  }
+
+  public convertIdToHyphenId(id:string): string {    
+    if (id != null)  {
+      return [id.slice(0, 3), '-', id.slice(3,6), '-', id.slice(6,9)].join('')
+    }
+    return id;
+  }
+
   getPendingVerificationOrg() {
     this.wrapperBuyerAndBothService.getpendingVerificationOrg(
       this.organisationId,

src/app/pages/manage-buyer-and-both-requests/view-verified-org/view-verified-org.component.html

@@ -84,7 +84,7 @@ <h2 class="govuk-heading-m">Organisation registries</h2>
                                         <tr class="govuk-table__row" *ngFor="let row of additionalIdentifiers">
                                             <th scope="row" class="govuk-table__header">{{ getSchemaName(row.scheme) }}
                                             </th>
-                                            <td class="govuk-table__cell">{{ row.id }}</td>
+                                            <td class="govuk-table__cell">{{ getId(row.id, row.scheme) }}</td>
                                             <td class="govuk-table__cell"></td>
                                         </tr>
                                     </tbody>
@@ -125,4 +125,4 @@ <h2 class="govuk-heading-m">Event log</h2>
                             (click)="nevigateViewEdit()">View / edit organisations’ right to buy status</a></p>
                 </div>
             </div>
-        </div>
+        </div>