Merge branch 'master' into pdf-export

Author: mkholjuraev

packages/advisor-components/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@redhat-cloud-services/frontend-components-advisor-components",
-    "version": "1.0.14",
+    "version": "1.0.15",
     "description": "Components to be used in Advisor applications and integrations.",
     "main": "index.js",
     "module": "esm/index.js",

packages/advisor-components/src/RuleDetails/RuleDetails.scss

@@ -8,9 +8,3 @@
     font-size: var(--pf-global--FontSize--sm);
   }
 }
-
-.topicsCard {
-  background-color: var(--pf-global--BackgroundColor--150);
-  box-shadow: none;
-  word-break: break-word;
-}

packages/advisor-components/src/RuleDetails/RuleDetails.tsx

@@ -10,20 +10,13 @@ import { SeverityLine } from '@redhat-cloud-services/frontend-components-charts/
 
 import RebootRequired from '../RebootRequired/RebootRequired';
 import RuleRating from '../RuleRating/RuleRating';
-import { barDividedList, topicLinks } from '../common';
 import { AdvisorProduct, Rating, RuleContentOcp, RuleContentRhel, TopicRhel } from '../types';
-import { ViewAffectedLink } from '../ViewAffectedLink';
 import { RuleDescription } from '../RuleDescription';
 
 export type Message = React.ReactNode;
 export type RuleDetailsMessages = {
   systemReboot: Message;
-  // RHEL
-  viewAffectedSystems?: Message;
-  // OCP
-  viewAffectedClusters?: Message;
   knowledgebaseArticle: Message;
-  topicRelatedToRule: Message;
   totalRisk: Message;
   rulesDetailsTotalRiskBody: Message;
   likelihoodLevel: Message;
@@ -46,16 +39,15 @@ export interface RuleDetailsProps {
   header?: React.ReactNode;
   isDetailsPage: boolean;
   children?: React.ReactNode;
-  topics?: TopicRhel[];
   /**
    * onVoteClick - a callback used to update the rating of a particular rule
    * @param {string} ruleId - ID (usually in plugin|error_key format) of the rule that needs to be updated
    * @param {number} newRating rating (-1, 0, 1)
    */
   onVoteClick?: (ruleId: string, calculatedRating: Rating) => unknown;
-  showViewAffected?: boolean;
-  linkComponent?: any;
   knowledgebaseUrl?: string;
+  Topics?: React.ReactNode;
+  ViewAffectedLink?: React.ReactNode;
 }
 
 const RuleDetails: React.FC<RuleDetailsProps> = ({
@@ -64,14 +56,13 @@ const RuleDetails: React.FC<RuleDetailsProps> = ({
   header,
   rule,
   isDetailsPage,
-  topics,
   onVoteClick,
-  showViewAffected,
   resolutionRisk,
   resolutionRiskDesc,
   children,
-  linkComponent: Link,
   knowledgebaseUrl,
+  Topics,
+  ViewAffectedLink,
 }) => (
   <Flex
     className="ins-c-rule-details"
@@ -92,23 +83,13 @@ const RuleDetails: React.FC<RuleDetailsProps> = ({
             </a>
           </StackItem>
         )}
-        {topics && rule.tags && topicLinks(rule as RuleContentRhel, topics, Link).length > 0 && (
-          <StackItem className="ins-c-rule-details__topics">
-            <strong>{messages.topicRelatedToRule}</strong>
-            <br />
-            {barDividedList(topicLinks(rule as RuleContentRhel, topics, Link))}
-          </StackItem>
-        )}
+        {Topics && <StackItem className="ins-c-rule-details__topics">{Topics}</StackItem>}
         {isDetailsPage && onVoteClick && (
           <StackItem className="ins-c-rule-details__vote">
             <RuleRating messages={messages} ruleId={rule.rule_id} ruleRating={rule.rating} onVoteClick={onVoteClick} />
           </StackItem>
         )}
-        {!isDetailsPage && showViewAffected && Link && (
-          <StackItem className="ins-c-rule-details__view-affected">
-            <ViewAffectedLink messages={messages} rule={rule} product={product} linkComponent={Link} />
-          </StackItem>
-        )}
+        {ViewAffectedLink && <StackItem className="ins-c-rule-details__view-affected">{ViewAffectedLink}</StackItem>}
       </Stack>
     </FlexItem>
     <FlexItem align={{ lg: 'alignRight' }}>

packages/advisor-components/src/ViewAffectedLink/ViewAffectedLink.tsx

@@ -1,10 +1,13 @@
 import React from 'react';
 
-import { RuleDetailsMessages } from '../RuleDetails/RuleDetails';
+import { Message } from '../RuleDetails/RuleDetails';
 import { AdvisorProduct, RuleContentOcp, RuleContentRhel } from '../types';
 
 interface ViewAffectedLinkProps {
-  messages: RuleDetailsMessages;
+  messages: {
+    viewAffectedClusters: Message;
+    viewAffectedSystems: Message;
+  };
   product: AdvisorProduct;
   rule: RuleContentOcp | RuleContentRhel;
   linkComponent: any;

packages/components/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@redhat-cloud-services/frontend-components",
-    "version": "3.11.0",
+    "version": "3.11.2",
     "description": "Common components for RedHat Cloud Services project.",
     "main": "index.js",
     "module": "esm/index.js",

packages/components/src/CullingInfo/CullingInformation.scss

@@ -1,4 +1,4 @@
-.ins-c-inventory__culling-warning { color: var(--pf-global--warning-color--100); }
+.ins-c-inventory__culling-warning { color: var(--pf-global--warning-color--200); }
 
 .ins-c-inventory__culling-danger { color: var(--pf-global--danger-color--100); }
 

packages/utils/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@redhat-cloud-services/frontend-components-utilities",
-    "version": "3.7.1",
+    "version": "3.7.2",
     "description": "Util functions for RedHat Cloud Services project.",
     "main": "index.js",
     "module": "esm/index.js",