CCM-9692: cleanup

Author: alexnuttall

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

@@ -712,17 +712,6 @@
           }
         ]
       },
-      "UpdateStatus": {
-        "type": "object",
-        "required": [
-          "templateStatus"
-        ],
-        "properties": {
-          "templateStatus": {
-            "$ref": "#/components/schemas/TemplateStatus"
-          }
-        }
-      },
       "TemplateDto": {
         "type": "object",
         "allOf": [

lambdas/backend-client/src/types/generated/types.gen.ts

@@ -93,10 +93,6 @@ export type CreateUpdateTemplate = BaseTemplate &
     | CreateUpdateLetterProperties
   );
 
-export type UpdateStatus = {
-  templateStatus: TemplateStatus;
-};
-
 export type TemplateDto = BaseTemplate & {
   id: string;
   templateStatus: TemplateStatus;

tests/test-team/config/e2e/e2e.config.ts

@@ -5,7 +5,7 @@ import baseConfig from '../playwright.config';
 export default defineConfig({
   ...baseConfig,
 
-  timeout: 35_000, // 35 seconds in the playwright default
+  timeout: 30_000, // 30 seconds in the playwright default
   expect: {
     timeout: 10_000, // default is 5 seconds. After creating and previewing sometimes the load is slow on a cold start
   },

tests/test-team/pages/email/template-mgmt-view-submitted-email-page.ts

@@ -8,16 +8,9 @@ export class TemplateMgmtViewSubmittedEmailPage extends TemplateMgmtViewSubmited
 
   public readonly messageText: Locator;
 
-  public readonly submitTemplateButton: Locator;
-
   constructor(page: Page) {
     super(page);
     this.subjectLineText = page.locator('[id="preview-content-subject"]');
     this.messageText = page.locator('[id="preview-content-message"]');
-    this.submitTemplateButton = page.locator('[id="submit-template-button"]');
-  }
-
-  async clickSubmitTemplateButton() {
-    await this.submitTemplateButton.click();
   }
 }

tests/test-team/pages/email/template-mgmt-view-submitted-letter-page.ts

@@ -0,0 +1,5 @@
+import { TemplateMgmtViewSubmitedBasePage } from '../template-mgmt-view-submitted-base-page';
+
+export class TemplateMgmtViewSubmittedLetterPage extends TemplateMgmtViewSubmitedBasePage {
+  static readonly pageUrlSegment = 'view-submitted-letter-template';
+}

…e-mgmt-template-submitted-letter-page.ts …e-mgmt-template-submitted-letter-page.tstests/test-team/pages/letter/temnplate-mgmt-template-submitted-letter-page.ts renamed to tests/test-team/pages/letter/template-mgmt-template-submitted-letter-page.ts tests/test-team/pages/letter/temnplate-mgmt-template-submitted-letter-page.ts renamed to tests/test-team/pages/letter/template-mgmt-template-submitted-letter-page.ts

@@ -6,15 +6,8 @@ export class TemplateMgmtViewSubmittedNhsAppPage extends TemplateMgmtViewSubmite
 
   public readonly messageText: Locator;
 
-  public readonly submitTemplateButton: Locator;
-
   constructor(page: Page) {
     super(page);
     this.messageText = page.locator('[id="preview-content-message"]');
-    this.submitTemplateButton = page.locator('[id="submit-template-button"]');
-  }
-
-  async clickSubmitTemplateButton() {
-    await this.submitTemplateButton.click();
   }
 }

tests/test-team/pages/letter/template-mgmt-view-submitted-letter-page.ts

@@ -6,15 +6,8 @@ export class TemplateMgmtViewSubmittedSmsPage extends TemplateMgmtViewSubmitedBa
 
   public readonly messageText: Locator;
 
-  public readonly submitTemplateButton: Locator;
-
   constructor(page: Page) {
     super(page);
     this.messageText = page.locator('[id="preview-content-message"]');
-    this.submitTemplateButton = page.locator('[id="submit-template-button"]');
-  }
-
-  async clickSubmitTemplateButton() {
-    await this.submitTemplateButton.click();
   }
 }

tests/test-team/pages/nhs-app/template-mgmt-view-submitted-nhs-app-page.ts

@@ -1,6 +1,6 @@
 import { test, expect } from '@playwright/test';
 import { TemplateStorageHelper } from '../../helpers/db/template-storage-helper';
-import { TemplateMgmtViewSubmittedLetterPage } from '../../pages/email/template-mgmt-view-submitted-letter-page';
+import { TemplateMgmtViewSubmittedLetterPage } from '../../pages/letter/template-mgmt-view-submitted-letter-page';
 import { TemplateFactory } from '../../helpers/factories/template-factory';
 import { Template } from '../../helpers/types';
 import {