2.64.50 case share hot fix-hot fix DONT merge until LIVE release (#610)

rayliangatos · Daniel-Lam · udaydenduluri33 · web-flow · commit 8bebbc9cdbba · 2020-11-18T09:19:19.000Z
* Fix security vulnerability from node-forge dependency Upgrade `node-forge` to version `0.10.0` (see https://www.npmjs.com/advisories/1561). * check for selected cases * 2.64.45-caselist-selected-check * EUI-2740-fix-select-all-issue-on-MO (#595) * Fix security vulnerability from node-forge dependency Upgrade `node-forge` to version `0.10.0` (see https://www.npmjs.com/advisories/1561). * check for selected cases * 2.64.45-caselist-selected-check * EUI-2740-fix-select-all-issue-on-MO * review comment * update version and release note * rename param * 2.64.47-case-share-hot-fix-retain-case-role * fix test error * 2.64.48-sharable-case-hot-fix * 2.64.50-case-share-hot-fix * upgrade to 2.64.51 after live release Co-authored-by: Lam <daniel.2.lam@atos.net> Co-authored-by: Uday Denduluri <uday.denduluri@gmail.com>
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -1,9 +1,12 @@
 ## RELEASE NOTES
+### Version 2.64.50-case-share-hot-fix
+* correct and cherry-pick the right commits
+
 ### Version 2.64.49-retain-hidden-value-complex-and-collection-types-fix
 **EUI-2739** Fix "retain hidden fields" functionality for all field types, including Complex and Collection types
 
 ### Version 2.64.48-case-share-hot-fix
-* Retriggering build
+* determine whether a case sharable by supplementary_data
 
 ### Version 2.64.47-case-share-hot-fix
 * variant base on 2.64.41-reinstate-EUI-2575
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hmcts/ccd-case-ui-toolkit",
-  "version": "2.64.49-retain-hidden-value-complex-and-collection-types-fix",
+  "version": "2.64.51-retain-hidden-value-complex-and-collection-types-fix",
   "engines": {
     "yarn": "^1.12.3",
     "npm": "^5.6.0"
diff --git a/src/shared/components/case-list/case-list.component.ts b/src/shared/components/case-list/case-list.component.ts
@@ -98,7 +98,7 @@ export class CaseListComponent {
   }
 
   public allOnPageSelected(): boolean {
-    return !this.cases.some(aCase => !this.isSelected(aCase))
+    return !this.cases.some(aCase => !this.isSelected(aCase));
   }
 }
 
diff --git a/src/shared/components/search-result/search-result.component.spec.ts b/src/shared/components/search-result/search-result.component.spec.ts
@@ -105,6 +105,9 @@ describe('SearchResultComponent', () => {
               OrgPolicyReference: 'Travis and Arnold Inc',
               OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'
             }
+          },
+          supplementary_data: {
+            orgs_assigned_users: {'9QV1DT1': 3}
           }
         },
         {
@@ -121,6 +124,9 @@ describe('SearchResultComponent', () => {
               OrgPolicyReference: 'Travis and Arnold Inc',
               OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'
             }
+          },
+          supplementary_data: {
+            orgs_assigned_users: {'9QV1DT1': 3}
           }
         },
         {
@@ -129,13 +135,19 @@ describe('SearchResultComponent', () => {
             PersonFirstName: 'Steve',
             PersonLastName: 'Jobs',
             PersonAddress: '1 Infinite Loop, Cupertino, California, USA, CA 95014'
+          },
+          supplementary_data: {
+            orgs_assigned_users: {'9QV1DT1': 3}
           }
         },
         {
           case_id: '0000000000000002',
           case_fields: {
             PersonFirstName: 'Bill',
             PersonAddress: 'Thames Valley Park, Sonning, Reading, England, RG6 1WA'
+          },
+          supplementary_data: {
+            orgs_assigned_users: {'9QV1DT1': 3}
           }
         }
       ],
@@ -465,7 +477,10 @@ describe('SearchResultComponent', () => {
             OrgPolicyReference: 'Travis and Arnold Inc',
             OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'
           }
-        }
+        },
+        supplementary_data: {
+          orgs_assigned_users: {'9QV1DT1': 3}
+        },
       };
       expect(component.canBeShared(caseView)).toEqual(true);
     });
@@ -474,9 +489,10 @@ describe('SearchResultComponent', () => {
       const caseView = {
         case_id: 'C111111',
         case_fields: {
-        }
+        },
+        supplementary_data: null
       };
-      expect(component.canBeShared(caseView)).toEqual(false);
+      expect(component.canBeShared(caseView)).toBeFalsy();
     });
 
     it('can any be shared', () => {
@@ -491,7 +507,10 @@ describe('SearchResultComponent', () => {
             OrgPolicyReference: 'Travis and Arnold Inc',
             OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'
           }
-        }
+        },
+        supplementary_data: {
+          orgs_assigned_users: {'9QV1DT1': 3}
+        },
       }]
       expect(component.canAnyBeShared()).toEqual(true);
     });
@@ -507,7 +526,10 @@ describe('SearchResultComponent', () => {
 
       const tempCaseItem: SearchResultViewItem = {
         case_id: '1',
-        case_fields: null
+        case_fields: null,
+        supplementary_data: {
+          orgs_assigned_users: {'9QV1DT1': 3}
+        }
       }
       expect(component.isSelected(tempCaseItem)).toBeTruthy();
     });
@@ -523,7 +545,8 @@ describe('SearchResultComponent', () => {
 
       const tempCaseItem: SearchResultViewItem = {
         case_id: '3',
-        case_fields: null
+        case_fields: null,
+        supplementary_data: null
       }
       expect(component.isSelected(tempCaseItem)).toBeFalsy();
 
@@ -544,6 +567,9 @@ describe('SearchResultComponent', () => {
             OrgPolicyReference: 'Travis and Arnold Inc',
             OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'
           }
+        },
+        supplementary_data: {
+          orgs_assigned_users: {'9QV1DT1': 3}
         }
       }];
       const tempCaseItem: SearchResultViewItem = {
@@ -560,6 +586,9 @@ describe('SearchResultComponent', () => {
             OrgPolicyReference: 'Travis and Arnold Inc',
             OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'
           }
+        },
+        supplementary_data: {
+          orgs_assigned_users: {'9QV1DT1': 3}
         }
       };
       expect(component.isSelected(tempCaseItem)).toBeTruthy();
@@ -585,6 +614,9 @@ describe('SearchResultComponent', () => {
               OrgPolicyReference: 'Travis and Arnold Inc',
               OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'
             }
+          },
+          supplementary_data: {
+            orgs_assigned_users: {'9QV1DT1': 3}
           }
         },
         {
@@ -601,6 +633,9 @@ describe('SearchResultComponent', () => {
               OrgPolicyReference: 'Travis and Arnold Inc',
               OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'
             }
+          },
+          supplementary_data: {
+            orgs_assigned_users: {'9QV1DT1': 3}
           }
         },
         {
@@ -609,6 +644,9 @@ describe('SearchResultComponent', () => {
             PersonFirstName: 'Steve',
             PersonLastName: 'Jobs',
             PersonAddress: '1 Infinite Loop, Cupertino, California, USA, CA 95014'
+          },
+          supplementary_data: {
+            orgs_assigned_users: {'9QV1DT1': 3}
           }
         },
         {
@@ -624,6 +662,9 @@ describe('SearchResultComponent', () => {
               OrgPolicyReference: 'Travis and Arnold Inc',
               OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'
             }
+          },
+          supplementary_data: {
+            orgs_assigned_users: {'9QV1DT1': 3}
           }
         }
       ]
@@ -645,6 +686,9 @@ describe('SearchResultComponent', () => {
             OrgPolicyReference: 'Travis and Arnold Inc',
             OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'
           }
+        },
+        supplementary_data: {
+          orgs_assigned_users: {'9QV1DT1': 3}
         }
       }
       component.changeSelection(aSelectedCase);
diff --git a/src/shared/components/search-result/search-result.component.ts b/src/shared/components/search-result/search-result.component.ts
@@ -148,7 +148,7 @@ export class SearchResultComponent implements OnChanges, OnInit {
   }
 
   public canBeShared(caseView: SearchResultViewItem): boolean {
-    return Object.keys(caseView.case_fields).length > 0;
+    return caseView.supplementary_data && caseView.supplementary_data.hasOwnProperty('orgs_assigned_users');
   }
 
   public canAnyBeShared(): boolean {
diff --git a/src/shared/domain/search/search-result-view-item.model.ts b/src/shared/domain/search/search-result-view-item.model.ts
@@ -8,4 +8,5 @@ export class SearchResultViewItem {
   @Type(() => CaseField)
   hydrated_case_fields?: CaseField[];
   columns?: object;
+  supplementary_data?: any;
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@hmcts/ccd-case-ui-toolkit",`
`3`		`- "version": "2.64.49-retain-hidden-value-complex-and-collection-types-fix",`
	`3`	`+ "version": "2.64.51-retain-hidden-value-complex-and-collection-types-fix",`
`4`	`4`	`"engines": {`
`5`	`5`	`"yarn": "^1.12.3",`
`6`	`6`	`"npm": "^5.6.0"`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ export class CaseListComponent {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`public allOnPageSelected(): boolean {`
`101`		`- return !this.cases.some(aCase => !this.isSelected(aCase))`
	`101`	`+ return !this.cases.some(aCase => !this.isSelected(aCase));`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`
Original file line number	Diff line number	Diff line change
`@@ -105,6 +105,9 @@ describe('SearchResultComponent', () => {`
`105`	`105`	`OrgPolicyReference: 'Travis and Arnold Inc',`
`106`	`106`	`OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'`
`107`	`107`	`}`
	`108`	`+ },`
	`109`	`+ supplementary_data: {`
	`110`	`+ orgs_assigned_users: {'9QV1DT1': 3}`
`108`	`111`	`}`
`109`	`112`	`},`
`110`	`113`	`{`
`@@ -121,6 +124,9 @@ describe('SearchResultComponent', () => {`
`121`	`124`	`OrgPolicyReference: 'Travis and Arnold Inc',`
`122`	`125`	`OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'`
`123`	`126`	`}`
	`127`	`+ },`
	`128`	`+ supplementary_data: {`
	`129`	`+ orgs_assigned_users: {'9QV1DT1': 3}`
`124`	`130`	`}`
`125`	`131`	`},`
`126`	`132`	`{`
`@@ -129,13 +135,19 @@ describe('SearchResultComponent', () => {`
`129`	`135`	`PersonFirstName: 'Steve',`
`130`	`136`	`PersonLastName: 'Jobs',`
`131`	`137`	`PersonAddress: '1 Infinite Loop, Cupertino, California, USA, CA 95014'`
	`138`	`+ },`
	`139`	`+ supplementary_data: {`
	`140`	`+ orgs_assigned_users: {'9QV1DT1': 3}`
`132`	`141`	`}`
`133`	`142`	`},`
`134`	`143`	`{`
`135`	`144`	`case_id: '0000000000000002',`
`136`	`145`	`case_fields: {`
`137`	`146`	`PersonFirstName: 'Bill',`
`138`	`147`	`PersonAddress: 'Thames Valley Park, Sonning, Reading, England, RG6 1WA'`
	`148`	`+ },`
	`149`	`+ supplementary_data: {`
	`150`	`+ orgs_assigned_users: {'9QV1DT1': 3}`
`139`	`151`	`}`
`140`	`152`	`}`
`141`	`153`	`],`
`@@ -465,7 +477,10 @@ describe('SearchResultComponent', () => {`
`465`	`477`	`OrgPolicyReference: 'Travis and Arnold Inc',`
`466`	`478`	`OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'`
`467`	`479`	`}`
`468`		`- }`
	`480`	`+ },`
	`481`	`+ supplementary_data: {`
	`482`	`+ orgs_assigned_users: {'9QV1DT1': 3}`
	`483`	`+ },`
`469`	`484`	`};`
`470`	`485`	`expect(component.canBeShared(caseView)).toEqual(true);`
`471`	`486`	`});`
`@@ -474,9 +489,10 @@ describe('SearchResultComponent', () => {`
`474`	`489`	`const caseView = {`
`475`	`490`	`case_id: 'C111111',`
`476`	`491`	`case_fields: {`
`477`		`- }`
	`492`	`+ },`
	`493`	`+ supplementary_data: null`
`478`	`494`	`};`
`479`		`- expect(component.canBeShared(caseView)).toEqual(false);`
	`495`	`+ expect(component.canBeShared(caseView)).toBeFalsy();`
`480`	`496`	`});`
`481`	`497`
`482`	`498`	`it('can any be shared', () => {`
`@@ -491,7 +507,10 @@ describe('SearchResultComponent', () => {`
`491`	`507`	`OrgPolicyReference: 'Travis and Arnold Inc',`
`492`	`508`	`OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'`
`493`	`509`	`}`
`494`		`- }`
	`510`	`+ },`
	`511`	`+ supplementary_data: {`
	`512`	`+ orgs_assigned_users: {'9QV1DT1': 3}`
	`513`	`+ },`
`495`	`514`	`}]`
`496`	`515`	`expect(component.canAnyBeShared()).toEqual(true);`
`497`	`516`	`});`
`@@ -507,7 +526,10 @@ describe('SearchResultComponent', () => {`
`507`	`526`
`508`	`527`	`const tempCaseItem: SearchResultViewItem = {`
`509`	`528`	`case_id: '1',`
`510`		`- case_fields: null`
	`529`	`+ case_fields: null,`
	`530`	`+ supplementary_data: {`
	`531`	`+ orgs_assigned_users: {'9QV1DT1': 3}`
	`532`	`+ }`
`511`	`533`	`}`
`512`	`534`	`expect(component.isSelected(tempCaseItem)).toBeTruthy();`
`513`	`535`	`});`
`@@ -523,7 +545,8 @@ describe('SearchResultComponent', () => {`
`523`	`545`
`524`	`546`	`const tempCaseItem: SearchResultViewItem = {`
`525`	`547`	`case_id: '3',`
`526`		`- case_fields: null`
	`548`	`+ case_fields: null,`
	`549`	`+ supplementary_data: null`
`527`	`550`	`}`
`528`	`551`	`expect(component.isSelected(tempCaseItem)).toBeFalsy();`
`529`	`552`
`@@ -544,6 +567,9 @@ describe('SearchResultComponent', () => {`
`544`	`567`	`OrgPolicyReference: 'Travis and Arnold Inc',`
`545`	`568`	`OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'`
`546`	`569`	`}`
	`570`	`+ },`
	`571`	`+ supplementary_data: {`
	`572`	`+ orgs_assigned_users: {'9QV1DT1': 3}`
`547`	`573`	`}`
`548`	`574`	`}];`
`549`	`575`	`const tempCaseItem: SearchResultViewItem = {`
`@@ -560,6 +586,9 @@ describe('SearchResultComponent', () => {`
`560`	`586`	`OrgPolicyReference: 'Travis and Arnold Inc',`
`561`	`587`	`OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'`
`562`	`588`	`}`
	`589`	`+ },`
	`590`	`+ supplementary_data: {`
	`591`	`+ orgs_assigned_users: {'9QV1DT1': 3}`
`563`	`592`	`}`
`564`	`593`	`};`
`565`	`594`	`expect(component.isSelected(tempCaseItem)).toBeTruthy();`
`@@ -585,6 +614,9 @@ describe('SearchResultComponent', () => {`
`585`	`614`	`OrgPolicyReference: 'Travis and Arnold Inc',`
`586`	`615`	`OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'`
`587`	`616`	`}`
	`617`	`+ },`
	`618`	`+ supplementary_data: {`
	`619`	`+ orgs_assigned_users: {'9QV1DT1': 3}`
`588`	`620`	`}`
`589`	`621`	`},`
`590`	`622`	`{`
`@@ -601,6 +633,9 @@ describe('SearchResultComponent', () => {`
`601`	`633`	`OrgPolicyReference: 'Travis and Arnold Inc',`
`602`	`634`	`OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'`
`603`	`635`	`}`
	`636`	`+ },`
	`637`	`+ supplementary_data: {`
	`638`	`+ orgs_assigned_users: {'9QV1DT1': 3}`
`604`	`639`	`}`
`605`	`640`	`},`
`606`	`641`	`{`
`@@ -609,6 +644,9 @@ describe('SearchResultComponent', () => {`
`609`	`644`	`PersonFirstName: 'Steve',`
`610`	`645`	`PersonLastName: 'Jobs',`
`611`	`646`	`PersonAddress: '1 Infinite Loop, Cupertino, California, USA, CA 95014'`
	`647`	`+ },`
	`648`	`+ supplementary_data: {`
	`649`	`+ orgs_assigned_users: {'9QV1DT1': 3}`
`612`	`650`	`}`
`613`	`651`	`},`
`614`	`652`	`{`
`@@ -624,6 +662,9 @@ describe('SearchResultComponent', () => {`
`624`	`662`	`OrgPolicyReference: 'Travis and Arnold Inc',`
`625`	`663`	`OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'`
`626`	`664`	`}`
	`665`	`+ },`
	`666`	`+ supplementary_data: {`
	`667`	`+ orgs_assigned_users: {'9QV1DT1': 3}`
`627`	`668`	`}`
`628`	`669`	`}`
`629`	`670`	`]`
`@@ -645,6 +686,9 @@ describe('SearchResultComponent', () => {`
`645`	`686`	`OrgPolicyReference: 'Travis and Arnold Inc',`
`646`	`687`	`OrgPolicyCaseAssignedRole: '[PETSOLICITOR]'`
`647`	`688`	`}`
	`689`	`+ },`
	`690`	`+ supplementary_data: {`
	`691`	`+ orgs_assigned_users: {'9QV1DT1': 3}`
`648`	`692`	`}`
`649`	`693`	`}`
`650`	`694`	`component.changeSelection(aSelectedCase);`
Original file line number	Diff line number	Diff line change
`@@ -148,7 +148,7 @@ export class SearchResultComponent implements OnChanges, OnInit {`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`public canBeShared(caseView: SearchResultViewItem): boolean {`
`151`		`- return Object.keys(caseView.case_fields).length > 0;`
	`151`	`+ return caseView.supplementary_data && caseView.supplementary_data.hasOwnProperty('orgs_assigned_users');`
`152`	`152`	`}`
`153`	`153`
`154`	`154`	`public canAnyBeShared(): boolean {`
Original file line number	Diff line number	Diff line change
`@@ -8,4 +8,5 @@ export class SearchResultViewItem {`
`8`	`8`	`@Type(() => CaseField)`
`9`	`9`	`hydrated_case_fields?: CaseField[];`
`10`	`10`	`columns?: object;`
	`11`	`+ supplementary_data?: any;`
`11`	`12`	`}`