Skip to content

Commit bc25b82

Browse files
authored
fix(web): tsc null check (#15109)
1 parent 8038dc9 commit bc25b82

File tree

19 files changed

+28
-26
lines changed

19 files changed

+28
-26
lines changed

datahub-web-react/src/app/entity/dataset/shared/utils.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export function getLastUpdatedMs(
55
operations: Pick<Operation, 'lastUpdatedTimestamp'>[] | null | undefined,
66
): number | undefined {
77
return (
8-
Math.max(
8+
Math?.max(
99
properties?.lastModified?.time || 0,
1010
(operations?.length && operations[0].lastUpdatedTimestamp) || 0,
1111
) || undefined

datahub-web-react/src/app/entityV2/shared/components/styled/search/__tests__/downloadAsCsvUtil.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { EntityType } from '@types';
1010

1111
// Mock external dependencies
1212
vi.mock('@app/shared/textUtil', () => ({
13-
capitalizeFirstLetterOnly: vi.fn((str: string) => str?.charAt(0).toUpperCase() + str?.slice(1).toLowerCase()),
13+
capitalizeFirstLetterOnly: vi.fn((str: string) => str?.charAt(0)?.toUpperCase() + str?.slice(1).toLowerCase()),
1414
}));
1515

1616
vi.mock('@utils/runtimeBasePath', () => ({

datahub-web-react/src/app/entityV2/shared/tabs/Incident/AcrylComponents/IncidentEditor.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ export const IncidentEditor = ({
4747
data?.title?.length &&
4848
data?.description &&
4949
data?.type &&
50-
(data?.type !== IncidentType.Custom || data?.customType),
50+
(data?.type !== IncidentType?.Custom || data?.customType),
5151
);
5252
const { user } = useUserContext();
5353
const userHasChangedState = useRef(false);

datahub-web-react/src/app/entityV2/summary/properties/property/properties/structuredProperty/StructuredPropertyProperty.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export default function StructuredPropertyProperty(props: PropertyComponentProps
2222
);
2323
}, [property.structuredProperty?.urn, entityData]);
2424

25-
const valueType = structuredPropertyEntry?.structuredProperty.definition.valueType.urn;
25+
const valueType = structuredPropertyEntry?.structuredProperty?.definition?.valueType?.urn;
2626

2727
const StructuredPropertyComponent = useMemo(() => {
2828
switch (valueType) {

datahub-web-react/src/app/entityV2/summary/properties/property/properties/structuredProperty/components/NumberStructuredProperty.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default function NumberStructuredProperty({
1111
...props
1212
}: StructuredPropertyComponentProps) {
1313
const values = useMemo(
14-
() => structuredPropertyEntry?.values.map((value) => (value as NumberValue)?.numberValue) ?? [],
14+
() => structuredPropertyEntry?.values?.map((value) => (value as NumberValue)?.numberValue) ?? [],
1515
[structuredPropertyEntry?.values],
1616
);
1717

datahub-web-react/src/app/entityV2/summary/properties/property/properties/structuredProperty/components/StringStructuredProperty.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ export default function StringStructuredProperty({
1111
...props
1212
}: StructuredPropertyComponentProps) {
1313
const values = useMemo(
14-
() => structuredPropertyEntry?.values.map((value) => (value as StringValue)?.stringValue) ?? [],
14+
() => structuredPropertyEntry?.values?.map((value) => (value as StringValue)?.stringValue) ?? [],
1515
[structuredPropertyEntry?.values],
1616
);
1717

datahub-web-react/src/app/homeV3/modules/assetCollection/AssetCollectionModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ const AssetCollectionModal = () => {
2424
moduleModalState: { position, close, isEditing, initialState },
2525
} = usePageTemplateContext();
2626
const [form] = Form.useForm();
27-
const currentName = initialState?.properties.name || '';
27+
const currentName = initialState?.properties?.name || '';
2828
const currentAssets = (initialState?.properties?.params?.assetCollectionParams?.assetUrns || []).filter(
2929
(urn): urn is string => typeof urn === 'string',
3030
);

datahub-web-react/src/app/homeV3/modules/documentation/DocumentationModal.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ const DocumentationModal = () => {
2222
moduleModalState: { position, close, isEditing, initialState },
2323
} = usePageTemplateContext();
2424
const [form] = Form.useForm();
25-
const currentName = initialState?.properties.name || '';
25+
const currentName = initialState?.properties?.name || '';
2626
const currentContent = initialState?.properties?.params?.richTextParams?.content;
2727
const urn = initialState?.urn;
2828

datahub-web-react/src/app/homeV3/modules/hierarchyViewModule/HierarchyViewModal.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,19 @@ export default function HierarchyViewModal() {
2020
const [form] = Form.useForm<HierarchyForm>();
2121

2222
const initialFormState: HierarchyForm = useMemo(() => {
23-
const originalAssetUrns = initialState?.properties.params.hierarchyViewParams?.assetUrns;
23+
const originalAssetUrns = initialState?.properties?.params?.hierarchyViewParams?.assetUrns;
2424
const assetType = getAssetTypeFromAssetUrns(originalAssetUrns);
2525
const assetUrns = filterAssetUrnsByAssetType(originalAssetUrns, assetType);
2626

2727
const relatedEntitiesFilterJson =
28-
initialState?.properties.params.hierarchyViewParams?.relatedEntitiesFilterJson;
28+
initialState?.properties?.params?.hierarchyViewParams?.relatedEntitiesFilterJson;
2929

3030
return {
31-
name: initialState?.properties.name || '',
31+
name: initialState?.properties?.name || '',
3232
assetsType: assetType,
3333
domainAssets: assetType === ASSET_TYPE_DOMAINS ? assetUrns : [],
3434
glossaryAssets: assetType === ASSET_TYPE_GLOSSARY ? assetUrns : [],
35-
showRelatedEntities: !!initialState?.properties.params.hierarchyViewParams?.showRelatedEntities,
35+
showRelatedEntities: !!initialState?.properties?.params?.hierarchyViewParams?.showRelatedEntities,
3636
relatedEntitiesFilter: relatedEntitiesFilterJson ? JSON.parse(relatedEntitiesFilterJson) : undefined,
3737
};
3838
}, [initialState]);

datahub-web-react/src/app/homeV3/modules/hierarchyViewModule/components/domains/hooks/useDomains.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export default function useDomains(parentDomainUrn: string | undefined, start: n
3434

3535
const domains = useMemo(() => {
3636
if (skip) return [];
37-
return data?.searchAcrossEntities?.searchResults.map((result) => result.entity).filter(isDomain);
37+
return data?.searchAcrossEntities?.searchResults?.map((result) => result.entity).filter(isDomain);
3838
}, [data, skip]);
3939

4040
const total = useMemo(() => data?.searchAcrossEntities?.total, [data]);

0 commit comments

Comments
 (0)