Skip to content

[NCL-8076] Add Analyzed Artifacts tabs #630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[NCL-8076] Add Analyzed Artifacts tabs #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/AppRoutes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ import { BuildPages } from 'components/BuildPages/BuildPages';
import { BuildsPage } from 'components/BuildsPage/BuildsPage';
import { DashboardPage } from 'components/DashboardPage/DashboardPage';
import { DeliverableAnalysesPage } from 'components/DeliverableAnalysesPage/DeliverableAnalysesPage';
import { DeliverableAnalysisDeliveredArtifactsPage } from 'components/DeliverableAnalysisDeliveredArtifactsPage/DeliverableAnalysisDeliveredArtifactsPage';
import { DeliverableAnalysisDetailPage } from 'components/DeliverableAnalysisDetailPage/DeliverableAnalysisDetailPage';
import { DeliverableAnalysisPages } from 'components/DeliverableAnalysisPages/DeliverableAnalysisPages';
import { DemoPage } from 'components/DemoPage/DemoPage';
import { ErrorPage } from 'components/ErrorPage/ErrorPage';
import { ExperimentalContent } from 'components/ExperimentalContent/ExperimentalContent';
Expand Down Expand Up @@ -385,8 +387,12 @@ export const AppRoutes = (
<Route
path=":deliverableAnalysisId"
handle={breadcrumbData.deliverableAnalysisDetail.id}
element={<DeliverableAnalysisDetailPage />}
/>
element={<DeliverableAnalysisPages />}
>
<Route path="details" element={<DeliverableAnalysisDetailPage />} />
<Route path="delivered-artifacts" element={<DeliverableAnalysisDeliveredArtifactsPage />} />
<Route index element={<Navigate to="details" replace />} />
</Route>
</Route>

{/* special pages */}
Expand Down
50 changes: 50 additions & 0 deletions ...s/DeliverableAnalysisDeliveredArtifactsPage/DeliverableAnalysisDeliveredArtifactsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import { Text, TextContent } from '@patternfly/react-core';
import { useCallback } from 'react';

import { useParamsRequired } from 'hooks/useParamsRequired';
import { useQueryParamsEffect } from 'hooks/useQueryParamsEffect';
import { useServiceContainer } from 'hooks/useServiceContainer';

import { ArtifactsList } from 'components/ArtifactsList/ArtifactsList';
import { Toolbar } from 'components/Toolbar/Toolbar';
import { ToolbarItem } from 'components/Toolbar/ToolbarItem';

import * as deliverableAnalysisApi from 'services/deliverableAnalysisApi';

interface IDeliverableAnalysisDeliveredArtifactsPageProps {
componentId?: string;
}

export const DeliverableAnalysisDeliveredArtifactsPage = ({
componentId = 'd2',
}: IDeliverableAnalysisDeliveredArtifactsPageProps) => {
const { deliverableAnalysisId } = useParamsRequired();

const serviceContainerArtifacts = useServiceContainer(deliverableAnalysisApi.getAnalyzedArtifacts);
const serviceContainerArtifactsRunner = serviceContainerArtifacts.run;

useQueryParamsEffect(
useCallback(
({ requestConfig } = {}) => serviceContainerArtifactsRunner({ serviceData: { id: deliverableAnalysisId }, requestConfig }),
[serviceContainerArtifactsRunner, deliverableAnalysisId]
),
{ componentId }
);

return (
<>
<Toolbar>
<ToolbarItem reservedWidth>
<TextContent>
<Text component="h2">Delivered Artifacts</Text>
<Text>
This list contains Artifacts analyzed in the current Deliverable Analysis. Each Artifact is represented by a PNC
Identifier.
</Text>
</TextContent>
</ToolbarItem>
</Toolbar>
<ArtifactsList {...{ serviceContainerArtifacts, componentId }} />;
</>
);
};
167 changes: 68 additions & 99 deletions src/components/DeliverableAnalysisDetailPage/DeliverableAnalysisDetailPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { useCallback, useEffect, useMemo } from 'react';

import { DeliverableAnalyzerOperation } from 'pnc-api-types-ts';

import { breadcrumbData } from 'common/breadcrumbData';
import { EntityTitles } from 'common/constants';
import { deliverableAnalysisOperationEntityAttributes } from 'common/deliverableAnalysisOperationEntityAttributes';
import { deliverableAnalysisReportEntityAttributes } from 'common/deliverableAnalysisReportEntityAttributes';
Expand All @@ -17,7 +16,6 @@ import { useDataBuffer } from 'hooks/useDataBuffer';
import { useParamsRequired } from 'hooks/useParamsRequired';
import { hasDeliverableAnalysisChanged, usePncWebSocketEffect } from 'hooks/usePncWebSocketEffect';
import { useServiceContainer } from 'hooks/useServiceContainer';
import { useTitle } from 'hooks/useTitle';

import { Attributes } from 'components/Attributes/Attributes';
import { AttributesItem } from 'components/Attributes/AttributesItem';
Expand All @@ -27,7 +25,6 @@ import { DeliverableAnalysisLabelLabelMapper } from 'components/LabelMapper/Deli
import { DeliverableAnalysisProgressStatusLabelMapper } from 'components/LabelMapper/DeliverableAnalysisProgressStatusLabelMapper';
import { DeliverableAnalysisResultLabelMapper } from 'components/LabelMapper/DeliverableAnalysisResultLabelMapper';
import { LogViewer } from 'components/LogViewer/LogViewer';
import { PageLayout } from 'components/PageLayout/PageLayout';
import { ProductMilestoneReleaseLabel } from 'components/ProductMilestoneReleaseLabel/ProductMilestoneReleaseLabel';
import { ServiceContainerLoading } from 'components/ServiceContainers/ServiceContainerLoading';
import { Toolbar } from 'components/Toolbar/Toolbar';
Expand All @@ -39,7 +36,6 @@ import * as productMilestoneApi from 'services/productMilestoneApi';
import * as productVersionApi from 'services/productVersionApi';

import { timestampHiglighter } from 'utils/preprocessorHelper';
import { generatePageTitle } from 'utils/titleHelper';

export const DeliverableAnalysisDetailPage = () => {
const { deliverableAnalysisId } = useParamsRequired();
Expand Down Expand Up @@ -109,104 +105,77 @@ export const DeliverableAnalysisDetailPage = () => {
)
);

useTitle(
generatePageTitle({
serviceContainer: serviceContainerDeliverableAnalysisOperation,
firstLevelEntity: 'Deliverable Analysis',
entityName: `Deliverable Analysis ${deliverableAnalysis?.id}`,
})
);

return (
<ServiceContainerLoading
{...serviceContainerDeliverableAnalysisOperation}
title="Product Milestone Deliverable Analysis details"
>
<PageLayout
title="Deliverable Analysis details"
breadcrumbs={[
{
entity: breadcrumbData.deliverableAnalysisDetail.id,
title: serviceContainerDeliverableAnalysisOperation.data?.id,
},
]}
>
<ContentBox padding marginBottom isResponsive>
<Attributes>
<AttributesItem title={deliverableAnalysisOperationEntityAttributes.id.title}>
{deliverableAnalysis?.id}
</AttributesItem>
<AttributesItem title={deliverableAnalysisOperationEntityAttributes['productMilestone.version'].title}>
{deliverableAnalysis?.productMilestone && (
<ServiceContainerLoading
{...serviceContainerProductMilestone}
variant="inline"
title={EntityTitles.productMilestone}
>
<ServiceContainerLoading
{...serviceContainerProductVersion}
variant="inline"
title={EntityTitles.productVersion}
>
<ProductMilestoneReleaseLabel
link={`/products/${serviceContainerProductVersion.data?.product?.id}/versions/${serviceContainerProductVersion.data?.id}/milestones/${serviceContainerProductMilestone.data?.id}`}
productMilestoneRelease={serviceContainerProductMilestone.data!}
productName={serviceContainerProductVersion.data?.product?.name}
isCurrent={
serviceContainerProductVersion.data?.currentProductMilestone?.id ===
serviceContainerProductMilestone.data?.id
}
/>
</ServiceContainerLoading>
<ServiceContainerLoading {...serviceContainerDeliverableAnalysisOperation} title="Deliverable Analysis Details">
<ContentBox padding marginBottom isResponsive>
<Attributes>
<AttributesItem title={deliverableAnalysisOperationEntityAttributes.id.title}>{deliverableAnalysis?.id}</AttributesItem>
<AttributesItem title={deliverableAnalysisOperationEntityAttributes['productMilestone.version'].title}>
{deliverableAnalysis?.productMilestone && (
<ServiceContainerLoading
{...serviceContainerProductMilestone}
variant="inline"
title={EntityTitles.productMilestone}
>
<ServiceContainerLoading {...serviceContainerProductVersion} variant="inline" title={EntityTitles.productVersion}>
<ProductMilestoneReleaseLabel
link={`/products/${serviceContainerProductVersion.data?.product?.id}/versions/${serviceContainerProductVersion.data?.id}/milestones/${serviceContainerProductMilestone.data?.id}`}
productMilestoneRelease={serviceContainerProductMilestone.data!}
productName={serviceContainerProductVersion.data?.product?.name}
isCurrent={
serviceContainerProductVersion.data?.currentProductMilestone?.id ===
serviceContainerProductMilestone.data?.id
}
/>
</ServiceContainerLoading>
)}
</AttributesItem>
<AttributesItem title={deliverableAnalysisOperationEntityAttributes['user.username'].title}>
{deliverableAnalysis?.user?.username}
</AttributesItem>
<AttributesItem title={deliverableAnalysisOperationEntityAttributes.progressStatus.title}>
{deliverableAnalysis?.progressStatus && (
<DeliverableAnalysisProgressStatusLabelMapper progressStatus={deliverableAnalysis.progressStatus} />
)}
</AttributesItem>
<AttributesItem title={deliverableAnalysisOperationEntityAttributes.result.title}>
{deliverableAnalysis?.result && <DeliverableAnalysisResultLabelMapper result={deliverableAnalysis.result} />}
</AttributesItem>
<AttributesItem title={deliverableAnalysisOperationEntityAttributes.submitTime.title}>
{deliverableAnalysis?.submitTime && <DateTime date={deliverableAnalysis.submitTime} />}
</AttributesItem>
<AttributesItem title={deliverableAnalysisOperationEntityAttributes.startTime.title}>
{deliverableAnalysis?.startTime && <DateTime date={deliverableAnalysis.startTime} />}
</AttributesItem>
<AttributesItem title={deliverableAnalysisOperationEntityAttributes.endTime.title}>
{deliverableAnalysis?.endTime && <DateTime date={deliverableAnalysis.endTime} />}
</AttributesItem>
<AttributesItem title={deliverableAnalysisOperationEntityAttributes.parameters.title}>
{deliverableAnalysis?.parameters &&
Object.values(deliverableAnalysis.parameters).map((parameter, index) => <div key={index}>{parameter}</div>)}
</AttributesItem>
<AttributesItem title={deliverableAnalysisReportEntityAttributes.labels.title}>
{(serviceContainerDeliverableAnalysisReport.loading ||
serviceContainerDeliverableAnalysisReport.error ||
!!serviceContainerDeliverableAnalysisReport.data?.labels?.length) && (
<ServiceContainerLoading
{...serviceContainerDeliverableAnalysisReport}
variant="inline"
title={'Deliverable Analysis label'}
>
<div className="display-flex gap-5">
{serviceContainerDeliverableAnalysisReport.data?.labels?.map((label) => (
<DeliverableAnalysisLabelLabelMapper key={label} label={label} />
))}
</div>
</ServiceContainerLoading>
)}
</AttributesItem>
</Attributes>
</ContentBox>
</ServiceContainerLoading>
)}
</AttributesItem>
<AttributesItem title={deliverableAnalysisOperationEntityAttributes['user.username'].title}>
{deliverableAnalysis?.user?.username}
</AttributesItem>
<AttributesItem title={deliverableAnalysisOperationEntityAttributes.progressStatus.title}>
{deliverableAnalysis?.progressStatus && (
<DeliverableAnalysisProgressStatusLabelMapper progressStatus={deliverableAnalysis.progressStatus} />
)}
</AttributesItem>
<AttributesItem title={deliverableAnalysisOperationEntityAttributes.result.title}>
{deliverableAnalysis?.result && <DeliverableAnalysisResultLabelMapper result={deliverableAnalysis.result} />}
</AttributesItem>
<AttributesItem title={deliverableAnalysisOperationEntityAttributes.submitTime.title}>
{deliverableAnalysis?.submitTime && <DateTime date={deliverableAnalysis.submitTime} />}
</AttributesItem>
<AttributesItem title={deliverableAnalysisOperationEntityAttributes.startTime.title}>
{deliverableAnalysis?.startTime && <DateTime date={deliverableAnalysis.startTime} />}
</AttributesItem>
<AttributesItem title={deliverableAnalysisOperationEntityAttributes.endTime.title}>
{deliverableAnalysis?.endTime && <DateTime date={deliverableAnalysis.endTime} />}
</AttributesItem>
<AttributesItem title={deliverableAnalysisOperationEntityAttributes.parameters.title}>
{deliverableAnalysis?.parameters &&
Object.values(deliverableAnalysis.parameters).map((parameter, index) => <div key={index}>{parameter}</div>)}
</AttributesItem>
<AttributesItem title={deliverableAnalysisReportEntityAttributes.labels.title}>
{(serviceContainerDeliverableAnalysisReport.loading ||
serviceContainerDeliverableAnalysisReport.error ||
!!serviceContainerDeliverableAnalysisReport.data?.labels?.length) && (
<ServiceContainerLoading
{...serviceContainerDeliverableAnalysisReport}
variant="inline"
title={'Deliverable Analysis label'}
>
<div className="display-flex gap-5">
{serviceContainerDeliverableAnalysisReport.data?.labels?.map((label) => (
<DeliverableAnalysisLabelLabelMapper key={label} label={label} />
))}
</div>
</ServiceContainerLoading>
)}
</AttributesItem>
</Attributes>
</ContentBox>

<LogViewerSection deliverableAnalysis={deliverableAnalysis} />
</PageLayout>
<LogViewerSection deliverableAnalysis={deliverableAnalysis} />
</ServiceContainerLoading>
);
};
Expand Down
72 changes: 72 additions & 0 deletions src/components/DeliverableAnalysisPages/DeliverableAnalysisPages.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
import { PropsWithChildren, useEffect } from 'react';
import { Outlet } from 'react-router-dom';

import { breadcrumbData } from 'common/breadcrumbData';
import { TOTAL_COUNT_REQUEST_CONFIG } from 'common/constants';

import { useParamsRequired } from 'hooks/useParamsRequired';
import { useServiceContainer } from 'hooks/useServiceContainer';
import { useTitle } from 'hooks/useTitle';

import { PageLayout } from 'components/PageLayout/PageLayout';
import { PageTabs } from 'components/PageTabs/PageTabs';
import { PageTabsItem } from 'components/PageTabs/PageTabsItem';
import { PageTabsLabel } from 'components/PageTabs/PageTabsLabel';

import * as deliverableAnalysisApi from 'services/deliverableAnalysisApi';
import * as operationsApi from 'services/operationsApi';

import { generatePageTitle } from 'utils/titleHelper';

interface IDeliverableAnalysisPagesProps {}

export const DeliverableAnalysisPages = ({ children }: PropsWithChildren<IDeliverableAnalysisPagesProps>) => {
const { deliverableAnalysisId } = useParamsRequired();

const serviceContainerDeliverableAnalysis = useServiceContainer(operationsApi.getDeliverableAnalysis);

const serviceContainerArtifacts = useServiceContainer(deliverableAnalysisApi.getAnalyzedArtifacts);
const serviceContainerArtifactsRunner = serviceContainerArtifacts.run;

useEffect(() => {
serviceContainerArtifactsRunner({
serviceData: { id: deliverableAnalysisId },
requestConfig: TOTAL_COUNT_REQUEST_CONFIG,
});
}, [deliverableAnalysisId, serviceContainerArtifactsRunner]);

useTitle(
generatePageTitle({
serviceContainer: serviceContainerDeliverableAnalysis,
firstLevelEntity: 'Deliverable Analysis',
entityName: `Deliverable Analysis ${deliverableAnalysisId}`,
})
);

const pageTabs = (
<PageTabs>
<PageTabsItem url="details">Details</PageTabsItem>
<PageTabsItem url="delivered-artifacts">
Delivered Artifacts
<PageTabsLabel serviceContainer={serviceContainerArtifacts} title="Delivered Artifacts Count">
{serviceContainerArtifacts.data?.totalHits}
</PageTabsLabel>
</PageTabsItem>
</PageTabs>
);

return (
<PageLayout
title={`Deliverable Analysis ${deliverableAnalysisId}`}
breadcrumbs={[
{
entity: breadcrumbData.deliverableAnalysisDetail.id,
title: deliverableAnalysisId,
},
]}
tabs={pageTabs}
>
<Outlet />
</PageLayout>
);
};
19 changes: 18 additions & 1 deletion ...ponents/ProductMilestoneDeliveredArtifactsPage/ProductMilestoneDeliveredArtifactsPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import { Text, TextContent } from '@patternfly/react-core';
import { useCallback } from 'react';

import { useParamsRequired } from 'hooks/useParamsRequired';
import { useQueryParamsEffect } from 'hooks/useQueryParamsEffect';
import { useServiceContainer } from 'hooks/useServiceContainer';

import { ArtifactsList } from 'components/ArtifactsList/ArtifactsList';
import { Toolbar } from 'components/Toolbar/Toolbar';
import { ToolbarItem } from 'components/Toolbar/ToolbarItem';

import * as productMilestoneApi from 'services/productMilestoneApi';

Expand All @@ -26,5 +29,19 @@ export const ProductMilestoneDeliveredArtifactsPage = ({ componentId = 'd1' }: I
{ componentId }
);

return <ArtifactsList {...{ serviceContainerArtifacts, componentId }} />;
return (
<>
<Toolbar>
<ToolbarItem reservedWidth>
<TextContent>
<Text component="h2">Delivered Artifacts</Text>
<Text>
This list contains Artifacts delivered in the current Milestone. Each Artifact is represented by a PNC Identifier.
</Text>
</TextContent>
</ToolbarItem>
</Toolbar>
<ArtifactsList {...{ serviceContainerArtifacts, componentId }} />;
</>
);
};
Loading
Loading