@squiz/dxp-cli-next 5.23.1-develop.1 → 5.23.1-develop.2

package/lib/job-runner/job/listJobs/listJobs.spec.js

@@ -14,12 +14,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const nock_1 = __importDefault(require("nock"));
 const listJobs_1 = __importDefault(require("./listJobs"));
-const logSpy = jest.spyOn(global.console, 'log');
 describe('listJobs', () => {
     it('correctly lists the job', () => __awaiter(void 0, void 0, void 0, function* () {
         process.env.ENABLE_OVERRIDE_JOB_RUNNER_URL = 'true';
         (0, nock_1.default)('http://localhost:9999')
-            .get('/job/latest?&page[size]=5')
+            .get('/job/latest?&page%5Bsize%5D=5')
             .reply(200, [{ name: 'simple-job', type: 'job', version: '1.0.0' }]);
         const program = (0, listJobs_1.default)();
         yield program.parseAsync([

package/lib/job-runner/jobContext/listJobContexts.js

@@ -44,16 +44,9 @@ const createListJobContextsCommand = () => {
                 size: options.size,
             });
             const res = yield apiService.client.get(listJobContextsUrl);
-            if (Array.isArray(res.data) && res.data.length > 0) {
-                spinner.succeed(`${res.data.length} contexts successfully retrieved`);
-                (0, utils_1.writeLineSeparator)();
-                res.data.forEach((context) => {
-                    console.log(`${chalk_1.default.green(chalk_1.default.bold(context.contextName))}: ${chalk_1.default.green(context.description)}`);
-                    for (const [key, value] of Object.entries(context.environment)) {
-                        console.log(`${chalk_1.default.bold(key)}: ${JSON.stringify(value)}`);
-                    }
-                    (0, utils_1.writeLineSeparator)();
-                });
+            if (Array.isArray(res.data.data) && res.data.data.length > 0) {
+                spinner.succeed(`Retrieved ${res.data.data.length} job contexts`);
+                yield (0, utils_1.logArrayResults)(res.data.data, res.data.links);
             }
             else {
                 spinner.succeed('No job contexts found');

package/lib/job-runner/jobContext/listJobContexts.spec.js

@@ -14,13 +14,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const nock_1 = __importDefault(require("nock"));
 const listJobContexts_1 = __importDefault(require("./listJobContexts"));
-const chalk_1 = __importDefault(require("chalk"));
-const logSpy = jest.spyOn(global.console, 'log');
 describe('listJobContexts', () => {
     process.env.ENABLE_OVERRIDE_JOB_RUNNER_URL = 'true';
     it('correctly lists the job contexts', () => __awaiter(void 0, void 0, void 0, function* () {
         (0, nock_1.default)('http://localhost:9999')
-            .get('/job-context?')
+            .get('/job-context?page%5Bsize%5D=20')
             .reply(200, [
             {
                 contextName: 'dev',
@@ -55,10 +53,5 @@ describe('listJobContexts', () => {
         const opts = program.opts();
         expect(opts.tenant).toEqual('myTenant');
         expect(opts.overrideUrl).toEqual('http://localhost:9999');
-        expect(logSpy).toHaveBeenCalledTimes(9);
-        expect(logSpy).toHaveBeenCalledWith(`${chalk_1.default.green(chalk_1.default.bold('dev'))}: ${chalk_1.default.green('dev context')}`);
-        expect(logSpy).toHaveBeenCalledWith(`${chalk_1.default.bold('something')}: ${JSON.stringify('cool')}`);
-        expect(logSpy).toHaveBeenCalledWith(`${chalk_1.default.bold('somethingElse')}: ${JSON.stringify('cooler')}`);
-        expect(logSpy).toHaveBeenCalledWith(chalk_1.default.cyan('------------------------------'));
     }));
 });

package/lib/job-runner/jobExecution/listJobExecutions/listJobExecutions.spec.js

@@ -19,7 +19,7 @@ describe('listJobExecutions', () => {
     it('correctly lists the job executions', () => __awaiter(void 0, void 0, void 0, function* () {
         process.env.ENABLE_OVERRIDE_JOB_RUNNER_URL = 'true';
         (0, nock_1.default)('http://localhost:9999')
-            .get('/executions/jobName/job-runner?&page[size]=5')
+            .get('/executions/jobName/job-runner?&page%5Bsize%5D=5')
             .reply(200, [
             {
                 context: 'dev',

package/lib/job-runner/utils.js

@@ -96,19 +96,20 @@ function addPaginationToUrl(url, opts) {
     if (opts.before && opts.after) {
         throw new Error('Only one of before and after can be set');
     }
-    if (opts.size) {
-        url += `&page[size]=${PaginationPageLimit[opts.size]}`;
-    }
-    else {
-        `&page[size]=${PaginationPageLimit.small}`;
-    }
+    const parsedUrl = new URL(url);
+    const params = parsedUrl.searchParams;
+    // Set page size
+    params.set('page[size]', opts.size
+        ? `${PaginationPageLimit[opts.size]}`
+        : `${PaginationPageLimit.small}`);
+    // Set pagination parameters
     if (opts.before) {
-        url += `&page[before]=${opts.before}`;
+        params.set('page[before]', opts.before);
     }
-    if (opts.after) {
-        url += `&page[after]=${opts.after}`;
+    else if (opts.after) {
+        params.set('page[after]', opts.after);
     }
-    return url;
+    return parsedUrl.toString();
 }
 exports.addPaginationToUrl = addPaginationToUrl;
 function logArrayResults(results, links) {

package/lib/job-runner/utils.spec.js

@@ -93,11 +93,11 @@ describe('readInputFile', () => {
 describe('addPaginationToUrl', () => {
     it('correctly adds the pagination size param to the url', () => __awaiter(void 0, void 0, void 0, function* () {
         const url = (0, utils_1.addPaginationToUrl)('http://localhost:9999//__dxp/au/job-runner/someTenant/job/latest?', { size: 'tiny', before: '', after: '' });
-        expect(url).toBe('http://localhost:9999//__dxp/au/job-runner/someTenant/job/latest?&page[size]=5');
+        expect(url).toBe('http://localhost:9999//__dxp/au/job-runner/someTenant/job/latest?page%5Bsize%5D=5');
     }));
     it('correctly adds the pagination params to the url', () => __awaiter(void 0, void 0, void 0, function* () {
         const url = (0, utils_1.addPaginationToUrl)('http://localhost:9999//__dxp/au/job-runner/someTenant/job/latest?', { size: 'tiny', before: '12345', after: '' });
-        expect(url).toBe('http://localhost:9999//__dxp/au/job-runner/someTenant/job/latest?&page[size]=5&page[before]=12345');
+        expect(url).toBe('http://localhost:9999//__dxp/au/job-runner/someTenant/job/latest?page%5Bsize%5D=5&page%5Bbefore%5D=12345');
     }));
     it('correctly throws error for before and after params', () => __awaiter(void 0, void 0, void 0, function* () {
         expect(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/dxp-cli-next",
-  "version": "5.23.1-develop.1",
+  "version": "5.23.1-develop.2",
   "repository": {
     "url": "https://gitlab.squiz.net/dxp/dxp-cli-next"
   },