Skip to content

Commit 8525ad7

Browse files
authored
Merge branch 'master' into peter/column-level-lineage
2 parents 53df515 + 8bf1f71 commit 8525ad7

File tree

19 files changed

+1101
-103
lines changed

19 files changed

+1101
-103
lines changed

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

+1
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ public CompletableFuture<AppConfig> get(final DataFetchingEnvironment environmen
140140
visualConfig.setAppTitle(_visualConfiguration.getAppTitle());
141141
}
142142
visualConfig.setHideGlossary(_visualConfiguration.isHideGlossary());
143+
visualConfig.setShowFullTitleInLineage(_visualConfiguration.isShowFullTitleInLineage());
143144
}
144145
if (_visualConfiguration != null && _visualConfiguration.getQueriesTab() != null) {
145146
QueriesTabConfig queriesTabConfig = new QueriesTabConfig();

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

+5
Original file line numberDiff line numberDiff line change
@@ -276,6 +276,11 @@ type VisualConfig {
276276
Configuration for search results
277277
"""
278278
searchResult: SearchResultsVisualConfig
279+
280+
"""
281+
Show full title in lineage view by default
282+
"""
283+
showFullTitleInLineage: Boolean
279284
}
280285

281286
"""

datahub-web-react/src/app/lineage/LineageVizInsideZoom.tsx

+5-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import { SchemaField, SchemaFieldRef } from '../../types.generated';
1010
import { useIsShowColumnsMode } from './utils/useIsShowColumnsMode';
1111
import { LineageVizControls } from './controls/LineageVizControls';
1212
import LineageVizRootSvg from './LineageVizRootSvg';
13+
import { useAppConfig } from '../useAppConfig';
1314

1415
const ControlsDiv = styled.div`
1516
display: flex;
@@ -65,12 +66,15 @@ export default function LineageVizInsideZoom({
6566
fineGrainedMap,
6667
refetchCenterNode,
6768
}: Props) {
69+
const appConfig = useAppConfig();
70+
const showFullTitle = appConfig.config.visualConfig.showFullTitleInLineage;
71+
6872
const [collapsedColumnsNodes, setCollapsedColumnsNodes] = useState<Record<string, boolean>>({});
6973
const [selectedField, setSelectedField] = useState<SchemaFieldRef | null>(null);
7074
const [highlightedEdges, setHighlightedEdges] = useState<ColumnEdge[]>([]);
7175
const [visibleColumnsByUrn, setVisibleColumnsByUrn] = useState<Record<string, Set<string>>>({});
7276
const [columnsByUrn, setColumnsByUrn] = useState<Record<string, SchemaField[]>>({});
73-
const [showExpandedTitles, setShowExpandedTitles] = useState(false);
77+
const [showExpandedTitles, setShowExpandedTitles] = useState(showFullTitle ?? false);
7478
const showColumns = useIsShowColumnsMode();
7579

7680
useEffect(() => {

datahub-web-react/src/graphql/app.graphql

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ query appConfig {
3737
visualConfig {
3838
logoUrl
3939
faviconUrl
40+
showFullTitleInLineage
4041
queriesTab {
4142
queriesTabResultSize
4243
}

datahub-web-react/src/graphql/browseV2.graphql

+1-24
Original file line numberDiff line numberDiff line change
@@ -7,30 +7,7 @@ query getBrowseResultsV2($input: BrowseV2Input!) {
77
entity {
88
urn
99
type
10-
... on Container {
11-
properties {
12-
name
13-
}
14-
}
15-
... on DataFlow {
16-
properties {
17-
name
18-
}
19-
}
20-
... on DataPlatformInstance {
21-
platform {
22-
name
23-
properties {
24-
displayName
25-
}
26-
}
27-
instanceId
28-
}
29-
... on Dataset {
30-
properties {
31-
name
32-
}
33-
}
10+
...entityDisplayNameFields
3411
}
3512
}
3613
start

datahub-web-react/src/graphql/fragments.graphql

+1-24
Original file line numberDiff line numberDiff line change
@@ -1308,30 +1308,7 @@ fragment browsePathV2Fields on BrowsePathV2 {
13081308
entity {
13091309
urn
13101310
type
1311-
... on Container {
1312-
properties {
1313-
name
1314-
}
1315-
}
1316-
... on DataFlow {
1317-
properties {
1318-
name
1319-
}
1320-
}
1321-
... on DataPlatformInstance {
1322-
platform {
1323-
name
1324-
properties {
1325-
displayName
1326-
}
1327-
}
1328-
instanceId
1329-
}
1330-
... on Dataset {
1331-
properties {
1332-
name
1333-
}
1334-
}
1311+
...entityDisplayNameFields
13351312
}
13361313
}
13371314
}

docs-website/docusaurus.config.js

+9
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,15 @@ module.exports = {
289289
// darkTheme: require("prism-react-renderer/themes/vsDark"),
290290
additionalLanguages: ["ini", "java", "graphql", "shell-session"],
291291
},
292+
algolia: {
293+
// This is the "Search API Key" in Algolia, which means that it is ok to be public.
294+
apiKey: "2adf840a044a5ecbf7bdaac88cbf9ee5",
295+
appId: "RK0UG797F3",
296+
indexName: "datahubproject",
297+
insights: true,
298+
contextualSearch: true,
299+
// debug: true,
300+
},
292301
},
293302
presets: [
294303
[

docs-website/src/theme/Layout/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export default function LayoutWrapper(props) {
99
<SecondNavbar />
1010
{props.children}
1111
</Layout>
12-
<img referrerpolicy="no-referrer-when-downgrade" src="https://static.scarf.sh/a.png?x-pxid=92db07cf-8934-4b30-857a-3fcfda4c86dd" />
12+
<img referrerpolicy="no-referrer-when-downgrade" src="https://static.scarf.sh/a.png?x-pxid=92db07cf-8934-4b30-857a-3fcfda4c86dd" style={{ display: 'none' }} />
1313
</>
1414
);
1515
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
source:
2+
type: mlflow
3+
config:
4+
tracking_uri: "http://127.0.0.1:5000"
5+
6+
sink:
7+
type: datahub-rest
8+
config:
9+
server: "http://localhost:8080"

metadata-ingestion/src/datahub/ingestion/source/common/subtypes.py

+5
Original file line numberDiff line numberDiff line change
@@ -92,3 +92,8 @@ class BIAssetSubTypes(StrEnum):
9292
# SAP Analytics Cloud
9393
SAC_STORY = "Story"
9494
SAC_APPLICATION = "Application"
95+
96+
97+
class MLAssetSubTypes(StrEnum):
98+
MLFLOW_TRAINING_RUN = "ML Training Run"
99+
MLFLOW_EXPERIMENT = "ML Experiment"

0 commit comments

Comments
 (0)