yujunjun/datahub
2
0
Fork 0
mirror of https://github.com/datahub-project/datahub.git synced 2025-08-31 21:03:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(ingestion-ui) Sort ingestion sources by last execution time (#5807)

Browse Source
This commit is contained in:
Chris Collins 2022-09-09 17:14:33 -04:00 committed by GitHub
parent de547a9af9
commit c4ac09d192
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
datahub-graphql-core/src/main/java/com/linkedin/datahub/graphql/resolvers/ingest/source/ListIngestionSourcesResolver.java
View File

@ -15,7 +15,9 @@ import com.linkedin.metadata.search.SearchEntity;
import com.linkedin.metadata.search.SearchResult;
import graphql.schema.DataFetcher;
import graphql.schema.DataFetchingEnvironment;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.Map;
import java.util.concurrent.CompletableFuture;
@ -66,15 +68,20 @@ public class ListIngestionSourcesResolver implements DataFetcher<CompletableFutu
new HashSet<>(gmsResult.getEntities().stream()
.map(SearchEntity::getEntity)
.collect(Collectors.toList())),
ImmutableSet.of(Constants.INGESTION_INFO_ASPECT_NAME),
ImmutableSet.of(Constants.INGESTION_INFO_ASPECT_NAME, Constants.INGESTION_SOURCE_KEY_ASPECT_NAME),
context.getAuthentication());
final Collection<EntityResponse> sortedEntities = entities.values()
.stream()
.sorted(Comparator.comparingLong(s -> -s.getAspects().get(Constants.INGESTION_SOURCE_KEY_ASPECT_NAME).getCreated().getTime()))
.collect(Collectors.toList());
// Now that we have entities we can bind this to a result.
final ListIngestionSourcesResult result = new ListIngestionSourcesResult();
result.setStart(gmsResult.getFrom());
result.setCount(gmsResult.getPageSize());
result.setTotal(gmsResult.getNumEntities());
result.setIngestionSources(IngestionResolverUtils.mapIngestionSources(entities.values()));
result.setIngestionSources(IngestionResolverUtils.mapIngestionSources(sortedEntities));
return result;
} catch (Exception e) {

9
datahub-graphql-core/src/test/java/com/linkedin/datahub/graphql/resolvers/ingest/source/ListIngestionSourceResolverTest.java
View File

@ -12,6 +12,7 @@ import com.linkedin.entity.EnvelopedAspectMap;
import com.linkedin.entity.client.EntityClient;
import com.linkedin.ingestion.DataHubIngestionSourceInfo;
import com.linkedin.metadata.Constants;
import com.linkedin.metadata.key.DataHubIngestionSourceKey;
import com.linkedin.metadata.search.SearchEntity;
import com.linkedin.metadata.search.SearchEntityArray;
import com.linkedin.metadata.search.SearchResult;
@ -36,6 +37,8 @@ public class ListIngestionSourceResolverTest {
EntityClient mockClient = Mockito.mock(EntityClient.class);
DataHubIngestionSourceInfo returnedInfo = getTestIngestionSourceInfo();
final DataHubIngestionSourceKey key = new DataHubIngestionSourceKey();
key.setId("test");
Mockito.when(mockClient.search(
Mockito.eq(Constants.INGESTION_SOURCE_ENTITY_NAME),
@ -55,7 +58,7 @@ public class ListIngestionSourceResolverTest {
Mockito.when(mockClient.batchGetV2(
Mockito.eq(Constants.INGESTION_SOURCE_ENTITY_NAME),
Mockito.eq(new HashSet<>(ImmutableSet.of(TEST_INGESTION_SOURCE_URN))),
Mockito.eq(ImmutableSet.of(Constants.INGESTION_INFO_ASPECT_NAME)),
Mockito.eq(ImmutableSet.of(Constants.INGESTION_INFO_ASPECT_NAME, Constants.INGESTION_SOURCE_KEY_ASPECT_NAME)),
Mockito.any(Authentication.class)
)).thenReturn(
ImmutableMap.of(
@ -65,7 +68,9 @@ public class ListIngestionSourceResolverTest {
.setUrn(TEST_INGESTION_SOURCE_URN)
.setAspects(new EnvelopedAspectMap(ImmutableMap.of(
Constants.INGESTION_INFO_ASPECT_NAME,
new EnvelopedAspect().setValue(new Aspect(returnedInfo.data()))
new EnvelopedAspect().setValue(new Aspect(returnedInfo.data())),
Constants.INGESTION_SOURCE_KEY_ASPECT_NAME,
new EnvelopedAspect().setValue(new Aspect(key.data()))
)))
)
);

5
datahub-web-react/src/app/ingest/source/IngestionSourceTable.tsx
View File

@ -49,12 +49,14 @@ function IngestionSourceTable({
dataIndex: 'type',
key: 'type',
render: TypeColumn,
sorter: (sourceA, sourceB) => sourceA.type.localeCompare(sourceB.type),
},
{
title: 'Name',
dataIndex: 'name',
key: 'name',
render: (name: string) => name || '',
sorter: (sourceA, sourceB) => sourceA.name.localeCompare(sourceB.name),
},
{
title: 'Schedule',
@ -67,12 +69,14 @@ function IngestionSourceTable({
dataIndex: 'execCount',
key: 'execCount',
render: (execCount: any) => <Typography.Text>{execCount || '0'}</Typography.Text>,
sorter: (sourceA, sourceB) => sourceA.execCount - sourceB.execCount,
},
{
title: 'Last Execution',
dataIndex: 'lastExecTime',
key: 'lastExecTime',
render: LastExecutionColumn,
sorter: (sourceA, sourceB) => sourceA.lastExecTime - sourceB.lastExecTime,
},
{
title: 'Last Status',
@ -81,6 +85,7 @@ function IngestionSourceTable({
render: (status: any, record) => (
<LastStatusColumn status={status} record={record} setFocusExecutionUrn={setFocusExecutionUrn} />
),
sorter: (sourceA, sourceB) => (sourceA.lastExecStatus || '').localeCompare(sourceB.lastExecStatus || ''),
},
{
title: '',