Merge remote-tracking branch 'origin' into feature/CCM-11172_add_template_id_to_table

Author: m-salaudeen

frontend/src/__tests__/app/upload-letter-template/__snapshots__/page.test.tsx.snap

@@ -1,24 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`UploadLetterTemplatePage should render UploadLetterTemplatePage with campaignId field when campaignIds is not available 1`] = `
-<LetterTemplateForm
-  campaignIds={
-    [
-      "campaign-id",
-    ]
-  }
-  initialState={
-    {
-      "campaignId": "campaign-id",
-      "language": "en",
-      "letterType": "x0",
-      "name": "",
-      "templateType": "LETTER",
-    }
-  }
-/>
-`;
-
 exports[`UploadLetterTemplatePage should render UploadLetterTemplatePage with campaignIds field when available 1`] = `
 <LetterTemplateForm
   campaignIds={

frontend/src/__tests__/app/upload-letter-template/page.test.tsx

@@ -30,7 +30,7 @@ describe('UploadLetterTemplatePage', () => {
     });
     mockFetchClient.mockResolvedValueOnce({
       data: {
-        campaignId: 'campaign2',
+        campaignIds: ['campaign2'],
         features: {},
       },
     });
@@ -49,26 +49,6 @@ describe('UploadLetterTemplatePage', () => {
     mockFetchClient.mockResolvedValueOnce({
       data: {
         campaignIds: ['campaign-id', 'other-campaign-id'],
-        campaignId: 'campaign-id',
-        features: {},
-      },
-    });
-
-    const page = await UploadLetterTemplatePage();
-
-    expect(await generateMetadata()).toEqual({ title: pageTitle });
-    expect(page).toMatchSnapshot();
-  });
-
-  it('should render UploadLetterTemplatePage with campaignId field when campaignIds is not available', async () => {
-    mockGetSessionServer.mockResolvedValueOnce({
-      accessToken: 'mocktoken',
-      clientId: 'client1',
-    });
-    mockFetchClient.mockResolvedValueOnce({
-      data: {
-        campaignIds: undefined,
-        campaignId: 'campaign-id',
         features: {},
       },
     });
@@ -107,7 +87,7 @@ describe('UploadLetterTemplatePage', () => {
     });
     mockFetchClient.mockResolvedValueOnce({
       data: {
-        campaignId: 'campaign2',
+        campaignIds: ['campaign2'],
         features: {},
       },
     });
@@ -130,7 +110,6 @@ describe('UploadLetterTemplatePage', () => {
     mockFetchClient.mockResolvedValueOnce({
       data: {
         campaignIds: [],
-        campaignId: 'campaign-id',
         features: {},
       },
     });
@@ -143,7 +122,7 @@ describe('UploadLetterTemplatePage', () => {
     );
   });
 
-  it('should redirect to error page when neither campaignIds nor campaignId is present', async () => {
+  it('should redirect to error page when neither campaignIds are not present', async () => {
     const mockRedirect = jest.mocked(redirect);
 
     mockGetSessionServer.mockResolvedValueOnce({
@@ -153,7 +132,6 @@ describe('UploadLetterTemplatePage', () => {
     mockFetchClient.mockResolvedValueOnce({
       data: {
         campaignIds: undefined,
-        campaignId: undefined,
         features: {},
       },
     });

frontend/src/app/upload-letter-template/page.tsx

@@ -22,15 +22,9 @@ const getSortedCampaignIds = (
     return;
   }
 
-  const { campaignIds, campaignId } = clientConfiguration;
+  const { campaignIds = [] } = clientConfiguration;
 
-  if (campaignIds) {
-    return campaignIds.sort();
-  }
-
-  if (campaignId) {
-    return [campaignId];
-  }
+  return campaignIds.sort();
 };
 
 const UploadLetterTemplatePage = async () => {

infrastructure/terraform/modules/backend-api/module_delete_routing_config_lambda.tf

@@ -65,4 +65,15 @@ data "aws_iam_policy_document" "delete_routing_config_lambda_policy" {
       var.kms_key_arn
     ]
   }
+
+  statement {
+    sid    = "AllowSSMParameterRead"
+    effect = "Allow"
+
+    actions = [
+      "ssm:GetParameter",
+    ]
+
+    resources = [local.client_ssm_path_pattern]
+  }
 }

infrastructure/terraform/modules/backend-api/module_submit_routing_config_lambda.tf

@@ -65,4 +65,15 @@ data "aws_iam_policy_document" "submit_routing_config_lambda_policy" {
       var.kms_key_arn
     ]
   }
+
+  statement {
+    sid    = "AllowSSMParameterRead"
+    effect = "Allow"
+
+    actions = [
+      "ssm:GetParameter",
+    ]
+
+    resources = [local.client_ssm_path_pattern]
+  }
 }

infrastructure/terraform/modules/backend-api/spec.tmpl.json

@@ -296,10 +296,6 @@
       },
       "ClientConfiguration": {
         "properties": {
-          "campaignId": {
-            "deprecated": true,
-            "type": "string"
-          },
           "campaignIds": {
             "items": {
               "type": "string"

lambdas/backend-api/src/__tests__/templates/api/get-client-configuration.test.ts

@@ -86,7 +86,7 @@ describe('Template API - get client configuration', () => {
 
     const clientConfiguration: ClientConfiguration = {
       features: { proofing: false },
-      campaignId: 'campaign',
+      campaignIds: ['campaign'],
     };
 
     mocks.templateClient.getClientConfiguration.mockResolvedValueOnce({