@odigos/ui-kit 0.0.23 → 0.0.25

package/lib/containers.js

@@ -1,27 +1,30 @@
 import React, { useState, useEffect, forwardRef, useRef, useImperativeHandle, useMemo, memo, useContext, createContext, useCallback, useLayoutEffect, Fragment } from 'react';
 import styled, { css } from 'styled-components';
-import { A as ACTION_OPTIONS, M as MONITORS_OPTIONS, I as INSTRUMENTATION_RULE_OPTIONS } from './index-D3sp5Hx7.js';
-import { D as DISPLAY_TITLES, F as FORM_ALERTS } from './index-C_0J5P9M.js';
+import { D as DISPLAY_TITLES, A as ACTION_OPTIONS, M as MONITORS_OPTIONS, B as BUTTON_TEXTS, I as INSTRUMENTATION_RULE_OPTIONS, F as FORM_ALERTS } from './index-HOKGoci6.js';
 import { ActionType, EntityTypes, StatusType, Crud, OtherStatus, NodeTypes, AddNodeTypes, EdgeTypes, FieldTypes, SignalType, CodeAttributesKeyTypes, PayloadCollectionKeyTypes, InstrumentationRuleType } from './types.js';
-import { f as DataCardFieldTypes, p as FieldLabel, b as Checkbox, o as FieldError, v as Input, x as InputTable, K as KeyValueInputsList, w as InputList, V as Text, P as Segment, O as SectionTitle, j as DocsButton, z as MonitorsCheckboxes, W as TextArea, k as Drawer, h as DeleteWarning, C as CancelWarning, d as ConditionDetails, D as DataCard, M as Modal, N as NavigationButtons, a3 as ModalBody, A as AutocompleteInput, i as Divider, R as Status, $ as FlexRow, Y as Tooltip, s as IconWrapped, G as MonitorsIcons, a4 as TableContainer, a5 as TableTitleWrap, r as IconTitleBadge, a6 as TableWrap, y as InteractiveTable, a1 as CenterThis, J as NoDataFound, a0 as FlexColumn, Z as TraceLoader, a as Badge, B as Button, E as ExtendArrow, n as Dropdown, a7 as getDefaultExportFromCjs, F as FadeLoader, g as DataTab, Q as SkeletonLoader, X as Toggle, L as NotificationNote, U as Stepper, I as IconButton, e as DataCardFields, t as IconsNav, q as IconGroup } from './index-BKyIuPoq.js';
-import { g as usePendingStore, f as useNotificationStore, a as useDrawerStore, b as useEntityStore, e as useModalStore, c as useFilterStore, s as styleInject, h as useSelectedStore, d as useInstrumentStore, k as getEntityId, i as useSetupStore, u as useDarkMode } from './index-DiTtXTRm.js';
+import { f as DataCardFieldTypes, o as FieldLabel, C as Checkbox, n as FieldError, u as Input, w as InputTable, K as KeyValueInputsList, v as InputList, V as Text, O as Segment, L as SectionTitle, i as DocsButton, y as MonitorsCheckboxes, W as TextArea, j as Drawer, d as ConditionDetails, D as DataCard, M as Modal, N as NavigationButtons, a4 as ModalBody, a as AutocompleteInput, h as Divider, R as Status, $ as FlexRow, Y as Tooltip, r as IconWrapped, z as MonitorsIcons, a5 as TableContainer, a6 as TableTitleWrap, q as IconTitleBadge, a7 as TableWrap, x as InteractiveTable, a1 as CenterThis, G as NoDataFound, a0 as FlexColumn, Z as TraceLoader, b as Badge, E as ExtendArrow, a2 as VerticalScroll, P as SelectionButton, B as Button, m as Dropdown, a8 as getDefaultExportFromCjs, F as FadeLoader, g as DataTab, Q as SkeletonLoader, X as Toggle, A as AddButton$1, J as NotificationNote, U as Stepper, I as IconButton, e as DataCardFields, s as IconsNav, p as IconGroup } from './index-CYUrArTm.js';
+import { h as usePendingStore, g as useNotificationStore, b as useDrawerStore, c as useEntityStore, f as useModalStore, d as useFilterStore, s as styleInject, i as useSelectedStore, e as useInstrumentStore, a as useDataStreamStore, k as getEntityId, j as useSetupStore, u as useDarkMode } from './index-CK8tITRA.js';
 import Theme from './theme.js';
 import { i as isEmpty, s as safeJsonParse } from './index-BZS1ijMm.js';
-import { i as CheckCircledIcon, O as OdigosLogo } from './index-BsH_egEe.js';
-import { C as CrossCircledIcon, E as EditIcon, O as OdigosLogoText, a as OverviewIcon, F as FilterIcon, N as NotificationIcon, S as SlackLogo, K as KeyIcon, T as TerminalIcon } from './index-KOMAv-TS.js';
-import { g as getActionIcon, a as getInstrumentationRuleIcon } from './index-C7Y1tYdc.js';
-import { u as useActionFormData, a as useClickNode, c as useDestinationFormData, b as useClickNotification, d as useSourceFormData, e as useSourceSelectionFormData } from './useSourceSelectionFormData-CrKof314.js';
-import { d as useKeyDown, e as useOnClickOutside, u as useContainerSize, c as useInstrumentationRuleFormData, g as useTransition, f as useTimeAgo, a as useCopy } from './useTransition-D0ykOLrk.js';
-import { T as TrashIcon, S as SearchIcon, P as PlusIcon$1, A as ArrowIcon, a as CopyIcon, f as CheckIcon, g as CrossIcon } from './index-BJxaoI0G.js';
-import { m as mapConditions, b as getStatusIcon, c as capitalizeFirstLetter } from './index-BfUUVS8N.js';
-import { f as filterActions, g as getConditionsBooleans, k as getEntityLabel, j as getEntityIcon, s as sleep$1, m as getPlatformIcon, n as getPlatformLabel, d as formatBytes, h as getContainersIcons, o as getValueForRange, i as getDestinationIcon, b as filterSources, a as filterDestinations, c as compareCondition, l as getMetricForEntity, p as getWorkloadId, e as getContainersInstrumentedCount, q as isOverTime } from './index-C48Fe7Pl.js';
+import { i as CheckCircledIcon, O as OdigosLogo } from './index-IKusBlIE.js';
+import { C as CrossCircledIcon, O as OdigosLogoText, a as OverviewIcon, F as FilterIcon, D as DataStreamsIcon, N as NotificationIcon, S as SlackLogo, K as KeyIcon, T as TerminalIcon } from './index-CamnKrev.js';
+import { g as getActionIcon, a as getInstrumentationRuleIcon } from './index-C0N2DFBu.js';
+import { u as useActionFormData, a as useClickNode, c as useDestinationFormData, b as useClickNotification, d as useSourceFormData, e as useSourceSelectionFormData } from './useSourceSelectionFormData-Bxm0NBIy.js';
+import { d as useKeyDown, e as useOnClickOutside, u as useContainerSize, c as useInstrumentationRuleFormData, g as useTransition, f as useTimeAgo, a as useCopy } from './useTransition-DvT5YNul.js';
+import { E as EditIcon } from './index-CWbxXTof.js';
+import { T as TrashIcon, S as SearchIcon, P as PlusIcon$1, f as CheckIcon, A as ArrowIcon, a as CopyIcon, g as CrossIcon } from './index-BJxaoI0G.js';
+import { D as DeleteWarning, C as CancelWarning } from './index-CTdoDQzG.js';
+import { m as mapConditions, b as getStatusIcon, c as capitalizeFirstLetter } from './index-C2m4uddS.js';
+import { f as filterActions, i as getConditionsBooleans, n as getEntityLabel, m as getEntityIcon, v as sleep$1, p as getPlatformIcon, q as getPlatformLabel, h as formatBytes, k as getContainersIcons, r as getValueForRange, l as getDestinationIcon, u as mapExportedSignals, g as filterSourcesByStream, e as filterSources, b as filterDestinationsByStream, a as filterDestinations, c as compareCondition, d as deepClone, o as getMetricForEntity, s as getWorkloadId, j as getContainersInstrumentedCount, t as isOverTime } from './index-BOkleuyi.js';
 import { createPortal } from 'react-dom';
-import { a5 as RulesIcon, a6 as SourcesIcon, a2 as ActionsIcon, a3 as DestinationsIcon } from './index-CksKgOxY.js';
+import { N as NoteBackToSummary, E as EditButton } from './index-DE7A6Q_i.js';
+import { D as DESTINATION_CATEGORIES } from './index-Dqief9td.js';
+import { a6 as RulesIcon, a7 as SourcesIcon, a3 as ActionsIcon, a4 as DestinationsIcon } from './index-BRW_Nl-n.js';
 import './index-DGel4E-Z.js';
 import './index-7-KCQK-x.js';
 
 const buildCard$3 = (action) => {
-    const { type, spec: { actionName, notes, signals, disabled, collectContainerAttributes, collectWorkloadId, collectClusterId, labelsAttributes, annotationsAttributes, clusterAttributes, attributeNamesToDelete, renames, piiCategories, fallbackSamplingRatio, samplingPercentage, endpointsFilters, }, } = action;
+    const { type, spec: { actionName, notes, signals, disabled, collectContainerAttributes, collectReplicaSetAttributes, collectWorkloadId, collectClusterId, labelsAttributes, annotationsAttributes, clusterAttributes, attributeNamesToDelete, renames, piiCategories, fallbackSamplingRatio, samplingPercentage, endpointsFilters, }, } = action;
     const arr = [
         { title: DISPLAY_TITLES.TYPE, value: type },
         { type: DataCardFieldTypes.ActiveStatus, title: DISPLAY_TITLES.STATUS, value: String(!disabled) },
@@ -32,6 +35,7 @@ const buildCard$3 = (action) => {
     ];
     if (type === ActionType.K8sAttributes) {
         arr.push({ title: 'Collect Container Attributes', value: String(collectContainerAttributes) });
+        arr.push({ title: 'Collect ReplicaSet Attributes', value: String(collectReplicaSetAttributes) });
         arr.push({ title: 'Collect Workload ID', value: String(collectWorkloadId) });
         arr.push({ title: 'Collect Cluster ID', value: String(collectClusterId) });
         if (!!labelsAttributes?.length)
@@ -158,8 +162,9 @@ const ErrorSampler = ({ value, setValue, formErrors }) => {
 
 const K8sAttributes = ({ value, setValue, formErrors }) => {
     useEffect(() => {
-        if (!value.collectContainerAttributes && !value.collectWorkloadId && !value.collectClusterId && !value.labelsAttributes?.length && !value.annotationsAttributes?.length) {
+        if (!value.collectContainerAttributes && !value.collectWorkloadId && !value.collectReplicaSetAttributes && !value.collectClusterId && !value.labelsAttributes?.length && !value.annotationsAttributes?.length) {
             setValue('collectContainerAttributes', true);
+            setValue('collectReplicaSetAttributes', true);
             setValue('collectWorkloadId', true);
             setValue('collectClusterId', true);
             setValue('labelsAttributes', []);
@@ -169,6 +174,7 @@ const K8sAttributes = ({ value, setValue, formErrors }) => {
     }, []);
     return (React.createElement(React.Fragment, null,
         React.createElement(Checkbox, { title: 'Collect Container Attributes', value: value['collectContainerAttributes'] || false, onChange: (bool) => setValue('collectContainerAttributes', bool), errorMessage: formErrors['collectContainerAttributes'] }),
+        React.createElement(Checkbox, { title: 'Collect ReplicaSet Attributes', value: value['collectReplicaSetAttributes'] || false, onChange: (bool) => setValue('collectReplicaSetAttributes', bool), errorMessage: formErrors['collectReplicaSetAttributes'] }),
         React.createElement(Checkbox, { title: 'Collect Workload ID', value: value['collectWorkloadId'] || false, onChange: (bool) => setValue('collectWorkloadId', bool), errorMessage: formErrors['collectWorkloadId'] }),
         React.createElement(Checkbox, { title: 'Collect Cluster ID', value: value['collectClusterId'] || false, onChange: (bool) => setValue('collectClusterId', bool), errorMessage: formErrors['collectClusterId'] }),
         React.createElement(InputTable, { columns: [
@@ -299,7 +305,7 @@ const CustomFields$1 = ({ actionType, value, setValue, formErrors }) => {
     return Component ? React.createElement(Component, { value: value, setValue: setValue, formErrors: formErrors }) : null;
 };
 
-const Container$l = styled.div `
+const Container$n = styled.div `
   display: flex;
   flex-direction: column;
   gap: 24px;
@@ -310,7 +316,7 @@ const FieldTitle$1 = styled(Text) `
 `;
 const ActionForm = ({ isUpdate, action, formData, formErrors, handleFormChange }) => {
     const theme = Theme.useTheme();
-    return (React.createElement(Container$l, null,
+    return (React.createElement(Container$n, null,
         isUpdate && (React.createElement("div", null,
             React.createElement(FieldTitle$1, null, "Status"),
             React.createElement(Segment, { options: [
@@ -569,11 +575,13 @@ const ActionModal = ({ createAction }) => {
 };
 
 const buildSpecCell$1 = (action) => {
-    const { type, spec: { collectContainerAttributes, collectWorkloadId, collectClusterId, labelsAttributes, annotationsAttributes, clusterAttributes, attributeNamesToDelete, renames, piiCategories, fallbackSamplingRatio, samplingPercentage, endpointsFilters, }, } = action;
+    const { type, spec: { collectContainerAttributes, collectReplicaSetAttributes, collectWorkloadId, collectClusterId, labelsAttributes, annotationsAttributes, clusterAttributes, attributeNamesToDelete, renames, piiCategories, fallbackSamplingRatio, samplingPercentage, endpointsFilters, }, } = action;
     let str = '';
     if (type === ActionType.K8sAttributes) {
         if (collectContainerAttributes)
             str += 'Container Attributes, ';
+        if (collectReplicaSetAttributes)
+            str += 'ReplicaSet Attributes, ';
         if (collectWorkloadId)
             str += 'Workload ID, ';
         if (collectClusterId)
@@ -663,7 +671,7 @@ const ConditionsStatuses = ({ conditions, id }) => {
 const columns$3 = [
     { key: 'icon', title: '' },
     { key: 'name', title: DISPLAY_TITLES.NAME, sortable: true },
-    { key: 'signals', title: DISPLAY_TITLES.Monitors },
+    { key: 'signals', title: DISPLAY_TITLES.MONITORS },
     { key: 'active-status', title: DISPLAY_TITLES.STATUS },
     { key: 'conditions', title: 'Conditions' },
     { key: 'type', title: DISPLAY_TITLES.TYPE, sortable: true },
@@ -731,14 +739,14 @@ const ActionTable = ({ maxHeight, maxWidth }) => {
     const badgeTooltip = useMemo(() => (filtered.length !== actions.length ? DISPLAY_TITLES.FILTERED_COUNT_TOOLTIP : undefined), [filtered, actions]);
     return (React.createElement(TableContainer, { "$maxWidth": maxWidth },
         React.createElement(TableTitleWrap, null,
-            React.createElement(IconTitleBadge, { icon: getEntityIcon(EntityTypes.Action), title: DISPLAY_TITLES.Actions, badge: badge, badgeTooltip: badgeTooltip, loading: actionsLoading })),
+            React.createElement(IconTitleBadge, { icon: getEntityIcon(EntityTypes.Action), title: DISPLAY_TITLES.ACTIONS, badge: badge, badgeTooltip: badgeTooltip, loading: actionsLoading })),
         React.createElement(TableWrap, { "$maxHeight": maxHeight },
             React.createElement(InteractiveTable, { columns: columns$3, rows: rows })),
         !filtered.length && (React.createElement(CenterThis, { style: { marginTop: '2rem' } },
             React.createElement(NoDataFound, null)))));
 };
 
-const Container$k = styled(FlexColumn) `
+const Container$m = styled(FlexColumn) `
   // width: 100vw;
   // height: 100vh;
   gap: 64px;
@@ -772,7 +780,7 @@ const AwaitPipeline = () => {
     useEffect(() => {
         awaitPipeline();
     }, []);
-    return (React.createElement(Container$k, null,
+    return (React.createElement(Container$m, null,
         React.createElement(OdigosLogoText, { size: 100 }),
         React.createElement(TraceLoader, { width: 400 }),
         React.createElement(TextWrap, null,
@@ -782,37 +790,6 @@ const AwaitPipeline = () => {
             React.createElement(Description, null, "It can take up to a few minutes. Grab a cup of coffee, look out a window, and enjoy your free moment!"))));
 };
 
-const StyledButton = styled(Button) `
-  gap: 8px;
-  text-transform: none;
-  text-decoration: none;
-  border: ${({ theme, $withBorder }) => `1px solid ${$withBorder ? theme.colors.border : 'transparent'}`};
-  &.not-selected {
-    background-color: ${({ theme, $color }) => $color || theme.colors.dropdown_bg_2 + Theme.opacity.hex['060']};
-    &:hover {
-      background-color: ${({ theme, $hoverColor }) => $hoverColor || theme.colors.dropdown_bg_2};
-    }
-  }
-  &.selected {
-    background-color: ${({ theme }) => theme.colors.majestic_blue + Theme.opacity.hex['048']};
-  }
-`;
-const TextLimited = styled(Text) `
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  font-size: 14px;
-`;
-const SelectionButton = ({ label, onClick, icon: Icon, iconSrc, badgeLabel, badgeFilled, isSelected, withBorder, color, hoverColor, style }) => {
-    return (React.createElement(StyledButton, { onClick: onClick, className: isSelected ? 'selected' : 'not-selected', "$withBorder": withBorder, "$color": color, "$hoverColor": hoverColor, style: style },
-        Icon && (React.createElement("div", null,
-            React.createElement(Icon, null))),
-        iconSrc && (React.createElement("div", null,
-            React.createElement("img", { src: iconSrc, alt: '', width: 16, height: 16 }))),
-        React.createElement(TextLimited, null, label),
-        badgeLabel !== undefined && React.createElement(Badge, { label: badgeLabel, filled: badgeFilled || isSelected })));
-};
-
 const Tab = styled(FlexRow) `
   width: 260px;
   padding: 4px;
@@ -845,10 +822,10 @@ const PushToEnd$1 = styled.div `
   margin-left: auto;
   margin-right: 6px;
 `;
-const RelativeContainer$2 = styled.div `
+const RelativeContainer$3 = styled.div `
   position: relative;
 `;
-const AbsoluteContainer$2 = styled.div `
+const AbsoluteContainer$3 = styled.div `
   position: absolute;
   top: calc(100% + 8px);
   left: 0;
@@ -858,12 +835,6 @@ const AbsoluteContainer$2 = styled.div `
   border-radius: 24px;
   width: 420px;
 `;
-const VerticalScroll$1 = styled.div `
-  display: flex;
-  flex-direction: column;
-  padding: 12px;
-  overflow-y: scroll;
-`;
 const HeadWrap = styled.div `
   border-bottom: ${({ theme }) => `1px solid ${theme.colors.border}`};
   padding: 12px;
@@ -886,16 +857,16 @@ const ComputePlatformSelect = ({ connections, selected, onSelect, onViewAll }) =
     const withSelect = !!connections.length;
     const filtered = connections.filter(({ id }) => id.toLowerCase().includes(searchText));
     const Icon = !!selected?.type ? getPlatformIcon(selected.type) : null;
-    return (React.createElement(RelativeContainer$2, { ref: containerRef },
+    return (React.createElement(RelativeContainer$3, { ref: containerRef },
         React.createElement(Tab, { "$withSelect": withSelect, onClick: () => setIsOpen((prev) => !prev) },
             React.createElement(LogoWrap, null, !!Icon ? React.createElement(Icon, { size: 20, fill: theme.text.info }) : React.createElement(OverviewIcon, { fill: theme.text.info })),
             React.createElement(Title$2, null, selected?.name || selected?.id || 'no platform'),
             withSelect && (React.createElement(PushToEnd$1, null,
                 React.createElement(ExtendArrow, { extend: isOpen, align: 'right' })))),
-        isOpen && withSelect && (React.createElement(AbsoluteContainer$2, null,
+        isOpen && withSelect && (React.createElement(AbsoluteContainer$3, null,
             React.createElement(HeadWrap, null,
                 React.createElement(Input, { placeholder: 'Search...', icon: SearchIcon, value: searchText, onChange: (e) => setSearchText(e.target.value.toLowerCase()) })),
-            React.createElement(VerticalScroll$1, { style: { maxHeight: '240px' } }, filtered.map(({ id, type, name, status }, idx) => (React.createElement(SelectionButton, { key: `platform-${id}`, icon: () => getPlatformIcon(type)({ fill: status === StatusType.Success ? theme.text.success : theme.text.error }), label: `${!!name ? name : getPlatformLabel(type)} (${id})`, isSelected: selected?.id === id, onClick: () => {
+            React.createElement(VerticalScroll, { style: { maxHeight: '240px' } }, filtered.map(({ id, type, name, status }, idx) => (React.createElement(SelectionButton, { key: `platform-${id}`, icon: () => getPlatformIcon(type)({ fill: status === StatusType.Success ? theme.text.success : theme.text.error }), label: `${!!name ? name : getPlatformLabel(type)} (${id})`, isSelected: selected?.id === id, onClick: () => {
                     if (status === StatusType.Success) {
                         onSelect(filtered[idx]);
                     }
@@ -970,8 +941,7 @@ const ConnectionTypeDropdown = ({ connections, title = '', value, onSelect, onDe
     return React.createElement(Dropdown, { disabled: !options?.length, title: title, placeholder: 'All Types', options: options, value: value, onSelect: onSelect, onDeselect: onDeselect, ...props });
 };
 
-const ErrorDropdown = ({ title = 'Error Message', value, onSelect, onDeselect, disabled, ...props }) => {
-    const { sources } = useEntityStore();
+const ErrorDropdown = ({ sources, title = 'Error Message', value, onSelect, onDeselect, disabled, ...props }) => {
     const options = useMemo(() => {
         const payload = [];
         // !! note:
@@ -996,8 +966,7 @@ const ErrorDropdown = ({ title = 'Error Message', value, onSelect, onDeselect, d
     return React.createElement(Dropdown, { disabled: disabled || !options?.length, title: title, placeholder: 'All', options: options, value: value, onSelect: onSelect, onDeselect: onDeselect, ...props });
 };
 
-const LanguageDropdown = ({ title = 'Programming Language', value, onSelect, onDeselect, ...props }) => {
-    const { sources } = useEntityStore();
+const LanguageDropdown = ({ sources, title = 'Programming Language', value, onSelect, onDeselect, ...props }) => {
     const options = useMemo(() => {
         const payload = [];
         sources.forEach(({ containers }) => {
@@ -1024,8 +993,7 @@ const MonitorDropdown = ({ title = 'Monitors', value, onSelect, onDeselect, ...p
     return React.createElement(Dropdown, { disabled: !options?.length, title: title, placeholder: 'All', options: options, value: value, onSelect: onSelect, onDeselect: onDeselect, ...props });
 };
 
-const NamespaceDropdown = ({ title = 'Namespace', value, onSelect, onDeselect, ...props }) => {
-    const { namespaces } = useEntityStore();
+const NamespaceDropdown = ({ namespaces, title = 'Namespace', value, onSelect, onDeselect, ...props }) => {
     const options = useMemo(() => {
         const payload = [];
         namespaces?.forEach(({ name }) => {
@@ -1038,8 +1006,7 @@ const NamespaceDropdown = ({ title = 'Namespace', value, onSelect, onDeselect, .
     return React.createElement(Dropdown, { disabled: !options?.length, title: title, placeholder: 'Select namespace', options: options, value: value, onSelect: onSelect, onDeselect: onDeselect, ...props });
 };
 
-const KindDropdown = ({ title = 'Kind', value, onSelect, onDeselect, ...props }) => {
-    const { sources } = useEntityStore();
+const KindDropdown = ({ sources, title = 'Kind', value, onSelect, onDeselect, ...props }) => {
     const options = useMemo(() => {
         const payload = [];
         sources.forEach(({ kind: id }) => {
@@ -1052,7 +1019,7 @@ const KindDropdown = ({ title = 'Kind', value, onSelect, onDeselect, ...props })
     return React.createElement(Dropdown, { disabled: !options?.length, title: title, placeholder: 'All', options: options, value: value, onSelect: onSelect, onDeselect: onDeselect, ...props });
 };
 
-const Container$j = styled.div `
+const Container$l = styled.div `
   display: flex;
   align-items: center;
   margin: 20px 0;
@@ -1072,7 +1039,7 @@ const ComputePlatformsActionsMenu = ({ connections }) => {
     useEffect(() => {
         return () => clearAll();
     }, [clearAll]);
-    return (React.createElement(Container$j, null,
+    return (React.createElement(Container$l, null,
         React.createElement(FlexRow, { "$gap": 16 },
             React.createElement(FlexRow, { "$gap": 12 },
                 React.createElement(Title$1, null, "Compute platforms"),
@@ -12470,7 +12437,7 @@ ControlsComponent.displayName = 'Controls';
  * @remarks To extend or customise the controls, you can use the [`<ControlButton />`](/api-reference/components/control-button) component
  *
  */
-const Controls$1 = memo(ControlsComponent);
+const Controls = memo(ControlsComponent);
 
 function MiniMapNodeComponent({ id, x, y, width, height, style, color, strokeColor, strokeWidth, className, borderRadius, shapeRendering, selected, onClick, }) {
     const { background, backgroundColor } = style || {};
@@ -12789,7 +12756,7 @@ function ResizeControl({ nodeId, position, variant = ResizeControlVariant.Handle
  */
 memo(ResizeControl);
 
-const Container$i = styled(FlexColumn) `
+const Container$k = styled(FlexColumn) `
   align-items: center !important;
   justify-content: center;
   align-self: stretch;
@@ -12826,7 +12793,7 @@ const AddNode = memo(({ id: nodeId, data }) => {
     const { isThisPending } = usePendingStore();
     const entity = nodeId.split('-')[0];
     const isPending = isThisPending({ entityType: entity });
-    return (React.createElement(Container$i, { "$nodeWidth": nodeWidth, className: 'nowheel nodrag' },
+    return (React.createElement(Container$k, { "$nodeWidth": nodeWidth, className: 'nowheel nodrag' },
         isPending ? (React.createElement(Fragment, null,
             React.createElement(TitleWrapper, null,
                 React.createElement(FadeLoader, null),
@@ -12843,7 +12810,7 @@ const AddNode = memo(({ id: nodeId, data }) => {
         React.createElement(Handle, { type: 'source', position: Position.Right, style: { visibility: 'hidden' } })));
 });
 
-const Container$h = styled.div `
+const Container$j = styled.div `
   width: ${({ $nodeWidth }) => `${$nodeWidth}px`};
 `;
 const BaseNode = memo(({ id: nodeId, data }) => {
@@ -12876,7 +12843,7 @@ const BaseNode = memo(({ id: nodeId, data }) => {
         }
         setSelectedSources(namespaces);
     };
-    return (React.createElement(Container$h, { "data-id": nodeId, "$nodeWidth": nodeWidth, className: 'nowheel nodrag' },
+    return (React.createElement(Container$j, { "data-id": nodeId, "$nodeWidth": nodeWidth, className: 'nowheel nodrag' },
         React.createElement(DataTab, { title: title, subTitle: subTitle, onClick: () => { }, renderActions: renderActions, iconProps: {
                 icon: icon,
                 icons: icons,
@@ -12896,19 +12863,19 @@ const BaseNode = memo(({ id: nodeId, data }) => {
         React.createElement(Handle, { type: 'source', position: Position.Right, style: { visibility: 'hidden' } })));
 });
 
-const Container$g = styled.div `
+const Container$i = styled.div `
   width: ${({ $nodeWidth }) => `${$nodeWidth}px`};
   height: ${({ $nodeHeight }) => `${$nodeHeight}px`};
   opacity: 0;
 `;
 const EdgedNode = memo(({ data }) => {
     const { nodeWidth, nodeHeight } = data;
-    return (React.createElement(Container$g, { "$nodeWidth": nodeWidth, "$nodeHeight": nodeHeight, className: 'nowheel nodrag' },
+    return (React.createElement(Container$i, { "$nodeWidth": nodeWidth, "$nodeHeight": nodeHeight, className: 'nowheel nodrag' },
         React.createElement(Handle, { type: 'source', position: Position.Right, style: { visibility: 'hidden' } }),
         React.createElement(Handle, { type: 'target', position: Position.Left, style: { visibility: 'hidden' } })));
 });
 
-const Container$f = styled.div `
+const Container$h = styled.div `
   width: ${({ $nodeWidth }) => $nodeWidth}px;
   height: ${({ $nodeHeight }) => $nodeHeight}px;
   background: transparent;
@@ -12917,7 +12884,7 @@ const Container$f = styled.div `
 `;
 const FrameNode = memo(({ data }) => {
     const { nodeWidth, nodeHeight } = data;
-    return (React.createElement(Container$f, { "$nodeWidth": nodeWidth, "$nodeHeight": nodeHeight, className: 'nowheel nodrag' },
+    return (React.createElement(Container$h, { "$nodeWidth": nodeWidth, "$nodeHeight": nodeHeight, className: 'nowheel nodrag' },
         React.createElement(Handle, { type: 'source', position: Position.Right, style: { visibility: 'hidden' } }),
         React.createElement(Handle, { type: 'target', position: Position.Left, style: { visibility: 'hidden' } })));
 });
@@ -12932,7 +12899,7 @@ const nodeConfig = {
 };
 
 const { framePadding: framePadding$3 } = nodeConfig;
-const Container$e = styled.div `
+const Container$g = styled.div `
   position: relative;
   z-index: 1;
   width: fit-content;
@@ -12980,7 +12947,7 @@ const ScrollNode = memo(({ data, ...rest }) => {
         current?.addEventListener('scroll', handleScroll);
         return () => current?.removeEventListener('scroll', handleScroll);
     }, [onScroll]);
-    return (React.createElement(Container$e, { ref: containerRef, "$nodeHeight": nodeHeight, className: 'nowheel nodrag' },
+    return (React.createElement(Container$g, { ref: containerRef, "$nodeHeight": nodeHeight, className: 'nowheel nodrag' },
         items.map((item) => (React.createElement(BaseNodeWrapper, { key: item.id, onClick: (e) => {
                 e.stopPropagation();
                 // @ts-ignore
@@ -12990,7 +12957,7 @@ const ScrollNode = memo(({ data, ...rest }) => {
         React.createElement(BottomOverlay, { "$hide": isBottomOfList })));
 });
 
-const Container$d = styled.div `
+const Container$f = styled.div `
   position: relative;
   width: ${({ $nodeWidth }) => `${$nodeWidth}px`};
   padding: 12px 0px 16px 0px;
@@ -13008,7 +12975,7 @@ const SelectorWrapper = styled(FlexRow) `
 const ActionsWrapper = styled(FlexRow) `
   margin-left: auto;
 `;
-const AddButton$1 = styled(Button) `
+const AddButton = styled(Button) `
   width: 24px;
   height: 24px;
   padding: 0;
@@ -13059,7 +13026,7 @@ const HeaderNode = memo(({ id: nodeId, data }) => {
             setSelectedSources({});
         }
     };
-    return (React.createElement(Container$d, { "$nodeWidth": nodeWidth, className: 'nowheel nodrag' },
+    return (React.createElement(Container$f, { "$nodeWidth": nodeWidth, className: 'nowheel nodrag' },
         entityType === EntityTypes.Source && (React.createElement(SelectorWrapper, null,
             React.createElement(Checkbox, { partiallyChecked: hasSelected && sources?.length !== totalSelectedSources, value: hasSelected && sources?.length === totalSelectedSources, onChange: onSelect, disabled: !sources?.length }))),
         React.createElement(IconTitleBadge, { icon: Icon, title: title, badge: isSourceAwaitingInstrumentation ? `${instrumentingPercent}%` : badge, badgeTooltip: badgeTooltip, loading: isFetching && !isSourceAwaitingInstrumentation }),
@@ -13070,7 +13037,7 @@ const Actions$1 = memo(({ entityType }) => {
     const theme = Theme.useTheme();
     const { onClickNode } = useClickNode();
     return (React.createElement(ActionsWrapper, null,
-        React.createElement(AddButton$1, { "data-id": `add-${entityType}`, variant: 'primary', onClick: (e) => {
+        React.createElement(AddButton, { "data-id": `add-${entityType}`, variant: 'primary', onClick: (e) => {
                 e.stopPropagation();
                 // @ts-ignore
                 onClickNode(undefined, {
@@ -13121,12 +13088,12 @@ const LabeledEdge = memo(({ id, sourceX, sourceY, targetX, targetY, sourcePositi
                 React.createElement(Tooltip, { text: 'Heads up! The data-flow metrics you see are calculated over 10-second intervals.' }, data?.label)))));
 });
 
-const Container$c = styled.div `
+const Container$e = styled.div `
   width: ${({ $nodeWidth }) => `${$nodeWidth}px`};
 `;
 const SkeletonNode = memo(({ id: nodeId, data }) => {
     const { nodeWidth } = data;
-    return (React.createElement(Container$c, { "data-id": nodeId, "$nodeWidth": nodeWidth, className: 'nowheel nodrag' },
+    return (React.createElement(Container$e, { "data-id": nodeId, "$nodeWidth": nodeWidth, className: 'nowheel nodrag' },
         React.createElement(SkeletonLoader, { size: 3 })));
 });
 
@@ -13168,7 +13135,7 @@ const Flow = ({ nodes, edges, onNodesChange, onEdgesChange }) => {
     return (React.createElement(FlowWrapper, null,
         React.createElement(index, { fitView: false, zoomOnScroll: false, nodes: nodes, nodeTypes: nodeTypes, edges: edges, edgeTypes: edgeTypes, onNodeClick: onClickNode, onNodesChange: (changes) => setTimeout(() => onNodesChange(changes), 0), onEdgesChange: (changes) => setTimeout(() => onEdgesChange(changes), 0) },
             React.createElement(ControllerWrapper, null,
-                React.createElement(Controls$1, { position: 'bottom-right', orientation: 'horizontal', showInteractive: false, showZoom: true, showFitView: true, fitViewOptions: {
+                React.createElement(Controls, { position: 'bottom-right', orientation: 'horizontal', showInteractive: false, showZoom: true, showFitView: true, fitViewOptions: {
                         duration: 300,
                         padding: 0.02,
                         includeHiddenNodes: true,
@@ -13248,7 +13215,7 @@ const buildRuleNodes = ({ loading, entities, positions, unfilteredCount }) => {
         },
         data: {
             nodeWidth: nodeWidth$4,
-            title: DISPLAY_TITLES.InstrumentationRules,
+            title: DISPLAY_TITLES.INSTRUMENTATION_RULES,
             icon: getEntityIcon(EntityTypes.InstrumentationRule),
             badge: unfilteredCount,
             isFetching: loading,
@@ -13291,8 +13258,8 @@ const buildRuleNodes = ({ loading, entities, positions, unfilteredCount }) => {
             data: {
                 nodeWidth: nodeWidth$4,
                 type: AddNodeTypes.AddRule,
-                title: 'ADD RULE',
-                subTitle: 'To modify OpenTelemetry data',
+                title: DISPLAY_TITLES.ADD_INSTRUMENTATION_RULE,
+                subTitle: DISPLAY_TITLES.TO_MODIFY_OTEL_DATA,
             },
         });
     }
@@ -13328,7 +13295,7 @@ const buildActionNodes = ({ loading, entities, positions, unfilteredCount }) =>
         },
         data: {
             nodeWidth: nodeWidth$3,
-            title: DISPLAY_TITLES.Actions,
+            title: DISPLAY_TITLES.ACTIONS,
             icon: getEntityIcon(EntityTypes.Action),
             badge: unfilteredCount,
             isFetching: loading,
@@ -13385,8 +13352,8 @@ const buildActionNodes = ({ loading, entities, positions, unfilteredCount }) =>
             data: {
                 nodeWidth: nodeWidth$3,
                 type: AddNodeTypes.AddAction,
-                title: 'ADD Action',
-                subTitle: 'To modify OpenTelemetry data',
+                title: DISPLAY_TITLES.ADD_ACTION,
+                subTitle: DISPLAY_TITLES.TO_MODIFY_OTEL_DATA,
             },
         });
     }
@@ -13426,7 +13393,7 @@ const buildSourceNodes = ({ loading, entities, positions, unfilteredCount, conta
         },
         data: {
             nodeWidth: nodeWidth$2,
-            title: DISPLAY_TITLES.Sources,
+            title: DISPLAY_TITLES.SOURCES,
             icon: getEntityIcon(EntityTypes.Source),
             badge: hasFiltersApplied ? `${entities.length}/${unfilteredCount}` : unfilteredCount,
             badgeTooltip: hasFiltersApplied ? DISPLAY_TITLES.FILTERED_COUNT_TOOLTIP : undefined,
@@ -13496,8 +13463,8 @@ const buildSourceNodes = ({ loading, entities, positions, unfilteredCount, conta
             data: {
                 nodeWidth: nodeWidth$2,
                 type: AddNodeTypes.AddSource,
-                title: 'ADD Source',
-                subTitle: 'To collect OpenTelemetry data',
+                title: DISPLAY_TITLES.ADD_SOURCE,
+                subTitle: DISPLAY_TITLES.TO_COLLECT_OTEL_DATA,
             },
         });
     }
@@ -13554,7 +13521,7 @@ const mapToNodeData = (entity) => {
         subTitle: entity.destinationType.displayName,
         icon,
         iconSrc,
-        monitors: Object.keys(entity.exportedSignals).filter((signal) => entity.exportedSignals[signal] === true),
+        monitors: mapExportedSignals(entity.exportedSignals),
         raw: entity,
     };
 };
@@ -13570,7 +13537,7 @@ const buildDestinationNodes = ({ loading, entities, positions, unfilteredCount }
         },
         data: {
             nodeWidth,
-            title: DISPLAY_TITLES.Destinations,
+            title: DISPLAY_TITLES.DESTINATIONS,
             icon: getEntityIcon(EntityTypes.Destination),
             badge: unfilteredCount,
             isFetching: loading,
@@ -13613,15 +13580,15 @@ const buildDestinationNodes = ({ loading, entities, positions, unfilteredCount }
             data: {
                 nodeWidth,
                 type: AddNodeTypes.AddDestination,
-                title: 'ADD Destination',
-                subTitle: 'To monitor OpenTelemetry data',
+                title: DISPLAY_TITLES.ADD_DESTINATION,
+                subTitle: DISPLAY_TITLES.TO_MONITOR_OTEL_DATA,
             },
         });
     }
     return nodes;
 };
 
-const Container$b = styled.div `
+const Container$d = styled.div `
   width: 100%;
   height: ${({ $heightToRemove }) => `calc(100vh - ${$heightToRemove})`};
   position: relative;
@@ -13629,6 +13596,7 @@ const Container$b = styled.div `
 const DataFlow = ({ heightToRemove, metrics }) => {
     const theme = Theme.useTheme();
     const filters = useFilterStore();
+    const { selectedStreamName } = useDataStreamStore();
     const { isAwaitingInstrumentation } = useInstrumentStore();
     const { containerRef, containerWidth, containerHeight } = useContainerSize();
     const { sources, sourcesLoading, destinations, destinationsLoading, actions, actionsLoading, instrumentationRules, instrumentationRulesLoading } = useEntityStore();
@@ -13656,25 +13624,27 @@ const DataFlow = ({ heightToRemove, metrics }) => {
         })), prevNodes));
     };
     useEffect(() => {
+        const sourcesByStream = filterSourcesByStream(sources, selectedStreamName);
         const sourceNodes = buildSourceNodes({
-            entities: filterSources(sources, filters),
+            entities: filterSources(sourcesByStream, filters),
             loading: sourcesLoading || isAwaitingInstrumentation,
-            unfilteredCount: sources.length,
+            unfilteredCount: sourcesByStream.length,
             positions,
             containerHeight,
             onScroll: ({ scrollTop }) => handleNodesScrolled(sourceNodes, EntityTypes.Source, scrollTop),
         });
         handleNodesChanged(sourceNodes, EntityTypes.Source);
-    }, [sources, sourcesLoading, isAwaitingInstrumentation, positions[EntityTypes.Source], filters, containerHeight]);
+    }, [selectedStreamName, sources, sourcesLoading, isAwaitingInstrumentation, positions[EntityTypes.Source], filters, containerHeight]);
     useEffect(() => {
+        const destinationsByStream = filterDestinationsByStream(destinations, selectedStreamName);
         const destinationNodes = buildDestinationNodes({
-            entities: filterDestinations(destinations, filters),
+            entities: filterDestinations(destinationsByStream, filters),
             loading: destinationsLoading,
-            unfilteredCount: destinations.length,
+            unfilteredCount: destinationsByStream.length,
             positions,
         });
         handleNodesChanged(destinationNodes, EntityTypes.Destination);
-    }, [destinations, destinationsLoading, positions[EntityTypes.Destination], filters]);
+    }, [selectedStreamName, destinations, destinationsLoading, positions[EntityTypes.Destination], filters]);
     useEffect(() => {
         const actionNodes = buildActionNodes({
             entities: filterActions(actions, filters),
@@ -13694,15 +13664,15 @@ const DataFlow = ({ heightToRemove, metrics }) => {
         });
         handleNodesChanged(ruleNodes, EntityTypes.InstrumentationRule);
     }, [instrumentationRules, instrumentationRulesLoading, positions[EntityTypes.InstrumentationRule]]);
-    return (React.createElement(Container$b, { ref: containerRef, "$heightToRemove": heightToRemove },
+    return (React.createElement(Container$d, { ref: containerRef, "$heightToRemove": heightToRemove },
         React.createElement(Flow, { nodes: nodes, edges: edges, onNodesChange: onNodesChange, onEdgesChange: onEdgesChange })));
 };
 
-const RelativeContainer$1 = styled.div `
+const RelativeContainer$2 = styled.div `
   position: relative;
   max-width: 200px;
 `;
-const AbsoluteContainer$1 = styled.div `
+const AbsoluteContainer$2 = styled.div `
   position: absolute;
   top: calc(100% + 8px);
   left: 0;
@@ -13779,26 +13749,21 @@ const HorizontalScroll = styled.div `
   border-bottom: ${({ theme }) => `1px solid ${theme.colors.border}`};
   overflow-x: scroll;
 `;
-const VerticalScroll = styled.div `
-  display: flex;
-  flex-direction: column;
-  padding: 12px;
-  overflow-y: scroll;
-`;
 const SearchResults = ({ searchText, onClose }) => {
     const theme = Theme.useTheme();
     const { onClickNode } = useClickNode();
+    const { selectedStreamName } = useDataStreamStore();
     const { sources, destinations, actions, instrumentationRules } = useEntityStore();
     const [selectedCategory, setSelectedCategory] = useState('all');
     const { categories, searchResults } = useMemo(() => buildSearchResults({
         instrumentationRules,
-        sources,
+        sources: filterSourcesByStream(sources, selectedStreamName),
         actions,
-        destinations,
+        destinations: filterDestinationsByStream(destinations, selectedStreamName),
         searchText,
         selectedCategory,
-    }), [instrumentationRules, sources, actions, destinations, searchText, selectedCategory]);
-    return (React.createElement(AbsoluteContainer$1, null,
+    }), [instrumentationRules, sources, actions, destinations, selectedStreamName, searchText, selectedCategory]);
+    return (React.createElement(AbsoluteContainer$2, null,
         React.createElement(HorizontalScroll, { style: { borderBottom: `1px solid ${!searchResults.length ? 'transparent' : theme.colors.border}` } }, categories.map(({ category, label, count }) => !!count && (React.createElement(SelectionButton, { key: `category-select-${category}`, label: label, badgeLabel: count, isSelected: selectedCategory === category, onClick: () => setSelectedCategory(category) })))),
         searchResults.map(({ category, label, entities }, catIdx) => !!entities.length && (React.createElement(Fragment, { key: `category-list-${category}` },
             React.createElement(VerticalScroll, { style: { maxHeight: selectedCategory !== 'all' ? '240px' : '140px' } },
@@ -13822,7 +13787,7 @@ const Search = () => {
     const containerRef = useRef(null);
     useOnClickOutside(containerRef, () => setFocused(false));
     useKeyDown({ key: 'Escape', active: !!input || focused }, onClose);
-    return (React.createElement(RelativeContainer$1, { ref: containerRef },
+    return (React.createElement(RelativeContainer$2, { ref: containerRef },
         React.createElement(Input, { placeholder: 'Search', icon: SearchIcon, value: input, onChange: (e) => setInput(e.target.value.toLowerCase()), onFocus: () => setFocused(true) }),
         !!input || focused ? React.createElement(SearchResults, { searchText: input, onClose: onClose }) : null));
 };
@@ -13862,19 +13827,22 @@ const getFilterCount = (params) => {
 };
 const Filters$1 = () => {
     const theme = Theme.useTheme();
-    const { namespaces, kinds, monitors, languages, errors, onlyErrors, setAll, clearAll, getEmptyState } = useFilterStore();
+    const { namespaces, sources } = useEntityStore();
+    const { selectedStreamName } = useDataStreamStore();
+    const { namespaces: namespaceFilters, kinds, monitors, languages, errors, onlyErrors, setAll, clearAll, getEmptyState } = useFilterStore();
+    const sourcesByStream = useMemo(() => filterSourcesByStream(sources, selectedStreamName), [sources, selectedStreamName]);
     // We need local state, because we want to keep the filters in the store only when the user clicks on apply
-    const [filters, setFilters] = useState({ namespaces, kinds, monitors, languages, errors, onlyErrors });
+    const [filters, setFilters] = useState({ namespaces: namespaceFilters, kinds, monitors, languages, errors, onlyErrors });
     const [filterCount, setFilterCount] = useState(getFilterCount(filters));
     const [focused, setFocused] = useState(false);
     const toggleFocused = () => setFocused((prev) => !prev);
     useEffect(() => {
         if (!focused) {
-            const payload = { namespaces, kinds, monitors, languages, errors, onlyErrors };
+            const payload = { namespaces: namespaceFilters, kinds, monitors, languages, errors, onlyErrors };
             setFilters(payload);
             setFilterCount(getFilterCount(payload));
         }
-    }, [focused, namespaces, kinds, monitors, errors, onlyErrors]);
+    }, [focused, namespaceFilters, kinds, monitors, errors, onlyErrors]);
     const onApply = () => {
         // TODO: remove trycatch after debugging
         try {
@@ -13898,17 +13866,17 @@ const Filters$1 = () => {
     const ref = useRef(null);
     useOnClickOutside(ref, onCancel);
     useKeyDown({ key: 'Escape', active: focused }, onCancel);
-    return (React.createElement(RelativeContainer$1, { ref: ref },
+    return (React.createElement(RelativeContainer$2, { ref: ref },
         React.createElement(SelectionButton, { label: 'Filters', icon: FilterIcon, badgeLabel: filterCount, badgeFilled: !!filterCount, withBorder: true, color: 'transparent', onClick: toggleFocused }),
-        React.createElement(AbsoluteContainer$1, { "$hidden": !focused },
+        React.createElement(AbsoluteContainer$2, { "$hidden": !focused },
             React.createElement(FormWrapper, null,
-                React.createElement(NamespaceDropdown, { value: filters['namespaces'], onSelect: (val) => setFilters((prev) => ({ ...prev, namespaces: [...(prev.namespaces || []), val] })), onDeselect: (val) => setFilters((prev) => ({ ...prev, namespaces: (prev.namespaces || []).filter((opt) => opt.id !== val.id) })), showSearch: true, required: true, isMulti: true }),
-                React.createElement(KindDropdown, { value: filters['kinds'], onSelect: (val) => setFilters((prev) => ({ ...prev, kinds: [...(prev.kinds || []), val] })), onDeselect: (val) => setFilters((prev) => ({ ...prev, kinds: (prev.kinds || []).filter((opt) => opt.id !== val.id) })), showSearch: true, required: true, isMulti: true }),
-                React.createElement(LanguageDropdown, { value: filters['languages'], onSelect: (val) => setFilters((prev) => ({ ...prev, languages: [...(prev.languages || []), val] })), onDeselect: (val) => setFilters((prev) => ({ ...prev, languages: (prev.languages || []).filter((opt) => opt.id !== val.id) })), showSearch: true, required: true, isMulti: true }),
+                React.createElement(NamespaceDropdown, { namespaces: namespaces, value: filters['namespaces'], onSelect: (val) => setFilters((prev) => ({ ...prev, namespaces: [...(prev.namespaces || []), val] })), onDeselect: (val) => setFilters((prev) => ({ ...prev, namespaces: (prev.namespaces || []).filter((opt) => opt.id !== val.id) })), showSearch: true, required: true, isMulti: true }),
+                React.createElement(KindDropdown, { sources: sourcesByStream, value: filters['kinds'], onSelect: (val) => setFilters((prev) => ({ ...prev, kinds: [...(prev.kinds || []), val] })), onDeselect: (val) => setFilters((prev) => ({ ...prev, kinds: (prev.kinds || []).filter((opt) => opt.id !== val.id) })), showSearch: true, required: true, isMulti: true }),
+                React.createElement(LanguageDropdown, { sources: sourcesByStream, value: filters['languages'], onSelect: (val) => setFilters((prev) => ({ ...prev, languages: [...(prev.languages || []), val] })), onDeselect: (val) => setFilters((prev) => ({ ...prev, languages: (prev.languages || []).filter((opt) => opt.id !== val.id) })), showSearch: true, required: true, isMulti: true }),
                 React.createElement(MonitorDropdown, { value: filters['monitors'], onSelect: (val) => setFilters((prev) => ({ ...prev, monitors: [...(prev.monitors || []), val] })), onDeselect: (val) => setFilters((prev) => ({ ...prev, monitors: (prev.monitors || []).filter((opt) => opt.id !== val.id) })), showSearch: true, required: true, isMulti: true }),
                 React.createElement(ToggleWrapper, null,
                     React.createElement(Toggle, { title: 'Show only sources with errors', initialValue: filters['onlyErrors'], onChange: (bool) => setFilters((prev) => ({ ...prev, errors: [], onlyErrors: bool })) })),
-                React.createElement(ErrorDropdown, { value: filters['errors'], onSelect: (val) => setFilters((prev) => ({ ...prev, errors: [...(prev.errors || []), val] })), onDeselect: (val) => setFilters((prev) => ({ ...prev, errors: (prev.errors || []).filter((opt) => opt.id !== val.id) })), disabled: !filters['onlyErrors'], showSearch: true, required: true, isMulti: true })),
+                React.createElement(ErrorDropdown, { sources: sourcesByStream, value: filters['errors'], onSelect: (val) => setFilters((prev) => ({ ...prev, errors: [...(prev.errors || []), val] })), onDeselect: (val) => setFilters((prev) => ({ ...prev, errors: (prev.errors || []).filter((opt) => opt.id !== val.id) })), disabled: !filters['onlyErrors'], showSearch: true, required: true, isMulti: true })),
             React.createElement(Actions, null,
                 React.createElement(ActionButton$1, { variant: 'primary', onClick: onApply }, "Apply"),
                 React.createElement(ActionButton$1, { variant: 'secondary', onClick: onCancel }, "Cancel"),
@@ -13916,7 +13884,60 @@ const Filters$1 = () => {
                     React.createElement(ActionButton$1, { variant: 'tertiary', onClick: onReset, "$color": theme.text.error }, "Reset"))))));
 };
 
-const Container$a = styled.div `
+const RelativeContainer$1 = styled.div `
+  position: relative;
+`;
+const Container$c = styled(FlexRow) `
+  border: 1px solid ${({ theme }) => theme.colors.border};
+  border-radius: 32px;
+
+  & button {
+    max-height: 28px;
+  }
+`;
+const AbsoluteContainer$1 = styled.div `
+  position: absolute;
+  top: calc(100% + 8px);
+  left: 0;
+  z-index: 1;
+  background-color: ${({ theme }) => theme.colors.dropdown_bg};
+  border: ${({ theme }) => `1px solid ${theme.colors.border}`};
+  border-radius: 24px;
+  width: 420px;
+`;
+const SelectionMenuHeadWrap = styled.div `
+  border-bottom: ${({ theme }) => `1px solid ${theme.colors.border}`};
+  padding: 12px;
+`;
+const SelectionWrap = styled(VerticalScroll) `
+  max-height: 240px;
+`;
+const DataStreamSelect = ({ onClickNewStream }) => {
+    const theme = Theme.useTheme();
+    const { dataStreams, selectedStreamName, setSelectedStreamName } = useDataStreamStore();
+    const containerRef = useRef(null);
+    const [popupOpen, setPopupOpen] = useState(false);
+    useOnClickOutside(containerRef, () => setPopupOpen(false));
+    const [searchText, setSearchText] = useState('');
+    const filteredDataStreams = useMemo(() => dataStreams.filter(({ name }) => !searchText || name.toLowerCase().includes(searchText.toLowerCase())), [dataStreams, searchText]);
+    return (React.createElement(RelativeContainer$1, null,
+        React.createElement(Container$c, { "$gap": 0 },
+            React.createElement(Button, { variant: 'tertiary', onClick: () => setPopupOpen((prev) => !prev) },
+                React.createElement(DataStreamsIcon, { fill: theme.text.info }),
+                React.createElement(Text, null, selectedStreamName),
+                React.createElement(ExtendArrow, { extend: popupOpen })),
+            React.createElement(Divider, { orientation: 'vertical', length: '32px', thickness: 2, margin: '0' }),
+            React.createElement(AddButton$1, { onClick: onClickNewStream, label: BUTTON_TEXTS.NEW })),
+        popupOpen && (React.createElement(AbsoluteContainer$1, { ref: containerRef },
+            React.createElement(SelectionMenuHeadWrap, null,
+                React.createElement(Input, { placeholder: 'Search...', icon: SearchIcon, value: searchText, onChange: (e) => setSearchText(e.target.value) })),
+            React.createElement(SelectionWrap, null, filteredDataStreams.map(({ name }) => (React.createElement(SelectionButton, { key: `stream-${name}`, label: name, isSelected: selectedStreamName === name, onClick: () => {
+                    setSelectedStreamName(name);
+                    setPopupOpen(false);
+                }, color: 'transparent', style: { width: '100%', justifyContent: 'flex-start' } }))))))));
+};
+
+const Container$b = styled.div `
   display: flex;
   align-items: center;
   margin: 20px 0;
@@ -13927,28 +13948,32 @@ const Container$a = styled.div `
 const PushToEnd = styled.div `
   margin-left: auto;
 `;
-const AddButton = styled(Button) `
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  gap: 6px;
-  min-width: 160px;
-  padding-right: 24px;
-`;
-const DataFlowActionsMenu = ({ addEntity }) => {
-    const theme = Theme.useTheme();
+const DataFlowActionsMenu = ({ addEntity, onClickNewStream }) => {
     const { setCurrentModal } = useModalStore();
-    return (React.createElement(Container$a, null,
+    return (React.createElement(Container$b, null,
+        onClickNewStream && React.createElement(DataStreamSelect, { onClickNewStream: onClickNewStream }),
         React.createElement(Search, null),
         React.createElement(Filters$1, null),
         addEntity && (React.createElement(PushToEnd, null,
-            React.createElement(AddButton, { "data-id": `add-${addEntity}`, onClick: () => setCurrentModal(addEntity) },
-                React.createElement(PlusIcon$1, { fill: theme.colors.primary }),
-                React.createElement(Text, { size: 14, family: 'secondary', color: theme.text.primary, weight: 600 },
-                    "ADD ",
-                    addEntity))))));
+            React.createElement(AddButton$1, { "data-id": `add-${addEntity}`, onClick: () => setCurrentModal(addEntity), label: `${BUTTON_TEXTS.ADD} ${addEntity}`, variant: 'primary' })))));
 };
 
+const DataStreamSelectionForm = forwardRef(({ isModal, onClickSummary }, ref) => {
+    const { dataStreams } = useDataStreamStore();
+    const [nameInput, setNameInput] = useState('');
+    useImperativeHandle(ref, () => ({
+        getFormValues: () => ({
+            name: nameInput,
+        }),
+    }));
+    const dataStreamOptions = useMemo(() => dataStreams.map(({ name }) => ({ label: name })), [dataStreams]);
+    return (React.createElement(ModalBody, { "$isNotModal": !isModal, "$minHeight": '70vh' },
+        React.createElement(FlexColumn, { "$gap": 24 },
+            onClickSummary && React.createElement(NoteBackToSummary, { onClick: onClickSummary }),
+            React.createElement(SectionTitle, { title: DISPLAY_TITLES.STREAM_NAME, description: DISPLAY_TITLES.STREAM_DESCRIPTION }),
+            React.createElement(AutocompleteInput, { placeholder: DISPLAY_TITLES.STREAM_NAME_PLACEHOLDER, autoFocus: true, options: dataStreamOptions, defaultText: nameInput, onTextChange: setNameInput }))));
+});
+
 const buildMonitorsList = (exportedSignals) => Object.keys(exportedSignals)
     .filter((key) => exportedSignals[key])
     .join(', ');
@@ -13957,7 +13982,7 @@ const buildCard$2 = (destination, yamlFields) => {
     const arr = [
         { title: DISPLAY_TITLES.NAME, value: destinationType.displayName },
         { title: DISPLAY_TITLES.TYPE, value: destinationType.type },
-        { type: DataCardFieldTypes.Monitors, title: DISPLAY_TITLES.Monitors, value: buildMonitorsList(exportedSignals) },
+        { type: DataCardFieldTypes.Monitors, title: DISPLAY_TITLES.MONITORS, value: buildMonitorsList(exportedSignals) },
     ];
     const parsedFields = safeJsonParse(fields, {});
     const sortedParsedFields = yamlFields.map((field) => ({ key: field.name, value: parsedFields[field.name] ?? null })).filter((item) => item.value !== null) ||
@@ -14022,7 +14047,7 @@ const ActionButton = styled(Button) `
   align-items: center;
   gap: 8px;
 
-  ${({ $status, theme }) => $status === 'success'
+  ${({ $status, theme }) => $status === StatusType.Success
     ? css `
           border-color: transparent;
           background-color: ${theme.colors.success};
@@ -14036,27 +14061,26 @@ const ActionButton = styled(Button) `
           background-color: transparent;
         `}
 `;
-const TestConnection = ({ destination, disabled, status, onError, onSuccess, validateForm, testConnection, testLoading, testResult }) => {
+const TestConnection = ({ destination, disabled, validateForm, status, testConnection, onSuccess, onError }) => {
     const theme = Theme.useTheme();
-    useEffect(() => {
-        if (testResult) {
-            if (testResult.succeeded)
-                onSuccess();
-            else
-                onError();
-        }
-    }, [testResult]);
+    const [loading, setLoading] = useState(false);
     const onClick = async () => {
-        if (validateForm())
-            await testConnection(destination);
+        if (validateForm()) {
+            setLoading(true);
+            const testResult = await testConnection(destination);
+            if (testResult) {
+                testResult.succeeded ? onSuccess(testResult) : onError(testResult);
+            }
+            setLoading(false);
+        }
     };
     const Icon = !!status ? getStatusIcon(status, theme) : undefined;
     return (React.createElement(ActionButton, { "$status": status, variant: 'secondary', disabled: disabled, onClick: onClick },
-        testLoading ? React.createElement(FadeLoader, null) : Icon ? React.createElement(Icon, null) : null,
-        React.createElement(Text, { family: 'secondary', decoration: 'underline', size: 14, color: !!status ? theme.text[status] : undefined }, testLoading ? 'Checking' : status === 'success' ? 'Connection OK' : status === 'error' ? 'Connection Failed' : 'Test Connection')));
+        loading ? React.createElement(FadeLoader, null) : Icon ? React.createElement(Icon, null) : null,
+        React.createElement(Text, { family: 'secondary', decoration: 'underline', size: 14, color: !!status ? theme.text[status] : undefined }, loading ? 'Checking' : status === StatusType.Success ? 'Connection OK' : status === 'error' ? 'Connection Failed' : 'Test Connection')));
 };
 
-const Container$9 = styled(FlexColumn) `
+const Container$a = styled(FlexColumn) `
   align-items: unset;
   padding: 0 4px;
 `;
@@ -14065,11 +14089,11 @@ const NotesWrapper = styled.div `
   flex-direction: column;
   gap: 12px;
 `;
-const DestinationForm = ({ isUpdate, categoryItem, formData, formErrors, validateForm, handleFormChange, dynamicFields, setDynamicFields, testConnection, testLoading, testResult, }) => {
+const DestinationForm = ({ isUpdate, categoryItem, formData, formErrors, validateForm, handleFormChange, dynamicFields, setDynamicFields, testConnection }) => {
     const { supportedSignals, testConnectionSupported, displayName } = categoryItem || {};
     const [autoFilled, setAutoFilled] = useState(false);
     const [isFormDirty, setIsFormDirty] = useState(false);
-    const [connectionStatus, setConnectionStatus] = useState(undefined);
+    const [connection, setConnection] = useState(undefined);
     const autoFillCheckRef = useRef(false);
     useEffect(() => {
         if (!!dynamicFields.length && !autoFillCheckRef.current) {
@@ -14092,7 +14116,7 @@ const DestinationForm = ({ isUpdate, categoryItem, formData, formErrors, validat
     }, [dynamicFields, isFormDirty]);
     const dirtyForm = () => {
         setIsFormDirty(true);
-        setConnectionStatus(undefined);
+        setConnection(undefined);
     };
     const supportedMonitors = useMemo(() => {
         const { logs, metrics, traces } = supportedSignals || {};
@@ -14124,19 +14148,28 @@ const DestinationForm = ({ isUpdate, categoryItem, formData, formErrors, validat
             traces: signals.includes(SignalType.Traces),
         });
     };
-    return (React.createElement(Container$9, { "$gap": 24 },
-        React.createElement(Container$9, { "$gap": 12 },
-            React.createElement(SectionTitle, { title: isUpdate ? 'Update destination' : 'Create destination', description: `Connect ${displayName} with Odigos.`, actionButton: testConnectionSupported && (React.createElement(TestConnection, { destination: formData, disabled: !isFormDirty, validateForm: validateForm, status: connectionStatus, testConnection: testConnection, testLoading: testLoading, testResult: testResult, onError: () => {
-                        setIsFormDirty(false);
-                        setConnectionStatus(StatusType.Error);
-                    }, onSuccess: () => {
-                        setIsFormDirty(false);
-                        setConnectionStatus(StatusType.Success);
-                    } })) }),
+    const onTestConnectionError = (testResult) => {
+        setIsFormDirty(false);
+        setConnection({
+            type: StatusType.Error,
+            title: testResult?.reason || 'Connection failed',
+            message: testResult?.message || 'Please check your input and try again.',
+        });
+    };
+    const onTestConnectionSuccess = (testResult) => {
+        setIsFormDirty(false);
+        setConnection({
+            type: StatusType.Success,
+            title: testResult?.reason || 'Connection succeeded',
+            message: testResult?.message || '',
+        });
+    };
+    return (React.createElement(Container$a, { "$gap": 24 },
+        React.createElement(Container$a, { "$gap": 12 },
+            React.createElement(SectionTitle, { title: isUpdate ? 'Update destination' : 'Create destination', description: `Connect ${displayName} with Odigos.`, actionButton: testConnectionSupported && (React.createElement(TestConnection, { destination: formData, disabled: !isFormDirty, validateForm: validateForm, status: connection?.type, testConnection: testConnection, onError: onTestConnectionError, onSuccess: onTestConnectionSuccess })) }),
             React.createElement(NotesWrapper, null,
-                testConnectionSupported && connectionStatus === StatusType.Error && React.createElement(NotificationNote, { type: StatusType.Error, message: 'Connection failed. Please check your input and try again.' }),
-                testConnectionSupported && connectionStatus === StatusType.Success && React.createElement(NotificationNote, { type: StatusType.Success, message: 'Connection succeeded.' }),
-                autoFilled && !connectionStatus && !isUpdate && React.createElement(NotificationNote, { type: StatusType.Default, message: `Odigos autocompleted ${displayName} destination details.` })),
+                testConnectionSupported && connection && React.createElement(NotificationNote, { type: connection.type, title: connection.title, message: connection.message }),
+                autoFilled && !connection && !isUpdate && React.createElement(NotificationNote, { type: StatusType.Default, message: `Odigos autocompleted ${displayName} destination details.` })),
             React.createElement(Divider, null)),
         React.createElement(MonitorsCheckboxes, { title: isUpdate ? '' : 'This connection will monitor:', required: true, allowedSignals: supportedMonitors, selectedSignals: selectedMonitors, setSelectedSignals: handleSelectedSignals, errorMessage: formErrors['exportedSignals'] }),
         !isUpdate && (React.createElement(Input, { title: 'Destination name', placeholder: 'Enter destination name', value: formData['name'], onChange: (e) => {
@@ -14168,9 +14201,11 @@ const DataContainer$2 = styled.div `
   flex-direction: column;
   gap: 12px;
 `;
-const DestinationDrawer = ({ categories, updateDestination, deleteDestination, testConnection, testLoading, testResult }) => {
+const DestinationDrawer = ({ categories, updateDestination, deleteDestination, testConnection }) => {
     const { destinations } = useEntityStore();
+    const { selectedStreamName } = useDataStreamStore();
     const { drawerType, drawerEntityId } = useDrawerStore();
+    const destinationsByStream = useMemo(() => filterDestinationsByStream(destinations, selectedStreamName), [destinations, selectedStreamName]);
     const drawerRef = useRef(null);
     const isOpen = drawerType !== EntityTypes.Destination;
     const [isEditing, setIsEditing] = useState(false);
@@ -14184,7 +14219,7 @@ const DestinationDrawer = ({ categories, updateDestination, deleteDestination, t
     const thisItem = useMemo(() => {
         if (isOpen)
             return null;
-        const found = destinations?.find((x) => x.id === drawerEntityId);
+        const found = destinationsByStream?.find((x) => x.id === drawerEntityId);
         if (!!found) {
             loadFormWithDrawerItem(found);
             const fields = [];
@@ -14202,7 +14237,7 @@ const DestinationDrawer = ({ categories, updateDestination, deleteDestination, t
             setYamlFields(fields);
         }
         return found;
-    }, [isOpen, drawerEntityId, destinations]);
+    }, [isOpen, drawerEntityId, destinationsByStream]);
     if (!thisItem)
         return null;
     const thisOptionType = categories.flatMap((category) => category.items).find((option) => option.type === thisItem.destinationType.type);
@@ -14232,32 +14267,34 @@ const DestinationDrawer = ({ categories, updateDestination, deleteDestination, t
             setIsFormDirty(false);
         }
     };
-    return (React.createElement(OverviewDrawer, { ref: drawerRef, title: thisItem.name || thisItem.destinationType.displayName, icons: icon ? [icon] : undefined, iconSrcs: iconSrc ? [iconSrc] : undefined, isEdit: isEditing, isFormDirty: isFormDirty, onEdit: handleEdit, onSave: handleSave, onDelete: handleDelete, onCancel: handleCancel, isLastItem: destinations.length === 1 }, isEditing ? (React.createElement(FormContainer$2, null,
+    return (React.createElement(OverviewDrawer, { ref: drawerRef, title: thisItem.name || thisItem.destinationType.displayName, icons: icon ? [icon] : undefined, iconSrcs: iconSrc ? [iconSrc] : undefined, isEdit: isEditing, isFormDirty: isFormDirty, onEdit: handleEdit, onSave: handleSave, onDelete: handleDelete, onCancel: handleCancel, isLastItem: destinationsByStream.length === 1 }, isEditing ? (React.createElement(FormContainer$2, null,
         React.createElement(DestinationForm, { isUpdate: true, categoryItem: thisOptionType, formData: formData, formErrors: formErrors, handleFormChange: (...params) => {
                 setIsFormDirty(true);
                 handleFormChange(...params);
             }, dynamicFields: dynamicFields, setDynamicFields: (...params) => {
                 setIsFormDirty(true);
                 setDynamicFields(...params);
-            }, validateForm: validateForm, testConnection: testConnection, testLoading: testLoading, testResult: testResult }))) : (React.createElement(DataContainer$2, null,
+            }, validateForm: validateForm, testConnection: testConnection }))) : (React.createElement(DataContainer$2, null,
         React.createElement(ConditionDetails, { conditions: thisItem.conditions || [] }),
         React.createElement(DataCard, { title: DISPLAY_TITLES.DESTINATION_DETAILS, data: !!thisItem ? buildCard$2(thisItem, yamlFields) : [] })))));
 };
 
-const ListsWrapper$1 = styled.div `
+const ListsWrapper = styled.div `
   display: flex;
   flex-direction: column;
   gap: 12px;
 `;
-const DestinationsList = ({ items, setSelectedItem }) => {
+const DestinationsList = ({ items, onSelectOption, onSelectConfigured }) => {
     return items.map((category) => {
-        return (React.createElement(ListsWrapper$1, { key: `category-${category.name}` },
-            React.createElement(SectionTitle, { size: 'small', title: capitalizeFirstLetter(category.name), description: category.description }),
-            category.items.map((item, idx) => {
+        const isAlreadyExisting = category.name === DESTINATION_CATEGORIES['EXISTS']['TITLE'];
+        return (React.createElement(ListsWrapper, { key: `category-${category.name}` },
+            React.createElement(SectionTitle, { size: 'small', icon: category.icon, title: capitalizeFirstLetter(category.name), description: category.description }),
+            category.items.map((item) => {
                 const { icon, iconSrc } = getDestinationIcon(item.type);
-                return (React.createElement(DataTab, { key: `select-destination-${item.type}-${idx}`, "data-id": `select-destination-${item.type}`, title: item.displayName, hoverText: 'Select', onClick: () => setSelectedItem(item), iconProps: {
-                        icon,
-                        iconSrc,
+                return (React.createElement(DataTab, { key: `select-${category.name}-destination-${item.type}`, "data-id": `select-${category.name}-destination-${item.type}`, title: item.displayName, hoverText: 'SELECT', onClick: () => (isAlreadyExisting ? onSelectConfigured(item.id) : onSelectOption(item)), iconProps: { icon, iconSrc }, checkboxProps: {
+                        withCheckbox: isAlreadyExisting,
+                        isChecked: item.selected,
+                        onCheckboxChange: () => onSelectConfigured(item.id),
                     }, visualProps: {
                         monitors: Object.keys(item.supportedSignals).filter((signal) => item.supportedSignals[signal].supported),
                         monitorsWithLabels: true,
@@ -14266,29 +14303,7 @@ const DestinationsList = ({ items, setSelectedItem }) => {
     });
 };
 
-const ListsWrapper = styled.div `
-  display: flex;
-  flex-direction: column;
-  gap: 12px;
-`;
-const PotentialDestinationsList = ({ items, setSelectedItem }) => {
-    if (!items.length)
-        return null;
-    return (React.createElement(ListsWrapper, null,
-        React.createElement(SectionTitle, { size: 'small', icon: OdigosLogo, title: 'Detected by Odigos', description: 'Odigos detects destinations for which automatic connection is available. All data will be filled out automatically.' }),
-        items.map((item, idx) => {
-            const { icon, iconSrc } = getDestinationIcon(item.type);
-            return (React.createElement(DataTab, { key: `select-potential-destination-${item.type}-${idx}`, "data-id": `select-potential-destination-${item.type}`, title: item.displayName, hoverText: 'Select', onClick: () => setSelectedItem(item), iconProps: {
-                    icon,
-                    iconSrc,
-                }, visualProps: {
-                    monitors: Object.keys(item.supportedSignals).filter((signal) => item.supportedSignals[signal].supported),
-                    monitorsWithLabels: true,
-                } }));
-        })));
-};
-
-const Container$8 = styled.div `
+const Container$9 = styled.div `
   display: flex;
   flex-direction: column;
   gap: 24px;
@@ -14299,7 +14314,7 @@ const Filters = styled.div `
   gap: 12px;
 `;
 const WidthConstraint = styled.div `
-  width: 160px;
+  width: 170px;
   margin-right: 8px;
 `;
 const ListsContainer = styled.div `
@@ -14314,22 +14329,60 @@ const ListsContainer = styled.div `
     max-height: calc(100vh - 400px);
   }
 `;
-const NoDataFoundWrapper$1 = styled(Container$8) `
+const NoDataFoundWrapper = styled(Container$9) `
   margin-top: 80px;
 `;
+const { MANAGED, SELF_HOSTED, DETECTED, EXISTS } = DESTINATION_CATEGORIES;
 const DROPDOWN_OPTIONS = [
     { value: 'All types', id: 'all' },
-    { value: 'Managed', id: 'managed' },
-    { value: 'Self-hosted', id: 'self hosted' },
+    { value: MANAGED.TITLE, id: MANAGED.TITLE },
+    { value: SELF_HOSTED.TITLE, id: SELF_HOSTED.TITLE },
+    { value: DETECTED.TITLE, id: DETECTED.TITLE },
+    { value: EXISTS.TITLE, id: EXISTS.TITLE },
 ];
 const DEFAULT_CATEGORY = DROPDOWN_OPTIONS[0];
 const DEFAULT_MONITORS = [SignalType.Logs, SignalType.Metrics, SignalType.Traces];
-const ChooseDestinationBody = ({ hidden, categories, potentialDestinations, onSelect }) => {
+const createConfiguredItems = (destinations, selectedStreamName, configuredDestinationIds) => destinations.map((dest) => {
+    const { type, displayName } = dest.destinationType;
+    const isInSelectedStream = dest.streamNames?.includes(selectedStreamName);
+    const isConfigured = configuredDestinationIds.has(dest.id);
+    return {
+        id: dest.id,
+        type,
+        displayName,
+        selected: isInSelectedStream || isConfigured,
+        fields: [],
+        testConnectionSupported: false,
+        supportedSignals: {
+            [SignalType.Logs]: { supported: dest.exportedSignals.logs },
+            [SignalType.Metrics]: { supported: dest.exportedSignals.metrics },
+            [SignalType.Traces]: { supported: dest.exportedSignals.traces },
+        },
+    };
+});
+const ChooseDestinationBody = ({ hidden, categories, potentialDestinations, onSelectOption, onSelectConfigured }) => {
+    const { destinations } = useEntityStore();
+    const { configuredDestinations } = useSetupStore();
+    const { selectedStreamName } = useDataStreamStore();
     const [search, setSearch] = useState('');
     const [selectedCategory, setSelectedCategory] = useState(DEFAULT_CATEGORY);
     const [selectedMonitors, setSelectedMonitors] = useState(DEFAULT_MONITORS);
     const filteredDestinations = useMemo(() => {
-        return categories
+        const clonedDestinationsCategories = deepClone(categories);
+        clonedDestinationsCategories.unshift({
+            name: EXISTS.TITLE,
+            description: EXISTS.DESCRIPTION,
+            icon: CheckIcon,
+            // !! do not "filterDestinationsByStream" here, because we need all destinations to select already configured
+            items: createConfiguredItems(destinations, selectedStreamName, new Set(configuredDestinations.map((d) => d.id))),
+        });
+        clonedDestinationsCategories.unshift({
+            name: DETECTED.TITLE,
+            description: DETECTED.DESCRIPTION,
+            icon: OdigosLogo,
+            items: potentialDestinations,
+        });
+        return clonedDestinationsCategories
             .map((category) => {
             const filteredItems = category.items.filter((item) => {
                 const matchesSearch = !search || item.displayName.toLowerCase().includes(search.toLowerCase());
@@ -14340,25 +14393,24 @@ const ChooseDestinationBody = ({ hidden, categories, potentialDestinations, onSe
             return { ...category, items: filteredItems };
         })
             .filter(({ items }) => !!items.length); // Filter out empty categories
-    }, [categories, search, selectedCategory, selectedMonitors]);
+    }, [categories, potentialDestinations, destinations, search, selectedCategory, selectedMonitors, selectedStreamName, configuredDestinations]);
     if (hidden)
         return null;
-    return (React.createElement(Container$8, null,
+    return (React.createElement(Container$9, null,
         React.createElement(SectionTitle, { title: 'Choose destination', description: 'Add backend destination you want to connect with Odigos.' }),
         React.createElement(Filters, null,
             React.createElement(WidthConstraint, null,
                 React.createElement(Input, { placeholder: 'Search...', icon: SearchIcon, value: search, onChange: ({ target: { value } }) => setSearch(value) })),
             React.createElement(WidthConstraint, null,
-                React.createElement(Dropdown, { options: DROPDOWN_OPTIONS, value: selectedCategory, onSelect: (opt) => setSelectedCategory(opt), onDeselect: () => { } })),
+                React.createElement(Dropdown, { options: DROPDOWN_OPTIONS, value: selectedCategory, onSelect: setSelectedCategory, onDeselect: () => { } })),
             React.createElement(MonitorsCheckboxes, { title: '', selectedSignals: selectedMonitors, setSelectedSignals: setSelectedMonitors })),
         React.createElement(Divider, null),
-        !filteredDestinations.length && !potentialDestinations.length ? (React.createElement(NoDataFoundWrapper$1, null,
+        !filteredDestinations.length ? (React.createElement(NoDataFoundWrapper, null,
             React.createElement(NoDataFound, { title: 'No destinations found' }))) : (React.createElement(ListsContainer, null,
-            React.createElement(PotentialDestinationsList, { items: potentialDestinations, setSelectedItem: onSelect }),
-            React.createElement(DestinationsList, { items: filteredDestinations, setSelectedItem: onSelect })))));
+            React.createElement(DestinationsList, { items: filteredDestinations, onSelectOption: onSelectOption, onSelectConfigured: onSelectConfigured })))));
 };
 
-const Container$7 = styled.div `
+const Container$8 = styled.div `
   display: flex;
 `;
 const SideMenuWrapper = styled.div `
@@ -14369,7 +14421,9 @@ const SideMenuWrapper = styled.div `
     display: none;
   }
 `;
-const DestinationModal = ({ isOnboarding, categories, potentialDestinations, createDestination, testConnection, testLoading, testResult }) => {
+const DestinationModal = ({ isOnboarding, categories, potentialDestinations, createDestination, updateDestination, testConnection }) => {
+    const { destinations } = useEntityStore();
+    const { selectedStreamName } = useDataStreamStore();
     const { addConfiguredDestination } = useSetupStore();
     const { currentModal, setCurrentModal } = useModalStore();
     const isOpen = currentModal === EntityTypes.Destination;
@@ -14378,6 +14432,55 @@ const DestinationModal = ({ isOnboarding, categories, potentialDestinations, cre
         supportedSignals: selectedItem?.supportedSignals,
         preLoadedFields: selectedItem?.fields,
     });
+    const handleAddExisting = (alreadyConfigDest) => {
+        const parsedFields = safeJsonParse(alreadyConfigDest.fields, {});
+        const fieldsArray = Object.entries(parsedFields).map(([key, value]) => ({
+            key,
+            value: String(value),
+        }));
+        const payload = {
+            type: alreadyConfigDest.destinationType.type,
+            name: alreadyConfigDest.destinationType.displayName,
+            currentStreamName: selectedStreamName,
+            exportedSignals: alreadyConfigDest.exportedSignals,
+            fields: fieldsArray,
+        };
+        updateDestination(alreadyConfigDest.id, payload);
+    };
+    const handleAddOnboarding = () => {
+        const fields = {};
+        dynamicFields.forEach((f) => {
+            fields[f.name] = (f.componentType === FieldTypes.Dropdown ? f.value?.value || '' : f.value);
+        });
+        addConfiguredDestination({
+            id: formData.type,
+            name: formData.name,
+            streamNames: [],
+            conditions: [],
+            exportedSignals: formData.exportedSignals,
+            fields: JSON.stringify(fields),
+            destinationType: {
+                type: selectedItem.type,
+                displayName: selectedItem.displayName,
+                supportedSignals: {
+                    logs: { supported: false },
+                    metrics: { supported: false },
+                    traces: { supported: false },
+                },
+            },
+        });
+    };
+    const handleAdd = (alreadyConfigDest) => {
+        // Handle case from already configured
+        if (alreadyConfigDest)
+            return handleAddExisting(alreadyConfigDest);
+        // Handle new cases from onboarding
+        if (isOnboarding)
+            return handleAddOnboarding();
+        // Handle new cases from overview
+        else
+            return createDestination(formData);
+    };
     const handleClose = () => {
         resetFormData();
         setSelectedItem(undefined);
@@ -14387,36 +14490,25 @@ const DestinationModal = ({ isOnboarding, categories, potentialDestinations, cre
         resetFormData();
         setSelectedItem(undefined);
     };
-    const handleSelect = (item) => {
+    const handleSelectOption = (item) => {
         resetFormData();
         handleFormChange('type', item?.type || '');
+        handleFormChange('currentStreamName', selectedStreamName);
         setYamlFields(item?.fields || []);
         setSelectedItem(item);
     };
+    const handleSelectConfigured = (id) => {
+        // !! do not "filterDestinationsByStream" here, because we need all destinations to select already configured
+        const foundConfigured = destinations.find((dest) => dest.id === id);
+        if (foundConfigured)
+            handleAdd(foundConfigured);
+    };
     const handleSubmit = async () => {
-        const isFormOk = validateForm({ withAlert: !isOnboarding, alertTitle: Crud.Create });
-        if (!isFormOk)
-            return null;
-        if (isOnboarding) {
-            const destinationTypeDetails = dynamicFields.map((field) => ({
-                title: field.title || '',
-                value: (field.componentType === FieldTypes.Dropdown ? field.value?.value || '' : field.value),
-            }));
-            destinationTypeDetails.unshift({
-                title: 'Destination name',
-                value: formData.name,
-            });
-            const storedDestination = {
-                type: selectedItem.type,
-                displayName: selectedItem.displayName,
-                exportedSignals: formData.exportedSignals,
-                destinationTypeDetails,
-                category: '', // Could be handled in a more dynamic way if needed
-            };
-            addConfiguredDestination({ stored: storedDestination, form: formData });
-        }
-        else {
-            createDestination(formData);
+        if (selectedItem) {
+            const isFormValid = validateForm({ withAlert: !isOnboarding, alertTitle: Crud.Create });
+            if (!isFormValid)
+                return null;
+            handleAdd();
         }
         handleClose();
     };
@@ -14426,10 +14518,9 @@ const DestinationModal = ({ isOnboarding, categories, potentialDestinations, cre
                 label: 'DONE',
                 variant: 'primary',
                 onClick: handleSubmit,
-                disabled: !selectedItem,
             },
         ];
-        if (!!selectedItem) {
+        if (selectedItem) {
             buttons.unshift({
                 label: 'BACK',
                 icon: ArrowIcon,
@@ -14440,105 +14531,104 @@ const DestinationModal = ({ isOnboarding, categories, potentialDestinations, cre
         return buttons;
     };
     useKeyDown({ key: 'Enter', active: isOpen }, () => handleSubmit());
-    return (React.createElement(Modal, { isOpen: isOpen, onClose: handleClose, header: { title: 'Add Destination' }, actionComponent: React.createElement(NavigationButtons, { buttons: renderHeaderButtons() }) },
-        React.createElement(Container$7, null,
+    return (React.createElement(Modal, { isOpen: isOpen, onClose: handleClose, header: { title: DISPLAY_TITLES.ADD_DESTINATION }, actionComponent: React.createElement(NavigationButtons, { buttons: renderHeaderButtons() }) },
+        React.createElement(Container$8, null,
             React.createElement(SideMenuWrapper, null,
-                React.createElement(Stepper, { currentStep: !!selectedItem ? 2 : 1, data: [
-                        { stepNumber: 1, title: 'Destinations' },
-                        { stepNumber: 2, title: 'CONNECTION' },
+                React.createElement(Stepper, { currentStep: selectedItem ? 2 : 1, data: [
+                        { stepNumber: 1, title: DISPLAY_TITLES.DESTINATIONS },
+                        { stepNumber: 2, title: DISPLAY_TITLES.CONNECTION },
                     ] })),
             React.createElement(ModalBody, { style: { margin: '32px 24px 12px 24px' } },
-                React.createElement(ChooseDestinationBody, { hidden: !!selectedItem, categories: categories, potentialDestinations: potentialDestinations, onSelect: handleSelect }),
-                !!selectedItem && (React.createElement(DestinationForm, { categoryItem: selectedItem, formData: formData, formErrors: formErrors, handleFormChange: handleFormChange, dynamicFields: dynamicFields, setDynamicFields: setDynamicFields, validateForm: validateForm, testConnection: testConnection, testLoading: testLoading, testResult: testResult }))))));
+                React.createElement(ChooseDestinationBody, { hidden: selectedItem !== undefined, categories: categories, potentialDestinations: potentialDestinations, onSelectOption: handleSelectOption, onSelectConfigured: handleSelectConfigured }),
+                selectedItem && (React.createElement(DestinationForm, { categoryItem: selectedItem, formData: formData, formErrors: formErrors, handleFormChange: handleFormChange, dynamicFields: dynamicFields, setDynamicFields: setDynamicFields, validateForm: validateForm, testConnection: testConnection }))))));
 };
 
-const Container$6 = styled.div `
+const Container$7 = styled.div `
   display: flex;
   flex-direction: column;
-  align-items: flex-start;
+  align-items: center;
   gap: 12px;
-  margin-top: 24px;
-  max-height: calc(100vh - 400px);
-  height: 100%;
-  overflow-x: hidden;
+  width: 100%;
+  max-height: calc(100vh - 310px);
+  height: fit-content;
   overflow-y: scroll;
 `;
-const ConfiguredList = () => {
+const DestinationList = ({ withDelete }) => {
     const { configuredDestinations } = useSetupStore();
-    return (React.createElement(Container$6, null, configuredDestinations.map(({ stored }, idx) => (React.createElement(ListItem, { key: `selected-destination-${stored.type}-${idx}`, "data-id": `selected-destination-${stored.type}`, item: stored, isLastItem: configuredDestinations.length === 1 })))));
+    if (!configuredDestinations.length) {
+        return (React.createElement(CenterThis, null,
+            React.createElement(NoDataFound, { title: 'No destinations', subTitle: 'Please add a destination' })));
+    }
+    return (React.createElement(Container$7, null, configuredDestinations.map((dest, idx) => (React.createElement(ListItem, { key: `configured-destination-${dest.destinationType.type}-${idx}`, "data-id": `configured-destination-${dest.destinationType.type}`, item: dest, isLastItem: configuredDestinations.length === 1, withDelete: withDelete })))));
 };
-const ListItem = ({ item, isLastItem }) => {
+const ListItem = ({ item, isLastItem, withDelete }) => {
     const { removeConfiguredDestination } = useSetupStore();
     const [deleteWarning, setDeleteWarning] = useState(false);
-    const { icon, iconSrc } = getDestinationIcon(item.type);
+    const { icon, iconSrc } = getDestinationIcon(item.destinationType.type);
+    const mappedFields = useMemo(() => Object.entries(safeJsonParse(item.fields, {})).map(([k, v]) => ({ title: k, value: v })) || [], [item.fields]);
     return (React.createElement(React.Fragment, null,
-        React.createElement(DataTab, { title: item.displayName, iconProps: {
-                icon,
-                iconSrc,
-            }, visualProps: {
-                monitors: Object.keys(item.exportedSignals).filter((signal) => item.exportedSignals[signal] === true),
+        React.createElement(DataTab, { title: item.destinationType.displayName || item.name, subTitle: item.destinationType.type, iconProps: { icon, iconSrc }, visualProps: {
+                monitors: mapExportedSignals(item.exportedSignals),
                 monitorsWithLabels: true,
             }, extendableProps: {
                 withExtend: true,
-                renderExtended: () => React.createElement(DataCardFields, { data: item.destinationTypeDetails }),
-            }, renderActions: () => (React.createElement(IconButton, { onClick: () => setDeleteWarning(true) },
-                React.createElement(TrashIcon, null))) }),
-        React.createElement(DeleteWarning, { isOpen: deleteWarning, name: item.displayName || item.type, type: EntityTypes.Destination, isLastItem: isLastItem, onApprove: () => removeConfiguredDestination(item), onDeny: () => setDeleteWarning(false) })));
+                renderExtended: () => React.createElement(DataCardFields, { data: mappedFields }),
+            }, renderActions: withDelete
+                ? () => (React.createElement(IconButton, { onClick: () => setDeleteWarning(true) },
+                    React.createElement(TrashIcon, null)))
+                : undefined }),
+        withDelete && (React.createElement(DeleteWarning, { isOpen: deleteWarning, name: item.destinationType.displayName || item.name, type: EntityTypes.Destination, isLastItem: isLastItem, onApprove: () => removeConfiguredDestination(item), onDeny: () => setDeleteWarning(false) }))));
 };
 
-const ContentWrapper = styled.div `
-  width: 640px;
-  padding-top: 64px;
-`;
-const NotificationNoteWrapper = styled.div `
-  margin-top: 24px;
-`;
-const AddDestinationButtonWrapper = styled.div `
-  width: 100%;
-  margin-top: 24px;
-`;
-const StyledAddDestinationButton = styled(Button) `
+const LargeAndWideAddButton = styled(Button) `
   display: flex;
   align-items: center;
   justify-content: center;
   gap: 8px;
   width: 100%;
+  padding: 32px;
+  border-radius: 16px;
+  border-style: dashed !important;
 `;
-const DestinationSelectionForm = ({ categories, potentialDestinations, createDestination, isLoading, testConnection, testLoading, testResult, isSourcesListEmpty, goToSources, }) => {
+const DestinationSelectionForm = ({ isSourcesListEmpty, goToSources, categories, potentialDestinations, updateDestination, testConnection, onClickSummary }) => {
     const theme = Theme.useTheme();
     const { setCurrentModal } = useModalStore();
+    const { configuredDestinations } = useSetupStore();
     const onOpen = () => setCurrentModal(EntityTypes.Destination);
-    return (React.createElement(ContentWrapper, null,
-        React.createElement(SectionTitle, { title: 'Configure destinations', description: 'Select destinations where telemetry data will be sent and configure their settings.' }),
-        !isLoading && isSourcesListEmpty && (React.createElement(NotificationNoteWrapper, null,
-            React.createElement(NotificationNote, { type: StatusType.Warning, message: 'No sources selected. Please go back to select sources.', action: {
-                    label: 'Select Sources',
-                    onClick: goToSources,
-                } }))),
-        React.createElement(AddDestinationButtonWrapper, null,
-            React.createElement(StyledAddDestinationButton, { variant: 'secondary', disabled: isLoading, onClick: onOpen },
-                React.createElement(PlusIcon$1, null),
-                React.createElement(Text, { color: theme.colors.secondary, size: 14, decoration: 'underline', family: 'secondary' }, "ADD Destination")),
-            React.createElement(DestinationModal, { isOnboarding: true, categories: categories, potentialDestinations: potentialDestinations, createDestination: createDestination, testConnection: testConnection, testLoading: testLoading, testResult: testResult })),
-        isLoading ? (React.createElement(CenterThis, null,
-            React.createElement(FadeLoader, { scale: 2, cssOverride: { marginTop: '3rem' } }))) : (React.createElement(ConfiguredList, null))));
+    return (React.createElement(React.Fragment, null,
+        React.createElement(ModalBody, { "$isNotModal": true },
+            React.createElement(FlexColumn, { "$gap": 12 },
+                React.createElement(FlexColumn, { "$gap": 24 },
+                    onClickSummary && React.createElement(NoteBackToSummary, { onClick: onClickSummary }),
+                    React.createElement(SectionTitle, { title: DISPLAY_TITLES.ADD_DESTINATIONS, badgeLabel: configuredDestinations.length, description: DISPLAY_TITLES.ADD_DESTINATION_DESCRIPTION }),
+                    isSourcesListEmpty && (React.createElement(NotificationNote, { type: StatusType.Warning, message: DISPLAY_TITLES.NO_SOURCES_GO_BACK, action: {
+                            label: DISPLAY_TITLES.SELECT_SOURCES,
+                            onClick: goToSources,
+                        } })),
+                    React.createElement(LargeAndWideAddButton, { variant: 'secondary', onClick: onOpen },
+                        React.createElement(PlusIcon$1, null),
+                        React.createElement(Text, { color: theme.colors.secondary, size: 14, decoration: 'underline', family: 'secondary' }, DISPLAY_TITLES.ADD_DESTINATION))),
+                React.createElement(DestinationList, { withDelete: true }))),
+        React.createElement(DestinationModal, { isOnboarding: true, categories: categories, potentialDestinations: potentialDestinations, createDestination: () => { }, updateDestination: updateDestination, testConnection: testConnection })));
 };
 
 const columns$2 = [
     { key: 'icon', title: '' },
     { key: 'name', title: DISPLAY_TITLES.NAME, sortable: true },
     { key: 'type', title: DISPLAY_TITLES.TYPE, sortable: true },
-    { key: 'signals', title: DISPLAY_TITLES.Monitors },
+    { key: 'signals', title: DISPLAY_TITLES.MONITORS },
     { key: 'conditions', title: 'Conditions' },
     { key: 'throughput', title: 'Throughput', sortable: true },
 ];
 const DestinationTable = ({ metrics, maxHeight, maxWidth }) => {
     const theme = Theme.useTheme();
     const filters = useFilterStore();
-    const { destinations, destinationsLoading } = useEntityStore();
+    const { selectedStreamName } = useDataStreamStore();
     const { setDrawerType, setDrawerEntityId } = useDrawerStore();
-    const filtered = useMemo(() => filterDestinations(destinations, filters), [destinations, filters]);
-    const rows = useMemo(() => filtered.map((dest) => {
+    const { destinations, destinationsLoading } = useEntityStore();
+    const destinationsByStream = useMemo(() => filterDestinationsByStream(destinations, selectedStreamName), [destinations, selectedStreamName]);
+    const filteredDestinations = useMemo(() => filterDestinations(destinationsByStream, filters), [destinationsByStream, filters]);
+    const rows = useMemo(() => filteredDestinations.map((dest) => {
         const { hasErrors, hasWarnings, hasDisableds } = getConditionsBooleans(dest.conditions || []);
         const { icon, iconSrc } = getDestinationIcon(dest.destinationType.type);
         return {
@@ -14573,19 +14663,29 @@ const DestinationTable = ({ metrics, maxHeight, maxWidth }) => {
                 },
                 {
                     columnKey: 'signals',
-                    component: () => React.createElement(MonitorsIcons, { withLabels: true, monitors: Object.keys(dest.exportedSignals).filter((signal) => dest.exportedSignals[signal] === true) }),
+                    component: () => React.createElement(MonitorsIcons, { withLabels: true, monitors: mapExportedSignals(dest.exportedSignals) }),
                 },
             ],
         };
-    }), [filtered, metrics]);
-    const badge = useMemo(() => (filtered.length !== destinations.length ? `${filtered.length}/${destinations.length}` : destinations.length), [filtered, destinations]);
-    const badgeTooltip = useMemo(() => (filtered.length !== destinations.length ? DISPLAY_TITLES.FILTERED_COUNT_TOOLTIP : undefined), [filtered, destinations]);
+    }), [filteredDestinations, metrics]);
+    const { badge, badgeTooltip } = useMemo(() => {
+        if (filteredDestinations.length !== destinationsByStream.length) {
+            return {
+                badge: `${filteredDestinations.length}/${destinationsByStream.length}`,
+                badgeTooltip: DISPLAY_TITLES.FILTERED_COUNT_TOOLTIP,
+            };
+        }
+        return {
+            badge: destinationsByStream.length,
+            badgeTooltip: undefined,
+        };
+    }, [filteredDestinations, destinationsByStream]);
     return (React.createElement(TableContainer, { "$maxWidth": maxWidth },
         React.createElement(TableTitleWrap, null,
-            React.createElement(IconTitleBadge, { icon: getEntityIcon(EntityTypes.Destination), title: DISPLAY_TITLES.Destinations, badge: badge, badgeTooltip: badgeTooltip, loading: destinationsLoading })),
+            React.createElement(IconTitleBadge, { icon: getEntityIcon(EntityTypes.Destination), title: DISPLAY_TITLES.DESTINATIONS, badge: badge, badgeTooltip: badgeTooltip, loading: destinationsLoading })),
         React.createElement(TableWrap, { "$maxHeight": maxHeight },
             React.createElement(InteractiveTable, { columns: columns$2, rows: rows })),
-        !filtered.length && (React.createElement(CenterThis, { style: { marginTop: '2rem' } },
+        !filteredDestinations.length && (React.createElement(CenterThis, { style: { marginTop: '2rem' } },
             React.createElement(NoDataFound, null)))));
 };
 
@@ -14786,7 +14886,7 @@ const CustomFields = ({ ruleType, value, setValue, formErrors }) => {
     return Component ? React.createElement(Component, { value: value, setValue: setValue, formErrors: formErrors }) : null;
 };
 
-const Container$5 = styled.div `
+const Container$6 = styled.div `
   display: flex;
   flex-direction: column;
   gap: 24px;
@@ -14797,7 +14897,7 @@ const FieldTitle = styled(Text) `
 `;
 const InstrumentationRuleForm = ({ isUpdate, rule, formData, formErrors, handleFormChange }) => {
     const theme = Theme.useTheme();
-    return (React.createElement(Container$5, null,
+    return (React.createElement(Container$6, null,
         isUpdate && (React.createElement("div", null,
             React.createElement(FieldTitle, null, "Status"),
             React.createElement(Segment, { options: [
@@ -15019,14 +15119,14 @@ const InstrumentationRuleTable = ({ maxHeight, maxWidth }) => {
     }), [instrumentationRules]);
     return (React.createElement(TableContainer, { "$maxWidth": maxWidth },
         React.createElement(TableTitleWrap, null,
-            React.createElement(IconTitleBadge, { icon: getEntityIcon(EntityTypes.Action), title: DISPLAY_TITLES.InstrumentationRules, badge: instrumentationRules.length, loading: instrumentationRulesLoading })),
+            React.createElement(IconTitleBadge, { icon: getEntityIcon(EntityTypes.Action), title: DISPLAY_TITLES.INSTRUMENTATION_RULES, badge: instrumentationRules.length, loading: instrumentationRulesLoading })),
         React.createElement(TableWrap, { "$maxHeight": maxHeight },
             React.createElement(InteractiveTable, { columns: columns$1, rows: rows })),
         !instrumentationRules.length && (React.createElement(CenterThis, { style: { marginTop: '2rem' } },
             React.createElement(NoDataFound, null)))));
 };
 
-const Container$4 = styled.div `
+const Container$5 = styled.div `
   position: fixed;
   bottom: 0;
   left: 50%;
@@ -15043,7 +15143,7 @@ const Container$4 = styled.div `
 const MultiSourceControl = ({ totalSourceCount, uninstrumentSources }) => {
     const theme = Theme.useTheme();
     const Transition = useTransition({
-        container: Container$4,
+        container: Container$5,
         animateIn: Theme.animations.slide.in['center'],
         animateOut: Theme.animations.slide.out['center'],
     });
@@ -15222,6 +15322,124 @@ const NotificationListItem = ({ id, seen, type, title, message, time, crdType, t
                     React.createElement(Text, { size: 10, color: theme.colors.orange_soft }, "new")))))));
 };
 
+const Container$4 = styled.div `
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  gap: 12px;
+  width: 100%;
+  max-height: ${({ $isModal }) => ($isModal ? 'calc(100vh - 510px)' : 'calc(100vh - 310px)')};
+  height: fit-content;
+  overflow-y: scroll;
+`;
+const Group = styled.div `
+  width: 100%;
+  padding-bottom: ${({ $isOpen }) => ($isOpen ? '18px' : '0')};
+  border-radius: 16px;
+  background-color: ${({ $selected, theme }) => ($selected ? theme.colors.majestic_blue + Theme.opacity.hex['024'] : theme.colors.dropdown_bg_2 + Theme.opacity.hex['040'])};
+`;
+const NamespaceItem = styled.div `
+  display: flex;
+  justify-content: space-between;
+  gap: 12px;
+  margin: 0;
+  padding: 18px;
+  border-radius: 16px;
+  cursor: ${({ $withClick }) => ($withClick ? 'pointer' : 'unset')};
+  &:hover {
+    background-color: ${({ $withClick, $selected, theme }) => $withClick && ($selected ? theme.colors.majestic_blue + Theme.opacity.hex['040'] : theme.colors.dropdown_bg_2 + Theme.opacity.hex['080'])};
+    transition: background-color 0.3s;
+  }
+`;
+const SourceItem = styled(NamespaceItem) `
+  width: calc(100% - 50px);
+  margin-left: auto;
+  padding: 8px;
+`;
+const RelativeWrapper = styled.div `
+  position: relative;
+  padding-bottom: ${({ $addPadding }) => ($addPadding ? '16px' : '0')};
+`;
+const AbsoluteWrapper = styled.div `
+  position: absolute;
+  top: 6px;
+  left: 18px;
+`;
+const NotSourcesWrapper = styled(CenterThis) `
+  padding-bottom: ${({ $addPadding }) => ($addPadding ? '16px' : '0')};
+`;
+const SelectionCount = styled(Text) `
+  width: 18px;
+`;
+const SourceList = ({ isModal = false, withInstances = true, filteredNamespacesAndSources, selectedNamespace, onSelectNamespace, selectedSources, onSelectSource }) => {
+    const theme = Theme.useTheme();
+    const { namespacesLoading } = useEntityStore();
+    const matrix = Object.entries(filteredNamespacesAndSources || {});
+    if (!matrix?.length) {
+        return (React.createElement(CenterThis, null, namespacesLoading ? (React.createElement(FadeLoader, null)) : (React.createElement(NoDataFound, { title: DISPLAY_TITLES.NO_SOURCES, subTitle: onSelectNamespace ? DISPLAY_TITLES.PLEASE_MAKE_SURE_UNIGNORED_NAMESPACES : DISPLAY_TITLES.PLEASE_ADD_SOURCE }))));
+    }
+    return (React.createElement(Container$4, { "$isModal": isModal }, matrix.map(([namespace, sources]) => {
+        const sourcesForNamespace = selectedSources?.[namespace] || [];
+        const onlySelectedSources = sourcesForNamespace.filter(({ selected }) => selected);
+        const isNamespaceLoaded = sourcesForNamespace.length > 0;
+        const isNamespaceSelected = selectedNamespace === namespace;
+        const isNamespaceAllSourcesSelected = onlySelectedSources.length > 0 && onlySelectedSources.length === sources.length;
+        const isNamespacePartiallySourcesSelected = onlySelectedSources.length > 0 && onlySelectedSources.length !== sources.length;
+        const hasSources = sources.length > 0;
+        if (!onSelectNamespace && !hasSources)
+            return null;
+        return (React.createElement(Group, { key: `namespace-${namespace}`, "data-id": `namespace-${namespace}`, "$selected": isNamespaceAllSourcesSelected, "$isOpen": isNamespaceSelected },
+            React.createElement(NamespaceItem, { "$selected": isNamespaceAllSourcesSelected, "$withClick": !!onSelectNamespace, onClick: () => onSelectNamespace?.(namespace) },
+                React.createElement(FlexRow, { "$gap": 12 },
+                    onSelectNamespace && React.createElement(Checkbox, { partiallyChecked: isNamespacePartiallySourcesSelected, value: isNamespaceAllSourcesSelected, onChange: (bool) => onSelectNamespace(namespace, bool) }),
+                    React.createElement(Text, null, namespace)),
+                React.createElement(FlexRow, { "$gap": 12 },
+                    React.createElement(SelectionCount, { size: 10, color: theme.text.grey }, isNamespaceLoaded ? `${onlySelectedSources.length}/${sources.length}` : null),
+                    onSelectNamespace && React.createElement(ExtendArrow, { extend: isNamespaceSelected }))),
+            (isNamespaceSelected || !onSelectNamespace) &&
+                (hasSources ? (React.createElement(RelativeWrapper, { "$addPadding": !onSelectSource },
+                    React.createElement(AbsoluteWrapper, null,
+                        React.createElement(Divider, { orientation: 'vertical', length: `${(sources.length || 0) * 36}px` })),
+                    sources.map((source) => {
+                        const isSourceSelected = onlySelectedSources.some(({ name }) => name === source.name);
+                        return React.createElement(SourceRow, { key: `source-${source.name}`, withInstances: withInstances, source: source, namespace: namespace, isSelected: isSourceSelected, onSelect: onSelectSource });
+                    }))) : (React.createElement(NotSourcesWrapper, { "$addPadding": !onSelectSource }, namespacesLoading ? React.createElement(FadeLoader, null) : React.createElement(NoDataFound, { title: DISPLAY_TITLES.NO_SOURCES_NAMESPACE, subTitle: DISPLAY_TITLES.TRY_SEARCH_OR_OTHER_NAMESPACE }))))));
+    })));
+};
+const SourceRow = ({ withInstances, source, namespace, isSelected, onSelect, }) => {
+    return (React.createElement(SourceItem, { "data-id": `source-${source.name}`, "$selected": isSelected, "$withClick": !!onSelect, onClick: () => onSelect?.(source) },
+        React.createElement(FlexRow, { "$gap": 12 },
+            onSelect && React.createElement(Checkbox, { value: isSelected, onChange: () => onSelect(source, namespace) }),
+            React.createElement(Text, null, source.name),
+            React.createElement(Text, { opacity: 0.8, size: 10 },
+                withInstances ? `${source.numberOfInstances || 0} running instance${source.numberOfInstances !== 1 ? 's' : ''} • ` : '',
+                source.kind))));
+};
+
+const Container$3 = styled.div `
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  gap: 12px;
+  width: 100%;
+  max-height: calc(100vh - 200px);
+  height: fit-content;
+  overflow-y: scroll;
+`;
+const SetupSummary = ({ onEditSources, onEditDestinations }) => {
+    const { configuredSources, configuredDestinations } = useSetupStore();
+    const sourceCount = useMemo(() => Object.values(configuredSources).reduce((total, sourceList) => total + sourceList.filter((s) => s.selected).length, 0), [configuredSources]);
+    return (React.createElement(ModalBody, { "$isNotModal": true },
+        React.createElement(FlexColumn, { "$gap": 12 },
+            React.createElement(SectionTitle, { title: DISPLAY_TITLES.SUMMARY, description: DISPLAY_TITLES.STREAM_CONFIRM }),
+            React.createElement(Container$3, null,
+                React.createElement(DataCard, { title: DISPLAY_TITLES.SELECTED_SOURCES, titleBadge: sourceCount, action: () => React.createElement(EditButton, { onClick: onEditSources }) },
+                    React.createElement(SourceList, { filteredNamespacesAndSources: configuredSources, withInstances: false })),
+                React.createElement(DataCard, { title: DISPLAY_TITLES.SELECTED_DESTINATIONS, titleBadge: configuredDestinations.length, action: () => React.createElement(EditButton, { onClick: onEditDestinations }) },
+                    React.createElement(DestinationList, null))))));
+};
+
 var NavIconIds;
 (function (NavIconIds) {
     NavIconIds["Overview"] = "overview";
@@ -15385,21 +15603,21 @@ const Describe$1 = ({ source, fetchDescribeSource }) => {
 const buildCard = (source) => {
     const { name, kind, namespace } = source;
     const arr = [
-        { title: DISPLAY_TITLES.Namespace, value: namespace },
+        { title: DISPLAY_TITLES.NAMESPACE, value: namespace },
         { title: DISPLAY_TITLES.KIND, value: kind },
         { title: DISPLAY_TITLES.NAME, value: name, tooltip: 'K8s resource name' },
     ];
     return arr;
 };
 
-const Container$3 = styled.div `
+const Container$2 = styled.div `
   display: flex;
   flex-direction: column;
   gap: 24px;
   padding: 4px;
 `;
 const SourceForm = ({ formData, handleFormChange }) => {
-    return (React.createElement(Container$3, null,
+    return (React.createElement(Container$2, null,
         React.createElement(Input, { name: 'sourceName', title: 'Source name', tooltip: 'This overrides the default service name that runs in your cluster.', placeholder: 'Use a name that overrides the source name', value: formData.otelServiceName, onChange: ({ target: { value } }) => handleFormChange('otelServiceName', value) })));
 };
 
@@ -15422,7 +15640,9 @@ const DataContainer$1 = styled.div `
 `;
 const SourceDrawer = ({ persistSources, updateSource, fetchDescribeSource }) => {
     const { sources } = useEntityStore();
+    const { selectedStreamName } = useDataStreamStore();
     const { drawerType, drawerEntityId } = useDrawerStore();
+    const sourcesByStream = useMemo(() => filterSourcesByStream(sources, selectedStreamName), [sources, selectedStreamName]);
     const drawerRef = useRef(null);
     const isOpen = drawerType !== EntityTypes.Source;
     const [isEditing, setIsEditing] = useState(false);
@@ -15432,11 +15652,11 @@ const SourceDrawer = ({ persistSources, updateSource, fetchDescribeSource }) =>
     const thisItem = useMemo(() => {
         if (isOpen)
             return null;
-        const found = sources?.find((x) => x.namespace === drawerEntityId.namespace && x.name === drawerEntityId.name && x.kind === drawerEntityId.kind);
+        const found = sourcesByStream?.find((x) => x.namespace === drawerEntityId.namespace && x.name === drawerEntityId.name && x.kind === drawerEntityId.kind);
         if (!!found)
             loadFormWithDrawerItem(found);
         return found;
-    }, [isOpen, drawerEntityId, sources]);
+    }, [isOpen, drawerEntityId, sourcesByStream]);
     if (!thisItem)
         return null;
     const containersData = thisItem.containers?.map((container) => ({
@@ -15453,7 +15673,7 @@ const SourceDrawer = ({ persistSources, updateSource, fetchDescribeSource }) =>
     };
     const handleDelete = async () => {
         const { namespace } = thisItem;
-        persistSources({ [namespace]: [{ ...thisItem, selected: false }] }, {});
+        persistSources({ [namespace]: [{ ...thisItem, selected: false, currentStreamName: selectedStreamName }] }, {});
         setIsFormDirty(false);
         setIsEditing(false);
         resetFormData();
@@ -15467,7 +15687,7 @@ const SourceDrawer = ({ persistSources, updateSource, fetchDescribeSource }) =>
         setIsFormDirty(false);
         setIsEditing(false);
     };
-    return (React.createElement(OverviewDrawer, { ref: drawerRef, title: thisItem.otelServiceName || thisItem.name, titleTooltip: 'This attribute is used to identify the name of the service (service.name) that is generating telemetry data.', icons: getContainersIcons(thisItem.containers), isEdit: isEditing, isFormDirty: isFormDirty, onEdit: selectedTab === Tabs.Overview ? handleEdit : undefined, onSave: handleSave, onDelete: selectedTab === Tabs.Overview ? handleDelete : undefined, onCancel: handleCancel, isLastItem: sources.length === 1, tabs: [
+    return (React.createElement(OverviewDrawer, { ref: drawerRef, title: thisItem.otelServiceName || thisItem.name, titleTooltip: 'This attribute is used to identify the name of the service (service.name) that is generating telemetry data.', icons: getContainersIcons(thisItem.containers), isEdit: isEditing, isFormDirty: isFormDirty, onEdit: selectedTab === Tabs.Overview ? handleEdit : undefined, onSave: handleSave, onDelete: selectedTab === Tabs.Overview ? handleDelete : undefined, onCancel: handleCancel, isLastItem: sourcesByStream.length === 1, tabs: [
             {
                 label: Tabs.Overview,
                 onClick: () => setSelectedTab(Tabs.Overview),
@@ -15482,137 +15702,22 @@ const SourceDrawer = ({ persistSources, updateSource, fetchDescribeSource }) =>
         React.createElement(SourceForm, { formData: formData, handleFormChange: (...params) => {
                 setIsFormDirty(true);
                 handleFormChange(...params);
+                handleFormChange('currentStreamName', selectedStreamName);
             } }))) : (React.createElement(DataContainer$1, null,
         React.createElement(ConditionDetails, { conditions: thisItem.conditions || [] }),
         React.createElement(DataCard, { title: DISPLAY_TITLES.SOURCE_DETAILS, data: !!thisItem ? buildCard(thisItem) : [] }),
         React.createElement(DataCard, { title: DISPLAY_TITLES.DETECTED_CONTAINERS, titleBadge: containersData.length, description: DISPLAY_TITLES.DETECTED_CONTAINERS_DESCRIPTION, data: containersData })))) : (React.createElement(Describe$1, { source: thisItem, fetchDescribeSource: fetchDescribeSource }))));
 };
 
-const Container$2 = styled.div `
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 12px;
-  max-height: ${({ $isModal }) => ($isModal ? 'calc(100vh - 510px)' : 'calc(100vh - 310px)')};
-  height: fit-content;
-  overflow-y: scroll;
-`;
-const Group = styled.div `
-  width: 100%;
-  padding-bottom: ${({ $isOpen }) => ($isOpen ? '18px' : '0')};
-  border-radius: 16px;
-  background-color: ${({ $selected, theme }) => ($selected ? theme.colors.majestic_blue + Theme.opacity.hex['024'] : theme.colors.dropdown_bg_2 + Theme.opacity.hex['040'])};
-`;
-const NamespaceItem = styled.div `
-  display: flex;
-  justify-content: space-between;
-  gap: 12px;
-  margin: 0;
-  padding: 18px;
-  border-radius: 16px;
-  cursor: pointer;
-  &:hover {
-    background-color: ${({ $selected, theme }) => ($selected ? theme.colors.majestic_blue + Theme.opacity.hex['040'] : theme.colors.dropdown_bg_2 + Theme.opacity.hex['080'])};
-    transition: background-color 0.3s;
-  }
-`;
-const SourceItem = styled(NamespaceItem) `
-  width: calc(100% - 50px);
-  margin-left: auto;
-  padding: 8px;
-`;
-const RelativeWrapper = styled.div `
-  position: relative;
-`;
-const AbsoluteWrapper = styled.div `
-  position: absolute;
-  top: 6px;
-  left: 18px;
-`;
-const SelectionCount = styled(Text) `
-  width: 18px;
-`;
-const NoDataFoundWrapper = styled.div `
-  padding: 50px 0;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-  gap: 12px;
-  height: 100%;
-  max-height: calc(100vh - 360px);
-  overflow-y: auto;
-`;
-const List = ({ isModal = false, filterNamespaces, filterSources, selectedNamespace, onSelectNamespace, selectedSources, onSelectSource, selectedFutureApps, onSelectFutureApps, onSelectAll, }) => {
-    const theme = Theme.useTheme();
-    const namespaces = filterNamespaces();
-    const { namespacesLoading } = useEntityStore();
-    if (!namespaces.length) {
-        return React.createElement(NoDataFoundWrapper, null, namespacesLoading ? React.createElement(FadeLoader, { scale: 2 }) : React.createElement(NoDataFound, { title: 'No namespaces found' }));
-    }
-    return (React.createElement(Container$2, { "$isModal": isModal }, namespaces.map(([namespace, sources]) => {
-        const sourcesForNamespace = selectedSources[namespace] || [];
-        const futureAppsForNamespace = selectedFutureApps[namespace] || false;
-        const isNamespaceLoaded = !!sourcesForNamespace.length;
-        const isNamespaceSelected = selectedNamespace === namespace;
-        const onlySelectedSources = sourcesForNamespace.filter(({ selected }) => selected);
-        const filteredSources = filterSources(namespace, { cancelSearch: true });
-        const isNamespaceAllSourcesSelected = !!onlySelectedSources.length && onlySelectedSources.length === sources.length;
-        const isNamespacePartiallySourcesSelected = !!onlySelectedSources.length && onlySelectedSources.length !== sources.length;
-        const hasFilteredSources = !!filteredSources.length;
-        return (React.createElement(Group, { key: `namespace-${namespace}`, "data-id": `namespace-${namespace}`, "$selected": isNamespaceAllSourcesSelected, "$isOpen": isNamespaceSelected && hasFilteredSources },
-            React.createElement(NamespaceItem, { "$selected": isNamespaceAllSourcesSelected, onClick: () => onSelectNamespace(namespace) },
-                React.createElement(FlexRow, { "$gap": 12 },
-                    React.createElement(Checkbox, { partiallyChecked: isNamespacePartiallySourcesSelected, value: isNamespaceAllSourcesSelected, onChange: (bool) => onSelectAll(bool, namespace) }),
-                    React.createElement(Text, null, namespace)),
-                React.createElement(FlexRow, { "$gap": 12 },
-                    React.createElement(Toggle, { title: 'Include Future Sources', initialValue: futureAppsForNamespace, onChange: (bool) => onSelectFutureApps(bool, namespace) }),
-                    React.createElement(Divider, { orientation: 'vertical', length: '12px', margin: '0' }),
-                    React.createElement(SelectionCount, { size: 10, color: theme.text.grey }, isNamespaceLoaded ? `${onlySelectedSources.length}/${sources.length}` : null),
-                    React.createElement(ExtendArrow, { extend: isNamespaceSelected }))),
-            isNamespaceSelected &&
-                (hasFilteredSources ? (React.createElement(RelativeWrapper, null,
-                    React.createElement(AbsoluteWrapper, null,
-                        React.createElement(Divider, { orientation: 'vertical', length: `${filteredSources.length * 36 - 12}px` })),
-                    filteredSources.map((source) => {
-                        const isSourceSelected = !!onlySelectedSources.find(({ name }) => name === source.name);
-                        return (React.createElement(SourceItem, { key: `source-${source.name}`, "data-id": `source-${source.name}`, "$selected": isSourceSelected, onClick: () => onSelectSource(source) },
-                            React.createElement(FlexRow, { "$gap": 12 },
-                                React.createElement(Checkbox, { value: isSourceSelected, onChange: () => onSelectSource(source, namespace) }),
-                                React.createElement(Text, null, source.name),
-                                React.createElement(Text, { opacity: 0.8, size: 10 },
-                                    source.numberOfInstances,
-                                    " running instance",
-                                    source.numberOfInstances !== 1 && 's',
-                                    " \u00B7 ",
-                                    source.kind))));
-                    }))) : (React.createElement(NoDataFoundWrapper, null, namespacesLoading ? React.createElement(FadeLoader, { scale: 1.5 }) : React.createElement(NoDataFound, { title: 'No sources available in this namespace', subTitle: 'Try searching again or select another namespace.' }))))));
-    })));
-};
-
-const FlexContainer = styled.div `
-  display: flex;
-  align-items: center;
+const ActionsRow = styled(FlexRow) `
   justify-content: space-between;
 `;
-// when bringin back the "Select all" checkbox, change the following width to 300px
 const SearchWrapper = styled.div `
-  width: 444px;
+  width: 420px;
 `;
-const Controls = ({ selectedSources, searchText, setSearchText, showSelectedOnly, setShowSelectedOnly }) => {
-    const selectedAppsCount = Object.values(selectedSources).reduce((prev, curr) => prev + curr.filter((s) => s.selected).length, 0);
-    return (React.createElement(React.Fragment, null,
-        React.createElement(SectionTitle, { title: 'Select Sources for Instrumentation', badgeLabel: selectedAppsCount, description: 'Select apps to monitor in each namespace. Odigos will instrument them and send telemetry data to your destinations.' }),
-        React.createElement(FlexContainer, { style: { marginTop: 24 } },
-            React.createElement(SearchWrapper, null,
-                React.createElement(Input, { placeholder: 'Search Kubernetes Namespaces', icon: SearchIcon, value: searchText, onChange: (e) => setSearchText(e.target.value.toLowerCase()) })),
-            React.createElement(Toggle, { title: 'Show selected only', initialValue: showSelectedOnly, onChange: setShowSelectedOnly })),
-        React.createElement(Divider, { margin: '16px 0' })));
-};
-
-const SourceSelectionForm = forwardRef((props, ref) => {
-    const { isModal, selectedNamespace, onSelectNamespace, namespace } = props;
-    const formState = useSourceSelectionFormData({ selectedNamespace, onSelectNamespace, namespace });
-    const { recordedInitialSources, getApiSourcesPayload, getApiFutureAppsPayload } = formState;
+const SourceSelectionForm = forwardRef(({ isModal, fetchSingleNamespace, onClickSummary }, ref) => {
+    const formState = useSourceSelectionFormData({ fetchSingleNamespace });
+    const { recordedInitialSources, selectedSources, getApiSourcesPayload, getApiFutureAppsPayload, searchText, setSearchText, showSelectedOnly, setShowSelectedOnly } = formState;
     useImperativeHandle(ref, () => ({
         getFormValues: () => ({
             initial: recordedInitialSources,
@@ -15620,19 +15725,24 @@ const SourceSelectionForm = forwardRef((props, ref) => {
             futureApps: getApiFutureAppsPayload(),
         }),
     }));
+    const selectedCount = Object.values(selectedSources).reduce((prev, curr) => prev + curr.filter((s) => s.selected).length, 0);
     return (React.createElement(ModalBody, { "$isNotModal": !isModal },
-        React.createElement(Controls, { ...props, ...formState }),
-        React.createElement(List, { ...props, ...formState })));
+        React.createElement(FlexColumn, { "$gap": 12 },
+            React.createElement(FlexColumn, { "$gap": 24 },
+                onClickSummary && React.createElement(NoteBackToSummary, { onClick: onClickSummary }),
+                React.createElement(SectionTitle, { title: DISPLAY_TITLES.SELECT_SOURCES, badgeLabel: selectedCount, description: DISPLAY_TITLES.SELECT_SOURCES_DESCRIPTION }),
+                React.createElement(ActionsRow, null,
+                    React.createElement(SearchWrapper, null,
+                        React.createElement(Input, { placeholder: DISPLAY_TITLES.SEARCH_NAMESPACES, icon: SearchIcon, value: searchText, onChange: (e) => setSearchText(e.target.value.toLowerCase()) })),
+                    React.createElement(Toggle, { title: DISPLAY_TITLES.SHOW_SELECTED_ONLY, initialValue: showSelectedOnly, onChange: setShowSelectedOnly }))),
+            React.createElement(Divider, null),
+            React.createElement(SourceList, { isModal: isModal, ...formState }))));
 });
 
-const SourceModal = ({ selectedNamespace, setSelectedNamespace, namespace, persistSources }) => {
+const SourceModal = ({ fetchSingleNamespace, persistSources }) => {
     const { currentModal, setCurrentModal } = useModalStore();
     const isOpen = currentModal === EntityTypes.Source;
-    const onSelectNamespace = (ns) => {
-        setSelectedNamespace((prev) => (prev === ns ? '' : ns));
-    };
     const handleClose = () => {
-        setSelectedNamespace('');
         setCurrentModal('');
     };
     const handleSubmit = async () => {
@@ -15651,14 +15761,14 @@ const SourceModal = ({ selectedNamespace, setSelectedNamespace, namespace, persi
                     onClick: handleSubmit,
                 },
             ] }) },
-        React.createElement(SourceSelectionForm, { ref: formRef, isModal: true, selectedNamespace: selectedNamespace, onSelectNamespace: onSelectNamespace, namespace: namespace })));
+        React.createElement(SourceSelectionForm, { ref: formRef, isModal: true, fetchSingleNamespace: fetchSingleNamespace })));
 };
 
 const columns = [
     { key: 'checkbox-and-icon', title: '' },
     { key: 'name', title: DISPLAY_TITLES.NAME, sortable: true },
     { key: 'type', title: 'Kubernetes Type', sortable: true },
-    { key: 'namespace', title: DISPLAY_TITLES.Namespace, sortable: true },
+    { key: 'namespace', title: DISPLAY_TITLES.NAMESPACE, sortable: true },
     { key: 'containers', title: DISPLAY_TITLES.DETECTED_CONTAINERS },
     { key: 'conditions', title: 'Conditions' },
     { key: 'throughput', title: 'Throughput', sortable: true },
@@ -15667,6 +15777,7 @@ const SourceTable = ({ metrics, maxHeight, maxWidth }) => {
     const theme = Theme.useTheme();
     const filters = useFilterStore();
     const { isThisPending } = usePendingStore();
+    const { selectedStreamName } = useDataStreamStore();
     const { sources, sourcesLoading } = useEntityStore();
     const { setDrawerType, setDrawerEntityId } = useDrawerStore();
     const { selectedSources, setSelectedSources } = useSelectedStore();
@@ -15679,7 +15790,8 @@ const SourceTable = ({ metrics, maxHeight, maxWidth }) => {
             return calculateProgress(sourcesToDelete, sourcesDeleted);
         return 1;
     }, [sourcesToCreate, sourcesCreated, sourcesToDelete, sourcesDeleted]);
-    const filtered = useMemo(() => filterSources(sources, filters), [sources, filters]);
+    const sourcesByStream = useMemo(() => filterSourcesByStream(sources, selectedStreamName), [sources, selectedStreamName]);
+    const filteredSources = useMemo(() => filterSources(sourcesByStream, filters), [sourcesByStream, filters]);
     const [hasSelected, totalSelectedSources] = useMemo(() => {
         let num = 0;
         Object.values(selectedSources).forEach((selectedSources) => {
@@ -15690,7 +15802,7 @@ const SourceTable = ({ metrics, maxHeight, maxWidth }) => {
     const onSelectAll = useCallback((bool) => {
         if (bool) {
             const payload = {};
-            filtered.forEach((source) => {
+            filteredSources.forEach((source) => {
                 const id = { namespace: source.namespace, name: source.name, kind: source.kind };
                 const isPending = isThisPending({ entityType: EntityTypes.Source, entityId: id });
                 if (!isPending) {
@@ -15707,7 +15819,7 @@ const SourceTable = ({ metrics, maxHeight, maxWidth }) => {
         else {
             setSelectedSources({});
         }
-    }, [filtered]);
+    }, [filteredSources]);
     const onSelectOne = useCallback((source) => {
         const { namespace, name, kind } = source;
         const payload = { ...selectedSources };
@@ -15722,7 +15834,7 @@ const SourceTable = ({ metrics, maxHeight, maxWidth }) => {
         }
         setSelectedSources(payload);
     }, [selectedSources]);
-    const rows = useMemo(() => filtered.map((source) => {
+    const rows = useMemo(() => filteredSources.map((source) => {
         const id = getWorkloadId(source);
         const idString = JSON.stringify(id);
         const { hasErrors, hasWarnings, hasDisableds } = getConditionsBooleans(source.conditions || []);
@@ -15772,13 +15884,23 @@ const SourceTable = ({ metrics, maxHeight, maxWidth }) => {
                 },
             ],
         };
-    }), [filtered, selectedSources, metrics, onSelectOne]);
-    const badge = useMemo(() => (filtered.length !== sources.length ? `${filtered.length}/${sources.length}` : sources.length), [filtered, sources]);
-    const badgeTooltip = useMemo(() => (filtered.length !== sources.length ? DISPLAY_TITLES.FILTERED_COUNT_TOOLTIP : undefined), [filtered, sources]);
+    }), [filteredSources, selectedSources, metrics, onSelectOne]);
+    const { badge, badgeTooltip } = useMemo(() => {
+        if (filteredSources.length !== sourcesByStream.length) {
+            return {
+                badge: `${filteredSources.length}/${sourcesByStream.length}`,
+                badgeTooltip: DISPLAY_TITLES.FILTERED_COUNT_TOOLTIP,
+            };
+        }
+        return {
+            badge: sourcesByStream.length,
+            badgeTooltip: undefined,
+        };
+    }, [filteredSources, sourcesByStream]);
     return (React.createElement(TableContainer, { "$maxWidth": maxWidth },
         React.createElement(TableTitleWrap, null,
-            React.createElement(Checkbox, { partiallyChecked: hasSelected && filtered?.length !== totalSelectedSources, value: hasSelected && filtered?.length === totalSelectedSources, onChange: onSelectAll, disabled: !filtered?.length }),
-            React.createElement(IconTitleBadge, { icon: getEntityIcon(EntityTypes.Source), title: DISPLAY_TITLES.Sources, badge: badge, badgeTooltip: badgeTooltip, loading: sourcesLoading && !isAwaitingInstrumentation })),
+            React.createElement(Checkbox, { partiallyChecked: hasSelected && filteredSources?.length !== totalSelectedSources, value: hasSelected && filteredSources?.length === totalSelectedSources, onChange: onSelectAll, disabled: !filteredSources?.length }),
+            React.createElement(IconTitleBadge, { icon: getEntityIcon(EntityTypes.Source), title: DISPLAY_TITLES.SOURCES, badge: badge, badgeTooltip: badgeTooltip, loading: sourcesLoading && !isAwaitingInstrumentation })),
         React.createElement(TableWrap, { "$maxHeight": maxHeight },
             React.createElement(InteractiveTable, { columns: columns, rows: isAwaitingInstrumentation ? [] : rows })),
         isAwaitingInstrumentation ? (React.createElement(CenterThis, { style: { marginTop: '2rem', gap: '24px' } },
@@ -15787,7 +15909,7 @@ const SourceTable = ({ metrics, maxHeight, maxWidth }) => {
                 React.createElement(Text, { color: theme.text.info },
                     !!sourcesToCreate ? 'Instrumenting' : 'Uninstrumenting',
                     " workloads..."),
-                React.createElement(Badge, { label: `${instrumentingPercent}%` })))) : !filtered.length ? (React.createElement(CenterThis, { style: { marginTop: '2rem' } },
+                React.createElement(Badge, { label: `${instrumentingPercent}%` })))) : !filteredSources.length ? (React.createElement(CenterThis, { style: { marginTop: '2rem' } },
             React.createElement(NoDataFound, null))) : null));
 };
 
@@ -16039,4 +16161,4 @@ const ToggleDarkMode = () => {
         React.createElement(Background, { "$darkMode": darkMode })));
 };
 
-export { ActionDrawer, ActionForm, ActionModal, ActionTable, AwaitPipeline, ComputePlatformSelect, ComputePlatforms, ComputePlatformsActionsMenu, ConnectionStatusDropdown, ConnectionTypeDropdown, DataFlow, DataFlowActionsMenu, DestinationDrawer, DestinationForm, DestinationModal, DestinationSelectionForm, DestinationTable, ErrorDropdown, InstrumentationRuleDrawer, InstrumentationRuleForm, InstrumentationRuleModal, InstrumentationRuleTable, KindDropdown, LanguageDropdown, MonitorDropdown, MultiSourceControl, NamespaceDropdown, NavIconIds, NotificationManager, OverviewDrawer, SideNav, SlackInvite, SourceDrawer, SourceForm, SourceModal, SourceSelectionForm, SourceTable, SystemOverview, ToastList, ToggleDarkMode };
+export { ActionDrawer, ActionForm, ActionModal, ActionTable, AwaitPipeline, ComputePlatformSelect, ComputePlatforms, ComputePlatformsActionsMenu, ConnectionStatusDropdown, ConnectionTypeDropdown, DataFlow, DataFlowActionsMenu, DataStreamSelectionForm, DestinationDrawer, DestinationForm, DestinationModal, DestinationSelectionForm, DestinationTable, ErrorDropdown, InstrumentationRuleDrawer, InstrumentationRuleForm, InstrumentationRuleModal, InstrumentationRuleTable, KindDropdown, LanguageDropdown, MonitorDropdown, MultiSourceControl, NamespaceDropdown, NavIconIds, NotificationManager, OverviewDrawer, SetupSummary, SideNav, SlackInvite, SourceDrawer, SourceForm, SourceModal, SourceSelectionForm, SourceTable, SystemOverview, TableCellConditions, ToastList, ToggleDarkMode };