@openshift-assisted/ui-lib 2.54.0 → 2.54.2

package/lib/cim/components/InfraEnv/InfraEnvFormPage.tsx

@@ -213,7 +213,7 @@ const InfraEnvForm: React.FC<React.PropsWithChildren<InfraEnvFormProps>> = ({
                                   window.open(
                                     getOCPStaticIPDocLink(docVersion),
                                     '_blank',
-                                    'noopener',
+                                    'noopener,noreferrer',
                                   )
                                 }
                               >

package/lib/cim/components/modals/CimConfiguration/CimStorageMissingAlert.tsx

@@ -23,7 +23,10 @@ export const CimStorageMissingAlert: React.FC<{
     <AlertActionLink key="install-storage-operator" onClick={() => navigate(storageOperatorUrl)}>
       {t('ai:Install storage operator')}
     </AlertActionLink>,
-    <AlertActionLink key="storage-class" onClick={() => window.open(docStorageUrl, '_blank')}>
+    <AlertActionLink
+      key="storage-class"
+      onClick={() => window.open(docStorageUrl, '_blank', 'noopener,noreferrer')}
+    >
       {contentWorkaround as unknown as string}
     </AlertActionLink>,
   ];

package/lib/common/components/clusterConfiguration/DiscoveryImageConfigForm.tsx

@@ -46,7 +46,9 @@ export const StaticIPInfo = ({ docVersion }: { docVersion?: string }) => {
         icon={<ExternalLinkAltIcon />}
         iconPosition="right"
         isInline
-        onClick={() => window.open(getOCPStaticIPDocLink(docVersion), '_blank', 'noopener')}
+        onClick={() =>
+          window.open(getOCPStaticIPDocLink(docVersion), '_blank', 'noopener,noreferrer')
+        }
       >
         {t('ai:View documentation')}
       </Button>

package/lib/common/components/clusterConfiguration/DownloadIso.tsx

@@ -45,7 +45,7 @@ const DownloadIso = ({
 
   const openCiscoIntersightHostsLink = (downloadUrl: string) => {
     updateTagsForCiscoIntersight ? updateTagsForCiscoIntersight() : '';
-    window.open(getCiscoIntersightLink(downloadUrl, ciscoUrl), '_blank', 'noopener');
+    window.open(getCiscoIntersightLink(downloadUrl, ciscoUrl), '_blank', 'noopener,noreferrer');
   };
 
   return (

package/lib/common/components/clusterDetail/ConsoleModal.tsx

@@ -138,7 +138,7 @@ export const ConsoleModal: React.FC<ConsoleModalProps> = ({
       type="submit"
       key="launch"
       variant={ButtonVariant.primary}
-      onClick={() => window.open(consoleUrl, '_blank', 'noopener')}
+      onClick={() => window.open(consoleUrl, '_blank', 'noopener,noreferrer')}
       isDisabled={!consoleUrl}
     >
       {t('ai:Launch OpenShift Console')}

package/lib/common/components/hosts/utils.ts

@@ -263,7 +263,14 @@ export const areOnlySoftValidationsFailing = (validationsInfo: HostValidationsIn
   );
   if (!failingValidationIds.length) return false;
   for (const id of failingValidationIds) {
-    if (!['ntp-synced', 'container-images-available', 'mtu-valid'].includes(id)) {
+    if (
+      ![
+        'ntp-synced',
+        'container-images-available',
+        'mtu-valid',
+        'inventory-not-partially-truncated',
+      ].includes(id)
+    ) {
       return false;
     }
   }

package/lib/common/config/constants.ts

@@ -92,6 +92,8 @@ export const hostValidationLabels = (t: TFunction): { [key in HostValidationId]:
   'sufficient-network-latency-requirement-for-role': t('ai:Network latency'),
   'sufficient-packet-loss-requirement-for-role': t('ai:Packet loss'),
   'has-inventory': t('ai:Hardware information'),
+  'inventory-not-partially-truncated': t('ai:Inventory partially truncated'),
+  'inventory-not-fully-truncated': t('ai:Inventory fully truncated'),
   'has-min-cpu-cores': t('ai:Minimum CPU cores'),
   'has-min-memory': t('ai:Minimum Memory'),
   'has-min-valid-disks': t('ai:Minimum disks of required size'),
@@ -163,6 +165,8 @@ export const hostValidationFailureHints = (
   'sufficient-network-latency-requirement-for-role': '',
   'sufficient-packet-loss-requirement-for-role': '',
   'has-inventory': '',
+  'inventory-not-partially-truncated': '',
+  'inventory-not-fully-truncated': '',
   'has-min-cpu-cores': '',
   'has-min-memory': '',
   'has-min-valid-disks': '',

package/lib/common/config/docs_links.ts

@@ -150,10 +150,11 @@ export const CHANGE_ISO_PASSWORD_FILE_LINK =
   'https://raw.githubusercontent.com/openshift/assisted-service/master/docs/change-iso-password.sh';
 
 export const getCiscoIntersightLink = (downloadIsoUrl: string, ciscoUrl?: string) => {
+  const isoUrl = encodeURIComponent(downloadIsoUrl);
   if (ciscoUrl) {
-    return `${ciscoUrl}?_workflow_Version=1&IsoUrl=${downloadIsoUrl}`;
+    return `${ciscoUrl}?_workflow_Version=1&IsoUrl=${isoUrl}`;
   }
-  return `https://www.intersight.com/an/workflow/workflow-definitions/execute/AddServersFromISO?_workflow_Version=1&IsoUrl=${downloadIsoUrl}`;
+  return `https://www.intersight.com/an/workflow/workflow-definitions/execute/AddServersFromISO?_workflow_Version=1&IsoUrl=${isoUrl}`;
 };
 
 export const MTV_LINK =

package/lib/common/selectors/clusterSelectors.ts

@@ -44,6 +44,13 @@ export const selectOlmOperators = (cluster?: Pick<Cluster, 'monitoredOperators'>
   );
 };
 
+// Includes dependency-only operators
+export const selectAllOlmOperators = (cluster?: Pick<Cluster, 'monitoredOperators'>) => {
+  return selectMonitoredOperators(cluster?.monitoredOperators).filter(
+    (operator) => operator.operatorType === 'olm' && !!operator.name,
+  );
+};
+
 export const hasEnabledOperators = (
   monitoredOperators: Cluster['monitoredOperators'],
   searchOperator: string,

package/lib/common/utils.ts

@@ -90,6 +90,9 @@ export const stringToJSON = <T>(jsonString: string | undefined): T | undefined =
 export const downloadFile = (fileUrl?: string, dataBlob?: Blob, fileName?: string) => {
   const link = document.createElement('a');
   if (fileUrl && fileUrl !== '') {
+    if (!/^(https?|blob):/i.test(fileUrl)) {
+      return;
+    }
     link.setAttribute('href', fileUrl);
   }
   if (dataBlob) {

package/lib/ocm/components/clusterConfiguration/OcmClusterProgressItems.tsx

@@ -4,7 +4,7 @@ import {
   EventListFetchProps,
   getEnabledHosts,
   RenderIf,
-  selectOlmOperators,
+  selectAllOlmOperators,
 } from '../../../common';
 import { FinalizingProgress } from '../../../common/components/clusterDetail/FinalizingProgress';
 import { ProgressBarTexts } from '../../../common/components/clusterDetail/ProgressBarTexts';
@@ -26,7 +26,7 @@ const OcmClusterProgressItems = ({
   fallbackEventsURL,
 }: OcmClusterProgressItemsProps) => {
   const enabledHosts = getEnabledHosts(cluster.hosts);
-  const olmOperators = selectOlmOperators(cluster);
+  const olmOperators = selectAllOlmOperators(cluster);
 
   const masterHosts = enabledHosts.filter((host) => host.role && 'master' === host.role);
   const workerHosts = enabledHosts.filter((host) => host.role && 'worker' === host.role);

package/lib/ocm/components/clusterConfiguration/operators/OperatorCheckbox.tsx

@@ -24,7 +24,6 @@ import {
 import NewFeatureSupportLevelBadge from '../../../../common/components/newFeatureSupportLevels/NewFeatureSupportLevelBadge';
 import { getFieldId, OperatorsValues, PopoverIcon } from '../../../../common';
 import { useNewFeatureSupportLevel } from '../../../../common/components/newFeatureSupportLevels';
-import { getNewOperators } from './utils';
 import {
   highlightMatch,
   OperatorSpec,
@@ -110,8 +109,10 @@ const OperatorRequirements = ({
 
 const OperatorCheckbox = ({
   bundles,
+  checkedOperatorIds,
   cluster,
   operatorId,
+  isChecked,
   title,
   featureId,
   notStandalone,
@@ -122,8 +123,10 @@ const OperatorCheckbox = ({
   searchTerm,
 }: {
   bundles: Bundle[];
+  checkedOperatorIds: Set<string>;
   cluster: Cluster;
   operatorId: string;
+  isChecked: boolean;
   openshiftVersion?: string;
   preflightRequirements: PreflightHardwareRequirements | undefined;
   searchTerm?: string;
@@ -135,52 +138,54 @@ const OperatorCheckbox = ({
   const { values, setFieldValue } = useFormikContext<OperatorsValues>();
   const fieldId = getFieldId(operatorId, 'input');
   const supportLevel = getFeatureSupportLevel(featureId);
+  const getDisabledReason = (): string | undefined => {
+    const featureDisabledReason = getFeatureDisabledReason(featureId);
+    if (featureDisabledReason) {
+      return featureDisabledReason;
+    }
+
+    const isRequiredByBundle = values.selectedBundles.some(
+      (selectedBundle) =>
+        !!bundles
+          .find((bundle) => bundle.id === selectedBundle.id)
+          ?.operators?.includes(operatorId),
+    );
+    if (isRequiredByBundle) {
+      return 'This operator is part of a selected bundle and cannot be deselected.';
+    }
 
-  const isRequiredByBundle = values.selectedBundles.some(
-    (selectedBundle) =>
-      !!bundles.find((bundle) => bundle.id === selectedBundle.id)?.operators?.includes(operatorId),
-  );
-  const isSelectedForBundle = values.selectedBundles.some((selectedBundle) =>
-    selectedBundle.optionalOperators?.includes(operatorId),
-  );
-  const isInBundle = isRequiredByBundle || isSelectedForBundle;
-
-  const isOperatorActive = (opName: string) =>
-    values.selectedOperators.includes(opName) ||
-    values.selectedBundles.some((selectedBundle) => {
-      const bundle = bundles.find(({ id }) => id === selectedBundle.id);
-      return (
-        bundle?.operators?.includes(opName) || selectedBundle.optionalOperators?.includes(opName)
-      );
-    });
-
-  const isChecked = values.selectedOperators.includes(operatorId) || isInBundle;
-
-  const parentOperator = preflightRequirements?.operators?.find(
-    (op) =>
-      !!op.operatorName &&
-      op.dependencies?.includes(operatorId) &&
-      isOperatorActive(op.operatorName),
-  );
-
-  let requiredByOperatorName = '';
-  if (parentOperator?.operatorName) {
-    requiredByOperatorName =
-      opSpecs[parentOperator.operatorName]?.title || parentOperator.operatorName;
-  }
-
-  let disabledReason = getFeatureDisabledReason(featureId);
-
-  if (isRequiredByBundle) {
-    disabledReason = 'This operator is part of a selected bundle and cannot be deselected.';
-  } else if (isSelectedForBundle) {
-    disabledReason =
-      'This optional operator is selected through a bundle. Use the bundle card to change it.';
-  } else if (requiredByOperatorName) {
-    disabledReason = `This operator is required by ${requiredByOperatorName}`;
-  } else if (notStandalone && !values.selectedOperators.includes(operatorId)) {
-    disabledReason = 'This operator cannot be installed as a standalone';
-  }
+    const isOptionallySelectedForBundle = values.selectedBundles.some((selectedBundle) =>
+      selectedBundle.optionalOperators?.includes(operatorId),
+    );
+    if (isOptionallySelectedForBundle) {
+      return 'This optional operator is selected through a bundle. Use the bundle card to change it.';
+    }
+
+    const parentOperator = preflightRequirements?.operators?.find(
+      ({ operatorName, dependencies }) =>
+        !!operatorName &&
+        dependencies?.includes(operatorId) &&
+        checkedOperatorIds.has(operatorName),
+    );
+    if (parentOperator?.operatorName) {
+      const parentName = opSpecs[parentOperator.operatorName]?.title || parentOperator.operatorName;
+      return `This operator is required by ${parentName}`;
+    }
+
+    if (notStandalone && !checkedOperatorIds.has(operatorId)) {
+      return 'This operator cannot be installed as a standalone';
+    }
+
+    return undefined;
+  };
+
+  const disabledReason = getDisabledReason();
+  const handleClick = (_: React.FormEvent, checked: boolean) => {
+    const next = checked
+      ? [...values.selectedOperators, operatorId]
+      : values.selectedOperators.filter((op) => op !== operatorId);
+    setFieldValue('selectedOperators', next);
+  };
 
   return (
     <FormGroup fieldId={fieldId} id={`form-control__${fieldId}`}>
@@ -202,18 +207,7 @@ const OperatorCheckbox = ({
         }
         aria-describedby={`${fieldId}-helper`}
         isChecked={isChecked}
-        onChange={(_, checked) => {
-          setFieldValue(
-            'selectedOperators',
-            getNewOperators(
-              values.selectedOperators,
-              operatorId,
-              preflightRequirements,
-              checked,
-              opSpecs,
-            ),
-          );
-        }}
+        onChange={handleClick}
         isDisabled={isViewerMode || !!disabledReason}
         description={
           !!Description && (

package/lib/ocm/components/clusterConfiguration/operators/utils.tsx

@@ -3,9 +3,7 @@ import {
   Bundle,
   PreflightHardwareRequirements,
 } from '@openshift-assisted/types/assisted-installer-service';
-import { OperatorSpec } from '../../../../common/components/operators/operatorSpecs';
-
-const getOperatorDependencies = (
+export const getOperatorDependencies = (
   operatorId: string,
   preflightRequirements: PreflightHardwareRequirements | undefined,
   dependencies: Set<string> = new Set(),
@@ -26,36 +24,6 @@ const getOperatorDependencies = (
   return [...dependencies];
 };
 
-export const getNewOperators = (
-  currentOperators: string[],
-  operatorId: string,
-  preflightRequirements: PreflightHardwareRequirements | undefined,
-  add: boolean,
-  opSpecs: { [key: string]: OperatorSpec },
-): string[] => {
-  const dependencies = getOperatorDependencies(operatorId, preflightRequirements);
-
-  if (add) {
-    const uniqueOps = new Set([...currentOperators, ...dependencies, operatorId]);
-    return Array.from(uniqueOps);
-  }
-
-  const newOperators = currentOperators.filter((op) => op !== operatorId);
-  const notStandaloneDeps = dependencies
-    .filter((dep) => opSpecs[dep]?.notStandalone)
-    .filter((dep) => {
-      const hasDependency = newOperators.some((op) =>
-        getOperatorDependencies(op, preflightRequirements).includes(dep),
-      );
-      if (!hasDependency) {
-        newOperators.splice(newOperators.indexOf(dep), 1);
-      }
-      return !hasDependency;
-    });
-
-  return currentOperators.filter((op) => op !== operatorId && !notStandaloneDeps.includes(op));
-};
-
 const getBundleOperators = (
   bundle: Bundle,
   preflightRequirements: PreflightHardwareRequirements | undefined,

package/lib/ocm/components/clusterConfiguration/platformIntegration/ExternalPlatformDropdown.tsx

@@ -155,7 +155,7 @@ export const ExternalPlatformDropdown = ({
 
   const handleClick = (event: MouseEvent<HTMLButtonElement>, href: string): void => {
     event.stopPropagation(); // Stop event propagation here
-    window.open(href, '_blank');
+    window.open(href, '_blank', 'noopener,noreferrer');
   };
 
   const { getFeatureSupportLevel, getFeatureDisabledReason } = useNewFeatureSupportLevel();

package/lib/ocm/components/clusterConfiguration/review/ReviewOperatorsTable.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { Title } from '@patternfly/react-core';
 import { Table, TableVariant, Tbody, Td, Tr } from '@patternfly/react-table';
-import { genericTableRowKey, selectOlmOperators } from '../../../../common';
+import { genericTableRowKey, selectAllOlmOperators } from '../../../../common';
 import { useStateSafely } from '../../../../common/hooks';
 import { Bundle, Cluster } from '@openshift-assisted/types/assisted-installer-service';
 import { TableSummaryExpandable } from './TableSummaryExpandable';
@@ -68,7 +68,7 @@ export const ReviewOperatorsTable = ({ cluster }: { cluster: Cluster }) => {
 
   const rows = React.useMemo(
     () =>
-      selectOlmOperators(cluster)
+      selectAllOlmOperators(cluster)
         .filter(({ name }) => !!name && !!opSpecs[name])
         .map((op) => {
           const opId = op.name as string;

package/lib/ocm/components/clusterDetail/ClusterInstallationError.tsx

@@ -42,7 +42,7 @@ const ClusterInstallationError: React.FC<ClusterInstallationErrorProps> = ({
               Download Installation Logs
             </AlertActionLink>
             <AlertActionLink
-              onClick={() => window.open(getReportIssueLink(), '_blank')}
+              onClick={() => window.open(getReportIssueLink(), '_blank', 'noopener,noreferrer')}
               id={getID('button-report-bug')}
             >
               Report a bug

package/lib/ocm/components/clusterDetail/ProgressBarAlerts.tsx

@@ -157,7 +157,7 @@ export const HostsInstallationFailed = ({
               Download installation logs
             </AlertActionLink>
             <AlertActionLink
-              onClick={() => window.open(getReportIssueLink(), '_blank')}
+              onClick={() => window.open(getReportIssueLink(), '_blank', 'noopener,noreferrer')}
               id={getID('button-report-bug')}
             >
               Report a bug

package/lib/ocm/components/clusterWizard/OperatorsSelect.tsx

@@ -19,6 +19,7 @@ import { OperatorsService } from '../../services';
 import { useFeature } from '../../hooks/use-feature';
 import OperatorCheckbox from '../clusterConfiguration/operators/OperatorCheckbox';
 import { useOperatorSpecs } from '../../../common/components/operators/operatorSpecs';
+import { getOperatorDependencies } from '../clusterConfiguration/operators/utils';
 
 const OperatorsSelect = ({
   cluster,
@@ -36,7 +37,6 @@ const OperatorsSelect = ({
   const [isExpanded, setIsExpanded] = React.useState(false);
   const [supportedOperators, setSupportedOperators] = useStateSafely<string[]>([]);
   const isSingleClusterFeatureEnabled = useFeature('ASSISTED_INSTALLER_SINGLE_CLUSTER_FEATURE');
-  const { values } = useFormikContext<OperatorsValues>();
   React.useEffect(() => {
     const fetchSupportedOperators = async () => {
       try {
@@ -54,6 +54,7 @@ const OperatorsSelect = ({
     void fetchSupportedOperators();
   }, [addAlert, setSupportedOperators, setIsLoading]);
 
+  const { values } = useFormikContext<OperatorsValues>();
   const { byCategory, byKey: opSpecs } = useOperatorSpecs();
 
   const operators = React.useMemo(() => {
@@ -65,10 +66,24 @@ const OperatorsSelect = ({
     });
   }, [isSingleClusterFeatureEnabled, supportedOperators]);
 
-  const selectedOperators = values.selectedOperators.filter(
-    (opKey) => operators.includes(opKey) && !!opSpecs[opKey],
+  const bundleOperators = new Set<string>();
+  values.selectedBundles.forEach((b) => {
+    b.optionalOperators?.forEach((op) => bundleOperators.add(op));
+    bundles.find(({ id }) => id === b.id)?.operators?.forEach((op) => bundleOperators.add(op));
+  });
+
+  const dependencies = new Set<string>();
+  [...values.selectedOperators, ...bundleOperators].forEach((op) =>
+    getOperatorDependencies(op, preflightRequirements, dependencies),
   );
 
+  const checkedOperatorIds = new Set([
+    ...values.selectedOperators,
+    ...bundleOperators,
+    ...dependencies,
+  ]);
+  const operatorsCount = operators.filter((op) => checkedOperatorIds.has(op)).length;
+
   if (isLoading) {
     return <LoadingState />;
   }
@@ -76,7 +91,7 @@ const OperatorsSelect = ({
   return (
     <>
       <ExpandableSection
-        toggleText={`Single Operators (${operators.length} | ${selectedOperators.length} selected)`}
+        toggleText={`Single operators (${operatorsCount} selected)`}
         onToggle={() => setIsExpanded(!isExpanded)}
         isExpanded={isExpanded}
         data-testid="single-operators-section"
@@ -113,6 +128,8 @@ const OperatorsSelect = ({
                     <OperatorCheckbox
                       bundles={bundles}
                       operatorId={spec.operatorKey}
+                      checkedOperatorIds={checkedOperatorIds}
+                      isChecked={checkedOperatorIds.has(spec.operatorKey)}
                       cluster={cluster}
                       openshiftVersion={cluster.openshiftVersion}
                       preflightRequirements={preflightRequirements}

package/lib/ocm/components/clusterWizard/wizardTransition.ts

@@ -242,6 +242,7 @@ const hostDiscoveryStepValidationsMap: WizardStepValidationMap = {
     'no-skip-missing-disk',
     'compatible-agent',
     'openshift-ai-gpu-requirements-satisfied',
+    'inventory-not-partially-truncated',
   ],
 };
 
@@ -260,7 +261,7 @@ const storageStepValidationsMap: WizardStepValidationMap = {
       'no-skip-missing-disk',
     ],
   },
-  softValidationIds: [],
+  softValidationIds: ['inventory-not-partially-truncated'],
 };
 
 const networkingStepValidationsMap: WizardStepValidationMap = {

package/package.json

@@ -1,7 +1,7 @@
 {
   "dependencies": {
-    "@openshift-assisted/locales": "2.54.0",
-    "@openshift-assisted/types": "2.54.0",
+    "@openshift-assisted/locales": "2.54.2",
+    "@openshift-assisted/types": "2.54.2",
     "@openshift-console/dynamic-plugin-sdk": "^4.19.1",
     "@patternfly/patternfly": "6.4.0",
     "@patternfly/react-code-editor": "6.4.1",
@@ -136,5 +136,5 @@
       ]
     }
   },
-  "version": "2.54.0"
+  "version": "2.54.2"
 }