Skip to content

Commit b26657b

Browse files
authored
fix/type-errors (#159)
* Fix type errors for event page * Format changes * Fix type error for person page * Add `typeCheck` to build cmd
1 parent 641fcd4 commit b26657b

File tree

27 files changed

+208
-176
lines changed

27 files changed

+208
-176
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"deploy:app": "gh-pages -d build",
2424
"preview:app": "vite preview -c vite.app.config.js --base /cdp-frontend/",
2525
"build:lib": "vite build -c vite.lib.config.js",
26-
"build": "npm-run-all --print-label clean --parallel build:app build:lib generateTypes",
26+
"build": "npm-run-all --print-label clean --parallel typeCheck build:app build:lib generateTypes",
2727
"clean": "rimraf build dist type-declarations",
2828
"format": "prettier --write src/**/*",
2929
"checkFormat": "prettier --check src/**/*.tsx",

src/components/Details/EventVideo/EventVideo.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ export const eventVideo = Template.bind({});
1414
eventVideo.args = {
1515
uri: "https://video.seattle.gov/media/council/council_113020_2022091V.mp4",
1616
componentRef: createRef<EventVideoRef>(),
17-
sessionNum: 0,
17+
sessionIndex: 0,
1818
};

src/components/Details/TranscriptFull/TranscriptFull.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import styled from "@emotion/styled";
44

55
import TranscriptItem, { TranscriptItemRef } from "../TranscriptItem/TranscriptItem";
66

7-
import { SentenceWithSessionIndex } from "../../../containers/EventContainer/types";
7+
import { ECSentence } from "../../../containers/EventContainer/types";
88
import secondsToHHMMSS from "../../../utils/secondsToHHMMSS";
99

1010
const TranscripItems = styled.div({
@@ -14,7 +14,7 @@ const TranscripItems = styled.div({
1414

1515
export interface TranscriptFullProps {
1616
/**The sentences of the transcript */
17-
sentences: SentenceWithSessionIndex[];
17+
sentences: ECSentence[];
1818
/**List of transcript item React references */
1919
transcriptItemsRefs: RefObject<TranscriptItemRef>[];
2020
/**Callback to play video clip */

src/components/Details/TranscriptItem/TranscriptItem.stories.tsx

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ withPictureSrc.args = {
1717
sessionIndex: 0,
1818
speakerId: "speaker-id-1",
1919
speakerName: "Lisa Herbold",
20-
text:
21-
"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
20+
text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
2221
startTime: "05:00:45",
2322
speakerPictureSrc: "https://www.seattle.gov/images/Council/Members/Herbold/Herbold_225x225.jpg",
2423
handleJumpToTranscript: action("handleJumpToTranscript"),
@@ -29,8 +28,7 @@ withoutPictureSrc.args = {
2928
sessionIndex: 0,
3029
speakerId: "speaker-id-1",
3130
speakerName: "Lisa Herbold",
32-
text:
33-
"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
31+
text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
3432
startTime: "05:00:45",
3533
handleJumpToTranscript: action("handleJumpToTranscript"),
3634
};
@@ -40,8 +38,7 @@ withSearchQuery.args = {
4038
sessionIndex: 0,
4139
speakerId: "speaker-id-1",
4240
speakerName: "Lisa Herbold",
43-
text:
44-
"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
41+
text: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",
4542
startTime: "05:00:45",
4643
speakerPictureSrc: "https://www.seattle.gov/images/Council/Members/Herbold/Herbold_225x225.jpg",
4744
searchQuery: "ipsum dolor sit",

src/components/Details/TranscriptSearch/TranscriptItems.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@ import {
1111
import { TranscriptItem } from "../TranscriptItem";
1212

1313
import secondsToHHMMSS from "../../../utils/secondsToHHMMSS";
14-
import { SentenceWithSessionIndex } from "../../../containers/EventContainer/types";
14+
import { ECSentence } from "../../../containers/EventContainer/types";
1515

1616
interface TranscriptItemsProps {
1717
searchQuery: string;
18-
sentences: SentenceWithSessionIndex[];
18+
sentences: ECSentence[];
1919
jumpToVideoClip(sessionIndex: number, startTime: number): void;
2020
jumpToTranscript(sentenceIndex: number): void;
2121
}

src/components/Details/TranscriptSearch/TranscriptSearch.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { stem } from "stemr";
44
import { removeStopwords } from "stopword";
55

66
import TranscriptItems from "./TranscriptItems";
7-
import { SentenceWithSessionIndex } from "../../../containers/EventContainer/types";
7+
import { ECSentence } from "../../../containers/EventContainer/types";
88

99
import { strings } from "../../../assets/LocalizedStrings";
1010
import { fontSizes } from "../../../styles/fonts";
@@ -51,7 +51,7 @@ export interface TranscriptSearchProps {
5151
/**The search query */
5252
searchQuery: string;
5353
/**The sentences of the transcript */
54-
sentences?: SentenceWithSessionIndex[];
54+
sentences?: ECSentence[];
5555
/**Callback to play video clip */
5656
jumpToVideoClip(sessionIndex: number, startTime: number): void;
5757
/**Callback to jump to sentence in the full transcript component */

src/components/Filters/SelectTextFilterOptions/getCheckboxText.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@ import { FilterState } from "../reducer";
99
* @returns {string} The text representation.
1010
*/
1111
const getCheckboxText = (checkboxes: FilterState<boolean>, defaultText: string): string => {
12-
const numberOfSelectedCheckbox = Object.values(checkboxes).filter((dataValue) => dataValue)
13-
.length;
12+
const numberOfSelectedCheckbox = Object.values(checkboxes).filter(
13+
(dataValue) => dataValue
14+
).length;
1415
const textRep = numberOfSelectedCheckbox
1516
? `${defaultText} : ${numberOfSelectedCheckbox}`
1617
: defaultText;

src/components/Filters/reducer.ts

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,21 @@ export interface FilterAction<T> {
1414
}
1515

1616
/**Create a filterReducer to manage filter's state.*/
17-
const createFilterReducer = <T>() => (
18-
state: FilterState<T>,
19-
action: FilterAction<T>
20-
): FilterState<T> => {
21-
switch (action.type) {
22-
case FILTER_UPDATE:
23-
return { ...state, [action.payload.keyName as string]: action.payload.dataValue as T };
24-
case FILTER_CLEAR:
25-
const newState = { ...state };
26-
Object.keys(newState).forEach(
27-
(keyName) => (newState[keyName] = action.payload.dataValue as T)
28-
);
29-
return newState;
30-
default:
31-
return state;
32-
}
33-
};
17+
const createFilterReducer =
18+
<T>() =>
19+
(state: FilterState<T>, action: FilterAction<T>): FilterState<T> => {
20+
switch (action.type) {
21+
case FILTER_UPDATE:
22+
return { ...state, [action.payload.keyName as string]: action.payload.dataValue as T };
23+
case FILTER_CLEAR:
24+
const newState = { ...state };
25+
Object.keys(newState).forEach(
26+
(keyName) => (newState[keyName] = action.payload.dataValue as T)
27+
);
28+
return newState;
29+
default:
30+
return state;
31+
}
32+
};
3433

3534
export default createFilterReducer;

src/components/Layout/TabbedContainer/TabbedContainer.stories.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const Template: Story<TabbedContainerProps> = (args) => <TabbedContainer {...arg
1212

1313
export const tabbedContainer = Template.bind({});
1414
tabbedContainer.args = {
15-
tabLabels: (["Minutes and Documents", "Full Transcript", "Votes"] as unknown) as JSX.Element[],
15+
tabLabels: ["Minutes and Documents", "Full Transcript", "Votes"] as unknown as JSX.Element[],
1616
children: [
1717
<p key={1}>Contents of Page 1</p>,
1818
<p key={2}>Contents of Page 2</p>,

src/containers/EventContainer/EventContainer.stories.tsx

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { Story, Meta } from "@storybook/react";
44
import EventContainer, { EventContainerProps } from "./EventContainer";
55

66
import { MATTER_STATUS_DECISION, VOTE_DECISION } from "../../constants/ProjectConstants";
7-
import { SentenceWithSessionIndex } from "./types";
7+
import { ECSentence } from "./types";
88

99
export default {
1010
component: EventContainer,
@@ -13,7 +13,7 @@ export default {
1313

1414
const Template: Story<EventContainerProps> = (args) => <EventContainer {...args} />;
1515

16-
const sentences: SentenceWithSessionIndex[] = [];
16+
const sentences: ECSentence[] = [];
1717
for (let sessionIndex = 0; sessionIndex < 2; sessionIndex++) {
1818
for (let sentenceIndex = 0; sentenceIndex < 10; sentenceIndex++) {
1919
sentences.push({
@@ -37,24 +37,25 @@ event.args = {
3737
},
3838
sessions: [
3939
{
40+
id: "s1",
4041
video_uri: "https://video.seattle.gov/media/council/council_113020_2022091V.mp4",
4142
session_index: 1,
42-
session_datetime: new Date(0),
4343
},
4444
{
45+
id: "s2",
4546
video_uri: "https://video.seattle.gov/media/council/econ_090821_2602120V.mp4",
4647
session_index: 2,
47-
session_datetime: new Date(3600000),
4848
},
4949
],
5050
sentences: sentences,
5151
eventMinutesItems: [
5252
{
53+
id: "test1",
5354
minutes_item: { name: "test" },
5455
},
5556
{
5657
id: "test2",
57-
minutes_item: { name: "test2", description: "test desc", matter: { id: "matter-id" } },
58+
minutes_item: { name: "test2", description: "test desc", matter_ref: "matter-id" },
5859
decision: MATTER_STATUS_DECISION.REJECTED,
5960
files: [
6061
{

0 commit comments

Comments
 (0)