feat(ingestion): add the new details form (step 2)

datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/GmsGraphQLEngine.java

@@ -1306,11 +1306,9 @@ private void configureMutationResolvers(final RuntimeWiring.Builder builder) {
                   "revokeAccessToken",
                   new RevokeAccessTokenResolver(this.entityClient, this.statefulTokenService))
               .dataFetcher(
-                  "createIngestionSource",
-                  new UpsertIngestionSourceResolver(this.entityClient, this.entityService))
+                  "createIngestionSource", new UpsertIngestionSourceResolver(this.entityClient))
               .dataFetcher(
-                  "updateIngestionSource",
-                  new UpsertIngestionSourceResolver(this.entityClient, this.entityService))
+                  "updateIngestionSource", new UpsertIngestionSourceResolver(this.entityClient))
               .dataFetcher(
                   "deleteIngestionSource", new DeleteIngestionSourceResolver(this.entityClient))
               .dataFetcher(

datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/source/UpsertIngestionSourceResolver.java

@@ -11,20 +11,17 @@
 import com.linkedin.datahub.graphql.exception.AuthorizationException;
 import com.linkedin.datahub.graphql.exception.DataHubGraphQLErrorCode;
 import com.linkedin.datahub.graphql.exception.DataHubGraphQLException;
-import com.linkedin.datahub.graphql.generated.OwnerEntityType;
 import com.linkedin.datahub.graphql.generated.StringMapEntryInput;
 import com.linkedin.datahub.graphql.generated.UpdateIngestionSourceConfigInput;
 import com.linkedin.datahub.graphql.generated.UpdateIngestionSourceInput;
 import com.linkedin.datahub.graphql.generated.UpdateIngestionSourceScheduleInput;
 import com.linkedin.datahub.graphql.resolvers.ingest.IngestionAuthUtils;
-import com.linkedin.datahub.graphql.resolvers.mutate.util.OwnerUtils;
 import com.linkedin.entity.client.EntityClient;
 import com.linkedin.ingestion.DataHubIngestionSourceConfig;
 import com.linkedin.ingestion.DataHubIngestionSourceInfo;
 import com.linkedin.ingestion.DataHubIngestionSourceSchedule;
 import com.linkedin.ingestion.DataHubIngestionSourceSource;
 import com.linkedin.ingestion.DataHubIngestionSourceSourceType;
-import com.linkedin.metadata.entity.EntityService;
 import com.linkedin.metadata.key.DataHubIngestionSourceKey;
 import com.linkedin.mxe.MetadataChangeProposal;
 import graphql.schema.DataFetcher;
@@ -46,12 +43,9 @@
 public class UpsertIngestionSourceResolver implements DataFetcher<CompletableFuture<String>> {
 
   private final EntityClient _entityClient;
-  private final EntityService<?> _entityService;
 
-  public UpsertIngestionSourceResolver(
-      final EntityClient entityClient, final EntityService<?> entityService) {
+  public UpsertIngestionSourceResolver(final EntityClient entityClient) {
     _entityClient = entityClient;
-    _entityService = entityService;
   }
 
   @Override
@@ -95,15 +89,7 @@ public CompletableFuture<String> get(final DataFetchingEnvironment environment)
     return GraphQLConcurrencyUtils.supplyAsync(
         () -> {
           try {
-            String urn =
-                _entityClient.ingestProposal(context.getOperationContext(), proposal, false);
-
-            if (!ingestionSourceUrn.isPresent()) {
-              OwnerUtils.addCreatorAsOwner(context, urn, OwnerEntityType.CORP_USER, _entityService);
-            }
-
-            return urn;
-
+            return _entityClient.ingestProposal(context.getOperationContext(), proposal, false);
           } catch (Exception e) {
             throw new RuntimeException(
                 String.format(

datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/ingest/secret/CreateSecretResolverTest.java

@@ -1,6 +1,5 @@
 package com.linkedin.datahub.graphql.resolvers.ingest.secret;
 
-import static com.linkedin.datahub.graphql.TestUtils.getMockEntityService;
 import static com.linkedin.datahub.graphql.resolvers.ingest.IngestTestUtils.*;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -14,7 +13,6 @@
 import com.linkedin.entity.client.EntityClient;
 import com.linkedin.events.metadata.ChangeType;
 import com.linkedin.metadata.Constants;
-import com.linkedin.metadata.entity.EntityService;
 import com.linkedin.metadata.key.DataHubSecretKey;
 import com.linkedin.metadata.utils.GenericRecordUtils;
 import com.linkedin.mxe.MetadataChangeProposal;
@@ -77,9 +75,7 @@ public void testGetSuccess() throws Exception {
   public void testGetUnauthorized() throws Exception {
     // Create resolver
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService<?> mockService = getMockEntityService();
-    UpsertIngestionSourceResolver resolver =
-        new UpsertIngestionSourceResolver(mockClient, mockService);
+    UpsertIngestionSourceResolver resolver = new UpsertIngestionSourceResolver(mockClient);
 
     // Execute resolver
     DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
@@ -95,12 +91,10 @@ public void testGetUnauthorized() throws Exception {
   public void testGetEntityClientException() throws Exception {
     // Create resolver
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService<?> mockService = getMockEntityService();
     Mockito.doThrow(RemoteInvocationException.class)
         .when(mockClient)
         .ingestProposal(any(), Mockito.any(), anyBoolean());
-    UpsertIngestionSourceResolver resolver =
-        new UpsertIngestionSourceResolver(mockClient, mockService);
+    UpsertIngestionSourceResolver resolver = new UpsertIngestionSourceResolver(mockClient);
 
     // Execute resolver
     DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);

datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/ingest/source/UpsertIngestionSourceResolverTest.java

@@ -1,6 +1,5 @@
 package com.linkedin.datahub.graphql.resolvers.ingest.source;
 
-import static com.linkedin.datahub.graphql.TestUtils.getMockEntityService;
 import static com.linkedin.datahub.graphql.TestUtils.verifyIngestProposal;
 import static com.linkedin.datahub.graphql.resolvers.ingest.IngestTestUtils.*;
 import static com.linkedin.metadata.Constants.*;
@@ -18,7 +17,6 @@
 import com.linkedin.ingestion.DataHubIngestionSourceConfig;
 import com.linkedin.ingestion.DataHubIngestionSourceInfo;
 import com.linkedin.ingestion.DataHubIngestionSourceSchedule;
-import com.linkedin.metadata.entity.EntityService;
 import com.linkedin.r2.RemoteInvocationException;
 import graphql.schema.DataFetchingEnvironment;
 import org.mockito.Mockito;
@@ -43,9 +41,7 @@ private static UpdateIngestionSourceInput makeInput() {
   public void testGetSuccess() throws Exception {
     // Create resolver
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService<?> mockService = getMockEntityService();
-    UpsertIngestionSourceResolver resolver =
-        new UpsertIngestionSourceResolver(mockClient, mockService);
+    UpsertIngestionSourceResolver resolver = new UpsertIngestionSourceResolver(mockClient);
 
     // Execute resolver
     QueryContext mockContext = getMockAllowContext();
@@ -83,9 +79,7 @@ public void testGetSuccess() throws Exception {
   public void testGetUnauthorized() throws Exception {
     // Create resolver
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService<?> mockService = getMockEntityService();
-    UpsertIngestionSourceResolver resolver =
-        new UpsertIngestionSourceResolver(mockClient, mockService);
+    UpsertIngestionSourceResolver resolver = new UpsertIngestionSourceResolver(mockClient);
 
     // Execute resolver
     DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
@@ -101,12 +95,10 @@ public void testGetUnauthorized() throws Exception {
   public void testGetEntityClientException() throws Exception {
     // Create resolver
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService<?> mockService = getMockEntityService();
     Mockito.doThrow(RemoteInvocationException.class)
         .when(mockClient)
         .ingestProposal(any(), any(), Mockito.eq(false));
-    UpsertIngestionSourceResolver resolver =
-        new UpsertIngestionSourceResolver(mockClient, mockService);
+    UpsertIngestionSourceResolver resolver = new UpsertIngestionSourceResolver(mockClient);
 
     // Execute resolver
     DataFetchingEnvironment mockEnv = Mockito.mock(DataFetchingEnvironment.class);
@@ -124,9 +116,7 @@ public void testUpsertWithInvalidCron() throws Exception {
 
     // Create resolver
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService<?> mockService = getMockEntityService();
-    UpsertIngestionSourceResolver resolver =
-        new UpsertIngestionSourceResolver(mockClient, mockService);
+    UpsertIngestionSourceResolver resolver = new UpsertIngestionSourceResolver(mockClient);
 
     // Execute resolver
     QueryContext mockContext = getMockAllowContext();
@@ -151,9 +141,7 @@ public void testUpsertWithInvalidTimezone() throws Exception {
 
     // Create resolver
     EntityClient mockClient = Mockito.mock(EntityClient.class);
-    EntityService<?> mockService = getMockEntityService();
-    UpsertIngestionSourceResolver resolver =
-        new UpsertIngestionSourceResolver(mockClient, mockService);
+    UpsertIngestionSourceResolver resolver = new UpsertIngestionSourceResolver(mockClient);
 
     // Execute resolver
     QueryContext mockContext = getMockAllowContext();

datahub-web-react/src/alchemy-components/components/AutoComplete/types.ts

@@ -17,6 +17,7 @@ export interface AutoCompleteProps {
     defaultValue?: ValueType;
     options: OptionType[];
     open?: boolean;
+    placeholder?: string;
 
     defaultActiveFirstOption?: boolean;
     filterOption?: boolean | ((inputValue: ValueType, option?: OptionType) => boolean);

datahub-web-react/src/alchemy-components/components/Breadcrumb/components.ts

@@ -1,3 +1,4 @@
+import { Divider } from 'antd';
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
 
@@ -30,3 +31,10 @@ export const BreadcrumbButton = styled(Text)`
         color: ${colors.primary[500]};
     }
 `;
+
+export const VerticalDivider = styled(Divider)`
+    color: ${colors.gray[100]};
+    height: 16px;
+    width: 2px;
+    margin: 0 4px;
+`;

datahub-web-react/src/alchemy-components/components/Button/utils.ts

@@ -232,7 +232,7 @@ const getButtonPadding = (size: SizeOptions, hasChildren: boolean, isCircle: boo
     const paddingStyles = {
         xs: {
             vertical: 6,
-            horizontal: 6,
+            horizontal: 8,
         },
         sm: {
             vertical: 8,

datahub-web-react/src/alchemy-components/components/Checkbox/types.ts

@@ -7,7 +7,7 @@ export interface CheckboxProps extends Omit<InputHTMLAttributes<HTMLInputElement
     labelTooltip?: string;
     error?: string;
     isChecked?: boolean;
-    setIsChecked?: React.Dispatch<React.SetStateAction<boolean>>;
+    setIsChecked?: (isChecked: boolean) => void;
     isDisabled?: boolean;
     isIntermediate?: boolean;
     isRequired?: boolean;

datahub-web-react/src/alchemy-components/components/Icon/Icon.tsx

@@ -17,6 +17,8 @@ export const iconDefaults: IconPropsDefaults = {
     tooltipText: '',
 };
 
+const ICON_NAMES = getIconNames();
+
 export const Icon = ({
     icon,
     source = iconDefaults.source,
@@ -29,7 +31,7 @@ export const Icon = ({
     tooltipText,
     ...props
 }: IconProps) => {
-    const { filled, outlined } = getIconNames();
+    const { filled, outlined } = ICON_NAMES;
     const { theme } = useCustomTheme();
 
     // Return early if no icon is provided

datahub-web-react/src/alchemy-components/components/Input/Input.tsx

@@ -19,7 +19,7 @@ import { getInputType } from '@components/components/Input/utils';
 export const inputDefaults: InputProps = {
     value: '',
     setValue: () => {},
-    label: 'Label',
+    label: '',
     placeholder: 'Placeholder',
     error: '',
     warning: '',

datahub-web-react/src/alchemy-components/components/Input/types.ts

@@ -4,8 +4,8 @@ import { IconProps } from '@components/components/Icon/types';
 
 export interface InputProps extends InputHTMLAttributes<HTMLInputElement> {
     value?: string | number | readonly string[] | undefined;
-    setValue?: React.Dispatch<React.SetStateAction<string>>;
-    label: string;
+    setValue?: (newValue: string) => void;
+    label?: string;
     placeholder?: string;
     icon?: IconProps;
     error?: string;

datahub-web-react/src/alchemy-components/components/Tabs/Tabs.tsx

@@ -234,6 +234,7 @@ export interface Props {
     tabs: Tab[];
     selectedTab?: string;
     onChange?: (selectedTabKey: string) => void;
+    onTabClick?: (activeKey: string, e: React.KeyboardEvent | React.MouseEvent) => void;
     urlMap?: Record<string, string>;
     onUrlChange?: (url: string) => void;
     defaultTab?: string;
@@ -249,12 +250,14 @@ export interface Props {
     scrollToTopOnChange?: boolean;
     maxHeight?: string;
     stickyHeader?: boolean;
+    destroyInactiveTabPane?: boolean;
 }
 
 export function Tabs({
     tabs,
     selectedTab,
     onChange,
+    onTabClick,
     urlMap,
     onUrlChange = (url) => window.history.replaceState({}, '', url),
     defaultTab,
@@ -266,6 +269,7 @@ export function Tabs({
     scrollToTopOnChange = false,
     maxHeight = '100%',
     stickyHeader = false,
+    destroyInactiveTabPane,
 }: Props) {
     const tabsContainerRef = useRef<HTMLDivElement>(null);
 
@@ -323,6 +327,8 @@ export function Tabs({
                     onUrlChange(urlMap[key]);
                 }
             }}
+            onTabClick={onTabClick}
+            destroyInactiveTabPane={destroyInactiveTabPane}
             $navMarginBottom={styleOptions?.navMarginBottom}
             $navMarginTop={styleOptions?.navMarginTop}
             $containerHeight={styleOptions?.containerHeight}

datahub-web-react/src/alchemy-components/components/TextArea/TextArea.tsx

@@ -14,7 +14,7 @@ import {
 import { TextAreaProps } from '@components/components/TextArea/types';
 
 export const textAreaDefaults: TextAreaProps = {
-    label: 'Label',
+    label: '',
     placeholder: 'Placeholder',
     error: '',
     warning: '',
@@ -55,9 +55,11 @@ export const TextArea = ({
 
     return (
         <TextAreaWrapper>
-            <Label>
-                {label} {isRequired && <Required>*</Required>}
-            </Label>
+            {label && (
+                <Label aria-label={label}>
+                    {label} {isRequired && <Required>*</Required>}
+                </Label>
+            )}
             <TextAreaContainer {...textAreaBaseProps}>
                 {icon && <StyledIcon icon={icon} size="lg" />}
                 <TextAreaField

datahub-web-react/src/alchemy-components/components/TextArea/types.ts

@@ -3,7 +3,7 @@ import { TextareaHTMLAttributes } from 'react';
 import { IconNames } from '@components/components/Icon';
 
 export interface TextAreaProps extends TextareaHTMLAttributes<HTMLTextAreaElement> {
-    label: string;
+    label?: string;
     placeholder?: string;
     icon?: IconNames;
     error?: string;

datahub-web-react/src/app/entityV2/shared/EntitySearchSelect/EntitySearchDropdown.tsx

@@ -169,10 +169,7 @@ export const EntitySearchDropdown: React.FC<EntitySearchDropdownProps> = ({
                 <Input
                     label=""
                     value={searchQuery}
-                    setValue={(value) => {
-                        const newValue = typeof value === 'function' ? value(searchQuery) : value;
-                        handleSearchChange(newValue);
-                    }}
+                    setValue={handleSearchChange}
                     placeholder={placeholder}
                     icon={{ icon: 'Search' }}
                     data-testid="entity-search-select-input"

datahub-web-react/src/app/ingestV2/runDetails/IngestionRunDetailsPage.tsx

@@ -1,8 +1,8 @@
-import { Breadcrumb, colors } from '@components';
-import { Divider } from 'antd';
+import { Breadcrumb } from '@components';
 import React, { useEffect } from 'react';
 import { useLocation, useParams } from 'react-router';
-import styled from 'styled-components';
+
+import { VerticalDivider } from '@components/components/Breadcrumb/components';
 
 import RunDetailsContent from '@app/ingestV2/runDetails/RunDetailsContent';
 import { formatDateTime } from '@app/ingestV2/shared/components/columns/DateTimeColumn';
@@ -12,13 +12,6 @@ import { PageLayout } from '@app/sharedV2/layouts/PageLayout';
 
 import { useGetIngestionExecutionRequestQuery } from '@graphql/ingestion.generated';
 
-const VerticalDivider = styled(Divider)`
-    color: ${colors.gray[100]};
-    height: 16px;
-    width: 2px;
-    margin: 0 4px;
-`;
-
 export default function IngestionRunDetailsPage() {
     const { urn } = useParams<{ urn: string }>();
 

datahub-web-react/src/app/ingestV2/shared/hooks/useCapabilitySummary.ts

@@ -13,7 +13,7 @@ export const useCapabilitySummary = () => {
             setError(null);
 
             try {
-                const response = await fetch('assets/ingestion/capability_summary.json');
+                const response = await fetch('/assets/ingestion/capability_summary.json');
                 if (!response.ok) {
                     throw new Error(`Failed to fetch capability summary: ${response.status} ${response.statusText}`);
                 }

datahub-web-react/src/app/ingestV2/source/builder/IngestionSourceBuilderModal.tsx

@@ -10,8 +10,8 @@ import { CreateScheduleStep } from '@app/ingestV2/source/builder/CreateScheduleS
 import { DefineRecipeStep } from '@app/ingestV2/source/builder/DefineRecipeStep';
 import { NameSourceStep } from '@app/ingestV2/source/builder/NameSourceStep';
 import { SelectTemplateStep } from '@app/ingestV2/source/builder/SelectTemplateStep';
-import sourcesJson from '@app/ingestV2/source/builder/sources.json';
 import { SourceBuilderState, StepProps } from '@app/ingestV2/source/builder/types';
+import { useIngestionSources } from '@app/ingestV2/source/builder/useIngestionSources';
 
 import { IngestionSource } from '@types';
 
@@ -87,7 +87,7 @@ export const IngestionSourceBuilderModal = ({
         },
     });
 
-    const ingestionSources = JSON.parse(JSON.stringify(sourcesJson)); // TODO: replace with call to server once we have access to dynamic list of sources
+    const { ingestionSources } = useIngestionSources();
 
     const sendAnalyticsStepViewedEvent = useCallback(
         (step: IngestionSourceBuilderStep) => {