Skip to content

Commit 444569a

Browse files
committed
fix missing owner
1 parent 9635656 commit 444569a

File tree

7 files changed

+67
-6
lines changed

7 files changed

+67
-6
lines changed

frontend/src/__tests__/components/molecules/PreviewTemplateDetails.test.tsx

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,13 @@ describe('PreviewTemplateDetailsLetter', () => {
219219
currentVersion: '4C728B7D-A028-4BA2-B180-A63CDD2AE1E9',
220220
virusScanStatus: 'PASSED',
221221
},
222+
proofs: {
223+
'a.pdf': {
224+
fileName: 'a.pdf',
225+
virusScanStatus: 'PASSED',
226+
supplier: 'MBA',
227+
},
228+
},
222229
},
223230
createdAt: '2025-01-13T10:19:25.579Z',
224231
updatedAt: '2025-01-13T10:19:25.579Z',

frontend/src/__tests__/components/molecules/__snapshots__/PreviewTemplateDetails.test.tsx.snap

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,58 @@ exports[`PreviewTemplateDetailsLetter If the template is client-owned, the clien
215215
</dd>
216216
</div>
217217
</dl>
218+
<dl
219+
class="nhsuk-summary-list nhsuk-u-margin-bottom-4 preview"
220+
>
221+
<div
222+
class="nhsuk-summary-list__row"
223+
>
224+
<dt
225+
class="nhsuk-summary-list__key"
226+
>
227+
Template proof files
228+
</dt>
229+
<dd
230+
class="nhsuk-summary-list__value"
231+
>
232+
<ul
233+
class="proofs"
234+
>
235+
<li>
236+
<a
237+
data-testid="proof-link_a.pdf"
238+
href="/templates/files/client/proofs/template-id/a.pdf"
239+
rel="noopener noreferrer"
240+
target="_blank"
241+
>
242+
<div
243+
class="container"
244+
>
245+
<svg
246+
class="icon"
247+
fill="none"
248+
height="26"
249+
viewBox="0 0 20 26"
250+
width="20"
251+
xmlns="http://www.w3.org/2000/svg"
252+
>
253+
<path
254+
d="M0 0V26H20V6.59375L19.7188 6.28125L13.7188 0.28125L13.4062 0H0ZM2 2H12V8H18V24H2V2ZM14 3.4375L16.5625 6H14V3.4375Z"
255+
fill="#4C6272"
256+
/>
257+
</svg>
258+
<p
259+
class="text"
260+
>
261+
a.pdf
262+
</p>
263+
</div>
264+
</a>
265+
</li>
266+
</ul>
267+
</dd>
268+
</div>
269+
</dl>
218270
</div>
219271
</DocumentFragment>
220272
`;

frontend/src/components/molecules/PreviewTemplateDetails/PreviewTemplateDetailsLetter.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ export default function PreviewTemplateDetailsLetter({
1717
}: {
1818
template: LetterTemplate;
1919
}) {
20+
console.log(template);
21+
2022
const proofFilenames = Object.values(template.files.proofs ?? {})
2123
.filter(({ virusScanStatus }) => virusScanStatus === 'PASSED')
2224
.map(({ fileName }) => fileName);
@@ -28,7 +30,7 @@ export default function PreviewTemplateDetailsLetter({
2830
template.owner;
2931

3032
const owner = template.owner ?? '';
31-
const proofOwner = owner.startsWith('CLIENT#') ? owner.slice(6) : owner;
33+
const proofOwner = owner.startsWith('CLIENT#') ? owner.slice(7) : owner;
3234

3335
return (
3436
<>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ data "aws_iam_policy_document" "get_template_lambda_policy" {
4040
effect = "Allow"
4141

4242
actions = [
43-
"dynamodb:GetItem",
43+
"dynamodb:BatchGetItem",
4444
]
4545

4646
resources = [

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ data "aws_iam_policy_document" "validate_letter_template_files" {
5555
effect = "Allow"
5656

5757
actions = [
58-
"dynamodb:GetItem",
58+
"dynamodb:BatchGetItem",
5959
"dynamodb:UpdateItem",
6060
]
6161

lambdas/backend-api/src/__tests__/templates/app/template-client.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ describe('templateClient', () => {
378378
updatedAt: updateTime,
379379
};
380380

381-
const { owner: _1, version: _2, ...expectedDto } = finalTemplate;
381+
const { version: _, ...expectedDto } = finalTemplate;
382382

383383
mocks.templateRepository.create.mockResolvedValueOnce({
384384
data: initialCreatedTemplate,
@@ -486,7 +486,7 @@ describe('templateClient', () => {
486486
updatedAt: updateTime,
487487
};
488488

489-
const { owner: _1, version: _2, ...expectedDto } = finalTemplate;
489+
const { version: _, ...expectedDto } = finalTemplate;
490490

491491
mocks.templateRepository.create.mockResolvedValueOnce({
492492
data: initialCreatedTemplate,

lambdas/backend-api/src/templates/app/template-client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ export class TemplateClient {
521521
private mapDatabaseObjectToDTO(
522522
databaseTemplate: DatabaseTemplate
523523
): TemplateDto | undefined {
524-
const { owner: _1, version: _2, ...templateDTO } = databaseTemplate;
524+
const { version: _, ...templateDTO } = databaseTemplate;
525525

526526
return isTemplateDtoValid(templateDTO);
527527
}

0 commit comments

Comments
 (0)