From b68076d18dcaa347c8a081b6724a7c825d6ccf32 Mon Sep 17 00:00:00 2001
From: Dan Labrecque <dlabrecq@redhat.com>
Date: Tue, 19 Mar 2024 12:07:40 -0400
Subject: [PATCH 01/20] Add overall status label to breakdown header

https://issues.redhat.com/browse/COST-4761
---
 .../breakdown/breakdownHeader.styles.ts       |  2 +
 .../components/breakdown/breakdownHeader.tsx  |  4 +-
 .../clusterInfo/clusterInfo.styles.ts         |  2 +-
 .../clusterInfo/clusterInfo.tsx               |  2 +-
 .../dataDetails/components/cloudIData.tsx     |  4 +-
 .../dataDetails/components/clusterData.tsx    |  4 +-
 .../dataDetails/components/overallStatus.tsx  | 73 +++++++++++++------
 .../dataDetails/dataDetails.styles.ts         |  5 +-
 .../dataDetails/dataDetails.tsx               | 10 +--
 .../dataDetails/utils/status.ts               | 50 +++++++++++--
 10 files changed, 112 insertions(+), 44 deletions(-)

diff --git a/src/routes/details/components/breakdown/breakdownHeader.styles.ts b/src/routes/details/components/breakdown/breakdownHeader.styles.ts
index 20a98dc0a..9c872185d 100644
--- a/src/routes/details/components/breakdown/breakdownHeader.styles.ts
+++ b/src/routes/details/components/breakdown/breakdownHeader.styles.ts
@@ -31,6 +31,8 @@ export const styles = {
   description: {
     color: global_disabled_color_100.value,
     fontSize: global_FontSize_xs.value,
+  },
+  descriptionContainer: {
     paddingLeft: '1px',
   },
   header: {
diff --git a/src/routes/details/components/breakdown/breakdownHeader.tsx b/src/routes/details/components/breakdown/breakdownHeader.tsx
index 9a1666ed4..c4d403157 100644
--- a/src/routes/details/components/breakdown/breakdownHeader.tsx
+++ b/src/routes/details/components/breakdown/breakdownHeader.tsx
@@ -161,8 +161,8 @@ class BreakdownHeader extends React.Component<BreakdownHeaderProps, any> {
               {intl.formatMessage(messages.breakdownTitle, { value: title })}
             </Title>
             {description && (
-              <div style={styles.description}>
-                {description}
+              <div style={styles.descriptionContainer}>
+                <span style={styles.description}>{description}</span>
                 {clusterInfoComponent && isClusterInfoToggleEnabled ? clusterInfoComponent : null}
                 {dataDetailsComponent && isClusterInfoToggleEnabled ? <div>{dataDetailsComponent}</div> : null}
               </div>
diff --git a/src/routes/details/ocpBreakdown/providerDetails/clusterInfo/clusterInfo.styles.ts b/src/routes/details/ocpBreakdown/providerDetails/clusterInfo/clusterInfo.styles.ts
index a82b201a2..c20bdbf4e 100644
--- a/src/routes/details/ocpBreakdown/providerDetails/clusterInfo/clusterInfo.styles.ts
+++ b/src/routes/details/ocpBreakdown/providerDetails/clusterInfo/clusterInfo.styles.ts
@@ -5,7 +5,7 @@ import global_warning_color_100 from '@patternfly/react-tokens/dist/js/global_wa
 import type React from 'react';
 
 export const styles = {
-  clusterInfo: {
+  clusterInfoButton: {
     fontSize: global_FontSize_xs.value,
   },
   loading: {
diff --git a/src/routes/details/ocpBreakdown/providerDetails/clusterInfo/clusterInfo.tsx b/src/routes/details/ocpBreakdown/providerDetails/clusterInfo/clusterInfo.tsx
index fb74fcac8..6c210ff74 100644
--- a/src/routes/details/ocpBreakdown/providerDetails/clusterInfo/clusterInfo.tsx
+++ b/src/routes/details/ocpBreakdown/providerDetails/clusterInfo/clusterInfo.tsx
@@ -30,7 +30,7 @@ const ClusterInfo: React.FC<ClusterInfoProps> = ({ clusterId }: ClusterInfoProps
 
   return (
     <>
-      <Button onClick={handleOnClick} style={styles.clusterInfo} variant={ButtonVariant.link}>
+      <Button onClick={handleOnClick} style={styles.clusterInfoButton} variant={ButtonVariant.link}>
         {intl.formatMessage(messages.clusterInfo)}
       </Button>
       <Modal className="costManagement" isOpen={isOpen} onClose={handleOnClose} variant={ModalVariant.medium}>
diff --git a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/cloudIData.tsx b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/cloudIData.tsx
index d3ed48b1c..9ca896c53 100644
--- a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/cloudIData.tsx
+++ b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/cloudIData.tsx
@@ -31,10 +31,10 @@ const CloudIData: React.FC<CloudDataProps> = ({ provider }: CloudDataProps) => {
       <ProgressStepper aria-label={intl.formatMessage(messages.dataDetailsCloudData)} isVertical style={styles.stepper}>
         <ProgressStep
           aria-label={intl.formatMessage(messages.dataDetailsCloudIntegrationStatus)}
-          icon={getProgressStepIcon(getProviderAvailability(provider))}
+          icon={getProgressStepIcon(getProviderAvailability(provider).status)}
           id="step1"
           titleId="step1-title"
-          variant={getProgressStepVariant(getProviderAvailability(provider))}
+          variant={getProgressStepVariant(getProviderAvailability(provider).status)}
         >
           {intl.formatMessage(messages.dataDetailsCloudIntegrationStatus)}
           <div style={styles.sourceLink}>
diff --git a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/clusterData.tsx b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/clusterData.tsx
index a4fa4a099..17a1b61b6 100644
--- a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/clusterData.tsx
+++ b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/clusterData.tsx
@@ -35,10 +35,10 @@ const ClusterData: React.FC<ClusterDataProps> = ({ provider }: ClusterDataProps)
       >
         <ProgressStep
           aria-label={intl.formatMessage(messages.dataDetailsIntegrationStatus)}
-          icon={getProgressStepIcon(getProviderAvailability(provider))}
+          icon={getProgressStepIcon(getProviderAvailability(provider).status)}
           id="step1"
           titleId="step1-title"
-          variant={getProgressStepVariant(getProviderAvailability(provider))}
+          variant={getProgressStepVariant(getProviderAvailability(provider).status)}
         >
           {intl.formatMessage(messages.dataDetailsIntegrationStatus)}
           <div style={styles.sourceLink}>
diff --git a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/overallStatus.tsx b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/overallStatus.tsx
index 69a2a45e4..af5eb5dae 100644
--- a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/overallStatus.tsx
+++ b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/overallStatus.tsx
@@ -3,6 +3,8 @@ import { ProviderType } from 'api/providers';
 import { getProvidersQuery } from 'api/queries/providersQuery';
 import type { AxiosError } from 'axios/index';
 import React from 'react';
+import type { MessageDescriptor } from 'react-intl';
+import { useIntl } from 'react-intl';
 import { useSelector } from 'react-redux';
 import { styles } from 'routes/details/ocpBreakdown/providerDetails/dataDetails/dataDetails.styles';
 import { getOverallStatusIcon } from 'routes/details/ocpBreakdown/providerDetails/dataDetails/utils/icon';
@@ -31,6 +33,7 @@ type OverallStatusProps = OverallStatusOwnProps;
 
 const OverallStatus: React.FC<OverallStatusProps> = ({ clusterId }: OverallStatusProps) => {
   const { providers, providersError } = useMapToProps();
+  const intl = useIntl();
 
   if (!providers || providersError) {
     return null;
@@ -41,7 +44,8 @@ const OverallStatus: React.FC<OverallStatusProps> = ({ clusterId }: OverallStatu
   const clusterProvider = ocpProviders?.data?.find(val => val.authentication?.credentials?.cluster_id === clusterId);
   const cloudProvider = providers?.data?.find(val => val.uuid === clusterProvider?.infrastructure?.uuid);
 
-  const getOverallStatus = () => {
+  const getOverallStatus = (): { msg: MessageDescriptor; status: StatusType } => {
+    let msg;
     let status;
 
     const cloudAvailability = getProviderAvailability(cloudProvider);
@@ -49,28 +53,55 @@ const OverallStatus: React.FC<OverallStatusProps> = ({ clusterId }: OverallStatu
     const cloudStatus = getProviderStatus(cloudProvider);
     const clusterStatus = getProviderStatus(clusterProvider);
 
-    if (cloudAvailability === StatusType.failed || clusterAvailability === StatusType.failed) {
-      status = StatusType.failed;
-    } else if (cloudStatus === StatusType.failed || clusterStatus === StatusType.failed) {
-      status = 'failed';
-    } else if (cloudAvailability === StatusType.paused || clusterAvailability === StatusType.paused) {
-      status = 'paused';
-    } else if (cloudStatus === StatusType.inProgress || clusterStatus === StatusType.inProgress) {
-      status = 'in_progress';
-    } else if (cloudStatus === StatusType.pending || clusterStatus === StatusType.pending) {
-      status = 'pending';
-    } else if (
-      cloudStatus === StatusType.complete &&
-      clusterStatus === StatusType.complete &&
-      cloudAvailability === StatusType.complete &&
-      clusterAvailability === StatusType.complete
-    ) {
-      status = 'complete';
-    }
-    return status;
+    const initializeState = (statusType: StatusType, state1, state2, state3, state4) => {
+      if (msg && status) {
+        return;
+      }
+      if (statusType === StatusType.complete) {
+        if (
+          state1.status === statusType &&
+          state2.status === statusType &&
+          state3.status === statusType &&
+          state4.status === statusType
+        ) {
+          msg = state1.msg;
+          status = statusType;
+        }
+      } else {
+        if (state1.status === statusType) {
+          msg = state1.msg;
+          status = statusType;
+        } else if (state2.status === statusType) {
+          msg = state2.msg;
+          status = statusType;
+        } else if (state3.status === statusType) {
+          msg = state3.msg;
+          status = statusType;
+        } else if (state4.status === statusType) {
+          msg = state4.msg;
+          status = statusType;
+        }
+      }
+    };
+
+    // Note: status is not synchronous; however, status shall be applied in order provided below (e.g., failed takes precedence over any other state).
+    // Cloud availability takes precedence over cloud status, while cluster availability takes precedence over cluster status, and so on...
+    initializeState(StatusType.failed, cloudAvailability, clusterAvailability, cloudStatus, clusterStatus);
+    initializeState(StatusType.paused, cloudAvailability, clusterAvailability, cloudStatus, clusterStatus);
+    initializeState(StatusType.inProgress, cloudAvailability, clusterAvailability, cloudStatus, clusterStatus); // Availability won't likely have in-progress and pending states
+    initializeState(StatusType.pending, cloudAvailability, clusterAvailability, cloudStatus, clusterStatus);
+    initializeState(StatusType.complete, clusterStatus, cloudStatus, clusterAvailability, cloudAvailability); // Must display the cluster status msg here
+
+    return { msg, status };
   };
 
-  return <span style={styles.statusIcon}>{getOverallStatusIcon(getOverallStatus())}</span>;
+  const overallStatus = getOverallStatus();
+  return (
+    <>
+      <span style={styles.statusIcon}>{getOverallStatusIcon(overallStatus.status)}</span>
+      <span style={styles.description}>{intl.formatMessage(overallStatus.msg)}</span>
+    </>
+  );
 };
 
 // eslint-disable-next-line no-empty-pattern
diff --git a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/dataDetails.styles.ts b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/dataDetails.styles.ts
index 4f7833cec..33f39d5aa 100644
--- a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/dataDetails.styles.ts
+++ b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/dataDetails.styles.ts
@@ -9,7 +9,6 @@ import type React from 'react';
 export const styles = {
   dataDetailsButton: {
     fontSize: global_FontSize_xs.value,
-    paddingLeft: global_spacer_sm.value,
   },
   description: {
     color: global_disabled_color_100.value,
@@ -25,8 +24,8 @@ export const styles = {
     marginRight: global_spacer_md.value,
   },
   statusIcon: {
-    paddingLeft: '1px',
-    paddingRight: '5px',
+    fontSize: global_FontSize_xs.value,
+    paddingRight: global_spacer_sm.value,
   },
   stepper: {
     margin: global_spacer_lg.value,
diff --git a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/dataDetails.tsx b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/dataDetails.tsx
index 448fae66a..d9dbd8090 100644
--- a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/dataDetails.tsx
+++ b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/dataDetails.tsx
@@ -31,12 +31,10 @@ const DataDetails: React.FC<DataDetailsProps> = ({ clusterId }: DataDetailsProps
 
   return (
     <>
-      <div style={styles.description}>
-        <OverallStatus clusterId={clusterId} />
-        <Button onClick={handleOnClick} style={styles.dataDetailsButton} variant={ButtonVariant.link}>
-          {intl.formatMessage(messages.dataDetails)}
-        </Button>
-      </div>
+      <OverallStatus clusterId={clusterId} />
+      <Button onClick={handleOnClick} style={styles.dataDetailsButton} variant={ButtonVariant.link}>
+        {intl.formatMessage(messages.dataDetails)}
+      </Button>
       <Modal className="costManagement" isOpen={isOpen} onClose={handleOnClose} variant={ModalVariant.small}>
         <ModalHeader title={intl.formatMessage(messages.dataDetails)} />
         <ModalBody>
diff --git a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/utils/status.ts b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/utils/status.ts
index e82b3f938..69dc6eb37 100644
--- a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/utils/status.ts
+++ b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/utils/status.ts
@@ -1,4 +1,7 @@
 import type { Provider } from 'api/providers';
+import { ProviderType } from 'api/providers';
+import messages from 'locales/messages';
+import type { MessageDescriptor } from 'react-intl';
 import { normalize } from 'routes/details/ocpBreakdown/providerDetails/utils/normailize';
 
 // eslint-disable-next-line no-shadow
@@ -27,12 +30,17 @@ export const lookupKey = (value: string) => {
   }
 };
 
-export const getProviderAvailability = (provider: Provider) => {
+export const getProviderAvailability = (provider: Provider): { msg: MessageDescriptor; status: StatusType } => {
   let status;
   if (!provider) {
     return status;
   }
 
+  const msg =
+    provider.source_type === ProviderType.ocp
+      ? messages.dataDetailsIntegrationStatus
+      : messages.dataDetailsCloudIntegrationStatus;
+
   if (provider.active === false && provider.paused === false) {
     status = StatusType.failed; // Inactive sources
   } else if (provider.paused === true) {
@@ -40,11 +48,37 @@ export const getProviderAvailability = (provider: Provider) => {
   } else {
     status = StatusType.complete;
   }
-  return status;
+  return { msg, status };
+};
+
+const getProviderStatusMsg = (
+  {
+    downloadState,
+    processingState,
+    summaryState,
+  }: {
+    downloadState: StatusType;
+    processingState: StatusType;
+    summaryState: StatusType;
+  },
+  status: StatusType
+): MessageDescriptor => {
+  let msg;
+
+  // We don't have a separate messages for cloud and on-prem
+  if (downloadState === status) {
+    msg = messages.dataDetailsRetrieval;
+  } else if (processingState === status) {
+    msg = messages.dataDetailsProcessing;
+  } else if (summaryState === status) {
+    msg = messages.dataDetailsIntegrationAndFinalization;
+  }
+  return msg;
 };
 
-export const getProviderStatus = (provider: Provider) => {
+export const getProviderStatus = (provider: Provider): { msg: MessageDescriptor; status: StatusType } => {
   let status;
+  let msg;
   if (!provider) {
     return status;
   }
@@ -59,24 +93,28 @@ export const getProviderStatus = (provider: Provider) => {
     summaryState === StatusType.failed
   ) {
     status = StatusType.failed;
+    msg = getProviderStatusMsg({ downloadState, processingState, summaryState }, StatusType.failed);
   } else if (
     downloadState === StatusType.inProgress ||
     processingState === StatusType.inProgress ||
     summaryState === StatusType.inProgress
   ) {
     status = StatusType.inProgress;
+    msg = getProviderStatusMsg({ downloadState, processingState, summaryState }, StatusType.inProgress);
   } else if (
     downloadState === StatusType.pending ||
     processingState === StatusType.pending ||
     summaryState === StatusType.pending
   ) {
     status = StatusType.pending;
+    msg = getProviderStatusMsg({ downloadState, processingState, summaryState }, StatusType.pending);
   } else if (
-    downloadState === StatusType.complete ||
-    processingState === StatusType.complete ||
+    downloadState === StatusType.complete &&
+    processingState === StatusType.complete &&
     summaryState === StatusType.complete
   ) {
     status = StatusType.complete;
+    msg = messages.dataDetailsIntegrationAndFinalization; // only one final step
   }
-  return status;
+  return { msg, status };
 };

From 4676d3b8f373032b07ec387e4ebf7ce5fe22d4ea Mon Sep 17 00:00:00 2001
From: Dan Labrecque <dlabrecq@redhat.com>
Date: Tue, 19 Mar 2024 18:43:35 -0400
Subject: [PATCH 02/20] Updated text to delete child tags

---
 locales/data.json                             | 26 ++++++++++++++++---
 locales/translations.json                     |  6 +++--
 src/locales/messages.ts                       | 18 ++++++++++---
 .../deleteTagMapping/deleteTagMapping.tsx     | 13 +++++++---
 .../deleteTagMappingAction.tsx                |  1 +
 5 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/locales/data.json b/locales/data.json
index 74600a0ac..aaedaa779 100644
--- a/locales/data.json
+++ b/locales/data.json
@@ -12209,13 +12209,13 @@
     "tagMappingDelete": [
       {
         "type": 0,
-        "value": "Delete tag mapping"
+        "value": "Delete tag mapping?"
       }
     ],
     "tagMappingDeleteDesc": [
       {
         "type": 0,
-        "value": "This action will remove the "
+        "value": "Deleting "
       },
       {
         "type": 1,
@@ -12223,7 +12223,7 @@
       },
       {
         "type": 0,
-        "value": " tag mapping. Changes will be reflected within 24 hours."
+        "value": " will queue a resummarization. Changes will be reflected within 24 hours."
       }
     ],
     "tagMappingDesc": [
@@ -12244,6 +12244,26 @@
         "value": "learnMore"
       }
     ],
+    "tagMappingRemove": [
+      {
+        "type": 0,
+        "value": "Remove child tag?"
+      }
+    ],
+    "tagMappingRemoveDesc": [
+      {
+        "type": 0,
+        "value": "Removing "
+      },
+      {
+        "type": 1,
+        "value": "value"
+      },
+      {
+        "type": 0,
+        "value": " will queue a resummarization. Changes will be reflected within 24 hours."
+      }
+    ],
     "tagMappingSelectChildTags": [
       {
         "type": 0,
diff --git a/locales/translations.json b/locales/translations.json
index c1e813d7a..dcda8ced9 100644
--- a/locales/translations.json
+++ b/locales/translations.json
@@ -560,9 +560,11 @@
   "tagLabelsMap": "Map tags and labels",
   "tagMappingAddChildTags": "Add child tags",
   "tagMappingAddChildTagsDesc": "Select additional tag key(s) that will be mapped to the {value} tag map. Tags that have been already mapped will not be available for selection.",
-  "tagMappingDelete": "Delete tag mapping",
-  "tagMappingDeleteDesc": "This action will remove the {value} tag mapping. Changes will be reflected within 24 hours.",
+  "tagMappingDelete": "Delete tag mapping?",
+  "tagMappingDeleteDesc": "Deleting {value} will queue a resummarization. Changes will be reflected within 24 hours.",
   "tagMappingDesc": "Combine multiple tags across your cloud integrations to group and filter similar tags with one tag key. {warning} Changes will be reflected within 24 hours. {learnMore}",
+  "tagMappingRemove": "Remove child tag?",
+  "tagMappingRemoveDesc": "Removing {value} will queue a resummarization. Changes will be reflected within 24 hours.",
   "tagMappingSelectChildTags": "Select child tags",
   "tagMappingSelectChildTagsDesc": "Select the child tags that you want to map to a parent key. Tags that have been already mapped will not be available for selection. {learnMore}",
   "tagMappingSelectParentTags": "Select parent tag",
diff --git a/src/locales/messages.ts b/src/locales/messages.ts
index a36591085..3fa3212d4 100644
--- a/src/locales/messages.ts
+++ b/src/locales/messages.ts
@@ -3441,13 +3441,13 @@ export default defineMessages({
     id: 'tagMappingAddChildTagsDesc',
   },
   tagMappingDelete: {
-    defaultMessage: 'Delete tag mapping',
-    description: 'Delete tag mapping',
+    defaultMessage: 'Delete tag mapping?',
+    description: 'Delete tag mapping?',
     id: 'tagMappingDelete',
   },
   tagMappingDeleteDesc: {
-    defaultMessage: 'This action will remove the {value} tag mapping. Changes will be reflected within 24 hours.',
-    description: 'This action will remove the {value} tag mapping. Changes will be reflected within 24 hours.',
+    defaultMessage: 'Deleting {value} will queue a resummarization. Changes will be reflected within 24 hours.',
+    description: 'Deleting {value} will queue a resummarization. Changes will be reflected within 24 hours.',
     id: 'tagMappingDeleteDesc',
   },
   tagMappingDesc: {
@@ -3457,6 +3457,16 @@ export default defineMessages({
       'Combine multiple tags across your cloud integrations to group and filter similar tags with one tag key. {warning} Changes will be reflected within 24 hours. {learnMore}',
     id: 'tagMappingDesc',
   },
+  tagMappingRemove: {
+    defaultMessage: 'Remove child tag?',
+    description: 'Remove child tag?',
+    id: 'tagMappingRemove',
+  },
+  tagMappingRemoveDesc: {
+    defaultMessage: 'Removing {value} will queue a resummarization. Changes will be reflected within 24 hours.',
+    description: 'Removing {value} will queue a resummarization. Changes will be reflected within 24 hours.',
+    id: 'tagMappingRemoveDesc',
+  },
   tagMappingSelectChildTags: {
     defaultMessage: 'Select child tags',
     description: 'Select child tags',
diff --git a/src/routes/settings/tagLabels/tagMapping/components/deleteTagMapping/deleteTagMapping.tsx b/src/routes/settings/tagLabels/tagMapping/components/deleteTagMapping/deleteTagMapping.tsx
index d6585bbdf..c6a3b849d 100644
--- a/src/routes/settings/tagLabels/tagMapping/components/deleteTagMapping/deleteTagMapping.tsx
+++ b/src/routes/settings/tagLabels/tagMapping/components/deleteTagMapping/deleteTagMapping.tsx
@@ -17,6 +17,7 @@ import { settingsActions, settingsSelectors } from 'store/settings';
 
 interface DeleteTagMappingOwnProps {
   isOpen?: boolean;
+  isChild?: boolean;
   item: SettingsData;
   onClose?: () => void;
   settingsType: SettingsType;
@@ -33,7 +34,7 @@ interface DeleteTagMappingStateProps {
 
 type DeleteTagMappingProps = DeleteTagMappingOwnProps;
 
-const DeleteTagMapping: React.FC<DeleteTagMappingProps> = ({ isOpen, item, onClose, settingsType }) => {
+const DeleteTagMapping: React.FC<DeleteTagMappingProps> = ({ isOpen, isChild, item, onClose, settingsType }) => {
   const [isFinish, setIsFinish] = useState(false);
   const { settingsUpdateError, settingsUpdateStatus } = useMapToProps({ settingsType });
 
@@ -64,13 +65,17 @@ const DeleteTagMapping: React.FC<DeleteTagMappingProps> = ({ isOpen, item, onClo
     <Modal className="costManagement" isOpen={isOpen} onClose={onClose} variant={ModalVariant.medium}>
       <ModalHeader
         className="iconOverride"
-        title={intl.formatMessage(messages.tagMappingDelete)}
+        title={intl.formatMessage(isChild ? messages.tagMappingRemove : messages.tagMappingDelete)}
         titleIconVariant="warning"
       />
-      <ModalBody>{intl.formatMessage(messages.tagMappingDeleteDesc, { value: <b>{item.key}</b> })}</ModalBody>
+      <ModalBody>
+        {intl.formatMessage(isChild ? messages.tagMappingRemoveDesc : messages.tagMappingDeleteDesc, {
+          value: <b>{item.key}</b>,
+        })}
+      </ModalBody>
       <ModalFooter>
         <Button key="confirm" onClick={handleOnDelete} variant="danger">
-          {intl.formatMessage(messages.tagMappingDelete)}
+          {intl.formatMessage(isChild ? messages.remove : messages.delete)}
         </Button>
         <Button key="cancel" onClick={onClose} variant="link">
           {intl.formatMessage(messages.cancel)}
diff --git a/src/routes/settings/tagLabels/tagMapping/components/deleteTagMapping/deleteTagMappingAction.tsx b/src/routes/settings/tagLabels/tagMapping/components/deleteTagMapping/deleteTagMappingAction.tsx
index 328c358bf..b33700b69 100644
--- a/src/routes/settings/tagLabels/tagMapping/components/deleteTagMapping/deleteTagMappingAction.tsx
+++ b/src/routes/settings/tagLabels/tagMapping/components/deleteTagMapping/deleteTagMappingAction.tsx
@@ -64,6 +64,7 @@ const DeleteTagMappingAction: React.FC<DeleteTagMappingActionProps> = ({ canWrit
       {getActions()}
       <DeleteTagMapping
         isOpen={isOpen}
+        isChild
         item={item}
         onClose={handleOnClose}
         settingsType={SettingsType.tagsMappingsChildRemove}

From d2227c2cae8134b99ff69694d79e67e1cd79b004 Mon Sep 17 00:00:00 2001
From: Dan Labrecque <dlabrecq@redhat.com>
Date: Tue, 19 Mar 2024 19:36:16 -0400
Subject: [PATCH 03/20] Refactor accordion toggle

https://issues.redhat.com/browse/COST-3824
---
 src/routes/settings/tagLabels/tagLabels.tsx | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/routes/settings/tagLabels/tagLabels.tsx b/src/routes/settings/tagLabels/tagLabels.tsx
index 0b2827036..1325395d8 100644
--- a/src/routes/settings/tagLabels/tagLabels.tsx
+++ b/src/routes/settings/tagLabels/tagLabels.tsx
@@ -53,8 +53,11 @@ const TagLabels: React.FC<TagLabelsProps> = ({ canWrite }) => {
     return availableItems;
   };
 
-  const handleOnClick = (event, index) => {
-    if (activeKey !== index) {
+  const handleOnToggle = (event, index) => {
+    const isOpen = activeKey === index;
+    if (isOpen) {
+      setActiveKey(index === 0 ? 1 : 0);
+    } else {
       setActiveKey(index);
     }
   };
@@ -78,18 +81,19 @@ const TagLabels: React.FC<TagLabelsProps> = ({ canWrite }) => {
 
   const getAccordionItem = (availableItems: AvailableItem[]) => {
     return availableItems.map((val, index) => {
+      const isExpanded = activeKey === index;
       return (
         <AccordionItem key={`accordion-${index}`}>
           <AccordionToggle
             id={`accordion-toggle-${index}`}
-            isExpanded={activeKey === index}
+            isExpanded={isExpanded}
             onClick={_evt => {
-              handleOnClick(_evt, index);
+              handleOnToggle(_evt, index);
             }}
           >
             {val.label}
           </AccordionToggle>
-          <AccordionContent isHidden={activeKey !== index}>{getAccordionContent(val.item, index)}</AccordionContent>
+          <AccordionContent isHidden={!isExpanded}>{getAccordionContent(val.item, index)}</AccordionContent>
         </AccordionItem>
       );
     });

From 3461bb47cdec973f7e0d88c9261967dc5fb5ebc3 Mon Sep 17 00:00:00 2001
From: Dan Labrecque <dlabrecq@redhat.com>
Date: Thu, 21 Mar 2024 08:00:53 -0400
Subject: [PATCH 04/20] Remove source type column and filter from parent
 selection step in the tag mapping wizard

https://issues.redhat.com/browse/COST-3824
---
 locales/data.json                             |  6 ----
 locales/translations.json                     |  1 -
 src/locales/messages.ts                       |  5 ---
 .../parentTagMappingReview.tsx                |  8 -----
 .../components/parentTags/parentTagsTable.tsx |  8 -----
 .../parentTags/parentTagsToolbar.tsx          | 31 -------------------
 6 files changed, 59 deletions(-)

diff --git a/locales/data.json b/locales/data.json
index aaedaa779..219eccd26 100644
--- a/locales/data.json
+++ b/locales/data.json
@@ -12162,12 +12162,6 @@
         "value": "Parent tag key"
       }
     ],
-    "tagKeyParentSource": [
-      {
-        "type": 0,
-        "value": "Parent integration"
-      }
-    ],
     "tagLabels": [
       {
         "type": 0,
diff --git a/locales/translations.json b/locales/translations.json
index dcda8ced9..d96e88bdb 100644
--- a/locales/translations.json
+++ b/locales/translations.json
@@ -554,7 +554,6 @@
   "tagHeadingValue": "Value",
   "tagKeyChild": "Child tag keys",
   "tagKeyParent": "Parent tag key",
-  "tagKeyParentSource": "Parent integration",
   "tagLabels": "Tags and labels",
   "tagLabelsEnable": "Enable tags and labels",
   "tagLabelsMap": "Map tags and labels",
diff --git a/src/locales/messages.ts b/src/locales/messages.ts
index 3fa3212d4..c1dcf629d 100644
--- a/src/locales/messages.ts
+++ b/src/locales/messages.ts
@@ -3408,11 +3408,6 @@ export default defineMessages({
     description: 'Parent tag key',
     id: 'tagKeyParent',
   },
-  tagKeyParentSource: {
-    defaultMessage: 'Parent integration',
-    description: 'Parent integration',
-    id: 'tagKeyParentSource',
-  },
   tagLabelsEnable: {
     defaultMessage: 'Enable tags and labels',
     description: 'Enable tags and labels',
diff --git a/src/routes/settings/tagLabels/tagMapping/components/parentTagMapping/parentTagMappingReview.tsx b/src/routes/settings/tagLabels/tagMapping/components/parentTagMapping/parentTagMappingReview.tsx
index 737294164..3a97e7a66 100644
--- a/src/routes/settings/tagLabels/tagMapping/components/parentTagMapping/parentTagMappingReview.tsx
+++ b/src/routes/settings/tagLabels/tagMapping/components/parentTagMapping/parentTagMappingReview.tsx
@@ -98,14 +98,6 @@ const ParentTagMappingReview: React.FC<ParentTagMappingReviewProps> = ({
                 {intl.formatMessage(messages.tagKeyParent)}
               </TextListItem>
               <TextListItem component={TextListItemVariants.dd}>{parentTags.map(item => item.key)}</TextListItem>
-              <TextListItem component={TextListItemVariants.dt}>
-                {intl.formatMessage(messages.tagKeyParentSource)}
-              </TextListItem>
-              <TextListItem component={TextListItemVariants.dd}>
-                {parentTags.map(item =>
-                  intl.formatMessage(messages.sourceTypes, { value: item?.source_type?.toLowerCase() })
-                )}
-              </TextListItem>
             </TextList>
           </TextContent>
         </StackItem>
diff --git a/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTagsTable.tsx b/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTagsTable.tsx
index f2df28e42..a7dd043d2 100644
--- a/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTagsTable.tsx
+++ b/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTagsTable.tsx
@@ -52,11 +52,6 @@ const ParentTagsTable: React.FC<ParentTagsTableProps> = ({
         name: intl.formatMessage(messages.detailsResourceNames, { value: 'tag_key' }),
         ...(tags.length && { isSortable: true }),
       },
-      {
-        orderBy: 'provider_type', // Todo: Rename as source_type?
-        name: intl.formatMessage(messages.sourceType),
-        ...(tags.length && { isSortable: true }),
-      },
     ];
 
     tags.map(item => {
@@ -68,9 +63,6 @@ const ParentTagsTable: React.FC<ParentTagsTableProps> = ({
           {
             value: item.key ? item.key : '',
           },
-          {
-            value: intl.formatMessage(messages.sourceTypes, { value: item?.source_type?.toLowerCase() }),
-          },
         ],
         item,
         selected: selectedItems?.find(val => val.uuid === item.uuid) !== undefined,
diff --git a/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTagsToolbar.tsx b/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTagsToolbar.tsx
index 53d308eda..71c985818 100644
--- a/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTagsToolbar.tsx
+++ b/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTagsToolbar.tsx
@@ -42,37 +42,6 @@ const ParentTagsToolbar: React.FC<ParentTagsToolbarProps> = ({
         key: 'key',
         name: intl.formatMessage(messages.filterByValues, { value: 'tag_key' }),
       },
-      {
-        key: 'source_type',
-        name: intl.formatMessage(messages.filterByValues, { value: 'source_type' }),
-        selectClassName: 'selectOverride', // A selector from routes/components/dataToolbar/dataToolbar.scss
-        selectOptions: [
-          {
-            key: 'AWS',
-            name: intl.formatMessage(messages.aws),
-          },
-          {
-            key: 'Azure',
-            name: intl.formatMessage(messages.azure),
-          },
-          {
-            key: 'GCP',
-            name: intl.formatMessage(messages.gcp),
-          },
-          // {
-          //   key: 'IBM',
-          //   name: intl.formatMessage(messages.ibm), // Todo: enable when supported by API
-          // },
-          {
-            key: 'OCI',
-            name: intl.formatMessage(messages.oci),
-          },
-          {
-            key: 'OCP',
-            name: intl.formatMessage(messages.openShift),
-          },
-        ],
-      },
     ];
     return options;
   };

From fa02e9c912da140d52c54999c7325996312e7b50 Mon Sep 17 00:00:00 2001
From: Dan Labrecque <dlabrecq@redhat.com>
Date: Thu, 21 Mar 2024 08:17:05 -0400
Subject: [PATCH 05/20] Add remove child tooltip

---
 locales/data.json                              | 16 ++++++++++++++--
 locales/translations.json                      |  6 ++++--
 src/locales/messages.ts                        | 18 ++++++++++++++----
 .../deleteTagMapping/deleteTagMapping.tsx      |  2 +-
 .../deleteTagMappingAction.tsx                 |  9 +++------
 5 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/locales/data.json b/locales/data.json
index 219eccd26..182abdcc3 100644
--- a/locales/data.json
+++ b/locales/data.json
@@ -12203,7 +12203,7 @@
     "tagMappingDelete": [
       {
         "type": 0,
-        "value": "Delete tag mapping?"
+        "value": "Delete tag mapping"
       }
     ],
     "tagMappingDeleteDesc": [
@@ -12220,6 +12220,12 @@
         "value": " will queue a resummarization. Changes will be reflected within 24 hours."
       }
     ],
+    "tagMappingDeleteTitle": [
+      {
+        "type": 0,
+        "value": "Delete tag mapping?"
+      }
+    ],
     "tagMappingDesc": [
       {
         "type": 0,
@@ -12241,7 +12247,7 @@
     "tagMappingRemove": [
       {
         "type": 0,
-        "value": "Remove child tag?"
+        "value": "Remove child tag"
       }
     ],
     "tagMappingRemoveDesc": [
@@ -12258,6 +12264,12 @@
         "value": " will queue a resummarization. Changes will be reflected within 24 hours."
       }
     ],
+    "tagMappingRemoveTitle": [
+      {
+        "type": 0,
+        "value": "Remove child tag?"
+      }
+    ],
     "tagMappingSelectChildTags": [
       {
         "type": 0,
diff --git a/locales/translations.json b/locales/translations.json
index d96e88bdb..418b8df15 100644
--- a/locales/translations.json
+++ b/locales/translations.json
@@ -559,11 +559,13 @@
   "tagLabelsMap": "Map tags and labels",
   "tagMappingAddChildTags": "Add child tags",
   "tagMappingAddChildTagsDesc": "Select additional tag key(s) that will be mapped to the {value} tag map. Tags that have been already mapped will not be available for selection.",
-  "tagMappingDelete": "Delete tag mapping?",
+  "tagMappingDelete": "Delete tag mapping",
   "tagMappingDeleteDesc": "Deleting {value} will queue a resummarization. Changes will be reflected within 24 hours.",
+  "tagMappingDeleteTitle": "Delete tag mapping?",
   "tagMappingDesc": "Combine multiple tags across your cloud integrations to group and filter similar tags with one tag key. {warning} Changes will be reflected within 24 hours. {learnMore}",
-  "tagMappingRemove": "Remove child tag?",
+  "tagMappingRemove": "Remove child tag",
   "tagMappingRemoveDesc": "Removing {value} will queue a resummarization. Changes will be reflected within 24 hours.",
+  "tagMappingRemoveTitle": "Remove child tag?",
   "tagMappingSelectChildTags": "Select child tags",
   "tagMappingSelectChildTagsDesc": "Select the child tags that you want to map to a parent key. Tags that have been already mapped will not be available for selection. {learnMore}",
   "tagMappingSelectParentTags": "Select parent tag",
diff --git a/src/locales/messages.ts b/src/locales/messages.ts
index c1dcf629d..1153b8398 100644
--- a/src/locales/messages.ts
+++ b/src/locales/messages.ts
@@ -3436,8 +3436,8 @@ export default defineMessages({
     id: 'tagMappingAddChildTagsDesc',
   },
   tagMappingDelete: {
-    defaultMessage: 'Delete tag mapping?',
-    description: 'Delete tag mapping?',
+    defaultMessage: 'Delete tag mapping',
+    description: 'Delete tag mapping',
     id: 'tagMappingDelete',
   },
   tagMappingDeleteDesc: {
@@ -3445,6 +3445,11 @@ export default defineMessages({
     description: 'Deleting {value} will queue a resummarization. Changes will be reflected within 24 hours.',
     id: 'tagMappingDeleteDesc',
   },
+  tagMappingDeleteTitle: {
+    defaultMessage: 'Delete tag mapping?',
+    description: 'Delete tag mapping?',
+    id: 'tagMappingDeleteTitle',
+  },
   tagMappingDesc: {
     defaultMessage:
       'Combine multiple tags across your cloud integrations to group and filter similar tags with one tag key. {warning} Changes will be reflected within 24 hours. {learnMore}',
@@ -3453,8 +3458,8 @@ export default defineMessages({
     id: 'tagMappingDesc',
   },
   tagMappingRemove: {
-    defaultMessage: 'Remove child tag?',
-    description: 'Remove child tag?',
+    defaultMessage: 'Remove child tag',
+    description: 'Remove child tag',
     id: 'tagMappingRemove',
   },
   tagMappingRemoveDesc: {
@@ -3462,6 +3467,11 @@ export default defineMessages({
     description: 'Removing {value} will queue a resummarization. Changes will be reflected within 24 hours.',
     id: 'tagMappingRemoveDesc',
   },
+  tagMappingRemoveTitle: {
+    defaultMessage: 'Remove child tag?',
+    description: 'Remove child tag?',
+    id: 'tagMappingRemoveTitle',
+  },
   tagMappingSelectChildTags: {
     defaultMessage: 'Select child tags',
     description: 'Select child tags',
diff --git a/src/routes/settings/tagLabels/tagMapping/components/deleteTagMapping/deleteTagMapping.tsx b/src/routes/settings/tagLabels/tagMapping/components/deleteTagMapping/deleteTagMapping.tsx
index c6a3b849d..8afb9ee9e 100644
--- a/src/routes/settings/tagLabels/tagMapping/components/deleteTagMapping/deleteTagMapping.tsx
+++ b/src/routes/settings/tagLabels/tagMapping/components/deleteTagMapping/deleteTagMapping.tsx
@@ -65,7 +65,7 @@ const DeleteTagMapping: React.FC<DeleteTagMappingProps> = ({ isOpen, isChild, it
     <Modal className="costManagement" isOpen={isOpen} onClose={onClose} variant={ModalVariant.medium}>
       <ModalHeader
         className="iconOverride"
-        title={intl.formatMessage(isChild ? messages.tagMappingRemove : messages.tagMappingDelete)}
+        title={intl.formatMessage(isChild ? messages.tagMappingRemoveTitle : messages.tagMappingDeleteTitle)}
         titleIconVariant="warning"
       />
       <ModalBody>
diff --git a/src/routes/settings/tagLabels/tagMapping/components/deleteTagMapping/deleteTagMappingAction.tsx b/src/routes/settings/tagLabels/tagMapping/components/deleteTagMapping/deleteTagMappingAction.tsx
index b33700b69..c4e54fb0a 100644
--- a/src/routes/settings/tagLabels/tagMapping/components/deleteTagMapping/deleteTagMappingAction.tsx
+++ b/src/routes/settings/tagLabels/tagMapping/components/deleteTagMapping/deleteTagMappingAction.tsx
@@ -25,16 +25,13 @@ const DeleteTagMappingAction: React.FC<DeleteTagMappingActionProps> = ({ canWrit
 
   const getActions = () => {
     const getTooltip = children => {
-      if (!canWrite) {
-        const disableTagsTooltip = intl.formatMessage(messages.readOnlyPermissions);
-        return <Tooltip content={disableTagsTooltip}>{children}</Tooltip>;
-      }
-      return children;
+      const msg = intl.formatMessage(!canWrite ? messages.readOnlyPermissions : messages.tagMappingRemove);
+      return <Tooltip content={msg}>{children}</Tooltip>;
     };
 
     return getTooltip(
       <Button
-        aria-label={intl.formatMessage(messages.delete)}
+        aria-label={intl.formatMessage(messages.tagMappingRemove)}
         isAriaDisabled={!canWrite || isDisabled}
         onClick={() => handleOnClick()}
         size="sm"

From 5041803c61a1dadbbf14e7ec0942f49ef9c2ab38 Mon Sep 17 00:00:00 2001
From: Dan Labrecque <dlabrecq@redhat.com>
Date: Thu, 21 Mar 2024 09:03:47 -0400
Subject: [PATCH 06/20] Add tooltips to delete actions

https://issues.redhat.com/browse/COST-4795
---
 .../components/rateForm/taggingRatesForm.tsx  | 19 +++++++-----
 .../costModels/components/readOnlyTooltip.tsx | 31 ++++++++++++-------
 .../costModels/costModel/sourcesTable.tsx     |  2 +-
 .../costModels/costModelsDetails/table.tsx    |  2 +-
 4 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/src/routes/settings/costModels/components/rateForm/taggingRatesForm.tsx b/src/routes/settings/costModels/components/rateForm/taggingRatesForm.tsx
index 95d28cf9f..8dd783b5f 100644
--- a/src/routes/settings/costModels/components/rateForm/taggingRatesForm.tsx
+++ b/src/routes/settings/costModels/components/rateForm/taggingRatesForm.tsx
@@ -7,6 +7,7 @@ import type { WrappedComponentProps } from 'react-intl';
 import { injectIntl } from 'react-intl';
 import { RateInput } from 'routes/settings/costModels/components/inputs/rateInput';
 import { SimpleInput } from 'routes/settings/costModels/components/inputs/simpleInput';
+import { ReadOnlyTooltip } from 'routes/settings/costModels/components/readOnlyTooltip';
 
 import type { UseRateData } from './useRateForm';
 import type { RateFormErrors, RateFormTagValue } from './utils';
@@ -88,14 +89,16 @@ const TaggingRatesFormBase: React.FC<TaggingRatesFormProps> = ({
             </SplitItem>
             <SplitItem>
               <FormGroup fieldId="__irrelevant" label={<div>&nbsp;</div>}>
-                <Button
-                  aria-label={intl.formatMessage(messages.costModelsRemoveTagLabel)}
-                  variant={ButtonVariant.plain}
-                  isDisabled={tagValues.length === 1}
-                  onClick={() => removeTag(ix)}
-                >
-                  <MinusCircleIcon />
-                </Button>
+                <ReadOnlyTooltip defaultMsg={messages.costModelsRemoveTagLabel}>
+                  <Button
+                    aria-label={intl.formatMessage(messages.costModelsRemoveTagLabel)}
+                    variant={ButtonVariant.plain}
+                    isDisabled={tagValues.length === 1}
+                    onClick={() => removeTag(ix)}
+                  >
+                    <MinusCircleIcon />
+                  </Button>
+                </ReadOnlyTooltip>
               </FormGroup>
             </SplitItem>
           </Split>
diff --git a/src/routes/settings/costModels/components/readOnlyTooltip.tsx b/src/routes/settings/costModels/components/readOnlyTooltip.tsx
index e6cd88531..dc6f05faa 100644
--- a/src/routes/settings/costModels/components/readOnlyTooltip.tsx
+++ b/src/routes/settings/costModels/components/readOnlyTooltip.tsx
@@ -1,25 +1,34 @@
 import { Tooltip } from '@patternfly/react-core';
 import messages from 'locales/messages';
 import React from 'react';
+import type { MessageDescriptor } from 'react-intl';
 import { useIntl } from 'react-intl';
 
 interface ReadOnlyTooltipBase {
-  tooltip?: string;
+  defaultMsg?: MessageDescriptor;
   children: JSX.Element;
-  isDisabled: boolean;
+  isDisabled?: boolean;
 }
 
-const ReadOnlyTooltip: React.FC<ReadOnlyTooltipBase> = ({ children, tooltip, isDisabled }) => {
+const ReadOnlyTooltip: React.FC<ReadOnlyTooltipBase> = ({ children, defaultMsg, isDisabled }) => {
   const intl = useIntl();
-  const content = tooltip ? tooltip : intl.formatMessage(messages.readOnlyPermissions);
 
-  return isDisabled ? (
-    <Tooltip isContentLeftAligned content={<div>{content}</div>}>
-      <div aria-label={intl.formatMessage(messages.readOnly)}>{children}</div>
-    </Tooltip>
-  ) : (
-    children
-  );
+  const getChildren = () => {
+    if (isDisabled) {
+      return <div aria-label={intl.formatMessage(messages.readOnly)}>{children}</div>;
+    }
+    return children;
+  };
+
+  if (defaultMsg || isDisabled) {
+    const msg = intl.formatMessage(isDisabled ? messages.readOnly : defaultMsg);
+    return (
+      <Tooltip isContentLeftAligned content={msg}>
+        {getChildren()}
+      </Tooltip>
+    );
+  }
+  return children;
 };
 
 export { ReadOnlyTooltip };
diff --git a/src/routes/settings/costModels/costModel/sourcesTable.tsx b/src/routes/settings/costModels/costModel/sourcesTable.tsx
index 47378bbc8..03b9ee65c 100644
--- a/src/routes/settings/costModels/costModel/sourcesTable.tsx
+++ b/src/routes/settings/costModels/costModel/sourcesTable.tsx
@@ -56,7 +56,7 @@ const SourcesTable: React.FC<SourcesTableProps> = ({ canWrite, costModels, intl,
               })}
             </Td>
             <Td isActionCell>
-              <ReadOnlyTooltip key="action" isDisabled={!canWrite}>
+              <ReadOnlyTooltip defaultMsg={messages.costModelsSourceDeleteSource} key="action" isDisabled={!canWrite}>
                 <Button
                   aria-label={intl.formatMessage(messages.costModelsSourceDelete)}
                   isAriaDisabled={!canWrite}
diff --git a/src/routes/settings/costModels/costModelsDetails/table.tsx b/src/routes/settings/costModels/costModelsDetails/table.tsx
index cc9b99136..9a2bdef71 100644
--- a/src/routes/settings/costModels/costModelsDetails/table.tsx
+++ b/src/routes/settings/costModels/costModelsDetails/table.tsx
@@ -131,7 +131,7 @@ class CostModelsTableBase extends React.Component<CostModelsTableProps, CostMode
               ))}
               {!r.heightAuto && stateName === 'success' && (
                 <Td isActionCell>
-                  <ReadOnlyTooltip key="action" isDisabled={!canWrite}>
+                  <ReadOnlyTooltip defaultMsg={messages.costModelsDelete} key="action" isDisabled={!canWrite}>
                     <Button
                       aria-label={intl.formatMessage(messages.delete)}
                       isAriaDisabled={!canWrite}

From c840b0e92f5f8e4c08afbecbb70b8f5e692b7cd7 Mon Sep 17 00:00:00 2001
From: Dan Labrecque <dlabrecq@redhat.com>
Date: Thu, 21 Mar 2024 13:36:59 -0400
Subject: [PATCH 07/20] Apply cluster filters from OCP details to Optimizations

https://issues.redhat.com/browse/COST-4477
---
 .../components/breakdown/breakdownBase.tsx       |  7 ++++---
 .../components/pvcChart/modal/pvcContent.tsx     |  1 -
 .../components/pvcChart/modal/pvcToolbar.tsx     |  5 ++---
 src/routes/details/ocpBreakdown/ocpBreakdown.tsx |  1 +
 .../ocpBreakdown/ocpBreakdownOptimizations.tsx   | 16 +++++++++++++---
 src/routes/details/ocpDetails/detailsTable.tsx   |  4 ++--
 6 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/routes/details/components/breakdown/breakdownBase.tsx b/src/routes/details/components/breakdown/breakdownBase.tsx
index e233c85fe..23953650d 100644
--- a/src/routes/details/components/breakdown/breakdownBase.tsx
+++ b/src/routes/details/components/breakdown/breakdownBase.tsx
@@ -74,6 +74,7 @@ export interface BreakdownStateProps {
   providersFetchStatus?: FetchStatus;
   providerType?: ProviderType;
   query?: Query;
+  queryState?: Query;
   report?: Report;
   reportError?: AxiosError;
   reportFetchStatus?: FetchStatus;
@@ -152,7 +153,7 @@ class BreakdownBase extends React.Component<BreakdownProps, BreakdownState> {
   };
 
   private getTab = (tab: BreakdownTab, contentRef, showBadge: boolean, index: number) => {
-    const { groupBy, groupByValue } = this.props;
+    const { groupBy, groupByValue, queryState } = this.props;
 
     return (
       <Tab
@@ -170,8 +171,8 @@ class BreakdownBase extends React.Component<BreakdownProps, BreakdownState> {
                     scope="costManagementMfe"
                     appName="cost-management-mfe"
                     module="./MfeOptimizationsBadge"
-                    groupBy={groupBy}
-                    groupByValue={groupByValue}
+                    cluster={queryState?.filter_by?.cluster ? queryState.filter_by.cluster : undefined}
+                    project={groupBy === 'project' ? groupByValue : undefined}
                   />
                 }
               </span>
diff --git a/src/routes/details/components/pvcChart/modal/pvcContent.tsx b/src/routes/details/components/pvcChart/modal/pvcContent.tsx
index 993897226..b6c59b70a 100644
--- a/src/routes/details/components/pvcChart/modal/pvcContent.tsx
+++ b/src/routes/details/components/pvcChart/modal/pvcContent.tsx
@@ -117,7 +117,6 @@ const PvcContent: React.FC<PvcContentProps> = () => {
     return (
       <PvcToolbar
         isDisabled={isDisabled}
-        isProject
         itemsPerPage={itemsPerPage}
         itemsTotal={itemsTotal}
         onFilterAdded={filter => handleOnFilterAdded(filter)}
diff --git a/src/routes/details/components/pvcChart/modal/pvcToolbar.tsx b/src/routes/details/components/pvcChart/modal/pvcToolbar.tsx
index 8d29b4262..d5c352438 100644
--- a/src/routes/details/components/pvcChart/modal/pvcToolbar.tsx
+++ b/src/routes/details/components/pvcChart/modal/pvcToolbar.tsx
@@ -9,7 +9,6 @@ import type { Filter } from 'routes/utils/filter';
 
 interface PvcToolbarOwnProps {
   isDisabled?: boolean;
-  isProject?: boolean;
   itemsPerPage?: number;
   itemsTotal?: number;
   onFilterAdded(filter: Filter);
@@ -35,7 +34,7 @@ class PvcToolbarBase extends React.Component<PvcToolbarProps, PvcToolbarState> {
   }
 
   private getCategoryOptions = (): ToolbarChipGroup[] => {
-    const { intl, isProject } = this.props;
+    const { intl } = this.props;
 
     const options = [
       {
@@ -46,7 +45,7 @@ class PvcToolbarBase extends React.Component<PvcToolbarProps, PvcToolbarState> {
       { name: intl.formatMessage(messages.filterByValues, { value: 'cluster' }), key: 'cluster' },
       { name: intl.formatMessage(messages.filterByValues, { value: 'storage_class' }), key: 'storageclass' },
     ];
-    return isProject ? options : options.filter(option => option.key !== 'project');
+    return options;
   };
 
   public render() {
diff --git a/src/routes/details/ocpBreakdown/ocpBreakdown.tsx b/src/routes/details/ocpBreakdown/ocpBreakdown.tsx
index 3e5107d14..a6c4209d4 100644
--- a/src/routes/details/ocpBreakdown/ocpBreakdown.tsx
+++ b/src/routes/details/ocpBreakdown/ocpBreakdown.tsx
@@ -125,6 +125,7 @@ const mapStateToProps = createMapStateToProps<OcpBreakdownOwnProps, BreakdownSta
     providersFetchStatus,
     providerType: ProviderType.ocp,
     query,
+    queryState,
     report,
     reportError,
     reportFetchStatus,
diff --git a/src/routes/details/ocpBreakdown/ocpBreakdownOptimizations.tsx b/src/routes/details/ocpBreakdown/ocpBreakdownOptimizations.tsx
index 80166b7b2..153b59b3f 100644
--- a/src/routes/details/ocpBreakdown/ocpBreakdownOptimizations.tsx
+++ b/src/routes/details/ocpBreakdown/ocpBreakdownOptimizations.tsx
@@ -7,6 +7,7 @@ import { useIntl } from 'react-intl';
 import { useLocation } from 'react-router-dom';
 import { routes } from 'routes';
 import { getGroupById, getGroupByValue } from 'routes/utils/groupBy';
+import { getQueryState } from 'routes/utils/queryState';
 import { formatPath } from 'utils/paths';
 
 interface OcpOptimizationsBreakdownOwnProps {
@@ -20,15 +21,23 @@ const useQueryFromRoute = () => {
   return parseQuery<Query>(location.search);
 };
 
+const useQueryState = () => {
+  const location = useLocation();
+  return getQueryState(location, 'details');
+};
+
 const OcpBreakdownOptimizations: React.FC<OcpOptimizationsBreakdownProps> = () => {
   const intl = useIntl();
   const location = useLocation();
   const queryFromRoute = useQueryFromRoute();
+  const queryState = useQueryState();
 
   const groupBy = getGroupById(queryFromRoute);
   const groupByValue = getGroupByValue(queryFromRoute);
   const otimizationsTab = location.search.indexOf('optimizationsTab') === -1 ? '&optimizationsTab=true' : '';
 
+  const clusterFilter = queryState?.filter_by?.cluster ? queryState.filter_by.cluster : undefined;
+
   return (
     <AsyncComponent
       scope="costManagementMfe"
@@ -36,13 +45,14 @@ const OcpBreakdownOptimizations: React.FC<OcpOptimizationsBreakdownProps> = () =
       module="./MfeOptimizationsTable"
       breadcrumbLabel={intl.formatMessage(messages.breakdownBackToOptimizationsProject, { value: groupByValue })}
       breadcrumbPath={formatPath(`${routes.ocpBreakdown.path}${location.search}${otimizationsTab}`)}
-      groupBy={groupBy}
-      groupByValue={groupByValue}
-      isProject={false}
+      cluster={clusterFilter}
+      hideCluster={clusterFilter !== undefined}
+      hideProject={groupBy === 'project'}
       linkPath={formatPath(routes.optimizationsBreakdown.path)}
       linkState={{
         ...(location.state && location.state),
       }}
+      project={groupBy === 'project' ? groupByValue : undefined}
     />
   );
 };
diff --git a/src/routes/details/ocpDetails/detailsTable.tsx b/src/routes/details/ocpDetails/detailsTable.tsx
index c830ab09f..b852ec99c 100644
--- a/src/routes/details/ocpDetails/detailsTable.tsx
+++ b/src/routes/details/ocpDetails/detailsTable.tsx
@@ -282,8 +282,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps, DetailsTableSt
                 scope="costManagementMfe"
                 appName="cost-management-mfe"
                 module="./MfeOptimizationsLink"
-                groupBy={groupBy}
-                groupByValue={item.id}
+                cluster={query?.filter_by?.cluster ? query.filter_by.cluster : undefined}
                 linkPath={getBreakdownPath({
                   basePath,
                   description: item.id,
@@ -300,6 +299,7 @@ class DetailsTableBase extends React.Component<DetailsTableProps, DetailsTableSt
                     breadcrumbPath,
                   },
                 }}
+                project={item.id}
               />
             ),
           },

From 05521b19f497ff56706a67fc8af1ea9e242d39d5 Mon Sep 17 00:00:00 2001
From: Dan Labrecque <dlabrecq@redhat.com>
Date: Fri, 22 Mar 2024 09:11:01 -0400
Subject: [PATCH 08/20] Lack of description omits cluster info link

https://issues.redhat.com/browse/COST-4761
---
 .../components/breakdown/breakdownHeader.styles.ts   |  3 +++
 .../details/components/breakdown/breakdownHeader.tsx | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/routes/details/components/breakdown/breakdownHeader.styles.ts b/src/routes/details/components/breakdown/breakdownHeader.styles.ts
index 9c872185d..18498165b 100644
--- a/src/routes/details/components/breakdown/breakdownHeader.styles.ts
+++ b/src/routes/details/components/breakdown/breakdownHeader.styles.ts
@@ -8,6 +8,9 @@ import global_spacer_xs from '@patternfly/react-tokens/dist/js/global_spacer_xs'
 import type React from 'react';
 
 export const styles = {
+  clusterInfoContainer: {
+    marginLeft: '-17px',
+  },
   cost: {
     marginTop: global_spacer_xl.var,
   },
diff --git a/src/routes/details/components/breakdown/breakdownHeader.tsx b/src/routes/details/components/breakdown/breakdownHeader.tsx
index c4d403157..c500fb1c4 100644
--- a/src/routes/details/components/breakdown/breakdownHeader.tsx
+++ b/src/routes/details/components/breakdown/breakdownHeader.tsx
@@ -160,13 +160,13 @@ class BreakdownHeader extends React.Component<BreakdownHeaderProps, any> {
             <Title headingLevel="h1" size={TitleSizes['2xl']}>
               {intl.formatMessage(messages.breakdownTitle, { value: title })}
             </Title>
-            {description && (
-              <div style={styles.descriptionContainer}>
-                <span style={styles.description}>{description}</span>
+            <div style={styles.descriptionContainer}>
+              {description && <span style={styles.description}>{description}</span>}
+              <span style={!description ? styles.clusterInfoContainer : undefined}>
                 {clusterInfoComponent && isClusterInfoToggleEnabled ? clusterInfoComponent : null}
-                {dataDetailsComponent && isClusterInfoToggleEnabled ? <div>{dataDetailsComponent}</div> : null}
-              </div>
-            )}
+              </span>
+              {dataDetailsComponent && isClusterInfoToggleEnabled ? <div>{dataDetailsComponent}</div> : null}
+            </div>
             {showCostDistribution && (
               <div style={styles.costDistribution}>
                 <CostDistribution costDistribution={costDistribution} onSelect={onCostDistributionSelect} />

From 26b2220aa71873dd5f40b6c7c019c478bb09c663 Mon Sep 17 00:00:00 2001
From: Dan Labrecque <dlabrecq@redhat.com>
Date: Fri, 22 Mar 2024 10:41:02 -0400
Subject: [PATCH 09/20] Status props may not be available initially.

https://issues.redhat.com/browse/COST-4761
---
 .../dataDetails/components/overallStatus.tsx     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/overallStatus.tsx b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/overallStatus.tsx
index af5eb5dae..58991233c 100644
--- a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/overallStatus.tsx
+++ b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/overallStatus.tsx
@@ -59,25 +59,25 @@ const OverallStatus: React.FC<OverallStatusProps> = ({ clusterId }: OverallStatu
       }
       if (statusType === StatusType.complete) {
         if (
-          state1.status === statusType &&
-          state2.status === statusType &&
-          state3.status === statusType &&
-          state4.status === statusType
+          state1?.status === statusType &&
+          state2?.status === statusType &&
+          state3?.status === statusType &&
+          state4?.status === statusType
         ) {
           msg = state1.msg;
           status = statusType;
         }
       } else {
-        if (state1.status === statusType) {
+        if (state1?.status === statusType) {
           msg = state1.msg;
           status = statusType;
-        } else if (state2.status === statusType) {
+        } else if (state2?.status === statusType) {
           msg = state2.msg;
           status = statusType;
-        } else if (state3.status === statusType) {
+        } else if (state3?.status === statusType) {
           msg = state3.msg;
           status = statusType;
-        } else if (state4.status === statusType) {
+        } else if (state4?.status === statusType) {
           msg = state4.msg;
           status = statusType;
         }

From 2d9d8f1ea139d86a92a3e3811c32a249b9e5754d Mon Sep 17 00:00:00 2001
From: Dan Labrecque <dlabrecq@redhat.com>
Date: Fri, 22 Mar 2024 11:40:37 -0400
Subject: [PATCH 10/20] Fix message when infrastructure is missing properties

https://issues.redhat.com/browse/COST-4761
---
 .../dataDetails/components/overallStatus.tsx      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/overallStatus.tsx b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/overallStatus.tsx
index 58991233c..2841805f9 100644
--- a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/overallStatus.tsx
+++ b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/overallStatus.tsx
@@ -96,12 +96,15 @@ const OverallStatus: React.FC<OverallStatusProps> = ({ clusterId }: OverallStatu
   };
 
   const overallStatus = getOverallStatus();
-  return (
-    <>
-      <span style={styles.statusIcon}>{getOverallStatusIcon(overallStatus.status)}</span>
-      <span style={styles.description}>{intl.formatMessage(overallStatus.msg)}</span>
-    </>
-  );
+  if (overallStatus.msg && overallStatus.status) {
+    return (
+      <>
+        <span style={styles.statusIcon}>{getOverallStatusIcon(overallStatus.status)}</span>
+        <span style={styles.description}>{intl.formatMessage(overallStatus.msg)}</span>
+      </>
+    );
+  }
+  return null;
 };
 
 // eslint-disable-next-line no-empty-pattern

From efc579c6dbd7f694ef12ff05eb0d6f5091e3e253 Mon Sep 17 00:00:00 2001
From: Dan Labrecque <dlabrecq@redhat.com>
Date: Fri, 22 Mar 2024 12:17:20 -0400
Subject: [PATCH 11/20] Skip summaryState for cloud

https://issues.redhat.com/browse/COST-4761
---
 .../dataDetails/components/overallStatus.tsx          | 11 ++++++-----
 .../providerDetails/dataDetails/utils/status.ts       |  8 ++++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/overallStatus.tsx b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/overallStatus.tsx
index 2841805f9..e96ef266d 100644
--- a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/overallStatus.tsx
+++ b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/components/overallStatus.tsx
@@ -50,7 +50,7 @@ const OverallStatus: React.FC<OverallStatusProps> = ({ clusterId }: OverallStatu
 
     const cloudAvailability = getProviderAvailability(cloudProvider);
     const clusterAvailability = getProviderAvailability(clusterProvider);
-    const cloudStatus = getProviderStatus(cloudProvider);
+    const cloudStatus = getProviderStatus(cloudProvider, true);
     const clusterStatus = getProviderStatus(clusterProvider);
 
     const initializeState = (statusType: StatusType, state1, state2, state3, state4) => {
@@ -58,11 +58,12 @@ const OverallStatus: React.FC<OverallStatusProps> = ({ clusterId }: OverallStatu
         return;
       }
       if (statusType === StatusType.complete) {
+        // A cluster may not have an integration, so cloudProvider could be undefined
         if (
-          state1?.status === statusType &&
-          state2?.status === statusType &&
-          state3?.status === statusType &&
-          state4?.status === statusType
+          (state1 === undefined || state1.status === statusType) &&
+          (state2 === undefined || state2?.status === statusType) &&
+          (state3 === undefined || state3?.status === statusType) &&
+          (state4 === undefined || state4?.status === statusType)
         ) {
           msg = state1.msg;
           status = statusType;
diff --git a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/utils/status.ts b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/utils/status.ts
index 69dc6eb37..a1c57c29d 100644
--- a/src/routes/details/ocpBreakdown/providerDetails/dataDetails/utils/status.ts
+++ b/src/routes/details/ocpBreakdown/providerDetails/dataDetails/utils/status.ts
@@ -76,16 +76,20 @@ const getProviderStatusMsg = (
   return msg;
 };
 
-export const getProviderStatus = (provider: Provider): { msg: MessageDescriptor; status: StatusType } => {
+export const getProviderStatus = (
+  provider: Provider,
+  isCloud = false
+): { msg: MessageDescriptor; status: StatusType } => {
   let status;
   let msg;
   if (!provider) {
     return status;
   }
 
+  // Skip summaryState for cloud
   const downloadState = lookupKey(provider.status.download.state);
   const processingState = lookupKey(provider.status.processing.state);
-  const summaryState = lookupKey(provider.status.summary.state);
+  const summaryState = isCloud ? StatusType.complete : lookupKey(provider.status.summary.state);
 
   if (
     downloadState === StatusType.failed ||

From 1a975345c89909e4446fc10728c746e41b8e06d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 10:50:33 +0000
Subject: [PATCH 12/20] (chore): Bump the lint-dependencies group with 2
 updates

Bumps the lint-dependencies group with 2 updates: [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) and [eslint-plugin-jest-dom](https://github.com/testing-library/eslint-plugin-jest-dom).


Updates `@typescript-eslint/parser` from 7.2.0 to 7.3.1
- [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases)
- [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md)
- [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v7.3.1/packages/parser)

Updates `eslint-plugin-jest-dom` from 5.1.0 to 5.2.0
- [Release notes](https://github.com/testing-library/eslint-plugin-jest-dom/releases)
- [Commits](https://github.com/testing-library/eslint-plugin-jest-dom/compare/v5.1.0...v5.2.0)

---
updated-dependencies:
- dependency-name: "@typescript-eslint/parser"
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: lint-dependencies
- dependency-name: eslint-plugin-jest-dom
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: lint-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 146 +++++++++++++++++++++++++++++++++++++++++-----
 package.json      |   4 +-
 2 files changed, 135 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index aba5a8a46..1e2068991 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -59,12 +59,12 @@
         "@types/react-redux": "^7.1.33",
         "@types/react-router-dom": "^5.3.3",
         "@typescript-eslint/eslint-plugin": "^7.2.0",
-        "@typescript-eslint/parser": "^7.2.0",
+        "@typescript-eslint/parser": "^7.3.1",
         "aphrodite": "^2.4.0",
         "copy-webpack-plugin": "^12.0.2",
         "eslint": "^8.57.0",
         "eslint-plugin-formatjs": "^4.12.2",
-        "eslint-plugin-jest-dom": "^5.1.0",
+        "eslint-plugin-jest-dom": "^5.2.0",
         "eslint-plugin-jsdoc": "^48.2.1",
         "eslint-plugin-markdown": "^4.0.1",
         "eslint-plugin-patternfly-react": "^5.2.1",
@@ -4395,19 +4395,19 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.2.0.tgz",
-      "integrity": "sha512-5FKsVcHTk6TafQKQbuIVkXq58Fnbkd2wDL4LB7AURN7RUOu1utVP+G8+6u3ZhEroW3DF6hyo3ZEXxgKgp4KeCg==",
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.3.1.tgz",
+      "integrity": "sha512-Rq49+pq7viTRCH48XAbTA+wdLRrB/3sRq4Lpk0oGDm0VmnjBrAOVXH/Laalmwsv2VpekiEfVFwJYVk6/e8uvQw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "7.2.0",
-        "@typescript-eslint/types": "7.2.0",
-        "@typescript-eslint/typescript-estree": "7.2.0",
-        "@typescript-eslint/visitor-keys": "7.2.0",
+        "@typescript-eslint/scope-manager": "7.3.1",
+        "@typescript-eslint/types": "7.3.1",
+        "@typescript-eslint/typescript-estree": "7.3.1",
+        "@typescript-eslint/visitor-keys": "7.3.1",
         "debug": "^4.3.4"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -4422,6 +4422,126 @@
         }
       }
     },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.3.1.tgz",
+      "integrity": "sha512-fVS6fPxldsKY2nFvyT7IP78UO1/I2huG+AYu5AMjCT9wtl6JFiDnsv4uad4jQ0GTFzcUV5HShVeN96/17bTBag==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.3.1",
+        "@typescript-eslint/visitor-keys": "7.3.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.3.1.tgz",
+      "integrity": "sha512-2tUf3uWggBDl4S4183nivWQ2HqceOZh1U4hhu4p1tPiIJoRRXrab7Y+Y0p+dozYwZVvLPRI6r5wKe9kToF9FIw==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.3.1.tgz",
+      "integrity": "sha512-tLpuqM46LVkduWP7JO7yVoWshpJuJzxDOPYIVWUUZbW+4dBpgGeUdl/fQkhuV0A8eGnphYw3pp8d2EnvPOfxmQ==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.3.1",
+        "@typescript-eslint/visitor-keys": "7.3.1",
+        "debug": "^4.3.4",
+        "globby": "^11.1.0",
+        "is-glob": "^4.0.3",
+        "minimatch": "9.0.3",
+        "semver": "^7.5.4",
+        "ts-api-utils": "^1.0.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "7.3.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.3.1.tgz",
+      "integrity": "sha512-9RMXwQF8knsZvfv9tdi+4D/j7dMG28X/wMJ8Jj6eOHyHWwDW4ngQJcqEczSsqIKKjFiLFr40Mnr7a5ulDD3vmw==",
+      "dev": true,
+      "dependencies": {
+        "@typescript-eslint/types": "7.3.1",
+        "eslint-visitor-keys": "^3.4.1"
+      },
+      "engines": {
+        "node": "^18.18.0 || >=20.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
+      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
+      "dev": true,
+      "engines": {
+        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dev": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/semver": {
+      "version": "7.6.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
+      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
+      "dev": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@typescript-eslint/parser/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "dev": true
+    },
     "node_modules/@typescript-eslint/scope-manager": {
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz",
@@ -9118,9 +9238,9 @@
       }
     },
     "node_modules/eslint-plugin-jest-dom": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-jest-dom/-/eslint-plugin-jest-dom-5.1.0.tgz",
-      "integrity": "sha512-JIXZp+E/h/aGlP/rQc4tuOejiHlZXg65qw8JAJMIJA5VsdjOkss/SYcRSqBrQuEOytEM8JvngUjcz31d1RrCrA==",
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-jest-dom/-/eslint-plugin-jest-dom-5.2.0.tgz",
+      "integrity": "sha512-ctnCP0MsLmUvbCyhnOQ+/1OmsZj+e7V6kFunazIx5728Yq7TQnuKI8HOsgPTStB+9iYEpiEa+VfKB09Lq7/3fA==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.16.3",
diff --git a/package.json b/package.json
index 4fbdce394..e66c16c1b 100644
--- a/package.json
+++ b/package.json
@@ -99,12 +99,12 @@
     "@types/react-redux": "^7.1.33",
     "@types/react-router-dom": "^5.3.3",
     "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@typescript-eslint/parser": "^7.2.0",
+    "@typescript-eslint/parser": "^7.3.1",
     "aphrodite": "^2.4.0",
     "copy-webpack-plugin": "^12.0.2",
     "eslint": "^8.57.0",
     "eslint-plugin-formatjs": "^4.12.2",
-    "eslint-plugin-jest-dom": "^5.1.0",
+    "eslint-plugin-jest-dom": "^5.2.0",
     "eslint-plugin-jsdoc": "^48.2.1",
     "eslint-plugin-markdown": "^4.0.1",
     "eslint-plugin-patternfly-react": "^5.2.1",

From c819b71cf37c24abbdd8761e8e9b0cf0e57d661b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 10:51:22 +0000
Subject: [PATCH 13/20] (chore): Bump the test-dependencies group with 1 update

Bumps the test-dependencies group with 1 update: [@testing-library/react](https://github.com/testing-library/react-testing-library).


Updates `@testing-library/react` from 14.2.1 to 14.2.2
- [Release notes](https://github.com/testing-library/react-testing-library/releases)
- [Changelog](https://github.com/testing-library/react-testing-library/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testing-library/react-testing-library/compare/v14.2.1...v14.2.2)

---
updated-dependencies:
- dependency-name: "@testing-library/react"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: test-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index aba5a8a46..740308fd7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -50,7 +50,7 @@
         "@swc/core": "1.3.105",
         "@swc/jest": "^0.2.36",
         "@testing-library/jest-dom": "^6.4.2",
-        "@testing-library/react": "^14.2.1",
+        "@testing-library/react": "^14.2.2",
         "@testing-library/user-event": "^14.5.2",
         "@types/jest": "^29.5.12",
         "@types/qs": "^6.9.12",
@@ -3629,9 +3629,9 @@
       }
     },
     "node_modules/@testing-library/react": {
-      "version": "14.2.1",
-      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-14.2.1.tgz",
-      "integrity": "sha512-sGdjws32ai5TLerhvzThYFbpnF9XtL65Cjf+gB0Dhr29BGqK+mAeN7SURSdu+eqgET4ANcWoC7FQpkaiGvBr+A==",
+      "version": "14.2.2",
+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-14.2.2.tgz",
+      "integrity": "sha512-SOUuM2ysCvjUWBXTNfQ/ztmnKDmqaiPV3SvoIuyxMUca45rbSWWAT/qB8CUs/JQ/ux/8JFs9DNdFQ3f6jH3crA==",
       "dev": true,
       "dependencies": {
         "@babel/runtime": "^7.12.5",
diff --git a/package.json b/package.json
index 4fbdce394..e7f3ee3b5 100644
--- a/package.json
+++ b/package.json
@@ -90,7 +90,7 @@
     "@swc/core": "1.3.105",
     "@swc/jest": "^0.2.36",
     "@testing-library/jest-dom": "^6.4.2",
-    "@testing-library/react": "^14.2.1",
+    "@testing-library/react": "^14.2.2",
     "@testing-library/user-event": "^14.5.2",
     "@types/jest": "^29.5.12",
     "@types/qs": "^6.9.12",

From abcb2de002702e21e73658083c68abc65a98c2bd Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 25 Mar 2024 10:55:59 +0000
Subject: [PATCH 14/20] (chore): Bump the ci-dependencies group with 5 updates

Bumps the ci-dependencies group with 5 updates:

| Package | From | To |
| --- | --- | --- |
| [@reduxjs/toolkit](https://github.com/reduxjs/redux-toolkit) | `2.2.1` | `2.2.2` |
| [react-intl](https://github.com/formatjs/formatjs) | `6.6.2` | `6.6.3` |
| [@formatjs/cli](https://github.com/formatjs/formatjs) | `6.2.7` | `6.2.8` |
| [@types/qs](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/qs) | `6.9.12` | `6.9.14` |
| [typescript](https://github.com/Microsoft/TypeScript) | `5.4.2` | `5.4.3` |


Updates `@reduxjs/toolkit` from 2.2.1 to 2.2.2
- [Release notes](https://github.com/reduxjs/redux-toolkit/releases)
- [Commits](https://github.com/reduxjs/redux-toolkit/compare/v2.2.1...v2.2.2)

Updates `react-intl` from 6.6.2 to 6.6.3
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/react-intl@6.6.2...react-intl@6.6.3)

Updates `@formatjs/cli` from 6.2.7 to 6.2.8
- [Release notes](https://github.com/formatjs/formatjs/releases)
- [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/cli@6.2.7...@formatjs/cli@6.2.8)

Updates `@types/qs` from 6.9.12 to 6.9.14
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/qs)

Updates `typescript` from 5.4.2 to 5.4.3
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Changelog](https://github.com/microsoft/TypeScript/blob/main/azure-pipelines.release.yml)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v5.4.2...v5.4.3)

---
updated-dependencies:
- dependency-name: "@reduxjs/toolkit"
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ci-dependencies
- dependency-name: react-intl
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: ci-dependencies
- dependency-name: "@formatjs/cli"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: ci-dependencies
- dependency-name: "@types/qs"
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: ci-dependencies
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-patch
  dependency-group: ci-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 48 +++++++++++++++++++++++------------------------
 package.json      | 10 +++++-----
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index aba5a8a46..a19a6016a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -22,7 +22,7 @@
         "@redhat-cloud-services/frontend-components-translations": "^3.2.7",
         "@redhat-cloud-services/frontend-components-utilities": "^4.0.7",
         "@redhat-cloud-services/rbac-client": "^1.2.13",
-        "@reduxjs/toolkit": "^2.2.1",
+        "@reduxjs/toolkit": "^2.2.2",
         "@unleash/proxy-client-react": "^4.2.2",
         "axios": "^1.6.8",
         "date-fns": "^3.6.0",
@@ -31,7 +31,7 @@
         "qs": "^6.12.0",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
-        "react-intl": "^6.6.2",
+        "react-intl": "^6.6.3",
         "react-redux": "^9.1.0",
         "react-router-dom": "^6.22.3",
         "redux": "^5.0.1",
@@ -41,7 +41,7 @@
         "victory-core": "^37.0.0"
       },
       "devDependencies": {
-        "@formatjs/cli": "^6.2.7",
+        "@formatjs/cli": "^6.2.8",
         "@formatjs/ecma402-abstract": "^1.18.2",
         "@formatjs/icu-messageformat-parser": "^2.7.6",
         "@redhat-cloud-services/eslint-config-redhat-cloud-services": "^2.0.3",
@@ -53,7 +53,7 @@
         "@testing-library/react": "^14.2.1",
         "@testing-library/user-event": "^14.5.2",
         "@types/jest": "^29.5.12",
-        "@types/qs": "^6.9.12",
+        "@types/qs": "^6.9.14",
         "@types/react": "^18.2.67",
         "@types/react-dom": "^18.2.22",
         "@types/react-redux": "^7.1.33",
@@ -86,7 +86,7 @@
         "rimraf": "^5.0.5",
         "ts-jest": "^29.1.2",
         "ts-patch": "^3.1.2",
-        "typescript": "^5.4.2",
+        "typescript": "^5.4.3",
         "webpack-bundle-analyzer": "^4.10.1"
       },
       "engines": {
@@ -872,9 +872,9 @@
       }
     },
     "node_modules/@formatjs/cli": {
-      "version": "6.2.7",
-      "resolved": "https://registry.npmjs.org/@formatjs/cli/-/cli-6.2.7.tgz",
-      "integrity": "sha512-F8sPvXsrjOXKAXpbZo3HObq3TZWNa91cimRukmy/54GRo83V0q2ybj9YXtBfcGlnFhzRFXq8ukkTtHgYeRMJaQ==",
+      "version": "6.2.8",
+      "resolved": "https://registry.npmjs.org/@formatjs/cli/-/cli-6.2.8.tgz",
+      "integrity": "sha512-sGtFehlHpNL5xbCkP5/zz5lgIVPPdQFqhY6Pcc9+whpBawln6VDzbaGA5ttWjtBDVVKZbEukiCFk8HW2H0OVxQ==",
       "dev": true,
       "bin": {
         "formatjs": "bin/formatjs"
@@ -928,9 +928,9 @@
       }
     },
     "node_modules/@formatjs/intl": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.10.0.tgz",
-      "integrity": "sha512-X3xT9guVkKDS86EKV80lS0KxoazUglkJTGZO66sKY7otgl0VeStPA8B3u8UkKT47PexVV98fUzjpkchYmbe9nw==",
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/@formatjs/intl/-/intl-2.10.1.tgz",
+      "integrity": "sha512-dsLG15U7xDi8yzKf4hcAWSsCaez3XrjTO2oaRHPyHtXLm1aEzYbDw6bClo/HMHu+iwS5GbDqT3DV+hYP2ylScg==",
       "dependencies": {
         "@formatjs/ecma402-abstract": "1.18.2",
         "@formatjs/fast-memoize": "2.2.0",
@@ -3002,9 +3002,9 @@
       "integrity": "sha512-P50stc+mnWLycID46/AKmD/760r5N1eoam//O6MUVriqVorUdht7xkUL78aJZU1vw8WW6xlrDHwz3F6BM148qg=="
     },
     "node_modules/@reduxjs/toolkit": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.2.1.tgz",
-      "integrity": "sha512-8CREoqJovQW/5I4yvvijm/emUiCCmcs4Ev4XPWd4mizSO+dD3g5G6w34QK5AGeNrSH7qM8Fl66j4vuV7dpOdkw==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.2.2.tgz",
+      "integrity": "sha512-454GZrEx3G6QSYwIx9ROaso1HR6sTH8qyZBe3KEsdWVGU3ayV8jYCwdaEJV3vl9V6+pi3GRl+7Xl7AeDna6qwQ==",
       "dependencies": {
         "immer": "^10.0.3",
         "redux": "^5.0.1",
@@ -4074,9 +4074,9 @@
       "integrity": "sha512-ga8y9v9uyeiLdpKddhxYQkxNDrfvuPrlFb0N1qnZZByvcElJaXthF1UhvCh9TLWJBEHeNtdnbysW7Y6Uq8CVng=="
     },
     "node_modules/@types/qs": {
-      "version": "6.9.12",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.12.tgz",
-      "integrity": "sha512-bZcOkJ6uWrL0Qb2NAWKa7TBU+mJHPzhx9jjLL1KHF+XpzEcR7EXHvjbHlGtR/IsP1vyPrehuS6XqkmaePy//mg==",
+      "version": "6.9.14",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.14.tgz",
+      "integrity": "sha512-5khscbd3SwWMhFqylJBLQ0zIu7c1K6Vz0uBIt915BI3zV0q1nfjRQD3RqSBcPaO6PHEF4ov/t9y89fSiyThlPA==",
       "dev": true
     },
     "node_modules/@types/range-parser": {
@@ -17862,13 +17862,13 @@
       "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ=="
     },
     "node_modules/react-intl": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-6.6.2.tgz",
-      "integrity": "sha512-IpW2IkLtGENSFlX3vfH11rjuCIsW0VyjT0Q1pPKMZPtT2z1FxLt4weFT5Ezti2TScT1xiyb3aQBFth9EB7jzAg==",
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/react-intl/-/react-intl-6.6.3.tgz",
+      "integrity": "sha512-vLKI0f+Q3pXD5szmCUPikTY7CJDPtxCBMG5YABQZ3IGEKzNB47zlvXyasUFfT25zpgQXeOfhRCdx4q6ubuR6bA==",
       "dependencies": {
         "@formatjs/ecma402-abstract": "1.18.2",
         "@formatjs/icu-messageformat-parser": "2.7.6",
-        "@formatjs/intl": "2.10.0",
+        "@formatjs/intl": "2.10.1",
         "@formatjs/intl-displaynames": "6.6.6",
         "@formatjs/intl-listformat": "7.5.5",
         "@types/hoist-non-react-statics": "^3.3.1",
@@ -20378,9 +20378,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.2.tgz",
-      "integrity": "sha512-+2/g0Fds1ERlP6JsakQQDXjZdZMM+rqpamFZJEKh4kwTIn3iDkgKtby0CeNd5ATNZ4Ry1ax15TMx0W2V+miizQ==",
+      "version": "5.4.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.3.tgz",
+      "integrity": "sha512-KrPd3PKaCLr78MalgiwJnA25Nm8HAmdwN3mYUYZgG/wizIo9EainNVQI9/yDavtVFRN2h3k8uf3GLHuhDMgEHg==",
       "devOptional": true,
       "bin": {
         "tsc": "bin/tsc",
diff --git a/package.json b/package.json
index 4fbdce394..05b4826dd 100644
--- a/package.json
+++ b/package.json
@@ -62,7 +62,7 @@
     "@redhat-cloud-services/frontend-components-translations": "^3.2.7",
     "@redhat-cloud-services/frontend-components-utilities": "^4.0.7",
     "@redhat-cloud-services/rbac-client": "^1.2.13",
-    "@reduxjs/toolkit": "^2.2.1",
+    "@reduxjs/toolkit": "^2.2.2",
     "@unleash/proxy-client-react": "^4.2.2",
     "axios": "^1.6.8",
     "date-fns": "^3.6.0",
@@ -71,7 +71,7 @@
     "qs": "^6.12.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-intl": "^6.6.2",
+    "react-intl": "^6.6.3",
     "react-redux": "^9.1.0",
     "react-router-dom": "^6.22.3",
     "redux": "^5.0.1",
@@ -81,7 +81,7 @@
     "victory-core": "^37.0.0"
   },
   "devDependencies": {
-    "@formatjs/cli": "^6.2.7",
+    "@formatjs/cli": "^6.2.8",
     "@formatjs/ecma402-abstract": "^1.18.2",
     "@formatjs/icu-messageformat-parser": "^2.7.6",
     "@redhat-cloud-services/eslint-config-redhat-cloud-services": "^2.0.3",
@@ -93,7 +93,7 @@
     "@testing-library/react": "^14.2.1",
     "@testing-library/user-event": "^14.5.2",
     "@types/jest": "^29.5.12",
-    "@types/qs": "^6.9.12",
+    "@types/qs": "^6.9.14",
     "@types/react": "^18.2.67",
     "@types/react-dom": "^18.2.22",
     "@types/react-redux": "^7.1.33",
@@ -126,7 +126,7 @@
     "rimraf": "^5.0.5",
     "ts-jest": "^29.1.2",
     "ts-patch": "^3.1.2",
-    "typescript": "^5.4.2",
+    "typescript": "^5.4.3",
     "webpack-bundle-analyzer": "^4.10.1"
   },
   "overrides": {

From 356ed1a1542d7502a9cc87cdeabc5f50c251114d Mon Sep 17 00:00:00 2001
From: Dan Labrecque <dlabrecq@redhat.com>
Date: Mon, 25 Mar 2024 20:03:28 -0400
Subject: [PATCH 15/20] Restore source type column in tag mapping wizard

https://issues.redhat.com/browse/COST-3824
---
 locales/data.json                             |  6 ++++
 locales/translations.json                     |  1 +
 src/locales/messages.ts                       |  5 +++
 .../parentTagMappingReview.tsx                |  8 +++++
 .../components/parentTags/parentTagsTable.tsx |  8 +++++
 .../parentTags/parentTagsToolbar.tsx          | 31 +++++++++++++++++++
 6 files changed, 59 insertions(+)

diff --git a/locales/data.json b/locales/data.json
index 182abdcc3..18d4bef08 100644
--- a/locales/data.json
+++ b/locales/data.json
@@ -12162,6 +12162,12 @@
         "value": "Parent tag key"
       }
     ],
+    "tagKeyParentSource": [
+      {
+        "type": 0,
+        "value": "Parent integration"
+      }
+    ],
     "tagLabels": [
       {
         "type": 0,
diff --git a/locales/translations.json b/locales/translations.json
index 418b8df15..36a80b8ba 100644
--- a/locales/translations.json
+++ b/locales/translations.json
@@ -554,6 +554,7 @@
   "tagHeadingValue": "Value",
   "tagKeyChild": "Child tag keys",
   "tagKeyParent": "Parent tag key",
+  "tagKeyParentSource": "Parent integration",
   "tagLabels": "Tags and labels",
   "tagLabelsEnable": "Enable tags and labels",
   "tagLabelsMap": "Map tags and labels",
diff --git a/src/locales/messages.ts b/src/locales/messages.ts
index 1153b8398..e687c749c 100644
--- a/src/locales/messages.ts
+++ b/src/locales/messages.ts
@@ -3408,6 +3408,11 @@ export default defineMessages({
     description: 'Parent tag key',
     id: 'tagKeyParent',
   },
+  tagKeyParentSource: {
+    defaultMessage: 'Parent integration',
+    description: 'Parent integration',
+    id: 'tagKeyParentSource',
+  },
   tagLabelsEnable: {
     defaultMessage: 'Enable tags and labels',
     description: 'Enable tags and labels',
diff --git a/src/routes/settings/tagLabels/tagMapping/components/parentTagMapping/parentTagMappingReview.tsx b/src/routes/settings/tagLabels/tagMapping/components/parentTagMapping/parentTagMappingReview.tsx
index 3a97e7a66..737294164 100644
--- a/src/routes/settings/tagLabels/tagMapping/components/parentTagMapping/parentTagMappingReview.tsx
+++ b/src/routes/settings/tagLabels/tagMapping/components/parentTagMapping/parentTagMappingReview.tsx
@@ -98,6 +98,14 @@ const ParentTagMappingReview: React.FC<ParentTagMappingReviewProps> = ({
                 {intl.formatMessage(messages.tagKeyParent)}
               </TextListItem>
               <TextListItem component={TextListItemVariants.dd}>{parentTags.map(item => item.key)}</TextListItem>
+              <TextListItem component={TextListItemVariants.dt}>
+                {intl.formatMessage(messages.tagKeyParentSource)}
+              </TextListItem>
+              <TextListItem component={TextListItemVariants.dd}>
+                {parentTags.map(item =>
+                  intl.formatMessage(messages.sourceTypes, { value: item?.source_type?.toLowerCase() })
+                )}
+              </TextListItem>
             </TextList>
           </TextContent>
         </StackItem>
diff --git a/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTagsTable.tsx b/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTagsTable.tsx
index a7dd043d2..f2df28e42 100644
--- a/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTagsTable.tsx
+++ b/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTagsTable.tsx
@@ -52,6 +52,11 @@ const ParentTagsTable: React.FC<ParentTagsTableProps> = ({
         name: intl.formatMessage(messages.detailsResourceNames, { value: 'tag_key' }),
         ...(tags.length && { isSortable: true }),
       },
+      {
+        orderBy: 'provider_type', // Todo: Rename as source_type?
+        name: intl.formatMessage(messages.sourceType),
+        ...(tags.length && { isSortable: true }),
+      },
     ];
 
     tags.map(item => {
@@ -63,6 +68,9 @@ const ParentTagsTable: React.FC<ParentTagsTableProps> = ({
           {
             value: item.key ? item.key : '',
           },
+          {
+            value: intl.formatMessage(messages.sourceTypes, { value: item?.source_type?.toLowerCase() }),
+          },
         ],
         item,
         selected: selectedItems?.find(val => val.uuid === item.uuid) !== undefined,
diff --git a/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTagsToolbar.tsx b/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTagsToolbar.tsx
index 71c985818..53d308eda 100644
--- a/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTagsToolbar.tsx
+++ b/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTagsToolbar.tsx
@@ -42,6 +42,37 @@ const ParentTagsToolbar: React.FC<ParentTagsToolbarProps> = ({
         key: 'key',
         name: intl.formatMessage(messages.filterByValues, { value: 'tag_key' }),
       },
+      {
+        key: 'source_type',
+        name: intl.formatMessage(messages.filterByValues, { value: 'source_type' }),
+        selectClassName: 'selectOverride', // A selector from routes/components/dataToolbar/dataToolbar.scss
+        selectOptions: [
+          {
+            key: 'AWS',
+            name: intl.formatMessage(messages.aws),
+          },
+          {
+            key: 'Azure',
+            name: intl.formatMessage(messages.azure),
+          },
+          {
+            key: 'GCP',
+            name: intl.formatMessage(messages.gcp),
+          },
+          // {
+          //   key: 'IBM',
+          //   name: intl.formatMessage(messages.ibm), // Todo: enable when supported by API
+          // },
+          {
+            key: 'OCI',
+            name: intl.formatMessage(messages.oci),
+          },
+          {
+            key: 'OCP',
+            name: intl.formatMessage(messages.openShift),
+          },
+        ],
+      },
     ];
     return options;
   };

From ba174cb1e76ad9839c8c194b0c84691457c3f873 Mon Sep 17 00:00:00 2001
From: Dan Labrecque <dlabrecq@redhat.com>
Date: Mon, 25 Mar 2024 20:29:12 -0400
Subject: [PATCH 16/20] Dependency updates

---
 package-lock.json | 246 ++++++++++++----------------------------------
 package.json      |   9 +-
 2 files changed, 67 insertions(+), 188 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8b17136e2..a2e69a69e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,7 +38,7 @@
         "redux-thunk": "^3.1.0",
         "typesafe-actions": "^5.1.0",
         "unleash-proxy-client": "^3.3.2",
-        "victory-core": "^37.0.0"
+        "victory-core": "^37.0.1"
       },
       "devDependencies": {
         "@formatjs/cli": "^6.2.8",
@@ -54,12 +54,12 @@
         "@testing-library/user-event": "^14.5.2",
         "@types/jest": "^29.5.12",
         "@types/qs": "^6.9.14",
-        "@types/react": "^18.2.67",
+        "@types/react": "^18.2.70",
         "@types/react-dom": "^18.2.22",
         "@types/react-redux": "^7.1.33",
         "@types/react-router-dom": "^5.3.3",
-        "@typescript-eslint/eslint-plugin": "^7.2.0",
-        "@typescript-eslint/parser": "^7.3.1",
+        "@typescript-eslint/eslint-plugin": "^7.4.0",
+        "@typescript-eslint/parser": "^7.4.0",
         "aphrodite": "^2.4.0",
         "copy-webpack-plugin": "^12.0.2",
         "eslint": "^8.57.0",
@@ -4086,9 +4086,9 @@
       "dev": true
     },
     "node_modules/@types/react": {
-      "version": "18.2.67",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.67.tgz",
-      "integrity": "sha512-vkIE2vTIMHQ/xL0rgmuoECBCkZFZeHr49HeWSc24AptMbNRo7pwSBvj73rlJJs9fGKj0koS+V7kQB1jHS0uCgw==",
+      "version": "18.2.70",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-18.2.70.tgz",
+      "integrity": "sha512-hjlM2hho2vqklPhopNkXkdkeq6Lv8WSZTpr7956zY+3WS5cfYUewtCzsJLsbW5dEv3lfSeQ4W14ZFeKC437JRQ==",
       "dependencies": {
         "@types/prop-types": "*",
         "@types/scheduler": "*",
@@ -4327,16 +4327,16 @@
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.2.0.tgz",
-      "integrity": "sha512-mdekAHOqS9UjlmyF/LSs6AIEvfceV749GFxoBAjwAv0nkevfKHWQFDMcBZWUiIC5ft6ePWivXoS36aKQ0Cy3sw==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.4.0.tgz",
+      "integrity": "sha512-yHMQ/oFaM7HZdVrVm/M2WHaNPgyuJH4WelkSVEWSSsir34kxW2kDJCxlXRhhGWEsMN0WAW/vLpKfKVcm8k+MPw==",
       "dev": true,
       "dependencies": {
         "@eslint-community/regexpp": "^4.5.1",
-        "@typescript-eslint/scope-manager": "7.2.0",
-        "@typescript-eslint/type-utils": "7.2.0",
-        "@typescript-eslint/utils": "7.2.0",
-        "@typescript-eslint/visitor-keys": "7.2.0",
+        "@typescript-eslint/scope-manager": "7.4.0",
+        "@typescript-eslint/type-utils": "7.4.0",
+        "@typescript-eslint/utils": "7.4.0",
+        "@typescript-eslint/visitor-keys": "7.4.0",
         "debug": "^4.3.4",
         "graphemer": "^1.4.0",
         "ignore": "^5.2.4",
@@ -4345,7 +4345,7 @@
         "ts-api-utils": "^1.0.1"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -4395,15 +4395,15 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.3.1.tgz",
-      "integrity": "sha512-Rq49+pq7viTRCH48XAbTA+wdLRrB/3sRq4Lpk0oGDm0VmnjBrAOVXH/Laalmwsv2VpekiEfVFwJYVk6/e8uvQw==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.4.0.tgz",
+      "integrity": "sha512-ZvKHxHLusweEUVwrGRXXUVzFgnWhigo4JurEj0dGF1tbcGh6buL+ejDdjxOQxv6ytcY1uhun1p2sm8iWStlgLQ==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/scope-manager": "7.3.1",
-        "@typescript-eslint/types": "7.3.1",
-        "@typescript-eslint/typescript-estree": "7.3.1",
-        "@typescript-eslint/visitor-keys": "7.3.1",
+        "@typescript-eslint/scope-manager": "7.4.0",
+        "@typescript-eslint/types": "7.4.0",
+        "@typescript-eslint/typescript-estree": "7.4.0",
+        "@typescript-eslint/visitor-keys": "7.4.0",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -4422,137 +4422,17 @@
         }
       }
     },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.3.1.tgz",
-      "integrity": "sha512-fVS6fPxldsKY2nFvyT7IP78UO1/I2huG+AYu5AMjCT9wtl6JFiDnsv4uad4jQ0GTFzcUV5HShVeN96/17bTBag==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.3.1",
-        "@typescript-eslint/visitor-keys": "7.3.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.3.1.tgz",
-      "integrity": "sha512-2tUf3uWggBDl4S4183nivWQ2HqceOZh1U4hhu4p1tPiIJoRRXrab7Y+Y0p+dozYwZVvLPRI6r5wKe9kToF9FIw==",
-      "dev": true,
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.3.1.tgz",
-      "integrity": "sha512-tLpuqM46LVkduWP7JO7yVoWshpJuJzxDOPYIVWUUZbW+4dBpgGeUdl/fQkhuV0A8eGnphYw3pp8d2EnvPOfxmQ==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.3.1",
-        "@typescript-eslint/visitor-keys": "7.3.1",
-        "debug": "^4.3.4",
-        "globby": "^11.1.0",
-        "is-glob": "^4.0.3",
-        "minimatch": "9.0.3",
-        "semver": "^7.5.4",
-        "ts-api-utils": "^1.0.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.3.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.3.1.tgz",
-      "integrity": "sha512-9RMXwQF8knsZvfv9tdi+4D/j7dMG28X/wMJ8Jj6eOHyHWwDW4ngQJcqEczSsqIKKjFiLFr40Mnr7a5ulDD3vmw==",
-      "dev": true,
-      "dependencies": {
-        "@typescript-eslint/types": "7.3.1",
-        "eslint-visitor-keys": "^3.4.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || >=20.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/eslint-visitor-keys": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
-      "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
-      "dev": true,
-      "engines": {
-        "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dev": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/semver": {
-      "version": "7.6.0",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-      "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-      "dev": true,
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@typescript-eslint/parser/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-      "dev": true
-    },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.2.0.tgz",
-      "integrity": "sha512-Qh976RbQM/fYtjx9hs4XkayYujB/aPwglw2choHmf3zBjB4qOywWSdt9+KLRdHubGcoSwBnXUH2sR3hkyaERRg==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.4.0.tgz",
+      "integrity": "sha512-68VqENG5HK27ypafqLVs8qO+RkNc7TezCduYrx8YJpXq2QGZ30vmNZGJJJC48+MVn4G2dCV8m5ZTVnzRexTVtw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.2.0",
-        "@typescript-eslint/visitor-keys": "7.2.0"
+        "@typescript-eslint/types": "7.4.0",
+        "@typescript-eslint/visitor-keys": "7.4.0"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -4560,18 +4440,18 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.2.0.tgz",
-      "integrity": "sha512-xHi51adBHo9O9330J8GQYQwrKBqbIPJGZZVQTHHmy200hvkLZFWJIFtAG/7IYTWUyun6DE6w5InDReePJYJlJA==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.4.0.tgz",
+      "integrity": "sha512-247ETeHgr9WTRMqHbbQdzwzhuyaJ8dPTuyuUEMANqzMRB1rj/9qFIuIXK7l0FX9i9FXbHeBQl/4uz6mYuCE7Aw==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "7.2.0",
-        "@typescript-eslint/utils": "7.2.0",
+        "@typescript-eslint/typescript-estree": "7.4.0",
+        "@typescript-eslint/utils": "7.4.0",
         "debug": "^4.3.4",
         "ts-api-utils": "^1.0.1"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -4587,12 +4467,12 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.2.0.tgz",
-      "integrity": "sha512-XFtUHPI/abFhm4cbCDc5Ykc8npOKBSJePY3a3s+lwumt7XWJuzP5cZcfZ610MIPHjQjNsOLlYK8ASPaNG8UiyA==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.4.0.tgz",
+      "integrity": "sha512-mjQopsbffzJskos5B4HmbsadSJQWaRK0UxqQ7GuNA9Ga4bEKeiO6b2DnB6cM6bpc8lemaPseh0H9B/wyg+J7rw==",
       "dev": true,
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -4600,13 +4480,13 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.2.0.tgz",
-      "integrity": "sha512-cyxS5WQQCoBwSakpMrvMXuMDEbhOo9bNHHrNcEWis6XHx6KF518tkF1wBvKIn/tpq5ZpUYK7Bdklu8qY0MsFIA==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.4.0.tgz",
+      "integrity": "sha512-A99j5AYoME/UBQ1ucEbbMEmGkN7SE0BvZFreSnTd1luq7yulcHdyGamZKizU7canpGDWGJ+Q6ZA9SyQobipePg==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.2.0",
-        "@typescript-eslint/visitor-keys": "7.2.0",
+        "@typescript-eslint/types": "7.4.0",
+        "@typescript-eslint/visitor-keys": "7.4.0",
         "debug": "^4.3.4",
         "globby": "^11.1.0",
         "is-glob": "^4.0.3",
@@ -4615,7 +4495,7 @@
         "ts-api-utils": "^1.0.1"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -4661,21 +4541,21 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/utils": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.2.0.tgz",
-      "integrity": "sha512-YfHpnMAGb1Eekpm3XRK8hcMwGLGsnT6L+7b2XyRv6ouDuJU1tZir1GS2i0+VXRatMwSI1/UfcyPe53ADkU+IuA==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.4.0.tgz",
+      "integrity": "sha512-NQt9QLM4Tt8qrlBVY9lkMYzfYtNz8/6qwZg8pI3cMGlPnj6mOpRxxAm7BMJN9K0AiY+1BwJ5lVC650YJqYOuNg==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@types/json-schema": "^7.0.12",
         "@types/semver": "^7.5.0",
-        "@typescript-eslint/scope-manager": "7.2.0",
-        "@typescript-eslint/types": "7.2.0",
-        "@typescript-eslint/typescript-estree": "7.2.0",
+        "@typescript-eslint/scope-manager": "7.4.0",
+        "@typescript-eslint/types": "7.4.0",
+        "@typescript-eslint/typescript-estree": "7.4.0",
         "semver": "^7.5.4"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -4719,16 +4599,16 @@
       "dev": true
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.2.0.tgz",
-      "integrity": "sha512-c6EIQRHhcpl6+tO8EMR+kjkkV+ugUNXOmeASA1rlzkd8EPIriavpWoiEz1HR/VLhbVIdhqnV6E7JZm00cBDx2A==",
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.4.0.tgz",
+      "integrity": "sha512-0zkC7YM0iX5Y41homUUeW1CHtZR01K3ybjM1l6QczoMuay0XKtrb93kv95AxUGwdjGr64nNqnOCwmEl616N8CA==",
       "dev": true,
       "dependencies": {
-        "@typescript-eslint/types": "7.2.0",
+        "@typescript-eslint/types": "7.4.0",
         "eslint-visitor-keys": "^3.4.1"
       },
       "engines": {
-        "node": "^16.0.0 || >=18.0.0"
+        "node": "^18.18.0 || >=20.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -20960,22 +20840,22 @@
       }
     },
     "node_modules/victory-core": {
-      "version": "37.0.0",
-      "resolved": "https://registry.npmjs.org/victory-core/-/victory-core-37.0.0.tgz",
-      "integrity": "sha512-aN5ZK9OO/HukifkX942Nsr0RidL/jsi/kTsBW68Ir6c6HazsfRFp0Ee3fIxy1ikUGe2XUaOu0eBv1v06+hfJKQ==",
+      "version": "37.0.1",
+      "resolved": "https://registry.npmjs.org/victory-core/-/victory-core-37.0.1.tgz",
+      "integrity": "sha512-PI/7ktVVb2wE7c5zUbpakgTu4n4f7+JMYXqajA/dnMEbh8ATLSRZja8sII3TjpG+QeOX4VEJNW6JxCHKTluhhw==",
       "dependencies": {
         "lodash": "^4.17.21",
         "react-fast-compare": "^3.2.0",
-        "victory-vendor": "^37.0.0"
+        "victory-vendor": "^37.0.1"
       },
       "peerDependencies": {
         "react": ">=16.6.0"
       }
     },
     "node_modules/victory-core/node_modules/victory-vendor": {
-      "version": "37.0.0",
-      "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-37.0.0.tgz",
-      "integrity": "sha512-jNqpyUTCw2EbNplG8KsbVkHCBPSOL5fTQHVf/1oOBecfVoO8dwAGDm0xFCAD4w4c9llck6zgIV3eqR04jVYRHA==",
+      "version": "37.0.1",
+      "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-37.0.1.tgz",
+      "integrity": "sha512-1AZGLvUO81GLtqbgfkxVoqCGzL5Cz4LnmEb4M/6jV48RfVRUBpE0mwv7NtdVDhjTVzkeyci82lPDJDaDBkTllw==",
       "dependencies": {
         "@types/d3-array": "^3.0.3",
         "@types/d3-ease": "^3.0.0",
diff --git a/package.json b/package.json
index bef7f70b2..075a962a5 100644
--- a/package.json
+++ b/package.json
@@ -78,7 +78,7 @@
     "redux-thunk": "^3.1.0",
     "typesafe-actions": "^5.1.0",
     "unleash-proxy-client": "^3.3.2",
-    "victory-core": "^37.0.0"
+    "victory-core": "^37.0.1"
   },
   "devDependencies": {
     "@formatjs/cli": "^6.2.8",
@@ -94,12 +94,12 @@
     "@testing-library/user-event": "^14.5.2",
     "@types/jest": "^29.5.12",
     "@types/qs": "^6.9.14",
-    "@types/react": "^18.2.67",
+    "@types/react": "^18.2.70",
     "@types/react-dom": "^18.2.22",
     "@types/react-redux": "^7.1.33",
     "@types/react-router-dom": "^5.3.3",
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
-    "@typescript-eslint/parser": "^7.3.1",
+    "@typescript-eslint/eslint-plugin": "^7.4.0",
+    "@typescript-eslint/parser": "^7.4.0",
     "aphrodite": "^2.4.0",
     "copy-webpack-plugin": "^12.0.2",
     "eslint": "^8.57.0",
@@ -130,7 +130,6 @@
     "webpack-bundle-analyzer": "^4.10.1"
   },
   "overrides": {
-    "@typescript-eslint/eslint-plugin": "^7.2.0",
     "redux": "^5.0.1"
   },
   "insights": {

From 2eb877455cc9bd07dbec00ee51246a4ebea3a584 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 23 Mar 2024 14:23:08 +0000
Subject: [PATCH 17/20] Bump webpack-dev-middleware from 5.3.3 to 5.3.4

Bumps [webpack-dev-middleware](https://github.com/webpack/webpack-dev-middleware) from 5.3.3 to 5.3.4.
- [Release notes](https://github.com/webpack/webpack-dev-middleware/releases)
- [Changelog](https://github.com/webpack/webpack-dev-middleware/blob/v5.3.4/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-dev-middleware/compare/v5.3.3...v5.3.4)

---
updated-dependencies:
- dependency-name: webpack-dev-middleware
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a2e69a69e..5a1242e51 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21502,9 +21502,9 @@
       }
     },
     "node_modules/webpack-dev-middleware": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.3.tgz",
-      "integrity": "sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==",
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
+      "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
       "dev": true,
       "dependencies": {
         "colorette": "^2.0.10",

From 0a60e2722b87f3523c371b055acdfc37ce2982bf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Mar 2024 00:06:06 +0000
Subject: [PATCH 18/20] Bump express from 4.18.3 to 4.19.2

Bumps [express](https://github.com/expressjs/express) from 4.18.3 to 4.19.2.
- [Release notes](https://github.com/expressjs/express/releases)
- [Changelog](https://github.com/expressjs/express/blob/master/History.md)
- [Commits](https://github.com/expressjs/express/compare/4.18.3...4.19.2)

---
updated-dependencies:
- dependency-name: express
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a2e69a69e..c1a11dcc3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6807,9 +6807,9 @@
       "dev": true
     },
     "node_modules/cookie": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
-      "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
+      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
       "dev": true,
       "engines": {
         "node": ">= 0.6"
@@ -10422,9 +10422,9 @@
       }
     },
     "node_modules/express": {
-      "version": "4.18.3",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.18.3.tgz",
-      "integrity": "sha512-6VyCijWQ+9O7WuVMTRBTl+cjNNIzD5cY5mQ1WM8r/LEkI2u8EYpOotESNwzNlyCn3g+dmjKYI6BmNneSr/FSRw==",
+      "version": "4.19.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.19.2.tgz",
+      "integrity": "sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==",
       "dev": true,
       "dependencies": {
         "accepts": "~1.3.8",
@@ -10432,7 +10432,7 @@
         "body-parser": "1.20.2",
         "content-disposition": "0.5.4",
         "content-type": "~1.0.4",
-        "cookie": "0.5.0",
+        "cookie": "0.6.0",
         "cookie-signature": "1.0.6",
         "debug": "2.6.9",
         "depd": "2.0.0",

From e78082ce61dddf2e2ef9204ce7e518f6fbaa3641 Mon Sep 17 00:00:00 2001
From: Dan Labrecque <dlabrecq@redhat.com>
Date: Tue, 26 Mar 2024 11:54:25 -0400
Subject: [PATCH 19/20] Fix sorting keys for parent and child tag mapping APIs

https://issues.redhat.com/browse/COST-3824
---
 .../tagLabels/tagMapping/components/childTags/childTags.tsx   | 2 +-
 .../tagLabels/tagMapping/components/parentTags/parentTags.tsx | 2 +-
 src/routes/settings/tagLabels/tagMapping/tagMapping.tsx       | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/routes/settings/tagLabels/tagMapping/components/childTags/childTags.tsx b/src/routes/settings/tagLabels/tagMapping/components/childTags/childTags.tsx
index b82536730..cedb04e74 100644
--- a/src/routes/settings/tagLabels/tagMapping/components/childTags/childTags.tsx
+++ b/src/routes/settings/tagLabels/tagMapping/components/childTags/childTags.tsx
@@ -45,7 +45,7 @@ const baseQuery: Query = {
   offset: 0,
   filter_by: {},
   order_by: {
-    parent: 'asc',
+    key: 'asc',
   },
 };
 
diff --git a/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTags.tsx b/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTags.tsx
index d58a6d43e..2d8d76ea4 100644
--- a/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTags.tsx
+++ b/src/routes/settings/tagLabels/tagMapping/components/parentTags/parentTags.tsx
@@ -46,7 +46,7 @@ const baseQuery: Query = {
   offset: 0,
   filter_by: {},
   order_by: {
-    parent: 'asc',
+    key: 'asc',
   },
 };
 
diff --git a/src/routes/settings/tagLabels/tagMapping/tagMapping.tsx b/src/routes/settings/tagLabels/tagMapping/tagMapping.tsx
index 2f9a5258a..82885a74b 100644
--- a/src/routes/settings/tagLabels/tagMapping/tagMapping.tsx
+++ b/src/routes/settings/tagLabels/tagMapping/tagMapping.tsx
@@ -44,6 +44,7 @@ const baseQuery: Query = {
   offset: 0,
   filter_by: {},
   order_by: {
+    child: 'asc',
     parent: 'asc',
   },
 };
@@ -149,6 +150,9 @@ const TagMapping: React.FC<MappingsProps> = ({ canWrite }) => {
 
   const handleOnSort = (sortType, isSortAscending) => {
     const newQuery = queryUtils.handleOnSort(query, sortType, isSortAscending);
+    if (sortType === 'parent') {
+      newQuery.order_by.child = isSortAscending ? 'asc' : 'desc';
+    }
     setQuery(newQuery);
   };
 

From 1ea5d3ab2694a9ad88606c8d0af0b0a1b683de5e Mon Sep 17 00:00:00 2001
From: Dan Labrecque <dlabrecq@redhat.com>
Date: Tue, 26 Mar 2024 13:14:20 -0400
Subject: [PATCH 20/20] Update broken doc link

https://issues.redhat.com/browse/COST-4797
---
 locales/data.json         | 2 +-
 locales/translations.json | 2 +-
 src/locales/messages.ts   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/locales/data.json b/locales/data.json
index 18d4bef08..8d1f6ca64 100644
--- a/locales/data.json
+++ b/locales/data.json
@@ -3565,7 +3565,7 @@
     "docsAddOcpSources": [
       {
         "type": 0,
-        "value": "https://access.redhat.com/documentation/en-us/cost_management_service/1-latest/html-single/adding_an_openshift_container_platform_source_to_cost_management"
+        "value": "https://access.redhat.com/documentation/en-us/cost_management_service/1-latest/html/integrating_openshift_container_platform_data_into_cost_management"
       }
     ],
     "docsCostCategory": [
diff --git a/locales/translations.json b/locales/translations.json
index 36a80b8ba..c7c88b159 100644
--- a/locales/translations.json
+++ b/locales/translations.json
@@ -244,7 +244,7 @@
   "distributionType": "Distribution type",
   "distributionTypeDesc": "{type, select, cpu {Distribute costs based on CPU usage}memory {Distribute costs based on memory usage}other {}}",
   "doNotDistribute": "Do not distribute",
-  "docsAddOcpSources": "https://access.redhat.com/documentation/en-us/cost_management_service/1-latest/html-single/adding_an_openshift_container_platform_source_to_cost_management",
+  "docsAddOcpSources": "https://access.redhat.com/documentation/en-us/cost_management_service/1-latest/html/integrating_openshift_container_platform_data_into_cost_management",
   "docsCostCategory": "https://access.redhat.com/documentation/en-us/cost_management_service/1-latest/html/managing_cost_data_using_tagging/assembly-configuring-tags-and-labels-in-cost-management#configuring-categories_configuring-tags-int",
   "docsCostModelTerminology": "https://access.redhat.com/documentation/en-us/cost_management_service/1-latest/html-single/using_cost_models/index#cost-model-terminology",
   "docsCostModels": "https://access.redhat.com/documentation/en-us/cost_management_service/1-latest/html-single/using_cost_models/index#assembly-setting-up-cost-models",
diff --git a/src/locales/messages.ts b/src/locales/messages.ts
index e687c749c..90e8491c1 100644
--- a/src/locales/messages.ts
+++ b/src/locales/messages.ts
@@ -1441,9 +1441,9 @@ export default defineMessages({
   },
   docsAddOcpSources: {
     defaultMessage:
-      'https://access.redhat.com/documentation/en-us/cost_management_service/1-latest/html-single/adding_an_openshift_container_platform_source_to_cost_management',
+      'https://access.redhat.com/documentation/en-us/cost_management_service/1-latest/html/integrating_openshift_container_platform_data_into_cost_management',
     description:
-      'https://access.redhat.com/documentation/en-us/cost_management_service/1-latest/html-single/adding_an_openshift_container_platform_source_to_cost_management',
+      'https://access.redhat.com/documentation/en-us/cost_management_service/1-latest/html/integrating_openshift_container_platform_data_into_cost_management',
     id: 'docsAddOcpSources',
   },
   docsCostCategory: {