Chi 3295 formdef package move

.github/actions/install-flex-plugin/action.yml

@@ -25,11 +25,11 @@ runs:
     - name: Install the Twilio CLI and plugins
       run: npm install -g twilio-cli  && twilio plugins:install @twilio-labs/plugin-flex@7.0.0
       shell: bash
-    - name: Install hrm-form-definitions Packages
-      run: npm ci
-      working-directory: ${{ inputs.path }}/hrm-form-definitions
-      shell: bash
     - name: Install plugin-hrm-form Packages
       run: npm ci
       working-directory: ${{ inputs.path }}/plugin-hrm-form
       shell: bash
+    - name: Install hrm-types packages
+      run: npm ci
+      working-directory: ${{ inputs.path }}/lambdas
+      shell: bash

.github/scripts/setupDeployFormDefinitionsEnv.sh

@@ -39,10 +39,10 @@ fi
 helpline="${helpline,,}"
 
 path="form-definitions/${helpline}"
-helpline_dir="./hrm-form-definitions/${path}"
+helpline_dir="./lambdas/packages/hrm-form-definitions/${path}"
 
 if [ ! -d "$helpline_dir" ]; then
-  echo "${helpline} is not a valid helpline. It must be one of: $(ls ./hrm-form-definitions/form-definitions)"
+  echo "${helpline} is not a valid helpline. It must be one of: $(ls ./lambdas/packages/hrm-form-definitions/form-definitions)"
 fi
 
 echo "environment=${environment}" >> $GITHUB_ENV

.github/workflows/flex-ci.yml

@@ -35,12 +35,15 @@ jobs:
         working-directory: ./plugin-hrm-form
       - name: Install Flex Plugin
         uses: ./.github/actions/install-flex-plugin
-      - name: Run hrm-form-definitions Lint
-        run: npm run lint
-        working-directory: ./hrm-form-definitions
       - name: Run plugin-hrm-form code Lint
         run: npm run lint --if-present
         working-directory: ./plugin-hrm-form
+      - name: Install Lambdas
+        run: npm ci
+        working-directory: ./lambdas
+      - name: Run Lambdas Lint
+        run: npm run lint
+        working-directory: ./lambdas
       - name: Install e2e-test Packages
         run: npm ci
         working-directory: ./e2e-tests
@@ -59,9 +62,6 @@ jobs:
         node-version: '20.x'
     - name: Install Flex Plugin
       uses: ./.github/actions/install-flex-plugin
-    - name: Run hrm-form-definitions Tests
-      run: npm run test
-      working-directory: ./hrm-form-definitions
     - name: Configure AWS credentials
       uses: aws-actions/configure-aws-credentials@v4
       with:

.github/workflows/twilio-lambda-ci.yml

@@ -46,6 +46,10 @@ jobs:
         run: |
           npm ci
         working-directory: ./lambdas
+      - name: Build Lambda packages
+        run: |
+          npm run build
+        working-directory: ./lambdas
 
       - name: Run Unit Tests
         run: |

.gitignore

@@ -7,4 +7,4 @@
 
 **/__pycache__/
 
-hrm-form-definitions/junit.xml
+**/junit.xml

e2e-tests/Dockerfile

@@ -36,7 +36,7 @@ RUN curl -fsSL https://deb.nodesource.com/setup_16.x | bash - && \
     curl -Lo /usr/local/bin/aws-lambda-rie https://github.com/aws/aws-lambda-runtime-interface-emulator/releases/latest/download/${REI_FILE} && \
     chmod +x /usr/local/bin/aws-lambda-rie
 
-COPY hrm-form-definitions/package*.json /app/hrm-form-definitions/
+COPY lambdas/packages/hrm-form-definitions/package*.json /app/hrm-form-definitions/
 COPY e2e-tests/package*.json /app/e2e-tests/
 
 RUN cd hrm-form-definitions && \
@@ -75,7 +75,7 @@ WORKDIR /app/e2e-tests
 
 RUN npx playwright install-deps
 
-COPY hrm-form-definitions /app/hrm-form-definitions
+COPY lambdas/packages/hrm-form-definitions /app/hrm-form-definitions
 COPY e2e-tests /app/e2e-tests
 COPY --chmod=0755 e2e-tests/docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 COPY e2e-tests/lambda/handler.js /app/e2e-tests/handler.js

e2e-tests/package.json

@@ -51,7 +51,7 @@
     "eslint-import-resolver-typescript": "^2.7.1",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "hrm-form-definitions": "file:../hrm-form-definitions",
+    "hrm-form-definitions": "file:../lambdas/packages/hrm-form-definitions",
     "mock-socket": "^9.1.5",
     "npm-run-all": "^4.1.5",
     "playwright-core": "^1.30.0",

e2e-tests/ui-tests/aselo-service-mocks/form-definitions.ts

@@ -32,7 +32,7 @@ export const mockFormDefinitions = async (page: Page) => {
       .url()
       .substring(context.FORM_DEFINITIONS_BASE_URL.toString().length);
     const definitionFilePath = path.join(
-      '../hrm-form-definitions/form-definitions',
+      '../lambdas/packages/hrm-form-definitions/form-definitions',
       definitionFile,
     );
     console.log('Loading form def file:', definitionFilePath);

e2e-tests/ui-tests/aselo-service-mocks/hrm/cases.ts

@@ -17,8 +17,6 @@
 import flexContext from '../../flex-in-a-box/global-context';
 import { addSeconds, subHours } from 'date-fns';
 // eslint-disable-next-line import/no-extraneous-dependencies
-import { DefinitionVersionId } from 'hrm-form-definitions';
-// eslint-disable-next-line import/no-extraneous-dependencies
 import { Page } from '@playwright/test';
 import context from '../global-context';
 import * as path from 'path';
@@ -39,7 +37,7 @@ const generateMockCases = (toGenerate: number): any[] => {
         'case category 2': ['subcategory3'],
       },
       info: {
-        definitionVersion: DefinitionVersionId.demoV1,
+        definitionVersion: 'demo-v1',
       },
       createdAt: time.toISOString(),
       updatedAt: time.toISOString(),

lambdas/.eslintrc.js

@@ -16,7 +16,7 @@
 
 module.exports = {
   extends: ['airbnb-typescript/base', 'plugin:prettier/recommended'],
-  plugins: ['prettier', 'jest', 'import'],
+  plugins: ['jest', 'import'],
   rules: {
     'prettier/prettier': ['error'],
     'no-console': 'off',
@@ -49,5 +49,7 @@ module.exports = {
     '**/coverage/**',
     'node_modules/**',
     '**/node_modules/**',
+    '**/*.js',
+    '**/*.d.ts'
   ],
 };

lambdas/Dockerfile

@@ -12,28 +12,28 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see https://www.gnu.org/licenses/.
 
 FROM public.ecr.aws/lambda/nodejs:22 as build
 
 ARG lambda_dir
 ENV lambda_dir ${lambda_dir}
 ARG lambda_name
 ENV lambda_name ${lambda_name}
 
 # This is a bit complicated by the need for access to the packages.
 # We must have the full repo context for our docker build so we can
 # copy the hrm-lib package and labmdas folders so that the file: based
 # dependency in package.json can be resolved
 COPY ${lambda_dir}/${lambda_name} /tmp/build/${lambda_dir}/${lambda_name}
-COPY ${lambda_dir}/../packages /tmp/build/${lambda_dir}/../packages
+COPY ${lambda_dir}/../packages /tmp/build/packages
 COPY package.json package-lock.json tsconfig.json tsconfig.base.json ${lambda_dir}/${lambda_name}/tsconfig.build.json /tmp/build/
 
 RUN dnf install -y rsync \
     && cd /tmp/build \
-    && npm ci -w ${lambda_dir}/${lambda_name} -w ${lambda_dir}/../packages/* --verbose \
+    && npm ci -w ${lambda_dir}/${lambda_name} -w packages/* --verbose \
     && npx tsc -b tsconfig.build.json --verbose \
     && cp -r ${lambda_dir}/${lambda_name}/dist/. /var/task/ \
     && mkdir -p /var/task/${lambda_dir} \
-    && cp -r ${lambda_dir}/../packages /var/task/${lambda_dir}/../packages/ \
+    && cp -r packages /var/task/ \
     && cp -r node_modules /var/task/
 
 # Ignore errors if node_modules is not present

lambdas/account-scoped/package.json

@@ -21,6 +21,8 @@
     "@aws-sdk/client-lex-runtime-service": "^3.787.0",
     "@aws-sdk/client-lex-runtime-v2": "^3.787.0",
     "@aws-sdk/client-ssm": "^3.716.0",
+    "@tech-matters/hrm-form-definitions": "^1.0.0",
+    "@tech-matters/hrm-types": "^1.0.0",
     "@twilio-labs/serverless-runtime-types": "^4.0.1",
     "date-fns": "^4.1.0",
     "lodash": "^4.17.21",

lambdas/account-scoped/src/hrm/availableContactFormSelector.ts

@@ -0,0 +1,40 @@
+/**
+ * Copyright (C) 2021-2023 Technology Matters
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see https://www.gnu.org/licenses/.
+ */
+
+import { HrmContactRawJson } from '@tech-matters/hrm-types';
+import { DefinitionVersion } from '@tech-matters/hrm-form-definitions';
+
+export type ContactFormDefinitionName = keyof Pick<
+  DefinitionVersion['tabbedForms'],
+  'ChildInformationTab' | 'CallerInformationTab' | 'CaseInformationTab'
+>;
+
+export type ContactFormName = keyof Omit<
+  HrmContactRawJson,
+  'callType' | 'definitionVersion' | 'categories' | 'contactlessTask'
+>;
+
+export type AvailableContactFormSelector = (
+  parameter?: any,
+) => (
+  source: keyof DefinitionVersion['prepopulateMappings'],
+  preEngagementSelections: any,
+  surveyAnswers: any,
+) => ContactFormDefinitionName[];
+
+export const staticAvailableContactTabSelector: AvailableContactFormSelector =
+  availableTabs => () =>
+    availableTabs;