Skip to content

Commit 5bf8ba9

Browse files
anshbansalanshbansal
authored
Merge branch 'datahub-project:master' into master
2 parents d69bd19 + 29d05c2 commit 5bf8ba9

File tree

109 files changed

+7011
-552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+7011
-552
lines changed

‎.github/workflows/build-and-test.yml

-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ on:
99
pull_request:
1010
branches:
1111
- "**"
12-
paths-ignore:
13-
- "docs/**"
14-
- "**.md"
1512
workflow_dispatch:
1613
release:
1714
types: [published]

‎datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/config/AppConfigResolver.java

+1
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,7 @@ public CompletableFuture<AppConfig> get(final DataFetchingEnvironment environmen
205205
.setShowNavBarRedesign(_featureFlags.isShowNavBarRedesign())
206206
.setShowAutoCompleteResults(_featureFlags.isShowAutoCompleteResults())
207207
.setEntityVersioningEnabled(_featureFlags.isEntityVersioning())
208+
.setShowHasSiblingsFilter(_featureFlags.isShowHasSiblingsFilter())
208209
.setShowSearchBarAutocompleteRedesign(
209210
_featureFlags.isShowSearchBarAutocompleteRedesign())
210211
.build();

‎datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/common/mappers/QueryPropertiesMapper.java

+12-5
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,32 @@
11
package com.linkedin.datahub.graphql.types.common.mappers;
22

3+
import com.linkedin.common.urn.Urn;
34
import com.linkedin.data.template.GetMode;
45
import com.linkedin.datahub.graphql.QueryContext;
56
import com.linkedin.datahub.graphql.generated.*;
6-
import com.linkedin.datahub.graphql.types.mappers.ModelMapper;
7+
import com.linkedin.datahub.graphql.types.mappers.EmbeddedModelMapper;
78
import com.linkedin.query.QueryProperties;
89
import javax.annotation.Nonnull;
910
import javax.annotation.Nullable;
1011

1112
public class QueryPropertiesMapper
12-
implements ModelMapper<
13+
implements EmbeddedModelMapper<
1314
QueryProperties, com.linkedin.datahub.graphql.generated.QueryProperties> {
1415

1516
public static final QueryPropertiesMapper INSTANCE = new QueryPropertiesMapper();
1617

1718
public static com.linkedin.datahub.graphql.generated.QueryProperties map(
18-
@Nullable final QueryContext context, @Nonnull final QueryProperties input) {
19-
return INSTANCE.apply(context, input);
19+
@Nullable final QueryContext context,
20+
@Nonnull final QueryProperties input,
21+
@Nonnull Urn entityUrn) {
22+
return INSTANCE.apply(context, input, entityUrn);
2023
}
2124

2225
@Override
2326
public com.linkedin.datahub.graphql.generated.QueryProperties apply(
24-
@Nullable final QueryContext context, @Nonnull final QueryProperties input) {
27+
@Nullable final QueryContext context,
28+
@Nonnull final QueryProperties input,
29+
@Nonnull Urn entityUrn) {
2530

2631
final com.linkedin.datahub.graphql.generated.QueryProperties result =
2732
new com.linkedin.datahub.graphql.generated.QueryProperties();
@@ -56,6 +61,8 @@ public com.linkedin.datahub.graphql.generated.QueryProperties apply(
5661
lastModified.setActor(input.getLastModified().getActor(GetMode.NULL).toString());
5762
result.setLastModified(lastModified);
5863

64+
result.setCustomProperties(CustomPropertiesMapper.map(input.getCustomProperties(), entityUrn));
65+
5966
return result;
6067
}
6168
}

‎datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/types/query/QueryMapper.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,18 @@ public static QueryEntity map(
3939
@Override
4040
public QueryEntity apply(
4141
@Nullable final QueryContext context, @Nonnull final EntityResponse entityResponse) {
42+
Urn entityUrn = entityResponse.getUrn();
4243
final QueryEntity result = new QueryEntity();
4344

44-
result.setUrn(entityResponse.getUrn().toString());
45+
result.setUrn(entityUrn.toString());
4546
result.setType(EntityType.QUERY);
4647
EnvelopedAspectMap aspectMap = entityResponse.getAspects();
4748
MappingHelper<QueryEntity> mappingHelper = new MappingHelper<>(aspectMap, result);
4849
mappingHelper.mapToResult(
4950
QUERY_PROPERTIES_ASPECT_NAME,
5051
(entity, dataMap) ->
51-
entity.setProperties(QueryPropertiesMapper.map(context, new QueryProperties(dataMap))));
52+
entity.setProperties(
53+
QueryPropertiesMapper.map(context, new QueryProperties(dataMap), entityUrn)));
5254
mappingHelper.mapToResult(QUERY_SUBJECTS_ASPECT_NAME, this::mapQuerySubjects);
5355
mappingHelper.mapToResult(DATA_PLATFORM_INSTANCE_ASPECT_NAME, this::mapPlatform);
5456
return mappingHelper.getResult();

‎datahub-graphql-core/src/main/resources/app.graphql

+5
Original file line numberDiff line numberDiff line change
@@ -599,6 +599,11 @@ type FeatureFlagsConfig {
599599
"""
600600
entityVersioningEnabled: Boolean!
601601

602+
"""
603+
If turned on, show the "has siblings" filter in search
604+
"""
605+
showHasSiblingsFilter: Boolean!
606+
602607
"""
603608
If turned on, show the redesigned search bar's autocomplete
604609
"""

‎datahub-graphql-core/src/main/resources/entity.graphql

+5
Original file line numberDiff line numberDiff line change
@@ -12255,6 +12255,11 @@ type QueryProperties {
1225512255
The asset that this query originated from, e.g. a View, a dbt Model, etc.
1225612256
"""
1225712257
origin: Entity
12258+
12259+
"""
12260+
Custom properties of the Data Product
12261+
"""
12262+
customProperties: [CustomPropertiesEntry!]
1225812263
}
1225912264

1226012265
"""

‎datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/types/common/mappers/QueryPropertiesMapperTest.java

+24-2
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,23 @@
66

77
import com.linkedin.common.AuditStamp;
88
import com.linkedin.common.urn.Urn;
9+
import com.linkedin.data.template.StringMap;
910
import com.linkedin.query.QueryLanguage;
1011
import com.linkedin.query.QueryProperties;
1112
import com.linkedin.query.QuerySource;
1213
import com.linkedin.query.QueryStatement;
14+
import org.testng.annotations.BeforeMethod;
1315
import org.testng.annotations.Test;
1416

1517
public class QueryPropertiesMapperTest {
1618

19+
private Urn _queryUrn;
20+
21+
@BeforeMethod
22+
public void BeforeMethod() throws Exception {
23+
_queryUrn = Urn.createFromString("urn:li:query:1");
24+
}
25+
1726
@Test
1827
public void testMapWithRequiredFields() throws Exception {
1928
// Create test data
@@ -41,7 +50,7 @@ public void testMapWithRequiredFields() throws Exception {
4150

4251
// Map the object
4352
com.linkedin.datahub.graphql.generated.QueryProperties result =
44-
QueryPropertiesMapper.map(null, input);
53+
QueryPropertiesMapper.map(null, input, _queryUrn);
4554

4655
// Verify required fields
4756
assertNotNull(result);
@@ -91,10 +100,14 @@ public void testMapWithOptionalFields() throws Exception {
91100
input.setName("Test Query");
92101
input.setDescription("Test Description");
93102
input.setOrigin(originUrn);
103+
StringMap customProps = new StringMap();
104+
customProps.put("key1", "value1");
105+
customProps.put("key2", "value2");
106+
input.setCustomProperties(customProps);
94107

95108
// Map the object
96109
com.linkedin.datahub.graphql.generated.QueryProperties result =
97-
QueryPropertiesMapper.map(null, input);
110+
QueryPropertiesMapper.map(null, input, _queryUrn);
98111

99112
// Verify required fields
100113
assertNotNull(result);
@@ -113,5 +126,14 @@ public void testMapWithOptionalFields() throws Exception {
113126
assertEquals(result.getDescription(), "Test Description");
114127
assertNotNull(result.getOrigin());
115128
assertEquals(result.getOrigin().getUrn(), originUrn.toString());
129+
assertNotNull(result.getCustomProperties());
130+
assertEquals(result.getCustomProperties().size(), 2);
131+
assertEquals(result.getCustomProperties().get(0).getKey(), "key1");
132+
assertEquals(result.getCustomProperties().get(0).getValue(), "value1");
133+
assertEquals(result.getCustomProperties().get(0).getAssociatedUrn(), _queryUrn.toString());
134+
assertEquals(result.getCustomProperties().get(1).getKey(), "key2");
135+
assertEquals(result.getCustomProperties().get(1).getValue(), "value2");
136+
assertEquals(result.getCustomProperties().get(1).getAssociatedUrn(), _queryUrn.toString());
137+
;
116138
}
117139
}

‎datahub-web-react/.eslintrc.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = {
88
'plugin:vitest/recommended',
99
'prettier',
1010
],
11-
plugins: ['@typescript-eslint', 'react-refresh'],
11+
plugins: ['@typescript-eslint', '@stylistic/js', 'react-refresh'],
1212
parserOptions: {
1313
ecmaVersion: 2020, // Allows for the parsing of modern ECMAScript features
1414
sourceType: 'module', // Allows for the use of imports
@@ -19,6 +19,7 @@ module.exports = {
1919
},
2020
rules: {
2121
'@typescript-eslint/no-explicit-any': 'off',
22+
'@stylistic/js/comma-dangle': ['error', 'always-multiline'],
2223
'arrow-body-style': 'off',
2324
'class-methods-use-this': 'off',
2425
'import/no-extraneous-dependencies': 'off',

‎datahub-web-react/package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
"antd": "4.24.7",
5252
"color-hash": "^2.0.1",
5353
"colorthief": "^2.4.0",
54+
"country-data-list": "^1.3.4",
5455
"cron-parser": "^4.8.1",
5556
"cronstrue": "^1.122.0",
5657
"d3-scale": "^4.0.2",
@@ -97,8 +98,7 @@
9798
"uuid": "^8.3.2",
9899
"virtualizedtableforantd4": "^1.2.1",
99100
"web-vitals": "^0.2.4",
100-
"yamljs": "^0.3.0",
101-
"country-data-list": "^1.3.4"
101+
"yamljs": "^0.3.0"
102102
},
103103
"scripts": {
104104
"analyze": "source-map-explorer 'dist/assets/*.js'",
@@ -145,6 +145,7 @@
145145
"@storybook/react-vite": "^8.1.11",
146146
"@storybook/test": "^8.1.11",
147147
"@storybook/theming": "^8.1.11",
148+
"@stylistic/eslint-plugin-js": "^4.2.0",
148149
"@types/graphql": "^14.5.0",
149150
"@types/query-string": "^6.3.0",
150151
"@types/styled-components": "^5.1.7",

‎datahub-web-react/src/app/entity/ownership/OwnershipList.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ export const OwnershipList = () => {
8989
duration: 3,
9090
})}
9191
<TabToolbar>
92-
<Button type="text" onClick={onClickCreateOwnershipType}>
93-
<PlusOutlined /> Create new Ownership Type
92+
<Button type="text" onClick={onClickCreateOwnershipType} data-testid="create-owner-type-v1">
93+
<PlusOutlined /> Create Ownership Type
9494
</Button>
9595
<SearchBar
9696
initialQuery=""

‎datahub-web-react/src/app/entity/ownership/table/ActionsColumn.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ export const ActionsColumn = ({ ownershipType, setIsOpen, setOwnershipType, refe
137137

138138
return (
139139
<StyledDropdown menu={menuProps}>
140-
<StyledMoreOutlined date-testid={DROPDOWN_TEST_ID} style={{ display: undefined }} />
140+
<StyledMoreOutlined data-testid={DROPDOWN_TEST_ID} style={{ display: undefined }} />
141141
</StyledDropdown>
142142
);
143143
};

‎datahub-web-react/src/app/entityV2/ownership/OwnershipList.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ export const OwnershipList = () => {
8989
duration: 3,
9090
})}
9191
<TabToolbar>
92-
<Button type="text" onClick={onClickCreateOwnershipType} data-testid="create-owner-type">
92+
<Button type="text" onClick={onClickCreateOwnershipType} data-testid="create-owner-type-v2">
9393
<PlusOutlined /> Create Ownership Type
9494
</Button>
9595
<SearchBar

‎datahub-web-react/src/app/entityV2/shared/tabs/Dataset/Validations/assertion/builder/details/PrimaryButton.tsx

+3-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ type Props = {
1313
disabled?: boolean;
1414
tooltip?: React.ReactNode;
1515
onClick: () => void;
16+
dataTestId?: string;
1617
};
1718

18-
export const PrimaryButton = ({ icon, title, tooltip, disabled = false, onClick }: Props) => {
19+
export const PrimaryButton = ({ icon, title, tooltip, disabled = false, onClick, dataTestId }: Props) => {
1920
return (
2021
<Tooltip title={tooltip} placement="left" showArrow={false}>
2122
<Button
@@ -24,6 +25,7 @@ export const PrimaryButton = ({ icon, title, tooltip, disabled = false, onClick
2425
e.stopPropagation();
2526
onClick();
2627
}}
28+
data-testid={dataTestId}
2729
>
2830
{(icon && <Icon>{icon}</Icon>) || null}
2931
{title}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ type IncidentDetailDrawerProps = {
2121

2222
export const IncidentDetailDrawer = ({ mode, onCancel, onSubmit, incident }: IncidentDetailDrawerProps) => {
2323
const [isEditView, setIsEditView] = useState<boolean>(false);
24-
const showEditor = isEditView || mode === IncidentAction.ADD;
24+
const showEditor = isEditView || mode === IncidentAction.CREATE;
2525
const modalClosePopup = () => {
2626
if (showEditor) {
2727
Modal.confirm({

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ export const IncidentDrawerHeader = ({
4343
const handleIncidentLinkCopy = useIncidentURNCopyLink(data ? data?.urn : '');
4444
return (
4545
<StyledHeader>
46-
<StyledTitle>{mode === IncidentAction.ADD ? 'Create New Incident' : data?.title}</StyledTitle>
46+
<StyledTitle>{mode === IncidentAction.CREATE ? 'Create New Incident' : data?.title}</StyledTitle>
4747
<StyledHeaderActions>
48-
{mode === IncidentAction.VIEW && isEditActive === false && (
48+
{mode === IncidentAction.EDIT && isEditActive === false && (
4949
<>
5050
<Tooltip2 title="Edit Incident">
5151
<EditButton

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

+14-8
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,15 @@ export const IncidentEditor = ({
3535
onSubmit,
3636
data,
3737
onClose,
38-
mode = IncidentAction.ADD,
38+
mode = IncidentAction.CREATE,
3939
}: IncidentEditorProps) => {
4040
const assigneeValues = data?.assignees && getAssigneeWithURN(data.assignees);
41-
const isFormValid = Boolean(data?.title?.length && data?.description && data?.type && data?.customType);
41+
const isFormValid = Boolean(
42+
data?.title?.length &&
43+
data?.description &&
44+
data?.type &&
45+
(data?.type !== IncidentType.Custom || data?.customType),
46+
);
4247
const { user } = useUserContext();
4348
const userHasChangedState = useRef(false);
4449
const isFirstRender = useRef(true);
@@ -47,7 +52,7 @@ export const IncidentEditor = ({
4752
const [isLoadingAssigneeOrAssets, setIsLoadingAssigneeOrAssets] = useState(true);
4853

4954
const [isRequiredFieldsFilled, setIsRequiredFieldsFilled] = useState<boolean>(
50-
mode === IncidentAction.VIEW ? !isFormValid : false,
55+
mode === IncidentAction.EDIT ? isFormValid : false,
5156
);
5257

5358
const { handleSubmit, form, isLoading } = useIncidentHandler({
@@ -78,7 +83,7 @@ export const IncidentEditor = ({
7883

7984
// Ensure we don't override user's choice if they manually change the state
8085
if (
81-
mode === IncidentAction.VIEW &&
86+
mode === IncidentAction.EDIT &&
8287
(formValues?.status === IncidentStage.Fixed || formValues?.status === IncidentStage.NoActionRequired) &&
8388
formValues?.state !== IncidentState.Resolved
8489
) {
@@ -105,7 +110,7 @@ export const IncidentEditor = ({
105110
}
106111
};
107112

108-
const actionButtonLabel = mode === IncidentAction.ADD ? 'Create' : 'Update';
113+
const actionButtonLabel = mode === IncidentAction.CREATE ? 'Create' : 'Update';
109114
const showCustomCategory = form.getFieldValue('type') === IncidentType.Custom;
110115
const isLinkedAssetPresent = !formValues?.resourceUrns?.length;
111116
const isSubmitButtonDisabled =
@@ -146,7 +151,7 @@ export const IncidentEditor = ({
146151
doNotFocus
147152
className="add-incident-description"
148153
placeholder="Provide a description..."
149-
content={mode === IncidentAction.VIEW ? data?.description : ''}
154+
content={mode === IncidentAction.EDIT ? data?.description : ''}
150155
/>
151156
</InputFormItem>
152157
<IncidentSelectField
@@ -158,7 +163,7 @@ export const IncidentEditor = ({
158163
}
159164
}}
160165
form={form}
161-
isDisabled={mode === IncidentAction.VIEW}
166+
isDisabled={mode === IncidentAction.EDIT}
162167
handleValuesChange={handleValuesChange}
163168
value={formValues?.[INCIDENT_OPTION_LABEL_MAPPING.category.fieldName]}
164169
/>
@@ -171,6 +176,7 @@ export const IncidentEditor = ({
171176
styles={{
172177
width: '50%',
173178
}}
179+
isDisabled={mode === IncidentAction.EDIT}
174180
id="custom-incident-type-input"
175181
/>
176182
</SelectFormItem>
@@ -205,7 +211,7 @@ export const IncidentEditor = ({
205211
setIsLinkedAssetsLoading={setIsLoadingAssigneeOrAssets}
206212
/>
207213
</SelectFormItem>
208-
{mode === IncidentAction.VIEW && (
214+
{mode === IncidentAction.EDIT && (
209215
<IncidentSelectField
210216
incidentLabelMap={INCIDENT_OPTION_LABEL_MAPPING.state}
211217
options={INCIDENT_STATES}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ export const IncidentLinkedAssetsList = ({
6363
};
6464

6565
useEffect(() => {
66-
if (mode === IncidentAction.ADD) {
66+
if (mode === IncidentAction.CREATE) {
6767
getEntities({
6868
variables: {
6969
urns: [urn],
@@ -75,7 +75,7 @@ export const IncidentLinkedAssetsList = ({
7575

7676
useEffect(() => {
7777
setLinkedAssets(resolvedLinkedAssets?.entities as any);
78-
if (mode === IncidentAction.ADD) {
78+
if (mode === IncidentAction.CREATE) {
7979
form.setFieldValue(RESOURCE_URN_FIELD_NAME, [urn]);
8080
}
8181
// eslint-disable-next-line react-hooks/exhaustive-deps

0 commit comments

Comments
 (0)