Merge branch 'master' into ps-add-recipe-deploy

datahub-project · Jul 19, 2023 · ca49921 · ca49921
2 parents c145720 + ee84464
commit ca49921
Show file tree

Hide file tree

Showing 39 changed files with 573 additions and 233 deletions.
diff --git a/datahub-web-react/src/app/analytics/event.ts b/datahub-web-react/src/app/analytics/event.ts
@@ -245,7 +245,7 @@ export interface BrowseV2ToggleNodeEvent extends BaseEvent {
  */
 export interface BrowseV2SelectNodeEvent extends BaseEvent {
     type: EventType.BrowseV2SelectNodeEvent;
-    targetNode: 'browse';
+    targetNode: 'browse' | 'platform';
     action: 'select' | 'deselect';
     entity: string;
     environment?: string;

diff --git a/datahub-web-react/src/app/ingest/source/builder/DefineRecipeStep.tsx b/datahub-web-react/src/app/ingest/source/builder/DefineRecipeStep.tsx
@@ -45,12 +45,14 @@ export const DefineRecipeStep = ({ state, updateState, goTo, prev, ingestionSour
     const placeholderRecipe = getPlaceholderRecipe(ingestionSources, type);
 
     const [stagedRecipeYml, setStagedRecipeYml] = useState(existingRecipeYaml || placeholderRecipe);
+    const [stagedRecipeName, setStagedRecipeName] = useState(state.name);
 
     useEffect(() => {
         if (existingRecipeYaml) {
+            setStagedRecipeName(state.name);
             setStagedRecipeYml(existingRecipeYaml);
         }
-    }, [existingRecipeYaml]);
+    }, [existingRecipeYaml, state.name]);
 
     const [stepComplete, setStepComplete] = useState(false);
 
@@ -97,6 +99,7 @@ export const DefineRecipeStep = ({ state, updateState, goTo, prev, ingestionSour
     if (type && CONNECTORS_WITH_FORM.has(type)) {
         return (
             <RecipeBuilder
+                key={stagedRecipeName}
                 state={state}
                 isEditing={isEditing}
                 displayRecipe={displayRecipe}

diff --git a/datahub-web-react/src/app/search/SearchResultList.tsx b/datahub-web-react/src/app/search/SearchResultList.tsx
@@ -48,6 +48,7 @@ const ResultWrapper = styled.div<{ showUpdatedStyles: boolean }>`
         margin: 0 auto 8px auto;
         padding: 8px 16px;
         max-width: 1200px;
+        border-bottom: 1px solid ${ANTD_GRAY[5]};
     `}
 `;
 

diff --git a/datahub-web-react/src/app/search/SearchResults.tsx b/datahub-web-react/src/app/search/SearchResults.tsx
@@ -26,12 +26,12 @@ import { BrowseProvider } from './sidebar/BrowseContext';
 import { useIsBrowseV2, useIsSearchV2 } from './useSearchAndBrowseVersion';
 import useToggleSidebar from './useToggleSidebar';
 
-const SearchResultsWrapper = styled.div<{ showUpdatedStyles: boolean }>`
+const SearchResultsWrapper = styled.div<{ v2Styles: boolean }>`
     display: flex;
     flex: 1;
 
     ${(props) =>
-        props.showUpdatedStyles &&
+        props.v2Styles &&
         `
         overflow: hidden;
     `}
@@ -45,12 +45,14 @@ const SearchBody = styled.div`
     overflow: auto;
 `;
 
-const ResultContainer = styled.div<{ displayUpdatedStyles: boolean }>`
+const ResultContainer = styled.div<{ v2Styles: boolean }>`
     flex: 1;
     overflow: auto;
     ${(props) =>
-        props.displayUpdatedStyles
+        props.v2Styles
             ? `
+        display: flex;
+        flex-direction: column;
         background-color: #F8F9FA;
     `
             : `
@@ -64,7 +66,7 @@ const PaginationControlContainer = styled.div`
     text-align: center;
 `;
 
-const PaginationInfoContainer = styled.div`
+const PaginationInfoContainer = styled.div<{ v2Styles: boolean }>`
     padding-left: 24px;
     padding-right: 32px;
     height: 47px;
@@ -73,6 +75,7 @@ const PaginationInfoContainer = styled.div`
     display: flex;
     justify-content: space-between;
     align-items: center;
+    ${({ v2Styles }) => v2Styles && `background-color: white;`}
 `;
 
 const LeftControlsContainer = styled.div`
@@ -92,6 +95,15 @@ const StyledTabToolbar = styled(TabToolbar)`
 
 const SearchMenuContainer = styled.div``;
 
+const SearchResultListContainer = styled.div<{ v2Styles: boolean }>`
+    ${({ v2Styles }) =>
+        v2Styles &&
+        `
+        flex: 1;
+        overflow: auto;
+    `}
+`;
+
 interface Props {
     unionType?: UnionType;
     query: string;
@@ -163,7 +175,7 @@ export const SearchResults = ({
     return (
         <>
             {loading && <Message type="loading" content="Loading..." style={{ marginTop: '10%' }} />}
-            <SearchResultsWrapper showUpdatedStyles={showSearchFiltersV2}>
+            <SearchResultsWrapper v2Styles={showSearchFiltersV2}>
                 <SearchBody>
                     {!showSearchFiltersV2 && (
                         <div id={SEARCH_RESULTS_FILTERS_ID} data-testid="search-filters-v1">
@@ -184,8 +196,8 @@ export const SearchResults = ({
                             </BrowseProvider>
                         </SidebarProvider>
                     )}
-                    <ResultContainer displayUpdatedStyles={showSearchFiltersV2}>
-                        <PaginationInfoContainer>
+                    <ResultContainer v2Styles={showSearchFiltersV2}>
+                        <PaginationInfoContainer v2Styles={showSearchFiltersV2}>
                             <LeftControlsContainer>
                                 {showBrowseV2 && <ToggleSidebarButton isOpen={isSidebarOpen} onClick={toggleSidebar} />}
                                 <Typography.Text>
@@ -223,7 +235,7 @@ export const SearchResults = ({
                         )}
                         {(error && <ErrorSection />) ||
                             (!loading && (
-                                <>
+                                <SearchResultListContainer v2Styles={showSearchFiltersV2}>
                                     <SearchResultList
                                         query={query}
                                         searchResults={combinedSiblingSearchResults}
@@ -253,7 +265,7 @@ export const SearchResults = ({
                                             />
                                         </SearchResultsRecommendationsContainer>
                                     )}
-                                </>
+                                </SearchResultListContainer>
                             ))}
                     </ResultContainer>
                 </SearchBody>

diff --git a/datahub-web-react/src/app/search/sidebar/BrowseContext.tsx b/datahub-web-react/src/app/search/sidebar/BrowseContext.tsx
@@ -185,7 +185,7 @@ export const useOnSelectBrowsePath = () => {
     const selectedFilters = useSelectedFilters();
     const onChangeFilters = useOnChangeFilters();
 
-    return (isSelected: boolean) => {
+    return (isSelected: boolean, removeFilters: string[] = []) => {
         const overrides: Array<FacetFilterInput> = [];
 
         // keep entity and subType filters for this given entity only if they exist, otherwise apply this entity filter
@@ -215,9 +215,9 @@ export const useOnSelectBrowsePath = () => {
             values: [browseSearchFilter],
         });
 
-        const filtersWithOverrides = applyFacetFilterOverrides(selectedFilters, overrides).filter(
-            (filter) => isSelected || !overrides.some((override) => override.field === filter.field),
-        );
+        const filtersWithOverrides = applyFacetFilterOverrides(selectedFilters, overrides)
+            .filter((filter) => !removeFilters.includes(filter.field))
+            .filter((filter) => isSelected || !overrides.some((override) => override.field === filter.field));
 
         onChangeFilters(filtersWithOverrides);
     };

diff --git a/datahub-web-react/src/app/search/sidebar/BrowseNode.tsx b/datahub-web-react/src/app/search/sidebar/BrowseNode.tsx
@@ -41,11 +41,10 @@ const BrowseNode = () => {
     const environmentAggregation = useMaybeEnvironmentAggregation();
     const platformAggregation = usePlatformAggregation();
     const browseResultGroup = useBrowseResultGroup();
-    const { trackToggleNodeEvent } = useSidebarAnalytics();
     const { count, entity } = browseResultGroup;
     const hasEntityLink = !!entity;
     const displayName = useBrowseDisplayName();
-    const { trackSelectNodeEvent } = useSidebarAnalytics();
+    const { trackSelectNodeEvent, trackToggleNodeEvent } = useSidebarAnalytics();
 
     const { isOpen, isClosing, toggle } = useToggle({
         initialValue: isBrowsePathPrefix && !isBrowsePathSelected,

diff --git a/datahub-web-react/src/app/search/sidebar/BrowseSidebar.tsx b/datahub-web-react/src/app/search/sidebar/BrowseSidebar.tsx
@@ -13,6 +13,7 @@ const Sidebar = styled.div<{ visible: boolean; width: number }>`
     transition: width 250ms ease-in-out;
     border-right: 1px solid ${(props) => props.theme.styles['border-color-base']};
     background-color: #f8f9fa;
+    background: white;
 `;
 
 const SidebarHeader = styled.div`

diff --git a/datahub-web-react/src/app/search/sidebar/PlatformNode.tsx b/datahub-web-react/src/app/search/sidebar/PlatformNode.tsx
@@ -5,7 +5,7 @@ import { formatNumber } from '../../shared/formatNumber';
 import ExpandableNode from './ExpandableNode';
 import { useEntityRegistry } from '../../useEntityRegistry';
 import { getFilterIconAndLabel } from '../filters/utils';
-import { PLATFORM_FILTER_NAME } from '../utils/constants';
+import { BROWSE_PATH_V2_FILTER_NAME, PLATFORM_FILTER_NAME } from '../utils/constants';
 import useBrowsePagination from './useBrowsePagination';
 import BrowseNode from './BrowseNode';
 import SidebarLoadingError from './SidebarLoadingError';
@@ -15,9 +15,11 @@ import {
     useEntityAggregation,
     useIsPlatformSelected,
     useMaybeEnvironmentAggregation,
+    useOnSelectBrowsePath,
     usePlatformAggregation,
 } from './BrowseContext';
 import useSidebarAnalytics from './useSidebarAnalytics';
+import { useHasFilterField } from './SidebarContext';
 
 const PlatformIconContainer = styled.div`
     width: 16px;
@@ -31,20 +33,18 @@ const Count = styled(Typography.Text)`
     padding-right: 8px;
 `;
 
-const BrowseGroupListContainer = styled.div`
-    background: white;
-    border-radius: 8px;
-    padding-right: 8px;
-`;
-
 const PlatformNode = () => {
-    const isSelected = useIsPlatformSelected();
+    const isPlatformSelected = useIsPlatformSelected();
+    const hasBrowseFilter = useHasFilterField(BROWSE_PATH_V2_FILTER_NAME);
+    const isPlatformAndPathSelected = isPlatformSelected && hasBrowseFilter;
+    const isPlatformOnlySelected = isPlatformSelected && !hasBrowseFilter;
     const entityAggregation = useEntityAggregation();
     const environmentAggregation = useMaybeEnvironmentAggregation();
     const platformAggregation = usePlatformAggregation();
     const { count } = platformAggregation;
     const registry = useEntityRegistry();
-    const { trackToggleNodeEvent } = useSidebarAnalytics();
+    const { trackToggleNodeEvent, trackSelectNodeEvent } = useSidebarAnalytics();
+    const onSelectBrowsePath = useOnSelectBrowsePath();
 
     const { icon, label } = getFilterIconAndLabel(
         PLATFORM_FILTER_NAME,
@@ -55,15 +55,21 @@ const PlatformNode = () => {
     );
 
     const { isOpen, isClosing, toggle } = useToggle({
-        initialValue: isSelected,
+        initialValue: isPlatformAndPathSelected,
         closeDelay: 250,
         onToggle: (isNowOpen: boolean) => trackToggleNodeEvent(isNowOpen, 'platform'),
     });
 
-    const onClickHeader = () => {
+    const onClickTriangle = () => {
         if (count) toggle();
     };
 
+    const onClickHeader = () => {
+        const isNowPlatformOnlySelected = !isPlatformOnlySelected;
+        onSelectBrowsePath(isNowPlatformOnlySelected, [BROWSE_PATH_V2_FILTER_NAME]);
+        trackSelectNodeEvent(isNowPlatformOnlySelected ? 'select' : 'deselect', 'platform');
+    };
+
     const { error, groups, loaded, observable, path, retry } = useBrowsePagination({ skip: !isOpen });
 
     const color = '#000';
@@ -72,12 +78,17 @@ const PlatformNode = () => {
         <ExpandableNode
             isOpen={isOpen && !isClosing && loaded}
             header={
-                <ExpandableNode.Header isOpen={isOpen} showBorder onClick={onClickHeader} style={{ paddingTop: 8 }}>
+                <ExpandableNode.SelectableHeader
+                    isOpen={isOpen}
+                    isSelected={isPlatformOnlySelected}
+                    showBorder
+                    onClick={onClickHeader}
+                >
                     <ExpandableNode.HeaderLeft>
                         <ExpandableNode.TriangleButton
                             isOpen={isOpen && !isClosing}
                             isVisible={!!platformAggregation.count}
-                            onClick={onClickHeader}
+                            onClick={onClickTriangle}
                             dataTestId={`browse-platform-${label}`}
                         />
                         <PlatformIconContainer>{icon}</PlatformIconContainer>
@@ -86,26 +97,24 @@ const PlatformNode = () => {
                         </ExpandableNode.Title>
                     </ExpandableNode.HeaderLeft>
                     <Count color={color}>{formatNumber(platformAggregation.count)}</Count>
-                </ExpandableNode.Header>
+                </ExpandableNode.SelectableHeader>
             }
             body={
                 <ExpandableNode.Body>
-                    <BrowseGroupListContainer>
-                        {groups.map((group) => (
-                            <BrowseProvider
-                                key={group.name}
-                                entityAggregation={entityAggregation}
-                                environmentAggregation={environmentAggregation}
-                                platformAggregation={platformAggregation}
-                                browseResultGroup={group}
-                                parentPath={path}
-                            >
-                                <BrowseNode />
-                            </BrowseProvider>
-                        ))}
-                        {error && <SidebarLoadingError onClickRetry={retry} />}
-                        {observable}
-                    </BrowseGroupListContainer>
+                    {groups.map((group) => (
+                        <BrowseProvider
+                            key={group.name}
+                            entityAggregation={entityAggregation}
+                            environmentAggregation={environmentAggregation}
+                            platformAggregation={platformAggregation}
+                            browseResultGroup={group}
+                            parentPath={path}
+                        >
+                            <BrowseNode />
+                        </BrowseProvider>
+                    ))}
+                    {error && <SidebarLoadingError onClickRetry={retry} />}
+                    {observable}
                 </ExpandableNode.Body>
             }
         />

diff --git a/docker/kafka-setup/Dockerfile b/docker/kafka-setup/Dockerfile
@@ -5,7 +5,7 @@ ARG MAVEN_REPO="https://repo1.maven.org/maven2"
 ARG SNAKEYAML_VERSION="2.0"
 
 RUN rm /usr/share/java/cp-base-new/snakeyaml-*.jar \
-    && wget -P /usr/share/java/cp-base-new $MAVEN_REPO/org/yaml/snakeyaml/$SNAKEYAML_VERSION/snakeyaml-$SNAKEYAML_VERSION.jar
+  && wget -P /usr/share/java/cp-base-new $MAVEN_REPO/org/yaml/snakeyaml/$SNAKEYAML_VERSION/snakeyaml-$SNAKEYAML_VERSION.jar
 
 # Based on https://github.com/blacktop's alpine kafka build
 FROM python:3-alpine
@@ -17,7 +17,7 @@ ENV SCALA_VERSION 2.13
 ENV CUB_CLASSPATH='"/usr/share/java/cp-base-new/*"'
 
 # Confluent Docker Utils Version (Namely the tag or branch to grab from git to install)
-ARG PYTHON_CONFLUENT_DOCKER_UTILS_VERSION="v0.0.58"
+ARG PYTHON_CONFLUENT_DOCKER_UTILS_VERSION="v0.0.60"
 
 # This can be overriden for an offline/air-gapped builds
 ARG PYTHON_CONFLUENT_DOCKER_UTILS_INSTALL_SPEC="git+https://github.com/confluentinc/confluent-docker-utils@${PYTHON_CONFLUENT_DOCKER_UTILS_VERSION}"
@@ -36,7 +36,9 @@ RUN mkdir -p /opt \
   && adduser -DH -s /sbin/nologin kafka \
   && chown -R kafka: /opt/kafka \
   && echo "===> Installing python packages ..."  \
-  && pip install --no-cache-dir jinja2 requests \
+  && pip install --no-cache-dir --upgrade pip wheel setuptools \
+  && pip install jinja2 requests \
+  && pip install "Cython<3.0" "PyYAML<6" --no-build-isolation \
   && pip install --prefer-binary --prefix=/usr/local --upgrade "${PYTHON_CONFLUENT_DOCKER_UTILS_INSTALL_SPEC}" \
   && rm -rf /tmp/* \
   && apk del --purge .build-deps

diff --git a/docker/quickstart/generate_and_compare.sh b/docker/quickstart/generate_and_compare.sh
@@ -8,5 +8,6 @@ set -euxo pipefail
 python3 -m venv venv
 source venv/bin/activate
 
+pip install --upgrade pip wheel setuptools
 pip install -r requirements.txt
 python generate_docker_quickstart.py check-all
diff --git a/docker/quickstart/requirements.txt b/docker/quickstart/requirements.txt
@@ -1,3 +1,3 @@
-PyYAML==5.4.1
+PyYAML==6.0
 python-dotenv==0.17.0
 click