Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const base: ApiWorldHeritageDto = {
state_party: "JPN",
state_party_codes: ["JPN"],
state_parties_meta: { JPN: { is_primary: true, inscription_year: 1993 } },
thumbnail: "https://whc.unesco.org/document/209295/site_0661_0026.jpg",
thumbnail_url: "https://whc.unesco.org/document/209295/site_0661_0026.jpg",
};

describe("toWorldHeritageVm", () => {
Expand Down Expand Up @@ -59,7 +59,7 @@ describe("toWorldHeritageVm", () => {
bufferText: "320 ha",
statePartyCodes: ["日本"],
statePartiesMeta: { JPN: { isPrimary: true, inscriptionYear: 1993 } },
thumbnailUrl: base.thumbnail,
thumbnailUrl: base.thumbnail_url,
images: [],
});

Expand Down Expand Up @@ -102,8 +102,8 @@ describe("toWorldHeritageVm", () => {
expect(vm.bufferText).toBe("—");
});

it("when thumbnail is null, thumbnailUrl is null", () => {
const vm = toWorldHeritageVm({ ...base, thumbnail: null }, "ja");
it("when thumbnail_url is null, thumbnailUrl is null", () => {
const vm = toWorldHeritageVm({ ...base, thumbnail_url: null }, "ja");
expect(vm.thumbnailUrl).toBeNull();
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export function toWorldHeritageDetailVm(
state_party: dto.state_party,
state_party_codes: dto.state_party_codes,
state_parties_meta: dto.state_parties_meta,
thumbnail: dto.thumbnail_url,
thumbnail_url: dto.thumbnail_url,
} satisfies import("../../../../domain/types.ts").ApiWorldHeritageDto;

const base: WorldHeritageVm = toWorldHeritageVm(listDto, locale);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export function toWorldHeritageVm(data: ApiWorldHeritageDto, locale: Locale): Wo
bufferText: fmtHa(data.buffer_zone_hectares),
criteriaText: criteriaCodes.join(", "),

thumbnailUrl: data.thumbnail,
thumbnailUrl: data.thumbnail_url,
images: [],
};
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const OK: ApiSearchResponse = {
unesco_site_url: "https://whc.unesco.org/en/list/661",
state_party_codes: ["JPN"],
state_parties_meta: { JPN: { is_primary: true, inscription_year: 1993 } },
thumbnail: null,
thumbnail_url: null,
},
],
pagination: { current_page: 1, per_page: 30, total: 1, last_page: 1 },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const makeWorldHeritageDto = (
state_party: null,
state_party_codes: ["JP"],
state_parties_meta: {},
thumbnail: null,
thumbnail_url: null,
} satisfies ApiWorldHeritageDto;

return { ...base, ...overrides };
Expand Down
2 changes: 1 addition & 1 deletion client/src/app/features/top/apis/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const makeDto = (overrides: Partial<ApiWorldHeritageDto> = {}): ApiWorldHeritage
state_party: null,
state_party_codes: ["JPN"],
state_parties_meta: {},
thumbnail: null,
thumbnail_url: null,
...overrides,
});

Expand Down
2 changes: 1 addition & 1 deletion client/src/domain/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export type ApiWorldHeritageDto = {
state_party: string | null;
state_party_codes: string[];
state_parties_meta: StatePartiesMetaDto;
thumbnail: string | null;
thumbnail_url: string | null;
};

/**
Expand Down
Loading