Skip to content

A
amundsen_dev
Unverified Commit 14261198 authored by Dorian Johnson's avatar Dorian Johnson Committed by GitHub
Browse files
Options

chore: finish remaining simple null check typing fixes (#756) 

Signed-off-by: 's avatarMarcos Iglesias Valle <golodhros@gmail.com>
parent 0d55e2d2
Show whitespace changes
Inline Side-by-side
Showing with 112 additions and 129 deletions
amundsen_application/static/.betterer.results
View file @ 14261198
// BETTERER RESULTS V2.
exports[`strict null compilation`] = {
value: `{
"js/components/common/Bookmark/MyBookmarks/index.tsx:3695929904": [
[66, 6, 7, "Type \'Element | null\' is not assignable to type \'Element | undefined\'.\\n Type \'null\' is not assignable to type \'Element | undefined\'.", "3716929964"],
[73, 8, 7, "Type \'Element | null\' is not assignable to type \'Element | undefined\'.\\n Type \'null\' is not assignable to type \'Element | undefined\'.", "3716929964"]
"js/components/Footer/index.tsx:474946957": [
[79, 2, 15, "No overload matches this call.\\n The last overload gave the following error.\\n Argument of type \'(state: GlobalState) => { lastIndexed: number | null; }\' is not assignable to parameter of type \'MapStateToPropsParam<StateFromProps, {}, {}>\'.\\n Type \'(state: GlobalState) => { lastIndexed: number | null; }\' is not assignable to type \'MapStateToPropsFactory<StateFromProps, {}, {}>\'.\\n Type \'{ lastIndexed: number | null; }\' is not assignable to type \'MapStateToProps<StateFromProps, {}, {}>\'.\\n Type \'{ lastIndexed: number | null; }\' provides no match for the signature \'(state: {}, ownProps: {}): StateFromProps\'.", "1389821531"]
],
"js/components/common/Card/index.tsx:1284486450": [
[35, 2, 7, "Type \'null\' is not assignable to type \'(e: SyntheticEvent<Element, Event>) => void\'.", "4055953994"]
],
"js/components/common/EditableSection/index.spec.tsx:1117078860": [
[93, 32, 4, "Argument of type \'null\' is not assignable to parameter of type \'Partial<EditableSectionProps> | undefined\'.", "2087897566"]
],
"js/components/common/ResourceListItem/DashboardListItem/index.spec.tsx:53357032": [
[163, 14, 29, "Type \'null\' is not assignable to type \'number\'.", "1157138603"]
],
"js/components/common/ScrollTracker/index.tsx:727804392": [
[55, 30, 29, "Argument of type \'number | undefined\' is not assignable to parameter of type \'number\'.\\n Type \'undefined\' is not assignable to type \'number\'.", "745919071"]
],
"js/components/common/SearchBar/index.spec.tsx:2504836695": [
[403, 30, 4, "Argument of type \'null\' is not assignable to parameter of type \'Partial<SearchBarProps> | undefined\'.", "2087897566"]
],
"js/components/common/SearchBar/index.tsx:4158354159": [
"js/components/common/SearchBar/index.tsx:3874012304": [
[255, 6, 11, "No overload matches this call.\\n The last overload gave the following error.\\n Type \'(() => SubmitSearchRequest) | null\' is not assignable to type \'ActionCreator<any>\'.\\n Type \'null\' is not assignable to type \'ActionCreator<any>\'.", "2296208050"],
[270, 4, 18, "No overload matches this call.\\n The last overload gave the following error.\\n Argument of type \'(dispatch: any, ownProps: any) => ActionCreator<unknown>\' is not assignable to parameter of type \'DispatchFromProps\'.\\n Type \'(dispatch: any, ownProps: any) => ActionCreator<unknown>\' is missing the following properties from type \'DispatchFromProps\': submitSearch, onInputChange, onSelectInlineResult", "2926224796"]
],
"js/components/common/Tags/TagInput/index.tsx:1066848945": [
[63, 22, 6, "Type \'undefined\' is not assignable to type \'GetAllTagsRequest\'.", "1979467425"],
[67, 22, 6, "Type \'undefined\' is not assignable to type \'UpdateTagsRequest\'.", "1979467425"]
],
"js/components/common/Tags/TagsList/index.tsx:4084208491": [
[99, 23, 9, "Object is possibly \'undefined\'.", "3803340896"],
[115, 38, 4, "Type \'Tag[] | undefined\' is not assignable to type \'Tag[]\'.\\n Type \'undefined\' is not assignable to type \'Tag[]\'.", "2087952548"]
],
"js/config/config-utils.ts:3097983516": [
[87, 4, 25, "\'style\' is specified more than once, so this usage will be overwritten.", "1214862559"]
],
"js/config/index.spec.ts:3696338512": [
[17, 6, 61, "Object is possibly \'undefined\'.", "1496333578"],
[51, 6, 61, "Object is possibly \'undefined\'.", "1496333578"]
],
"js/ducks/announcements/index.ts:2989299303": [
"js/ducks/announcements/index.ts:3464360346": [
[37, 2, 10, "Type \'null\' is not assignable to type \'number\'.", "3382497788"],
[49, 8, 10, "Type \'null\' is not assignable to type \'number\'.", "3382497788"],
[62, 8, 5, "Type \'AnnouncementPost[] | undefined\' is not assignable to type \'AnnouncementPost[]\'.\\n Type \'undefined\' is not assignable to type \'AnnouncementPost[]\'.", "187752366"]
[49, 8, 10, "Type \'null\' is not assignable to type \'number\'.", "3382497788"]
],
"js/ducks/dashboard/reducer.ts:1902488284": [
[71, 2, 10, "Type \'null\' is not assignable to type \'number\'.", "3382497788"],
......@@ -67,12 +39,6 @@ exports[`strict null compilation`] = {
[258, 39, 4, "Argument of type \'null\' is not assignable to parameter of type \'string | undefined\'.", "2087897566"],
[306, 34, 4, "Argument of type \'null\' is not assignable to parameter of type \'Issue\'.", "2087897566"]
],
"js/ducks/lastIndexed/reducer.ts:1072326537": [
[10, 2, 11, "Type \'null\' is not assignable to type \'number\'.", "1159268112"],
[43, 8, 11, "Type \'number | undefined\' is not assignable to type \'number\'.\\n Type \'undefined\' is not assignable to type \'number\'.", "1159268112"],
[43, 21, 40, "Object is possibly \'undefined\'.", "195627832"],
[47, 8, 11, "Type \'null\' is not assignable to type \'number\'.", "1159268112"]
],
"js/ducks/notification/tests/index.spec.ts:2474130513": [
[197, 43, 4, "Argument of type \'null\' is not assignable to parameter of type \'SubmitNotificationRequest\'.", "2087897566"]
],
......@@ -91,55 +57,23 @@ exports[`strict null compilation`] = {
"js/ducks/tableMetadata/reducer.ts:2668005658": [
[65, 2, 10, "Type \'null\' is not assignable to type \'number\'.", "3382497788"]
],
"js/ducks/tags/reducer.ts:419330645": [
[130, 16, 48, "Object is possibly \'undefined\'.", "1931932323"]
],
"js/ducks/user/reducer.ts:1917256202": [
[119, 22, 41, "Object is possibly \'undefined\'.", "291980569"],
[135, 16, 33, "Object is possibly \'undefined\'.", "625812796"],
[154, 15, 36, "Object is possibly \'undefined\'.", "3626509514"],
[171, 16, 37, "Object is possibly \'undefined\'.", "1613771502"]
],
"js/ducks/utilMethods.ts:3713570825": [
[52, 4, 5, "Type \'string | null\' is not assignable to type \'string | undefined\'.\\n Type \'null\' is not assignable to type \'string | undefined\'.", "173467459"]
],
"js/pages/ProfilePage/index.spec.tsx:4086464143": [
[41, 6, 4, "Argument of type \'null\' is not assignable to parameter of type \'Partial<Location<{} | null | undefined>> | undefined\'.", "2087897566"]
],
"js/pages/ProfilePage/index.tsx:1225704099": [
[356, 2, 15, "No overload matches this call.\\n The last overload gave the following error.\\n Argument of type \'(state: GlobalState) => { user: PeopleUser; resourceRelations: { table: { bookmarks: Bookmark[]; own: Resource[]; read: Resource[]; }; dashboard: { bookmarks: Bookmark[] | undefined; own: Resource[] | undefined; read: never[]; }; }; }\' is not assignable to parameter of type \'MapStateToPropsParam<StateFromProps, {}, {}>\'.\\n Type \'(state: GlobalState) => { user: PeopleUser; resourceRelations: { table: { bookmarks: Bookmark[]; own: Resource[]; read: Resource[]; }; dashboard: { bookmarks: Bookmark[] | undefined; own: Resource[] | undefined; read: never[]; }; }; }\' is not assignable to type \'MapStateToPropsFactory<StateFromProps, {}, {}>\'.\\n Type \'{ user: PeopleUser; resourceRelations: { table: { bookmarks: Bookmark[]; own: Resource[]; read: Resource[]; }; dashboard: { bookmarks: Bookmark[] | undefined; own: Resource[] | undefined; read: never[]; }; }; }\' is not assignable to type \'MapStateToProps<StateFromProps, {}, {}>\'.\\n Type \'{ user: PeopleUser; resourceRelations: { table: { bookmarks: Bookmark[]; own: Resource[]; read: Resource[]; }; dashboard: { bookmarks: Bookmark[] | undefined; own: Resource[] | undefined; read: never[]; }; }; }\' provides no match for the signature \'(state: {}, ownProps: {}): StateFromProps\'.", "1389821531"]
],
"js/pages/SearchPage/SearchFilter/FilterSection/index.tsx:2128122504": [
[51, 48, 18, "Type \'CheckboxFilterProperties[] | undefined\' is not assignable to type \'CheckboxFilterProperties[]\'.\\n Type \'undefined\' is not assignable to type \'CheckboxFilterProperties[]\'.", "12656471"]
"js/pages/SearchPage/SearchFilter/index.spec.tsx:1059167396": [
[233, 23, 9, "Argument of type \'undefined\' is not assignable to parameter of type \'FilterConfig\'.", "2620553983"]
],
"js/pages/SearchPage/SearchFilter/index.spec.tsx:2944458990": [
[232, 23, 9, "Argument of type \'undefined\' is not assignable to parameter of type \'FilterConfig\'.", "2620553983"]
],
"js/pages/SearchPage/SearchFilter/index.tsx:1113311229": [
[80, 8, 42, "Type \'{ value: string; label: string | undefined; }[]\' is not assignable to type \'CheckboxFilterProperties[]\'.\\n Type \'{ value: string; label: string | undefined; }\' is not assignable to type \'CheckboxFilterProperties\'.\\n Types of property \'label\' are incompatible.\\n Type \'string | undefined\' is not assignable to type \'string\'.\\n Type \'undefined\' is not assignable to type \'string\'.", "3344322363"],
[86, 26, 7, "Argument of type \'{ categoryId: string; helpText: string | undefined; title: string; type: FilterType; }\' is not assignable to parameter of type \'never\'.", "2519086860"],
[95, 56, 4, "No overload matches this call.\\n The last overload gave the following error.\\n Argument of type \'null\' is not assignable to parameter of type \'{}\'.", "2087897566"]
"js/pages/SearchPage/SearchFilter/index.tsx:2448037720": [
[96, 56, 4, "No overload matches this call.\\n The last overload gave the following error.\\n Argument of type \'null\' is not assignable to parameter of type \'{}\'.", "2087897566"]
],
"js/pages/SearchPage/index.tsx:3158270092": [
[176, 11, 12, "Property \'filterSections\' is missing in type \'{}\' but required in type \'Readonly<Pick<StateFromProps, \\"filterSections\\">>\'.", "250899467"]
],
"js/pages/TableDetailPage/DataPreviewButton/index.tsx:793484139": [
[141, 17, 16, "Object is possibly \'undefined\'.", "3451845569"],
[257, 30, 34, "Argument of type \'number | null\' is not assignable to parameter of type \'number\'.\\n Type \'null\' is not assignable to type \'number\'.", "3967943985"]
],
"js/pages/TableDetailPage/TableDashboardResourceList/index.tsx:3276822301": [
[65, 2, 15, "No overload matches this call.\\n The last overload gave the following error.\\n Argument of type \'(state: GlobalState) => { dashboards: DashboardResource[]; isLoading: boolean; errorText: string | undefined; }\' is not assignable to parameter of type \'MapStateToPropsParam<StateFromProps, OwnProps, {}>\'.\\n Type \'(state: GlobalState) => { dashboards: DashboardResource[]; isLoading: boolean; errorText: string | undefined; }\' is not assignable to type \'MapStateToPropsFactory<StateFromProps, OwnProps, {}>\'.\\n Type \'{ dashboards: DashboardResource[]; isLoading: boolean; errorText: string | undefined; }\' is not assignable to type \'MapStateToProps<StateFromProps, OwnProps, {}>\'.\\n Type \'{ dashboards: DashboardResource[]; isLoading: boolean; errorText: string | undefined; }\' provides no match for the signature \'(state: {}, ownProps: OwnProps): StateFromProps\'.", "1389821531"]
],
"js/pages/TableDetailPage/WatermarkLabel/index.spec.tsx:1587893154": [
[77, 57, 4, "Argument of type \'null\' is not assignable to parameter of type \'string\'.", "2087897566"]
],
"js/pages/TableDetailPage/WatermarkLabel/index.tsx:1354016727": [
[80, 34, 3, "Argument of type \'string | null\' is not assignable to parameter of type \'string\'.\\n Type \'null\' is not assignable to type \'string\'.", "193412913"]
],
"js/pages/TableDetailPage/index.tsx:3727993506": [
[185, 10, 13, "Type \'null\' is not assignable to type \'((newValue: string, onSuccess?: (() => any) | undefined, onFailure?: (() => any) | undefined) => void) | undefined\'.", "67794331"],
[240, 11, 26, "Type \'{ itemsPerPage: number; source: string; }\' is missing the following properties from type \'Readonly<Pick<TableDashboardResourceListProps, \\"source\\" | \\"isLoading\\" | \\"dashboards\\" | \\"itemsPerPage\\" | \\"errorText\\"> & OwnProps>\': isLoading, dashboards, errorText", "2224258167"],
[329, 16, 7, "Type \'string | null\' is not assignable to type \'string | undefined\'.\\n Type \'null\' is not assignable to type \'string | undefined\'.", "3817619378"]
"js/pages/TableDetailPage/index.tsx:587812140": [
[235, 11, 26, "Type \'{ itemsPerPage: number; source: string; }\' is missing the following properties from type \'Readonly<Pick<TableDashboardResourceListProps, \\"source\\" | \\"isLoading\\" | \\"dashboards\\" | \\"itemsPerPage\\" | \\"errorText\\"> & OwnProps>\': isLoading, dashboards, errorText", "2224258167"]
]
}`
};
amundsen_application/static/jest.config.js
View file @ 14261198
......@@ -19,7 +19,7 @@ module.exports = {
statements: 78, // 75
},
'./js/ducks': {
branches: 75,
branches: 74, // 75
functions: 80,
lines: 80,
statements: 85,
......
amundsen_application/static/js/components/Footer/index.tsx
View file @ 14261198
......@@ -14,7 +14,7 @@ import { formatDateTimeLong } from 'utils/dateUtils';
// Props
interface StateFromProps {
lastIndexed: number;
lastIndexed?: number;
}
interface DispatchFromProps {
......@@ -38,8 +38,8 @@ export class Footer extends React.Component<FooterProps> {
getLastIndexed();
}
generateDateTimeString = () => {
return formatDateTimeLong({ epochTimestamp: this.props.lastIndexed });
generateDateTimeString = (lastIndexed: number): string => {
return formatDateTimeLong({ epochTimestamp: lastIndexed });
};
render() {
......@@ -47,7 +47,11 @@ export class Footer extends React.Component<FooterProps> {
if (this.props.lastIndexed) {
content = (
<div>{`Amundsen was last indexed on ${this.generateDateTimeString()}`}</div>
<div>
{`Amundsen was last indexed on ${this.generateDateTimeString(
this.props.lastIndexed
)}`}
</div>
);
}
......
amundsen_application/static/js/components/common/Bookmark/MyBookmarks/index.spec.tsx
View file @ 14261198
......@@ -118,9 +118,9 @@ describe('MyBookmarks', () => {
expect(element.props().emptyText).toBe(EMPTY_BOOKMARK_MESSAGE);
});
it('returns null if there are no bookmarks to render', () => {
it('returns undefined if there are no bookmarks to render', () => {
content = wrapper.instance().generateTabContent(ResourceType.user);
expect(content).toBe(null);
expect(content).toBeUndefined();
});
});
......
amundsen_application/static/js/components/common/Bookmark/MyBookmarks/index.tsx
View file @ 14261198
......@@ -29,11 +29,11 @@ interface StateFromProps {
export type MyBookmarksProps = StateFromProps;
export class MyBookmarks extends React.Component<MyBookmarksProps> {
generateTabContent = (resource: ResourceType): JSX.Element | null => {
generateTabContent = (resource: ResourceType): JSX.Element | undefined => {
const bookmarks = this.props.myBookmarks[resource];
if (!bookmarks) {
return null;
return undefined;
}
return (
......
amundsen_application/static/js/components/common/Card/index.tsx
View file @ 14261198
......@@ -33,7 +33,7 @@ const Card: React.FC<CardProps> = ({
title,
subtitle,
copy,
onClick = null,
onClick = undefined,
isLoading = false,
}: CardProps) => {
let card;
......
amundsen_application/static/js/components/common/EditableSection/index.spec.tsx
View file @ 14261198
......@@ -91,7 +91,7 @@ describe('EditableSection', () => {
it('renders children as-is for non-react elements', () => {
const child = 'non-react-child';
const { wrapper } = setup(null, child);
const { wrapper } = setup(undefined, child);
expect(wrapper.find('.editable-section-content').text()).toBe(child);
});
......
amundsen_application/static/js/components/common/ResourceListItem/DashboardListItem/index.spec.tsx
View file @ 14261198
......@@ -161,7 +161,7 @@ describe('DashboardListItem', () => {
uri: 'product_dashboard://cluster.group/name',
url: 'product/name',
cluster: 'cluster',
last_successful_run_timestamp: null,
last_successful_run_timestamp: 0,
},
});
expect(wrapper.find('.resource-badges').find('.title-3').text()).toBe(
......
amundsen_application/static/js/components/common/ScrollTracker/index.tsx
View file @ 14261198
......@@ -53,7 +53,8 @@ export default class ScrollTracker extends React.Component<
const scrollableAmount = Math.max(contentHeight - windowHeight, 1);
if (threshold <= (100 * scrollTop) / scrollableAmount) {
this.fireAnalyticsEvent(this.state.thresholds.shift());
this.state.thresholds.shift();
this.fireAnalyticsEvent(threshold);
}
};
......
amundsen_application/static/js/components/common/SearchBar/index.spec.tsx
View file @ 14261198
......@@ -401,7 +401,7 @@ describe('SearchBar', () => {
expect(result.onSelectInlineResult).toBeInstanceOf(Function);
});
it('sets clearSearch on the props if on search route', () => {
const { props } = setup(null, null, { pathname: '/search' });
const { props } = setup(undefined, undefined, { pathname: '/search' });
result = mapDispatchToProps(dispatch, props);
expect(result.clearSearch).toBeInstanceOf(Function);
});
......
amundsen_application/static/js/components/common/SearchBar/index.tsx
View file @ 14261198
......@@ -32,7 +32,7 @@ export interface StateFromProps {
}
export interface DispatchFromProps {
clearSearch?: () => SubmitSearchRequest;
clearSearch?: () => void;
submitSearch: (searchTerm: string) => SubmitSearchRequest;
onInputChange: (term: string) => InlineSearchRequest;
onSelectInlineResult: (
......
amundsen_application/static/js/components/common/Tags/TagInput/index.tsx
View file @ 14261198
......@@ -10,7 +10,12 @@ import CreatableSelect from 'react-select/lib/Creatable';
import { GlobalState } from 'ducks/rootReducer';
import { getAllTags, updateTags } from 'ducks/tags/reducer';
import { GetAllTagsRequest, UpdateTagsRequest } from 'ducks/tags/types';
import {
GetAllTags,
GetAllTagsRequest,
UpdateTags,
UpdateTagsRequest,
} from 'ducks/tags/types';
import { EditableSectionChildProps } from 'components/common/EditableSection';
import { ResourceType, Tag, UpdateMethod, UpdateTagData } from 'interfaces';
......@@ -61,11 +66,20 @@ class TagInput extends React.Component<TagInputProps, TagInputState> {
public static defaultProps: TagInputProps = {
allTags: [],
getAllTags: () => void 0,
getAllTags: () => ({
type: GetAllTags.REQUEST,
}),
isLoading: false,
resourceType: ResourceType.table,
tags: [],
updateTags: () => void 0,
updateTags: () => ({
type: UpdateTags.REQUEST,
payload: {
tagArray: [],
resourceType: ResourceType.table,
uriKey: '',
},
}),
uriKey: '',
};
......
amundsen_application/static/js/components/common/Tags/TagsList/index.tsx
View file @ 14261198
......@@ -97,7 +97,7 @@ const LongTagsList: React.FC<TagsListProps> = ({
}: TagsListProps) => {
const hasCuratedTags = curatedTags.length > 0;
const hasPopularTags = popularTags.length > 0;
const hasOtherTags = otherTags.length > 0;
const hasOtherTags = otherTags && otherTags.length > 0;
return (
<div className="full-tag-list">
<h1 className="tag-list-title" id="browse-header">
......@@ -113,7 +113,7 @@ const LongTagsList: React.FC<TagsListProps> = ({
)}
{hasCuratedTags && <TagsListBlock tags={curatedTags} />}
{hasOtherTags && <TagsListLabel titleText={OTHER_TAGS_TITLE} />}
{hasOtherTags && <TagsListBlock tags={otherTags} />}
{hasOtherTags && <TagsListBlock tags={otherTags || []} />}
</div>
);
};
......
amundsen_application/static/js/config/config-utils.ts
View file @ 14261198
......@@ -82,7 +82,7 @@ export function getFilterConfigByResource(
* use BadgeStyle.DEFAULT and badge name as display name.
*/
export function getBadgeConfig(badgeName: string): BadgeStyleConfig {
const config = AppConfig.badges[badgeName] || {};
const config: object = AppConfig.badges[badgeName] || {};
return {
style: BadgeStyle.DEFAULT,
......
amundsen_application/static/js/ducks/announcements/index.ts
View file @ 14261198
......@@ -55,13 +55,18 @@ export default function reducer(
isLoading: false,
statusCode: action.payload.statusCode,
};
case GetAnnouncements.SUCCESS:
case GetAnnouncements.SUCCESS: {
const { payload } = <GetAnnouncementsResponse>action;
if (payload === undefined) {
throw Error('payload must be set for GetAnnouncements.SUCCESS');
}
return {
...state,
isLoading: false,
statusCode: action.payload.statusCode,
posts: (<GetAnnouncementsResponse>action).payload.posts,
posts: payload.posts || [],
};
}
default:
return state;
}
......
amundsen_application/static/js/ducks/lastIndexed/reducer.ts
View file @ 14261198
......@@ -5,7 +5,7 @@ import {
} from './types';
export interface LastIndexedReducerState {
lastIndexed: number;
lastIndexed: number | null;
}
export const initialState: LastIndexedReducerState = {
lastIndexed: null,
......@@ -39,10 +39,15 @@ export default function reducer(
switch (action.type) {
case GetLastIndexed.REQUEST:
return initialState;
case GetLastIndexed.SUCCESS:
case GetLastIndexed.SUCCESS: {
const { payload } = <GetLastIndexedResponse>action;
if (payload === undefined) {
throw Error('payload must be set for GetLastIndexed.SUCCESS');
}
return {
lastIndexed: (<GetLastIndexedResponse>action).payload.lastIndexedEpoch,
lastIndexed: payload.lastIndexedEpoch || null,
};
}
case GetLastIndexed.FAILURE:
return {
lastIndexed: null,
......
amundsen_application/static/js/ducks/tags/reducer.ts
View file @ 14261198
......@@ -128,7 +128,7 @@ export default function reducer(
resourceTags: {
...state.resourceTags,
isLoading: false,
tags: (<GetDashboardResponse>action).payload.dashboard.tags,
tags: (<GetDashboardResponse>action).payload.dashboard?.tags || [],
},
};
case GetTableData.FAILURE:
......
amundsen_application/static/js/ducks/user/reducer.ts
View file @ 14261198
......@@ -114,11 +114,16 @@ export default function reducer(
action
): UserReducerState {
switch (action.type) {
case GetLoggedInUser.SUCCESS:
case GetLoggedInUser.SUCCESS: {
const { payload } = <GetLoggedInUserResponse>action;
if (payload === undefined) {
throw Error('payload must be set for GetLoggedInUser.SUCCESS');
}
return {
...state,
loggedInUser: (<GetLoggedInUserResponse>action).payload.user,
loggedInUser: payload.user,
};
}
case GetUser.REQUEST:
case GetUser.FAILURE:
return {
......@@ -128,14 +133,19 @@ export default function reducer(
user: defaultUser,
},
};
case GetUser.SUCCESS:
case GetUser.SUCCESS: {
const { payload } = <GetUserResponse>action;
if (payload === undefined) {
throw Error('payload must be set for GetUser.SUCCESS');
}
return {
...state,
profile: {
...state.profile,
user: (<GetUserResponse>action).payload.user,
user: payload.user,
},
};
}
case GetUserOwn.REQUEST:
case GetUserOwn.FAILURE:
return {
......@@ -147,14 +157,19 @@ export default function reducer(
},
},
};
case GetUserOwn.SUCCESS:
case GetUserOwn.SUCCESS: {
const { payload } = <GetUserOwnResponse>action;
if (payload === undefined) {
throw Error('payload must be set for GetUserOwn.SUCCESS');
}
return {
...state,
profile: {
...state.profile,
own: (<GetUserOwnResponse>action).payload.own,
own: payload.own,
},
};
}
case GetUserRead.REQUEST:
case GetUserRead.FAILURE:
return {
......@@ -164,14 +179,19 @@ export default function reducer(
read: [],
},
};
case GetUserRead.SUCCESS:
case GetUserRead.SUCCESS: {
const { payload } = <GetUserReadResponse>action;
if (payload === undefined) {
throw Error('payload must be set for GetUserRead.SUCCESS');
}
return {
...state,
profile: {
...state.profile,
read: (<GetUserReadResponse>action).payload.read,
read: payload.read,
},
};
}
default:
return state;
}
......
amundsen_application/static/js/ducks/utilMethods.ts
View file @ 14261198
......@@ -50,7 +50,7 @@ export function logClick(
command: 'click',
target_id:
target.dataset && target.dataset.type ? target.dataset.type : target.id,
label: target.innerText || target.textContent,
label: target.innerText || target.textContent || '',
};
if (target.nodeValue !== null) {
......
amundsen_application/static/js/pages/ProfilePage/index.spec.tsx
View file @ 14261198
......@@ -39,7 +39,7 @@ describe('ProfilePage', () => {
const setup = (propOverrides?: Partial<ProfilePageProps>) => {
const routerProps = getMockRouterProps<RouteProps>(
{ userId: 'test0' },
null
undefined
);
const props: ProfilePageProps = {
user: globalState.user.profile.user,
......
amundsen_application/static/js/pages/SearchPage/SearchFilter/FilterSection/index.tsx
View file @ 14261198
......@@ -49,7 +49,10 @@ export class FilterSection extends React.Component<FilterSectionProps> {
}
if (type === FilterType.CHECKBOX_SELECT) {
return (
<CheckBoxFilter categoryId={categoryId} checkboxProperties={options} />
<CheckBoxFilter
categoryId={categoryId}
checkboxProperties={options || []}
/>
);
}
};
......
amundsen_application/static/js/pages/SearchPage/SearchFilter/index.spec.tsx
View file @ 14261198
......@@ -221,6 +221,7 @@ describe('mapStateToProps', () => {
{
categoryId: mockSchemaId,
helpText: mockHelpText,
options: [],
title: mockSchemaTitle,
type: FilterType.INPUT_SELECT,
},
......
amundsen_application/static/js/pages/SearchPage/SearchFilter/index.tsx
View file @ 14261198
......@@ -67,20 +67,21 @@ export class SearchFilter extends React.Component<SearchFilterProps> {
export const mapStateToProps = (state: GlobalState) => {
const resourceType = state.search.resource;
const filterCategories = getFilterConfigByResource(resourceType);
const filterSections = [];
const filterSections: CheckboxFilterSection[] = [];
if (filterCategories) {
filterCategories.forEach((categoryConfig) => {
const section = {
const section: CheckboxFilterSection = {
categoryId: categoryConfig.categoryId,
helpText: categoryConfig.helpText,
title: categoryConfig.displayName,
type: categoryConfig.type,
options: [],
};
if (categoryConfig.type === FilterType.CHECKBOX_SELECT) {
(section as CheckboxFilterSection).options = categoryConfig.options.map(
section.options = categoryConfig.options.map(
({ value, displayName }) => {
return { value, label: displayName };
return { value, label: displayName || '' };
}
);
}
......
amundsen_application/static/js/pages/TableDetailPage/DataPreviewButton/index.tsx
View file @ 14261198
......@@ -47,7 +47,7 @@ interface DataPreviewButtonState {
showModal: boolean;
}
export function getStatusFromCode(httpErrorCode: number) {
export function getStatusFromCode(httpErrorCode: number | null) {
switch (httpErrorCode) {
case null:
return LoadingStatus.LOADING;
......@@ -139,7 +139,7 @@ export class DataPreviewButton extends React.Component<
<div className="grid-cell grid-header subtitle-3">
{fieldName.toUpperCase()}
</div>
{previewData.data.map((row, rowId) => {
{(previewData.data || []).map((row, rowId) => {
const cellId = `${colId}:${rowId}`;
const dataItemValue = this.getSanitizedValue(row[fieldName]);
return (
......
amundsen_application/static/js/pages/TableDetailPage/WatermarkLabel/index.tsx
View file @ 14261198
......@@ -34,7 +34,7 @@ class WatermarkLabel extends React.Component<WatermarkLabelProps> {
return (watermark && watermark.partition_value) || null;
};
renderWatermarkInfo = (low: string, high: string) => {
renderWatermarkInfo = (low: string | null, high: string | null) => {
if (low === null && high === null) {
return (
<div className="body-2">
......
amundsen_application/static/js/pages/TableDetailPage/index.tsx
View file @ 14261198
......@@ -179,12 +179,7 @@ export class TableDetail extends React.Component<
return descriptions.map((d) => (
<EditableSection key={`prog_desc:${d.source}`} title={d.source} readOnly>
<EditableText
maxLength={999999}
value={d.text}
editable={false}
onSubmitValue={null}
/>
<EditableText maxLength={999999} value={d.text} editable={false} />
</EditableSection>
));
};
......@@ -327,7 +322,7 @@ export class TableDetail extends React.Component<
title={Constants.DESCRIPTION_TITLE}
readOnly={!data.is_editable}
editText={editText}
editUrl={editUrl}
editUrl={editUrl || undefined}
>
<TableDescEditableText
maxLength={getMaxLength('tableDescLength')}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment