@abgov/nx-adsp 5.9.0-beta.1 → 5.9.0-beta.3

package/src/generators/react-task-list/react-task-list.js

@@ -0,0 +1,124 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const nx_oc_1 = require("@abgov/nx-oc");
+const devkit_1 = require("@nrwl/devkit");
+const axios_1 = require("axios");
+const enquirer_1 = require("enquirer");
+const path = require("path");
+function getQueueDefinition(configurationServiceUrl, token) {
+    var _a;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { data } = yield axios_1.default.get(new URL('configuration/v2/configuration/platform/task-service/active', configurationServiceUrl).href, {
+            headers: { Authorization: `Bearer ${token}` },
+            params: { orLatest: true },
+        });
+        const queues = Object.values(((_a = data === null || data === void 0 ? void 0 : data.configuration) === null || _a === void 0 ? void 0 : _a.queues) || {});
+        const choices = queues.map((queue) => `${queue.namespace}:${queue.name}`);
+        if (choices.length < 1) {
+            throw new Error('No queues definitions found.');
+        }
+        const { definition } = yield (0, enquirer_1.prompt)({
+            type: 'autocomplete',
+            name: 'definition',
+            message: 'Which queue definition do you want to generate a task list for?',
+            choices,
+        });
+        const queueDefinition = queues.find((queue) => `${queue.namespace}:${queue.name}` === definition);
+        const { addStream } = yield (0, enquirer_1.prompt)({
+            type: 'confirm',
+            name: 'addStream',
+            message: 'Do you want to add an event stream for live updates?',
+        });
+        const { fileName } = (0, devkit_1.names)(queueDefinition.name);
+        let updateStreamId = '';
+        if (addStream) {
+            updateStreamId = `${fileName}-updates`;
+            const result = yield axios_1.default.patch(new URL('configuration/v2/configuration/platform/push-service', configurationServiceUrl).href, {
+                operation: 'UPDATE',
+                update: {
+                    [updateStreamId]: {
+                        id: updateStreamId,
+                        name: `${queueDefinition.name} updates`,
+                        description: `Provides updates of task events associated with queue ${queueDefinition.namespace}:${queueDefinition.name}.`,
+                        events: [
+                            'task-created',
+                            'task-assigned',
+                            'task-priority-set',
+                            'task-started',
+                            'task-completed',
+                            'task-cancelled',
+                            'task-updated',
+                        ].map((eventName) => ({
+                            namespace: 'task-service',
+                            name: eventName,
+                            criteria: {
+                                context: {
+                                    queueNamespace: queueDefinition.namespace,
+                                    queueName: queueDefinition.name,
+                                },
+                            },
+                        })),
+                        webhooks: [],
+                        subscriberRoles: [
+                            ...new Set([
+                                ...(queueDefinition.workerRoles || []),
+                                ...(queueDefinition.assignerRoles || []),
+                            ]),
+                        ],
+                        publicSubscribe: false,
+                    },
+                },
+            }, { headers: { Authorization: `Bearer ${token}` } });
+            if (result.status === 200) {
+                console.log(`Created push stream ${updateStreamId} for task updates.`);
+            }
+        }
+        return { queueDefinition, updateStreamId };
+    });
+}
+function normalizeOptions(host, options) {
+    var _a, _b;
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { env, accessToken } = options;
+        const projectName = (0, devkit_1.names)(options.project).fileName;
+        const projectRoot = `${(0, devkit_1.getWorkspaceLayout)(host).appsDir}/${projectName}`;
+        const environment = nx_oc_1.environments[env || 'prod'];
+        const urls = yield (0, nx_oc_1.getServiceUrls)(environment.directoryServiceUrl);
+        const tenantServiceUrl = urls['urn:ads:platform:tenant-service:v2'];
+        const configurationServiceUrl = urls['urn:ads:platform:configuration-service'];
+        let tenantToken = accessToken;
+        if (!accessToken) {
+            const environmentFile = `${projectRoot}/src/environments/environment.ts`;
+            const result = (_a = host.read(environmentFile)) === null || _a === void 0 ? void 0 : _a.toString();
+            let realm = (_b = /realm: '([a-zA-Z0-9-]{36})',/.exec(result)) === null || _b === void 0 ? void 0 : _b[1];
+            if (!realm) {
+                const token = yield (0, nx_oc_1.realmLogin)(environment.accessServiceUrl, 'core');
+                const tenant = yield (0, nx_oc_1.selectTenant)(tenantServiceUrl, token);
+                realm = tenant.realm;
+            }
+            tenantToken = yield (0, nx_oc_1.realmLogin)(environment.accessServiceUrl, realm);
+        }
+        const { queueDefinition, updateStreamId } = yield getQueueDefinition(configurationServiceUrl, tenantToken);
+        return Object.assign(Object.assign({}, options), { projectRoot,
+            queueDefinition,
+            updateStreamId });
+    });
+}
+function addFiles(host, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const queueNames = (0, devkit_1.names)(options.queueDefinition.name);
+        const templateOptions = Object.assign(Object.assign(Object.assign({}, options), queueNames), { queueNamespace: options.queueDefinition.namespace, queueName: options.queueDefinition.name, tmpl: '' });
+        (0, devkit_1.generateFiles)(host, path.join(__dirname, 'files'), `${options.projectRoot}/src/app`, templateOptions);
+    });
+}
+function default_1(host, options) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const normalizedOptions = yield normalizeOptions(host, options);
+        yield addFiles(host, normalizedOptions);
+        yield (0, devkit_1.formatFiles)(host);
+        return;
+    });
+}
+exports.default = default_1;
+//# sourceMappingURL=react-task-list.js.map

package/src/generators/react-task-list/react-task-list.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"react-task-list.js","sourceRoot":"","sources":["../../../../../../packages/nx-adsp/src/generators/react-task-list/react-task-list.ts"],"names":[],"mappings":"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"}

package/src/generators/react-task-list/react-task-list.spec.ts

@@ -0,0 +1,71 @@
+import * as utils from '@abgov/nx-oc';
+import { addProjectConfiguration } from '@nrwl/devkit';
+import { createTreeWithEmptyV1Workspace } from '@nrwl/devkit/testing';
+import axios from 'axios';
+import { prompt } from 'enquirer';
+
+import { Schema } from './schema';
+import generator from './react-task-list';
+import { QueueDefinition } from '../../utils/task';
+
+const queueDefinition: QueueDefinition = {
+  namespace: 'test',
+  name: 'run-test',
+  assignerRoles: ['test-assigner'],
+  workerRoles: ['test-worker'],
+};
+
+jest.mock('@abgov/nx-oc');
+const utilsMock = utils as jest.Mocked<typeof utils>;
+utilsMock.getServiceUrls.mockResolvedValue({
+  'urn:ads:platform:tenant-service:v2': 'https://tenant-service/tenant/v2',
+  'urn:ads:platform:configuration-service': 'https://configuration-service',
+});
+
+utilsMock.realmLogin.mockResolvedValue('token');
+utilsMock.selectTenant.mockResolvedValue({ name: 'demo', realm: 'demo' });
+
+jest.mock('axios');
+const axiosMock = axios as jest.Mocked<typeof axios>;
+axiosMock.get.mockResolvedValueOnce({
+  data: { configuration: { queues: { 'test:run-test': queueDefinition } } },
+});
+axiosMock.patch.mockResolvedValueOnce({
+  data: { 'test:run-test': queueDefinition },
+});
+
+jest.mock('enquirer', () => ({ prompt: jest.fn() }));
+const promptMock = prompt as jest.Mock;
+promptMock
+  .mockResolvedValueOnce({ definition: 'test:run-test' })
+  .mockResolvedValueOnce({ addStream: true });
+
+describe('React Task List Generator', () => {
+  const options: Schema = {
+    project: 'test',
+    env: 'dev',
+  };
+
+  it('can run', async () => {
+    const host = createTreeWithEmptyV1Workspace();
+
+    addProjectConfiguration(host, 'test', {
+      root: 'apps/test',
+      projectType: 'application',
+      targets: {
+        build: {
+          executor: '@nrwl/web:webpack',
+        },
+      },
+    });
+
+    await generator(host, options);
+    expect(host.exists('apps/test/src/app/run-test/run-test.tsx')).toBeTruthy();
+    expect(
+      host.exists('apps/test/src/app/run-test/run-test.slice.ts')
+    ).toBeTruthy();
+    expect(
+      host.exists('apps/test/src/app/run-test/run-test.module.css')
+    ).toBeTruthy();
+  }, 30000);
+});

package/src/generators/react-task-list/schema.d.ts

@@ -0,0 +1,14 @@
+import { EnvironmentName } from '@abgov/nx-oc';
+import { QueueDefinition } from '../../utils/task';
+
+export interface Schema {
+  project: string;
+  env: EnvironmentName;
+  accessToken?: string;
+}
+
+export interface NormalizedSchema extends Schema {
+  projectRoot: string;
+  queueDefinition: QueueDefinition;
+  updateStreamId: string;
+}

package/src/generators/react-task-list/schema.json

@@ -0,0 +1,45 @@
+{
+  "$schema": "http://json-schema.org/schema",
+  "cli": "nx",
+  "id": "NxAdspReactTaskList",
+  "title": "",
+  "type": "object",
+  "properties": {
+    "project": {
+      "type": "string",
+      "description": "Project to add task list component in.",
+      "$default": {
+        "$source": "argv",
+        "index": 0
+      },
+      "x-prompt": "Which project to add task list component for?"
+    },
+    "env": {
+      "type": "string",
+      "description": "Environment to target.",
+      "$default": {
+        "$source": "argv",
+        "index": 1
+      },
+      "alias": "e",
+      "x-prompt": {
+        "message": "Which ADSP environment do you want to target? (Typically test for ADSP tenants.)",
+        "type": "list",
+        "items": [
+          "test",
+          "prod",
+          "dev"
+        ]
+      }
+    },
+    "accessToken": {
+      "type": "string",
+      "description": "Access token for retrieving configuration from ADSP APIs.",
+      "alias": "at"
+    }
+  },
+  "required": [
+    "project",
+    "env"
+  ]
+}

package/src/utils/form.d.ts

@@ -1,4 +1,5 @@
 export interface FormDefinition {
+    id: string;
     name: string;
     dataSchema: Record<string, unknown>;
 }

package/src/utils/form.js.map

@@ -1 +1 @@
-{"version":3,"file":"form.js","sourceRoot":"","sources":["../../../../../packages/nx-adsp/src/utils/form.ts"],"names":[],"mappings":";;;;AAAA,yEAAoD;AAOpD,SAAsB,qBAAqB,CAAC,EAC1C,IAAI,EACJ,UAAU,GACK;;QACf,MAAM,KAAK,GAAG,MAAM,IAAA,mCAAO,EAAC,UAAU,EAAE,IAAI,EAAE;YAC5C,oBAAoB,EAAE,KAAK;YAC3B,aAAa,EAAE,EAAE;YACjB,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC;IACf,CAAC;CAAA;AAXD,sDAWC"}
+{"version":3,"file":"form.js","sourceRoot":"","sources":["../../../../../packages/nx-adsp/src/utils/form.ts"],"names":[],"mappings":";;;;AAAA,yEAAoD;AAQpD,SAAsB,qBAAqB,CAAC,EAC1C,IAAI,EACJ,UAAU,GACK;;QACf,MAAM,KAAK,GAAG,MAAM,IAAA,mCAAO,EAAC,UAAU,EAAE,IAAI,EAAE;YAC5C,oBAAoB,EAAE,KAAK;YAC3B,aAAa,EAAE,EAAE;YACjB,MAAM,EAAE,KAAK;SACd,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC;IACf,CAAC;CAAA;AAXD,sDAWC"}

package/src/utils/task.d.ts

@@ -0,0 +1,6 @@
+export interface QueueDefinition {
+  namespace: string;
+  name: string;
+  assignerRoles: string[];
+  workerRoles: string[];
+}