Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions webpack/ForemanRhCloudPages.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import ForemanInventoryUpload from './ForemanInventoryUpload';
import InsightsVulnerabilityListPage from './InsightsVulnerability/InsightsVulnerabilityListPage';
import InsightsCloudSync from './InsightsCloudSync';
import IopRecommendationDetails from './IopRecommendationDetails/IopRecommendationDetails';
import IopPathwayDetails from './IopPathwayDetails/IopPathwayDetails';
import InsightsHostDetailsTab from './InsightsHostDetailsTab';
import CveDetailsPage from './CveDetailsPage';
import InsightsComplianceReportsPage from './InsightsCompliance/InsightsComplianceReportsPage';
Expand Down Expand Up @@ -41,6 +42,11 @@ export const routes = [
exact: true,
render: props => <InsightsCloudSync {...props} />,
},
{
path: '/foreman_rh_cloud/recommendations/pathways/:slug',
exact: false,
render: props => <IopPathwayDetails {...props} />,
},
{
path: '/foreman_rh_cloud/recommendations',
exact: false,
Expand Down
40 changes: 40 additions & 0 deletions webpack/IopPathwayDetails/IopPathwayDetails.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
import React from 'react';
import { useRouteMatch } from 'react-router-dom';
import { ScalprumComponent, ScalprumProvider } from '@scalprum/react-core';

import RemediationModal from '../InsightsCloudSync/Components/RemediationModal';
import { createProviderOptions } from '../common/ScalprumModule/ScalprumContext';
import { useInsightsPermissions } from '../common/Hooks/PermissionsHooks';

const scope = 'advisor';
const pathwayModule = './PathwayDetailsWrapped';

const IopPathwayDetails = props => {
const pathwayMatch = useRouteMatch(
'/foreman_rh_cloud/recommendations/pathways/:slug'
);
const slug = pathwayMatch?.params?.slug;
Comment thread
jeremylenz marked this conversation as resolved.

return (
<div className="iop-pathway-details-scalprum advisor">
<ScalprumComponent
scope={scope}
module={pathwayModule}
pathwayId={slug}
IopRemediationModal={RemediationModal}
{...props}
/>
</div>
);
};

const IopPathwayDetailsWrapped = props => {
const permissions = useInsightsPermissions();
return (
<ScalprumProvider {...createProviderOptions(permissions)}>
<IopPathwayDetails {...props} />
</ScalprumProvider>
);
};

export default IopPathwayDetailsWrapped;
18 changes: 0 additions & 18 deletions webpack/IopRecommendationDetails/IopRecommendationDetails.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,12 @@ import { useInsightsPermissions } from '../common/Hooks/PermissionsHooks';

const scope = 'advisor';
const module = './RecommendationDetailsWrapped';
const pathwayModule = './PathwayDetailsWrapped';

const IopRecommendationDetails = props => {
const pathwayMatch = useRouteMatch(
'/foreman_rh_cloud/recommendations/pathways/:slug'
);
const urlParams = useRouteMatch('/foreman_rh_cloud/recommendations/:rule_id');
// eslint-disable-next-line camelcase
const ruleId = urlParams?.params?.rule_id;

if (pathwayMatch) {
return (
<div className="iop-pathway-details-scalprum advisor">
<ScalprumComponent
scope={scope}
module={pathwayModule}
pathwayId={pathwayMatch.params.slug}
IopRemediationModal={RemediationModal}
{...props}
/>
</div>
);
}

return (
<div className="iop-recommendation-details-scalprum advisor">
<ScalprumComponent
Expand Down
Loading