Skip to content

Commit 4dcea67

Browse files
committed
MMI-3263 Fix front page images (bcgov#2459)
1 parent e364dd1 commit 4dcea67

File tree

10 files changed

+28
-20
lines changed

10 files changed

+28
-20
lines changed
Binary file not shown.

app/editor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
"redux-logger": "3.0.6",
6161
"styled-components": "6.1.11",
6262
"stylis": "4.3.2",
63-
"tno-core": "1.0.13"
63+
"tno-core": "1.0.15"
6464
},
6565
"devDependencies": {
6666
"@simbathesailor/use-what-changed": "2.0.0",

app/editor/yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12209,7 +12209,7 @@ __metadata:
1220912209
sass-extract-loader: 1.1.0
1221012210
styled-components: 6.1.11
1221112211
stylis: 4.3.2
12212-
tno-core: 1.0.13
12212+
tno-core: 1.0.15
1221312213
typescript: 4.9.5
1221412214
vitest: 3.0.7
1221512215
languageName: unknown
@@ -16674,9 +16674,9 @@ __metadata:
1667416674
languageName: node
1667516675
linkType: hard
1667616676

16677-
"tno-core@npm:1.0.13":
16678-
version: 1.0.13
16679-
resolution: "tno-core@npm:1.0.13"
16677+
"tno-core@npm:1.0.15":
16678+
version: 1.0.15
16679+
resolution: "tno-core@npm:1.0.15"
1668016680
dependencies:
1668116681
"@elastic/elasticsearch": ^8.13.1
1668216682
"@fortawesome/free-solid-svg-icons": ^6.4.2
@@ -16709,7 +16709,7 @@ __metadata:
1670916709
styled-components: ^6.1.11
1671016710
stylis: ^4.3.2
1671116711
yup: ^1.1.1
16712-
checksum: 330aaa3f739466b24b7f201ef665024de2355240bc9e3615054df3af6fc22caed0290acb99efa1288698fadd1d22c6700901f44836ad3e459fb976c6a935bb1c
16712+
checksum: 6afb49b193fdd9553e3c625846af61fa20f7ef8475dad175ce841652159416fff2802881e069595084c2f6d81ace0bc31a64de8ce980637047c2973927baaa99
1671316713
languageName: node
1671416714
linkType: hard
1671516715

Binary file not shown.

app/subscriber/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"sheetjs": "file:packages/xlsx-0.20.1.tgz",
4646
"styled-components": "6.1.11",
4747
"stylis": "4.3.2",
48-
"tno-core": "1.0.13"
48+
"tno-core": "1.0.15"
4949
},
5050
"devDependencies": {
5151
"@testing-library/jest-dom": "6.6.3",

app/subscriber/src/components/front-page-gallery/FrontPageGallery.tsx

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ interface IFrontPageGallery extends React.HTMLAttributes<HTMLDivElement> {
1414
interface IImage {
1515
url: string;
1616
id: number;
17+
contentId: number;
18+
alt: string;
1719
}
1820

1921
export const FrontPageGallery: React.FC<IFrontPageGallery> = ({ frontpages }) => {
@@ -26,8 +28,13 @@ export const FrontPageGallery: React.FC<IFrontPageGallery> = ({ frontpages }) =>
2628
frontpages
2729
.filter((fp) => fp.fileReferences?.length)
2830
.map(async (fp) => {
29-
const result = await stream(fp.fileReferences![0].path);
30-
return { url: result, id: fp.id };
31+
const fr = fp.fileReferences[0];
32+
return {
33+
url: await stream(fr.path),
34+
id: fr.id,
35+
alt: fp.headline,
36+
contentId: fp.id,
37+
};
3138
}),
3239
);
3340
srcUrls.then((results) => setSrcUrls(results));
@@ -38,11 +45,11 @@ export const FrontPageGallery: React.FC<IFrontPageGallery> = ({ frontpages }) =>
3845
<Row justifyContent="center" className="content">
3946
{srcUrls.map((s) => (
4047
<img
41-
key={s.url}
42-
alt={`${s.id}`}
48+
key={s.id}
49+
alt={`${s.alt}`}
4350
className="front-page"
4451
src={s.url}
45-
onClick={() => navigateAndScroll(`/view/${s.id}`)}
52+
onClick={() => navigateAndScroll(`/view/${s.contentId}`)}
4653
/>
4754
))}
4855
</Row>

app/subscriber/src/features/todays-front-pages/TodaysFrontPages.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { DateFilter } from 'components/date-filter';
33
import { FrontPageGallery } from 'components/front-page-gallery';
44
import React from 'react';
55
import { useApp, useContent, useSettings } from 'store/hooks';
6-
import { generateFilterQuery, IContentModel, IFilterSettingsModel, Loader } from 'tno-core';
6+
import { generateMustQuery, IContentModel, IFilterSettingsModel, Loader } from 'tno-core';
77

88
import * as styled from './styled';
99

@@ -63,7 +63,7 @@ export const TodaysFrontPages: React.FC = () => {
6363
frontPageFilter?.startDate !== filter?.startDate ||
6464
frontPageFilter?.endDate !== filter?.endDate)
6565
) {
66-
fetchResults(generateFilterQuery(frontPageFilter)).catch(() => {});
66+
fetchResults(generateMustQuery(frontPageFilter)).catch(() => {});
6767
setFilter(frontPageFilter);
6868
}
6969
}, [fetchResults, filter?.dateOffset, filter?.endDate, filter?.startDate, frontPageFilter]);

app/subscriber/yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12029,7 +12029,7 @@ __metadata:
1202912029
sheetjs: "file:packages/xlsx-0.20.1.tgz"
1203012030
styled-components: 6.1.11
1203112031
stylis: 4.3.2
12032-
tno-core: 1.0.13
12032+
tno-core: 1.0.15
1203312033
typescript: 4.9.5
1203412034
vitest: 3.0.7
1203512035
languageName: unknown
@@ -16367,9 +16367,9 @@ __metadata:
1636716367
languageName: node
1636816368
linkType: hard
1636916369

16370-
"tno-core@npm:1.0.13":
16371-
version: 1.0.13
16372-
resolution: "tno-core@npm:1.0.13"
16370+
"tno-core@npm:1.0.15":
16371+
version: 1.0.15
16372+
resolution: "tno-core@npm:1.0.15"
1637316373
dependencies:
1637416374
"@elastic/elasticsearch": ^8.13.1
1637516375
"@fortawesome/free-solid-svg-icons": ^6.4.2
@@ -16402,7 +16402,7 @@ __metadata:
1640216402
styled-components: ^6.1.11
1640316403
stylis: ^4.3.2
1640416404
yup: ^1.1.1
16405-
checksum: 330aaa3f739466b24b7f201ef665024de2355240bc9e3615054df3af6fc22caed0290acb99efa1288698fadd1d22c6700901f44836ad3e459fb976c6a935bb1c
16405+
checksum: 6afb49b193fdd9553e3c625846af61fa20f7ef8475dad175ce841652159416fff2802881e069595084c2f6d81ace0bc31a64de8ce980637047c2973927baaa99
1640616406
languageName: node
1640716407
linkType: hard
1640816408

libs/npm/core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "tno-core",
33
"description": "TNO shared library",
4-
"version": "1.0.13",
4+
"version": "1.0.15",
55
"homepage": "https://github.com/bcgov/tno",
66
"license": "Apache-2.0",
77
"files": [

libs/npm/core/src/hooks/api/interfaces/IFileReferenceModel.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { IAuditColumnsModel } from './IAuditColumnsModel';
22

33
export interface IFileReferenceModel extends IAuditColumnsModel {
4+
id: number;
45
contentId: number;
56
contentType: string;
67
fileName: string;

0 commit comments

Comments
 (0)