From d39cc36b3696b4e73b2e34a0894202b74d7e9800 Mon Sep 17 00:00:00 2001 From: Tim Robinson Date: Wed, 13 Jan 2016 22:53:19 +0000 Subject: [PATCH] Changed block port retriving to get every project and display them instead --- node_modules/c9/docker-helpers.js | 9 +++++++++ node_modules/c9/docker-helpers_test.js | 17 +++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/node_modules/c9/docker-helpers.js b/node_modules/c9/docker-helpers.js index b7a28d99..e4b67a9f 100644 --- a/node_modules/c9/docker-helpers.js +++ b/node_modules/c9/docker-helpers.js @@ -16,6 +16,15 @@ var dockerHelpers = { .split("-") .splice(1) .join("-"); + }, + + getProjectIdFromContainerName: function (containerName) { + if (containerName.split("-").length < 3) return ""; + return containerName.replace(/^container-/, "") + .replace(/-[a-zA-Z]+$/, "") + .split("-") + .splice(-1) + .join("-"); } } diff --git a/node_modules/c9/docker-helpers_test.js b/node_modules/c9/docker-helpers_test.js index 22fc128a..32af8bdd 100644 --- a/node_modules/c9/docker-helpers_test.js +++ b/node_modules/c9/docker-helpers_test.js @@ -40,4 +40,21 @@ describe("docker-helpers", function() { assert.equal(dockerHelpers.getProjectNameFromContainerName("/selenium-9213"), ""); }); }); + + describe("getProjectIdFromContainerName", function() { + it("should work", function() { + assert.equal(dockerHelpers.getProjectIdFromContainerName("container-stefko-demo-project-884917"), "884917"); + assert.equal(dockerHelpers.getProjectIdFromContainerName("container-scollins-booking_admin-1667108-yORDDrjnsOiiLveG"), "1667108"); + assert.equal(dockerHelpers.getProjectIdFromContainerName("jakrawczt-test-3-jkr-1633955"), "1633955"); + assert.equal(dockerHelpers.getProjectIdFromContainerName("thn85-p18-1016460"), "1016460"); + assert.equal(dockerHelpers.getProjectIdFromContainerName("thn85-proj-18239823-1016490"), "1016490"); + assert.equal(dockerHelpers.getProjectIdFromContainerName("artawil-etutor_11plus-wp-1422098"), "1422098"); + assert.equal(dockerHelpers.getProjectIdFromContainerName("container-johns66139-nice-access-bot-1753521-SDcuzVdxeUNhwhpo"), "1753521"); + assert.equal(dockerHelpers.getProjectIdFromContainerName("johns66139-nice-access-bot-1753521-SDcuzVdxeUNhwhpo"), "1753521"); + assert.equal(dockerHelpers.getProjectIdFromContainerName("d9canary"), ""); + assert.equal(dockerHelpers.getProjectIdFromContainerName("selenium-9213"), ""); + assert.equal(dockerHelpers.getProjectIdFromContainerName("/selenium-9213"), ""); + }); + }); + });