Merge remote-tracking branch 'upstream/master'

RedHatInsights · Jul 14, 2023 · ddf5246 · ddf5246
2 parents 06fa0f8 + ce1e2e0
commit ddf5246
Show file tree

Hide file tree

Showing 90 changed files with 974 additions and 3,830 deletions.
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -1,3 +1,5 @@
 exclude_patterns:
   - "src/__fixtures__/*.js"
   - "src/**/*.test.js"
+  - "src/**/*.cy.js"
+
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -16,7 +16,7 @@
     "@redhat-cloud-services/frontend-components-notifications": "^3.2.12",
     "@redhat-cloud-services/frontend-components-pdf-generator": "^2.6.18",
     "@redhat-cloud-services/frontend-components-remediations": "^3.2.8",
-    "@redhat-cloud-services/frontend-components-utilities": "^3.5.0",
+    "@redhat-cloud-services/frontend-components-utilities": "^3.7.3",
     "@redhat-cloud-services/host-inventory-client": "^1.0.114",
     "@types/react": "^17.0.50",
     "apollo-boost": "^0.4.9",
@@ -62,8 +62,7 @@
     "roots": [
       "<rootDir>/src/"
     ],
-    "transformIgnorePatterns": [
-    ],
+    "transformIgnorePatterns": [],
     "moduleNameMapper": {
       "\\.(css|scss)$": "identity-obj-proxy",
       "^SmartComponents$": "<rootDir>/src/SmartComponents",

diff --git a/pr_check.sh b/pr_check.sh
@@ -23,7 +23,7 @@ export DEPLOY_FRONTENDS="true"
 export IQE_ENV="ephemeral"
 export IQE_SELENIUM="true"
 export IQE_CJI_TIMEOUT="30m"
-export REF_ENV="insights-stage"
+export REF_ENV="insights-production"
 export COMPONENTS_W_RESOURCES="compliance"
 export COMPONENT_NAME="compliance-frontend"
 

diff --git a/src/PresentationalComponents/ComplianceRemediationButton/constants.js b/src/PresentationalComponents/ComplianceRemediationButton/constants.js
@@ -4,7 +4,7 @@ export const DEFAULT_SYSTEMS_PER_BATCH = 3;
 export const DEFAULT_CONNCURRENT_REQUESTS_FOR_ISSUES = 3;
 
 export const GET_SYSTEMS_ISSUES = gql`
-  query getSystems(
+  query CRB_Systems(
     $filter: String!
     $policyId: ID
     $perPage: Int

diff --git a/src/PresentationalComponents/RulesTable/RulesTable.js b/src/PresentationalComponents/RulesTable/RulesTable.js
@@ -75,7 +75,6 @@ const RulesTable = ({
       items={rules}
       columns={columns}
       isStickyHeader
-      variant={ruleGroups ? 'compact' : 'default'}
       filters={{
         filterConfig: buildFilterConfig({
           showRuleStateFilter,

diff --git a/src/PresentationalComponents/RulesTable/__snapshots__/RulesTable.test.js.snap b/src/PresentationalComponents/RulesTable/__snapshots__/RulesTable.test.js.snap
@@ -456,7 +456,6 @@ exports[`RulesTable expect to pass on options 1`] = `
       "selectedFilter": false,
     }
   }
-  variant="default"
 />
 `;
 
@@ -915,6 +914,5 @@ exports[`RulesTable expect to render without error 1`] = `
       "selectedFilter": false,
     }
   }
-  variant="default"
 />
 `;
diff --git a/...alComponents/SupportedSSGVersionsLink/__snapshots__/SupportedSSGVersionsLink.test.js.snap b/...alComponents/SupportedSSGVersionsLink/__snapshots__/SupportedSSGVersionsLink.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`SupportedSSGVersionsLink expect to render without error 1`] = `
 <a
-  href="https://access.redhat.com/documentation/en-us/red_hat_insights/2023/html/assessing_and_monitoring_security_policy_compliance_of_rhel_systems/con-compl-assess-overview_compl-assess-overview#con-compl-assess-supported-configurations_compl-assess-overview"
+  href="https://access.redhat.com/articles/6644131"
   rel="noopener noreferrer"
   target="_blank"
 >

diff --git a/src/PresentationalComponents/TabbedRules/ProfileTabContent.js b/src/PresentationalComponents/TabbedRules/ProfileTabContent.js
@@ -25,6 +25,7 @@ import OsVersionText from './OsVersionText';
 import { Link } from 'react-router-dom';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons';
 import ResetRules from '../ResetRules/ResetRules';
+import useFeature from 'Utilities/hooks/useFeature';
 
 const ProfileSystemCount = ({ count = 0 }) => (
   <Badge isRead>{`${count} ${pluralize(count, 'system')}`}</Badge>
@@ -74,11 +75,10 @@ SSGPopoverBody.propTypes = {
 };
 
 const BENCHMARK_QUERY = gql`
-  query benchmarkQuery($id: String!) {
+  query PTC_Benchmark($id: String!) {
     benchmark(id: $id) {
       id
       osMajorVersion
-      ruleTree
       rules {
         id
         title
@@ -90,14 +90,6 @@ const BENCHMARK_QUERY = gql`
         identifier
         values
       }
-      valueDefinitions {
-        defaultValue
-        description
-        id
-        refId
-        title
-        valueType
-      }
     }
   }
 `;
@@ -116,13 +108,16 @@ const ProfileTabContent = ({
   ruleValues,
   onRuleValueReset,
 }) => {
+  const ruleGroups = useFeature('ruleGroups');
+
   const {
     data: benchmark,
     error,
     loading,
   } = useQuery(BENCHMARK_QUERY, {
     variables: {
       id: profile.benchmark.id,
+      enableRuleTree: ruleGroups,
     },
     skip: !handleSelect || !profile.benchmark?.id,
   });

diff --git a/src/SmartComponents/CompliancePolicies/CompliancePolicies.cy.js b/src/SmartComponents/CompliancePolicies/CompliancePolicies.cy.js
@@ -421,7 +421,7 @@ describe('Policies table tests', () => {
 
     it('Row actions has correct items', () => {
       cy.ouiaType('PF4/TableRow', 'tr')
-        .get('td[data-key="5"] >> button')
+        .get('td[data-key="6"] >> button')
         .first()
         .click();
       cy.ouiaType('PF4/TableRow', 'tr')

diff --git a/src/SmartComponents/CreatePolicy/CreatePolicy.js b/src/SmartComponents/CreatePolicy/CreatePolicy.js
@@ -97,7 +97,7 @@ export const CreatePolicyForm = ({
   return (
     <React.Fragment>
       <Wizard
-        width={1220}
+        width={1300}
         className="compliance"
         isOpen
         onNext={onNext}