Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/calendar entry publish date #1039

Merged
merged 5 commits into from
Jul 25, 2024
Merged

Fix/calendar entry publish date #1039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9eba607
Change releaseDate to release_date
StRhys Jul 25, 2024
aa54b1c
Fix release datet in test
StRhys Jul 25, 2024
5ef60cf
Conditional for blank date
StRhys Jul 25, 2024
02d9d79
Add tests for handling blank and missing release dates
StRhys Jul 25, 2024
1614569
Remove blank date test
StRhys Jul 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/app/views/collections/schedule-by-release/ScheduleByRelease.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,15 @@ export class ScheduleByRelease extends Component {
//TODO check whether the release is already associated to a collection

const title = release.description.title.replace(/<\/?[^>]+(>|$)/g, ""); // remove any <strong> tags added on by Babbage's response
const releaseDate = release.description.release_date;
const formattedDate = releaseDate ? date.format(releaseDate, "dddd, dd/mm/yyyy h:MMTT") : "";

return {
id: release.uri,
columnValues: [title, date.format(release.description.releaseDate, "dddd, dd/mm/yyyy h:MMTT")],
columnValues: [title, formattedDate],
returnValue: {
uri: release.uri,
releaseDate: release.description.releaseDate,
releaseDate: releaseDate,
title,
isProvisional: !release.description.finalised,
},
Expand Down
32 changes: 23 additions & 9 deletions src/app/views/collections/schedule-by-release/ScheduleByRelease.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,23 +21,23 @@ jest.mock("../../../utilities/api-clients/releases", () => ({
uri: "/releases/my-release",
description: {
title: "My release",
releaseDate: "2018-05-17T09:30:54.928Z",
release_date: "2018-05-17T09:30:54.928Z",
finalised: true,
},
},
{
uri: "/releases/my-second-release",
description: {
title: "My second release",
releaseDate: "2018-05-20T09:30:54.928Z",
release_date: "2018-05-20T09:30:54.928Z",
finalised: true,
},
},
{
uri: "/releases/my-third-release",
description: {
title: "My third release",
releaseDate: "2018-05-21T09:30:54.928Z",
release_date: "2018-05-21T09:30:54.928Z",
finalised: true,
},
},
Expand All @@ -59,23 +59,23 @@ const mockedReleases = [
uri: "/releases/my-release",
description: {
title: "My release",
releaseDate: "2018-05-17T09:30:54.928Z",
release_date: "2018-05-17T09:30:54.928Z",
finalised: true,
},
},
{
uri: "/releases/my-second-release",
description: {
title: "My second release",
releaseDate: "2018-05-20T09:30:54.928Z",
release_date: "2018-05-20T09:30:54.928Z",
finalised: true,
},
},
{
uri: "/releases/my-third-release",
description: {
title: "My third release",
releaseDate: "2018-05-21T09:30:54.928Z",
release_date: "2018-05-21T09:30:54.928Z",
finalised: true,
},
},
Expand Down Expand Up @@ -188,6 +188,20 @@ describe("Mapping releases response to table", () => {

expect(component.instance().mapReleasesToTableRows(releasesWithHTMLTags)[0].returnValue.title).toBe("My tagged release");
});

it("handles no dates", () => {
const releasesWithoutReleaseDate = [
{
uri: "/releases/my-release-without-date",
description: {
title: "My release without date",
finalised: true,
},
},
];

expect(component.instance().mapReleasesToTableRows(releasesWithoutReleaseDate)[0].columnValues[1]).toBe("");
});
});

describe("Searching releases", () => {
Expand Down Expand Up @@ -256,23 +270,23 @@ describe("Loading more releases", () => {
uri: "/releases/my-fourth-release",
description: {
title: "My fourth release",
releaseDate: "2018-05-17T09:30:54.928Z",
release_date: "2018-05-17T09:30:54.928Z",
finalised: true,
},
},
{
uri: "/releases/my-fifth-release",
description: {
title: "My fifth release",
releaseDate: "2018-05-17T09:30:54.928Z",
release_date: "2018-05-17T09:30:54.928Z",
finalised: true,
},
},
{
uri: "/releases/my-sixth-release",
description: {
title: "My sixth release",
releaseDate: "2018-05-17T09:30:54.928Z",
release_date: "2018-05-17T09:30:54.928Z",
finalised: true,
},
},
Expand Down