Merge pull request #1812 from belemaire/fix-code-push-release

Fix bug in code-push release

Author: belemaire

ern-orchestrator/src/codepush.ts

@@ -371,18 +371,30 @@ export async function performCodePushOtaUpdate(
       );
     }
 
-    const miniAppsToBeCodePushed = _.unionBy(
-      referenceMiniAppsToCodePush,
+    const miniAppsToBeCodePushedUnordered: PackagePath[] = _.unionBy(
       miniApps,
+      referenceMiniAppsToCodePush,
       (x) => x.basePath,
     );
 
-    const jsApiImplsToBeCodePushed = _.unionBy(
-      referenceJsApiImplsToCodePush,
+    // Reorder MiniApps to preserve current order set in Cauldron
+    const miniAppsToBeCodePushed: PackagePath[] = orderPackagePaths(
+      referenceMiniAppsToCodePush,
+      miniAppsToBeCodePushedUnordered,
+    );
+
+    const jsApiImplsToBeCodePushedUnordered = _.unionBy(
       jsApiImpls,
+      referenceJsApiImplsToCodePush,
       (x) => x.basePath,
     );
 
+    // Reorder JS API implementations to preserve current order set in Cauldron
+    const jsApiImplsToBeCodePushed: PackagePath[] = orderPackagePaths(
+      referenceJsApiImplsToCodePush,
+      jsApiImplsToBeCodePushedUnordered,
+    );
+
     const pathsToMiniAppsToBeCodePushed = _.map(miniAppsToBeCodePushed, (m) =>
       PackagePath.fromString(m.toString()),
     );
@@ -658,3 +670,23 @@ export async function getCodePushAppName(
     }`
   );
 }
+
+// Reorder packages to preserve current order as set in Cauldron
+export function orderPackagePaths(
+  referencePackagePaths: PackagePath[],
+  packagePaths: PackagePath[],
+): PackagePath[] {
+  const packages: PackagePath[] = [];
+  for (const m of referencePackagePaths) {
+    const x = _.find(packagePaths, (p) => p.basePath === m.basePath) ?? m;
+    packages.push(x);
+  }
+  // Add all new packages if any
+  const newPackages: PackagePath[] = _.differenceBy(
+    packagePaths,
+    referencePackagePaths,
+    (p) => p.basePath,
+  );
+  packages.push(...newPackages);
+  return packages;
+}

ern-orchestrator/test/codepush-test.ts

@@ -851,4 +851,61 @@ describe('codepush', () => {
       expect(result).equal('app-android');
     });
   });
+
+  describe('orderPackagePaths', () => {
+    const referencePackagePaths: PackagePath[] = [
+      PackagePath.fromString(
+        'git+ssh://[email protected]/foo/A.git#24f0eebdd714949ec5af5366a1adcf6aeb759bdf',
+      ),
+      PackagePath.fromString(
+        'git+ssh://[email protected]/foo/B.git#a4e7b1b1f4671330edac9d7ac09be66e29a56e43',
+      ),
+      PackagePath.fromString(
+        'git+ssh://[email protected]/foo/C.git#09f6a4f8c19ced184bad428272b1f02f76ffd5b8',
+      ),
+    ];
+    const [originalPkgA, originalPkgB, originalPkgC] = referencePackagePaths;
+
+    const updatedPackagedPaths: PackagePath[] = [
+      PackagePath.fromString(
+        'git+ssh://[email protected]/foo/A.git#b554f6e7a3433f9118de8a677e34d27b161f501a',
+      ),
+      PackagePath.fromString(
+        'git+ssh://[email protected]/foo/B.git#683c50cd2e50c6146f87cc377b9db1e24e722de6',
+      ),
+      PackagePath.fromString(
+        'git+ssh://[email protected]/foo/C.git#9548e24c79830658be6f038177310b98298653b2',
+      ),
+    ];
+    const [updatedPkgA, updatedPkgB, updatedPkgC] = updatedPackagedPaths;
+
+    it('should preserve packages reference order', () => {
+      const res = sut.orderPackagePaths(referencePackagePaths, [
+        updatedPkgC,
+        updatedPkgA,
+        updatedPkgB,
+      ]);
+      expect(res).deep.equal([updatedPkgA, updatedPkgB, updatedPkgC]);
+    });
+
+    it('should keep reference packages that are not updated', () => {
+      const res = sut.orderPackagePaths(referencePackagePaths, [
+        updatedPkgB,
+        updatedPkgA,
+      ]);
+      expect(res).deep.equal([updatedPkgA, updatedPkgB, originalPkgC]);
+    });
+
+    it('should keep new packages that are not part of reference packages', () => {
+      const newPkg = PackagePath.fromString(
+        'git+ssh://[email protected]/foo/D.git#ccf32848ae53ce9e339090bb3a1b26c971041734',
+      );
+      const res = sut.orderPackagePaths(referencePackagePaths, [
+        updatedPkgB,
+        updatedPkgA,
+        newPkg,
+      ]);
+      expect(res).deep.equal([updatedPkgA, updatedPkgB, originalPkgC, newPkg]);
+    });
+  });
 });