Skip to content
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

NCL-7816 Integrate Product Milestone Comparison REST API #619

Merged
merged 3 commits into from
Feb 12, 2025
Merged

NCL-7816 Integrate Product Milestone Comparison REST API #619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
757f8b6
NCL-7816 Update pnc-api-types-ts package to v3.1.3 latest snapshot
patrikk0123 Feb 12, 2025
0faaa69
NCL-7816 Connect Product Milestone Comparison to REST API
patrikk0123 Jan 30, 2025
5290107
NCL-7816 Fix ServiceContainerLoading to consider empty Array DTO in '…
patrikk0123 Jan 30, 2025
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
2 changes: 1 addition & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
"graphology-layout": "^0.6.1",
"graphology-layout-forceatlas2": "^0.10.1",
"lodash-es": "^4.17.21",
"pnc-api-types-ts": "project-ncl/pnc-api-types-ts#v3.1.3-SNAPSHOT-pnc-2a93ac3",
"pnc-api-types-ts": "project-ncl/pnc-api-types-ts#v3.1.3-SNAPSHOT-pnc-7abd9ec33",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-router-dom": "^6.12.1",
Expand Down
24 changes: 9 additions & 15 deletions src/AppLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ import { useServiceContainer } from 'hooks/useServiceContainer';
import { StorageKeys, useStorage } from 'hooks/useStorage';

import { DropdownLinkItem } from 'components/Dropdown/DropdownLinkItem';
import { ExperimentalContent } from 'components/ExperimentalContent/ExperimentalContent';
import { ExperimentalContentMarker } from 'components/ExperimentalContent/ExperimentalContentMarker';
import { ProtectedComponent } from 'components/ProtectedContent/ProtectedComponent';
import { OldUIAnnouncement } from 'components/TopBar/OldUIAnnouncement';
import { TopBarAnnouncement } from 'components/TopBar/TopBarAnnouncement';
Expand Down Expand Up @@ -335,19 +333,15 @@ export const AppLayout = () => {
<Link to="/scm-repositories">SCM Repositories</Link>
</NavItem>

<ExperimentalContent>
<ExperimentalContentMarker dataSource="mock" contentType="text" showTooltip>
<NavExpandable title="Insights" groupId="insights" isActive={pathname.includes('/product-milestone-comparison')}>
<NavItem
groupId="insights"
itemId="insights_product-milestone-comparison"
isActive={pathname.includes('/product-milestone-comparison')}
>
<Link to="/insights/product-milestone-comparison">Product Milestone Comparison</Link>
</NavItem>
</NavExpandable>
</ExperimentalContentMarker>
</ExperimentalContent>
<NavExpandable title="Insights" groupId="insights" isActive={pathname.includes('/product-milestone-comparison')}>
<NavItem
groupId="insights"
itemId="insights_product-milestone-comparison"
isActive={pathname.includes('/product-milestone-comparison')}
>
<Link to="/insights/product-milestone-comparison">Product Milestone Comparison</Link>
</NavItem>
</NavExpandable>
</NavList>
</Nav>
);
Expand Down
9 changes: 1 addition & 8 deletions src/AppRoutes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,14 +403,7 @@ export const AppRoutes = (
/>
</Route>
<Route path="insights">
<Route
path="product-milestone-comparison"
element={
<ExperimentalContent isRouteVariant>
<ProductMilestoneComparisonPage />
</ExperimentalContent>
}
/>
<Route path="product-milestone-comparison" element={<ProductMilestoneComparisonPage />} />
</Route>
<Route path="about" element={<AboutPage />} />
<Route path="preferences" element={<PreferencesPage />} />
Expand Down
18 changes: 4 additions & 14 deletions src/components/ProductMilestoneComparisonPage/ProductMilestoneComparisonPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,12 @@ import { PageTitles } from 'common/constants';
import { useServiceContainer } from 'hooks/useServiceContainer';
import { useTitle } from 'hooks/useTitle';

import { ExperimentalContent } from 'components/ExperimentalContent/ExperimentalContent';
import { ExperimentalContentMarker } from 'components/ExperimentalContent/ExperimentalContentMarker';
import { PageLayout } from 'components/PageLayout/PageLayout';
import { ProductMilestoneComparisonTable } from 'components/ProductMilestoneComparisonTable/ProductMilestoneComparisonTable';

import * as productMilestoneApi from 'services/productMilestoneApi';

interface IProductMilestoneComparisonPageProps {
componentId?: string;
}

export const ProductMilestoneComparisonPage = ({ componentId = 't1' }: IProductMilestoneComparisonPageProps) => {
export const ProductMilestoneComparisonPage = () => {
const serviceContainerProductMilestoneComparisonTable = useServiceContainer(productMilestoneApi.getProductMilestoneComparison);

useTitle(PageTitles.productMilestoneComparison);
Expand All @@ -26,16 +20,12 @@ export const ProductMilestoneComparisonPage = ({ componentId = 't1' }: IProductM
title={PageTitles.productMilestoneComparison}
description={
<>
List of Delivered Artifacts, for example <Label>regexp:regexp:jar</Label>, and their versions in selected Product
Milestones, for example <Label>Red Hat Single Sign-On 7.1.2.CR1</Label>.
List of Delivered Artifact prefixes, for example <Label>regexp:regexp:jar</Label>, and versions they were delivered in
selected Product Milestones, for example <Label>Red Hat Single Sign-On 7.1.2.CR1</Label>.
</>
}
>
<ExperimentalContent>
<ExperimentalContentMarker dataSource="mock" contentType="box" showTooltip>
<ProductMilestoneComparisonTable {...{ serviceContainerProductMilestoneComparisonTable, componentId }} />
</ExperimentalContentMarker>
</ExperimentalContent>
<ProductMilestoneComparisonTable {...{ serviceContainerProductMilestoneComparisonTable }} />
</PageLayout>
);
};
Loading