@odigos/ui-kit 0.0.14 → 0.0.16

package/lib/containers.js

@@ -1,24 +1,24 @@
-import React, { useState, useEffect, forwardRef, useImperativeHandle, useRef, useMemo, useId, memo, useContext, createContext, useCallback, useLayoutEffect, Fragment } from 'react';
+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-CJKFedQi.js';
+import { A as ACTION_OPTIONS, M as MONITORS_OPTIONS, I as INSTRUMENTATION_RULE_OPTIONS } from './index-lL1o2K_5.js';
 import { D as DISPLAY_TITLES, F as FORM_ALERTS } from './index-C_0J5P9M.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, U as Text, O as Segment, S as SectionTitle, j as DocsButton, z as MonitorsCheckboxes, V as TextArea, k as Drawer, h as DeleteWarning, C as CancelWarning, d as ConditionDetails, D as DataCard, M as Modal, N as NavigationButtons, a2 as ModalBody, A as AutocompleteInput, i as Divider, Q as Status, _ as FlexRow, X as Tooltip, s as IconWrapped, G as MonitorsIcons, a3 as TableContainer, a4 as TableTitleWrap, r as IconTitleBadge, a5 as TableWrap, y as InteractiveTable, a0 as CenterThis, J as NoDataFound, $ as FlexColumn, Y as TraceLoader, a as Badge, B as Button, E as ExtendArrow, n as Dropdown, a6 as getDefaultExportFromCjs, F as FadeLoader, g as DataTab, P as SkeletonLoader, W as Toggle, L as NotificationNote, R as Stepper, I as IconButton, e as DataCardFields, t as IconsNav, q as IconGroup } from './index-B5wdZoej.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-DYEcdkUF.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, U as Text, O as Segment, S as SectionTitle, j as DocsButton, z as MonitorsCheckboxes, V as TextArea, k as Drawer, h as DeleteWarning, C as CancelWarning, d as ConditionDetails, D as DataCard, M as Modal, N as NavigationButtons, a2 as ModalBody, A as AutocompleteInput, i as Divider, Q as Status, _ as FlexRow, X as Tooltip, s as IconWrapped, G as MonitorsIcons, a3 as TableContainer, a4 as TableTitleWrap, r as IconTitleBadge, a5 as TableWrap, y as InteractiveTable, a0 as CenterThis, J as NoDataFound, $ as FlexColumn, Y as TraceLoader, a as Badge, B as Button, E as ExtendArrow, n as Dropdown, a6 as getDefaultExportFromCjs, F as FadeLoader, g as DataTab, P as SkeletonLoader, W as Toggle, L as NotificationNote, R as Stepper, I as IconButton, e as DataCardFields, t as IconsNav, q as IconGroup } from './index-D6cZdmUs.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, j as getEntityId, i as useSetupStore, u as useDarkMode } from './index-IvGLauAo.js';
 import Theme from './theme.js';
 import { i as isEmpty, s as safeJsonParse } from './index-BZS1ijMm.js';
-import { i as CheckCircledIcon, h as ErrorTriangleIcon, W as WarningTriangleIcon } from './index-9ObpINp4.js';
-import { C as CrossCircledIcon, E as EditIcon, O as OdigosLogoText, b as OverviewIcon, F as FilterIcon, N as NotificationIcon, S as SlackLogo, a as FolderIcon, K as KeyIcon, T as TerminalIcon } from './index-3KUV6Vlt.js';
-import { g as getActionIcon, a as getInstrumentationRuleIcon } from './index-Db_ZDrEr.js';
-import { u as useActionFormData, a as useClickNode, c as useDestinationFormData, b as useClickNotification, d as useSourceFormData, e as useSourceSelectionFormData } from './useSourceSelectionFormData-BnlRp8m3.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-CFmm4scp.js';
+import { i as CheckCircledIcon, h as ErrorTriangleIcon, W as WarningTriangleIcon } from './index-DM8CZWtL.js';
+import { C as CrossCircledIcon, E as EditIcon, O as OdigosLogoText, b as OverviewIcon, F as FilterIcon, N as NotificationIcon, S as SlackLogo, a as FolderIcon, K as KeyIcon, T as TerminalIcon } from './index-DH2zLaey.js';
+import { g as getActionIcon, a as getInstrumentationRuleIcon } from './index-CLOUNx6Z.js';
+import { u as useActionFormData, a as useClickNode, c as useDestinationFormData, b as useClickNotification, d as useSourceFormData, e as useSourceSelectionFormData } from './useSourceSelectionFormData-R_uK7F7W.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-hWYVBuSi.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-D_Qn2U89.js';
-import { m as mapConditions, b as getStatusIcon, c as capitalizeFirstLetter } from './index-CYn62h8x.js';
-import { f as filterActions, g as getConditionsBooleans, j as getEntityLabel, i as getEntityIcon, s as sleep$1, l as getPlatformIcon, m as getPlatformLabel, d as formatBytes, h as getContainersIcons, n as getValueForRange, b as filterSources, a as filterDestinations, c as compareCondition, k as getMetricForEntity, e as getContainersInstrumentedCount, o as isOverTime } from './index-BtuW12KL.js';
+import { m as mapConditions, b as getStatusIcon, c as capitalizeFirstLetter } from './index-CKtl8KxE.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-DiEc-llU.js';
 import require$$1 from 'use-sync-external-store/shim';
 import { createPortal } from 'react-dom';
 import { O as OdigosLogo } from './index-BGlk5VhF.js';
-import { R as RulesIcon, S as SourcesIcon, A as ActionsIcon, D as DestinationsIcon } from './index-BjJpYtF1.js';
+import { R as RulesIcon, W as SourcesIcon, y as ActionsIcon, z as DestinationsIcon } from './index-DB8Djrsy.js';
 import 'babel-runtime/helpers/extends';
 import 'babel-runtime/core-js/object/get-prototype-of';
 import 'babel-runtime/helpers/classCallCheck';
@@ -332,7 +332,7 @@ const ActionForm = ({ isUpdate, action, formData, formErrors, handleFormChange }
         React.createElement(TextArea, { title: 'Notes', value: formData['notes'], onChange: ({ target: { value } }) => handleFormChange('notes', value), errorMessage: formErrors['notes'] })));
 };
 
-const OverviewDrawer = ({ children, width = 640, title, titleTooltip, icon, iconSrc, isEdit = false, isFormDirty = false, isLastItem = false, onEdit, onSave, onDelete, onCancel, tabs, }) => {
+const OverviewDrawer = forwardRef(({ children, width = 640, title, titleTooltip, icon, iconSrc, isEdit = false, isFormDirty = false, isLastItem = false, onEdit, onSave, onDelete, onCancel, tabs }, drawerRef) => {
     const theme = Theme.useTheme();
     const { isThisPending } = usePendingStore();
     const { addNotification } = useNotificationStore();
@@ -342,18 +342,20 @@ const OverviewDrawer = ({ children, width = 640, title, titleTooltip, icon, icon
     const [isCancelModalOpen, setIsCancelModalOpen] = useState(false);
     const titleRef = useRef(null);
     const isSource = drawerType === EntityTypes.Source;
-    const closeDrawer = () => {
-        setDrawerType(null);
-        setDrawerEntityId(null);
-        if (onEdit)
-            onEdit(false);
-        setIsDeleteModalOpen(false);
-        setIsCancelModalOpen(false);
-    };
     const closeWarningModals = () => {
         setIsDeleteModalOpen(false);
         setIsCancelModalOpen(false);
     };
+    const closeDrawer = () => {
+        closeWarningModals();
+        if (onEdit)
+            onEdit(false);
+        setDrawerType(null);
+        setDrawerEntityId(null);
+    };
+    useImperativeHandle(drawerRef, () => ({
+        closeDrawer,
+    }));
     const handleCancel = () => {
         titleRef.current?.clearTitle();
         if (onCancel)
@@ -402,7 +404,7 @@ const OverviewDrawer = ({ children, width = 640, title, titleTooltip, icon, icon
         actionButtons.push({
             'data-id': 'drawer-edit',
             variant: 'tertiary',
-            onClick: isPending ? () => handlePending('edit') : onEdit ? () => onEdit(true) : undefined,
+            onClick: isPending ? () => handlePending('edit') : () => onEdit(true),
             children: (React.createElement(React.Fragment, null,
                 React.createElement(EditIcon, null),
                 React.createElement(Text, { size: 14, family: 'secondary', decoration: 'underline' }, "Edit"))),
@@ -411,7 +413,7 @@ const OverviewDrawer = ({ children, width = 640, title, titleTooltip, icon, icon
         actionButtons.push({
             'data-id': 'drawer-delete',
             variant: 'tertiary',
-            onClick: isPending ? () => handlePending(isSource ? 'uninstrument' : 'delete') : onEdit ? clickDelete : undefined,
+            onClick: isPending ? () => handlePending(isSource ? 'uninstrument' : 'delete') : clickDelete,
             children: (React.createElement(React.Fragment, null,
                 React.createElement(TrashIcon, null),
                 React.createElement(Text, { color: theme.text.error, size: 14, family: 'secondary', decoration: 'underline' }, isSource ? 'Uninstrument' : 'Delete'))),
@@ -454,7 +456,7 @@ const OverviewDrawer = ({ children, width = 640, title, titleTooltip, icon, icon
             } }, children),
         React.createElement(DeleteWarning, { isOpen: isDeleteModalOpen, noOverlay: true, name: `${drawerType}${title ? ` (${title})` : ''}`, type: drawerType, isLastItem: isLastItem, onApprove: handleDelete, onDeny: closeWarningModals }),
         React.createElement(CancelWarning, { isOpen: isCancelModalOpen, noOverlay: true, name: 'edit mode', onApprove: handleCancel, onDeny: closeWarningModals })));
-};
+});
 const EditTitle = forwardRef(({ title }, ref) => {
     const [inputValue, setInputValue] = useState(title);
     useEffect(() => {
@@ -482,12 +484,9 @@ const DataContainer$3 = styled.div `
 `;
 const ActionDrawer = ({ updateAction, deleteAction }) => {
     const { actions } = useEntityStore();
-    const { drawerType, drawerEntityId, setDrawerEntityId, setDrawerType } = useDrawerStore();
+    const { drawerType, drawerEntityId } = useDrawerStore();
+    const drawerRef = useRef(null);
     const isOpen = drawerType !== EntityTypes.Action;
-    const onClose = () => {
-        setDrawerType(null);
-        setDrawerEntityId(null);
-    };
     const [isEditing, setIsEditing] = useState(false);
     const [isFormDirty, setIsFormDirty] = useState(false);
     const { formData, formErrors, handleFormChange, resetFormData, validateForm, loadFormWithDrawerItem } = useActionFormData();
@@ -518,7 +517,7 @@ const ActionDrawer = ({ updateAction, deleteAction }) => {
         setIsFormDirty(false);
         resetFormData();
         // close drawer, all other cases are handled in OverviewDrawer
-        onClose();
+        drawerRef.current?.closeDrawer();
     };
     const handleSave = (newTitle) => {
         if (validateForm({ withAlert: true, alertTitle: Crud.Update })) {
@@ -529,7 +528,7 @@ const ActionDrawer = ({ updateAction, deleteAction }) => {
             setIsFormDirty(false);
         }
     };
-    return (React.createElement(OverviewDrawer, { title: thisItem.spec.actionName || thisItem.type, icon: getActionIcon(thisItem.type), isEdit: isEditing, isFormDirty: isFormDirty, onEdit: handleEdit, onSave: handleSave, onDelete: handleDelete, onCancel: handleCancel }, isEditing && thisOptionType ? (React.createElement(FormContainer$3, null,
+    return (React.createElement(OverviewDrawer, { ref: drawerRef, title: thisItem.spec.actionName || thisItem.type, icon: getActionIcon(thisItem.type), isEdit: isEditing, isFormDirty: isFormDirty, onEdit: handleEdit, onSave: handleSave, onDelete: handleDelete, onCancel: handleCancel }, isEditing && thisOptionType ? (React.createElement(FormContainer$3, null,
         React.createElement(ActionForm, { isUpdate: true, action: thisOptionType, formData: formData, formErrors: formErrors, handleFormChange: (...params) => {
                 setIsFormDirty(true);
                 handleFormChange(...params);
@@ -644,20 +643,27 @@ const buildSpecCell$1 = (action) => {
     return str;
 };
 
-const TableCellConditions = ({ conditions }) => {
+const TableCellConditions = ({ conditions, id }) => {
     const errors = useMemo(() => conditions?.filter(({ status }) => status === StatusType.Error) || [], [conditions]);
     const warnings = useMemo(() => conditions?.filter(({ status }) => status === StatusType.Warning) || [], [conditions]);
     const disableds = useMemo(() => conditions?.filter(({ status }) => status === OtherStatus.Disabled) || [], [conditions]);
     const isLoading = useMemo(() => !conditions?.length || !!conditions?.find(({ status }) => status === OtherStatus.Loading), [conditions]);
-    return (React.createElement("div", { style: { lineHeight: 1 } }, errors.length > 0 ? (React.createElement(ConditionsStatuses, { conditions: errors })) : warnings.length > 0 ? (React.createElement(ConditionsStatuses, { conditions: warnings })) : disableds.length > 0 ? (React.createElement(ConditionsStatuses, { conditions: disableds })) : isLoading ? (React.createElement(Status, { status: OtherStatus.Loading, title: OtherStatus.Loading, withBorder: true, withIcon: true })) : (React.createElement(Status, { status: StatusType.Success, title: StatusType.Success, withBorder: true, withIcon: true }))));
+    const conditionsToShow = errors.length > 0 ? errors : warnings.length > 0 ? warnings : disableds.length > 0 ? disableds : [];
+    if (conditionsToShow.length > 0) {
+        return (React.createElement("div", { style: { lineHeight: 1 } },
+            React.createElement(ConditionsStatuses, { conditions: conditionsToShow, id: id })));
+    }
+    const elseStatus = isLoading ? OtherStatus.Loading : StatusType.Success;
+    return (React.createElement("div", { style: { lineHeight: 1 } },
+        React.createElement(Status, { status: elseStatus, title: elseStatus, withBorder: true, withIcon: true })));
 };
-const ConditionsStatuses = ({ conditions }) => {
+const ConditionsStatuses = ({ conditions, id }) => {
     const theme = Theme.useTheme();
-    return (React.createElement(FlexRow, null, mapConditions(conditions).map(({ status, type, reason, message, lastTransitionTime }) => {
+    return (React.createElement(FlexRow, null, mapConditions(conditions).map(({ status, type, reason, message, lastTransitionTime }, i) => {
         if (status === 'loading' || status === 'disabled')
             status = StatusType.Info;
         const icon = getStatusIcon(status, theme);
-        return (React.createElement(Tooltip, { key: useId(), titleIcon: icon, title: type, text: message || reason || '', timestamp: lastTransitionTime },
+        return (React.createElement(Tooltip, { key: `condition-${id}-${status}-${type}-${i}`, titleIcon: icon, title: type, text: message || reason || '', timestamp: lastTransitionTime },
             React.createElement(Status, { status: status, title: reason || type, withBorder: true, withIcon: true })));
     })));
 };
@@ -719,7 +725,7 @@ const ActionTable = ({ maxHeight, maxWidth }) => {
                 },
                 {
                     columnKey: 'conditions',
-                    component: () => React.createElement(TableCellConditions, { conditions: act.conditions || [] }),
+                    component: () => React.createElement(TableCellConditions, { conditions: act.conditions || [], id: act.id }),
                 },
                 {
                     columnKey: 'active-status',
@@ -1026,7 +1032,8 @@ 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 = ({ namespaces, title = 'Namespace', value, onSelect, onDeselect, ...props }) => {
+const NamespaceDropdown = ({ title = 'Namespace', value, onSelect, onDeselect, ...props }) => {
+    const { namespaces } = useEntityStore();
     const options = useMemo(() => {
         const payload = [];
         namespaces?.forEach(({ name }) => {
@@ -12718,7 +12725,22 @@ const BaseNode = memo(({ id: nodeId, data }) => {
         setSelectedSources(namespaces);
     };
     return (React.createElement(Container$i, { "data-id": nodeId, "$nodeWidth": nodeWidth, className: 'nowheel nodrag' },
-        React.createElement(DataTab, { title: title, subTitle: subTitle, icon: icon, icons: icons, iconSrc: iconSrc, iconSrcs: iconSrcs, status: status, faded: faded, monitors: monitors, isActive: isActive, withCheckbox: isSource, isChecked: sourceIndex !== -1, onCheckboxChange: onSelectSource, isCheckboxDisabled: isPending, renderActions: renderActions, onClick: () => { } }),
+        React.createElement(DataTab, { title: title, subTitle: subTitle, onClick: () => { }, renderActions: renderActions, iconProps: {
+                icon: icon,
+                icons: icons,
+                iconSrc: iconSrc,
+                iconSrcs: iconSrcs,
+            }, visualProps: {
+                status: status,
+                faded: faded,
+                monitors: monitors,
+                isActive: isActive,
+            }, checkboxProps: {
+                withCheckbox: isSource,
+                isChecked: sourceIndex !== -1,
+                onCheckboxChange: onSelectSource,
+                isCheckboxDisabled: isPending,
+            } }),
         React.createElement(Handle, { type: 'target', position: Position.Left, style: { visibility: 'hidden' } }),
         React.createElement(Handle, { type: 'source', position: Position.Right, style: { visibility: 'hidden' } })));
 });
@@ -13350,6 +13372,10 @@ const getNodePositions = ({ containerWidth }) => {
     const endX = (containerWidth <= 1500 ? 1500 : containerWidth) - nodeWidth$1 - startX;
     const getY = (idx) => nodeHeight * ((idx || 0) + 1);
     const positions = {
+        [EntityTypes.Namespace]: {
+            x: 0,
+            y: () => 0,
+        },
         [EntityTypes.InstrumentationRule]: {
             x: startX,
             y: getY,
@@ -13379,6 +13405,7 @@ const getNodePositions = ({ containerWidth }) => {
 const { nodeWidth } = nodeConfig;
 const mapToNodeData = (entity) => {
     const { hasDisableds, priorotizedStatus } = getConditionsBooleans(entity.conditions || []);
+    const { icon, iconSrc } = getDestinationIcon(entity.destinationType.type);
     return {
         nodeWidth,
         id: entity.id,
@@ -13387,7 +13414,8 @@ const mapToNodeData = (entity) => {
         faded: hasDisableds,
         title: getEntityLabel(entity, EntityTypes.Destination, { prioritizeDisplayName: true }),
         subTitle: entity.destinationType.displayName,
-        iconSrc: entity.destinationType.imageUrl,
+        icon,
+        iconSrc,
         monitors: Object.keys(entity.exportedSignals).filter((signal) => entity.exportedSignals[signal] === true),
         raw: entity,
     };
@@ -13545,6 +13573,7 @@ const AbsoluteContainer$1 = styled.div `
   border: ${({ theme }) => `1px solid ${theme.colors.border}`};
   border-radius: 24px;
   width: 420px;
+  display: ${({ $hidden }) => ($hidden ? 'none' : 'block')};
 `;
 
 const buildSearchResults = ({ instrumentationRules, sources, actions, destinations, searchText, selectedCategory }) => {
@@ -13675,6 +13704,13 @@ const Actions = styled.div `
   padding: 12px;
   border-top: ${({ theme }) => `1px solid ${theme.colors.border}`};
 `;
+const ActionButton$1 = styled(Button) `
+  font-size: 14px;
+  ${({ $color }) => `color: ${$color};`}
+`;
+const PushRight = styled.div `
+  margin-left: auto;
+`;
 const getFilterCount = (params) => {
     let count = 0;
     count += params.namespaces?.length || 0;
@@ -13686,9 +13722,8 @@ const getFilterCount = (params) => {
         count++;
     return count;
 };
-const Filters$1 = ({ namespaces: namespaceItems }) => {
+const Filters$1 = () => {
     const theme = Theme.useTheme();
-    const { sources } = useEntityStore();
     const { namespaces, kinds, monitors, languages, errors, onlyErrors, setAll, clearAll, getEmptyState } = useFilterStore();
     // 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 });
@@ -13703,9 +13738,15 @@ const Filters$1 = ({ namespaces: namespaceItems }) => {
         }
     }, [focused, namespaces, kinds, monitors, errors, onlyErrors]);
     const onApply = () => {
-        setAll(filters);
-        setFilterCount(getFilterCount(filters));
-        setFocused(false);
+        // TODO: remove trycatch after debugging
+        try {
+            setAll(filters);
+            setFilterCount(getFilterCount(filters));
+            setFocused(false);
+        }
+        catch (error) {
+            console.error(error);
+        }
     };
     const onReset = () => {
         clearAll();
@@ -13713,15 +13754,17 @@ const Filters$1 = ({ namespaces: namespaceItems }) => {
         setFilterCount(0);
         setFocused(false);
     };
-    const onCancel = useCallback(() => setFocused(false), []);
+    const onCancel = () => {
+        setFocused(false);
+    };
     const ref = useRef(null);
     useOnClickOutside(ref, onCancel);
     useKeyDown({ key: 'Escape', active: focused }, onCancel);
     return (React.createElement(RelativeContainer$1, { ref: ref },
         React.createElement(SelectionButton, { label: 'Filters', icon: FilterIcon, badgeLabel: filterCount, badgeFilled: !!filterCount, withBorder: true, color: 'transparent', onClick: toggleFocused }),
-        focused && (React.createElement(AbsoluteContainer$1, null,
+        React.createElement(AbsoluteContainer$1, { "$hidden": !focused },
             React.createElement(FormWrapper, null,
-                React.createElement(NamespaceDropdown, { namespaces: !!namespaceItems?.length ? namespaceItems : sources?.map(({ namespace }) => ({ name: namespace })) || [], 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(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(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 }),
@@ -13729,9 +13772,10 @@ const Filters$1 = ({ namespaces: namespaceItems }) => {
                     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(Actions, null,
-                React.createElement(Button, { variant: 'primary', onClick: onApply, style: { fontSize: 14 } }, "Apply"),
-                React.createElement(Button, { variant: 'secondary', onClick: onCancel, style: { fontSize: 14 } }, "Cancel"),
-                React.createElement(Button, { variant: 'tertiary', onClick: onReset, style: { fontSize: 14, color: theme.text.error, marginLeft: '160px' } }, "Reset"))))));
+                React.createElement(ActionButton$1, { variant: 'primary', onClick: onApply }, "Apply"),
+                React.createElement(ActionButton$1, { variant: 'secondary', onClick: onCancel }, "Cancel"),
+                React.createElement(PushRight, null,
+                    React.createElement(ActionButton$1, { variant: 'tertiary', onClick: onReset, "$color": theme.text.error }, "Reset"))))));
 };
 
 const Container$b = styled.div `
@@ -13753,13 +13797,12 @@ const AddButton = styled(Button) `
   min-width: 160px;
   padding-right: 24px;
 `;
-const DataFlowActionsMenu = ({ namespaces, addEntity }) => {
+const DataFlowActionsMenu = ({ addEntity }) => {
     const theme = Theme.useTheme();
     const { setCurrentModal } = useModalStore();
-    const { sources, destinations, actions, instrumentationRules } = useEntityStore();
     return (React.createElement(Container$b, null,
         React.createElement(Search, null),
-        React.createElement(Filters$1, { namespaces: namespaces, sources: sources }),
+        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 }),
@@ -13991,12 +14034,9 @@ const DataContainer$2 = styled.div `
 `;
 const DestinationDrawer = ({ categories, updateDestination, deleteDestination, testConnection, testLoading, testResult }) => {
     const { destinations } = useEntityStore();
-    const { drawerType, drawerEntityId, setDrawerEntityId, setDrawerType } = useDrawerStore();
+    const { drawerType, drawerEntityId } = useDrawerStore();
+    const drawerRef = useRef(null);
     const isOpen = drawerType !== EntityTypes.Destination;
-    const onClose = () => {
-        setDrawerType(null);
-        setDrawerEntityId(null);
-    };
     const [isEditing, setIsEditing] = useState(false);
     const [isFormDirty, setIsFormDirty] = useState(false);
     // const [thisItem, setThisItem] = useState<Destination | undefined>(undefined)
@@ -14030,6 +14070,7 @@ const DestinationDrawer = ({ categories, updateDestination, deleteDestination, t
     if (!thisItem)
         return null;
     const thisOptionType = categories.map(({ items }) => items.filter(({ type }) => type === thisItem.destinationType.type)).filter((arr) => !!arr.length)?.[0]?.[0];
+    const { icon, iconSrc } = getDestinationIcon(thisOptionType.type);
     const handleEdit = (bool) => {
         setIsEditing(typeof bool === 'boolean' ? bool : true);
     };
@@ -14044,7 +14085,7 @@ const DestinationDrawer = ({ categories, updateDestination, deleteDestination, t
         setIsFormDirty(false);
         resetFormData();
         // close drawer, all other cases are handled in OverviewDrawer
-        onClose();
+        drawerRef.current?.closeDrawer();
     };
     const handleSave = async (newTitle) => {
         if (validateForm({ withAlert: true, alertTitle: Crud.Update })) {
@@ -14055,7 +14096,7 @@ const DestinationDrawer = ({ categories, updateDestination, deleteDestination, t
             setIsFormDirty(false);
         }
     };
-    return (React.createElement(OverviewDrawer, { title: thisItem.name || thisItem.destinationType.displayName, iconSrc: thisItem.destinationType.imageUrl, 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, icon: icon, iconSrc: iconSrc, isEdit: isEditing, isFormDirty: isFormDirty, onEdit: handleEdit, onSave: handleSave, onDelete: handleDelete, onCancel: handleCancel, isLastItem: destinations.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);
@@ -14076,7 +14117,16 @@ const DestinationsList = ({ items, setSelectedItem }) => {
     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) => (React.createElement(DataTab, { key: `select-destination-${item.type}-${idx}`, "data-id": `select-destination-${item.type}`, title: item.displayName, iconSrc: item.imageUrl, hoverText: 'Select', monitors: Object.keys(item.supportedSignals).filter((signal) => item.supportedSignals[signal].supported), monitorsWithLabels: true, onClick: () => setSelectedItem(item) })))));
+            category.items.map((item, idx) => {
+                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,
+                    }, visualProps: {
+                        monitors: Object.keys(item.supportedSignals).filter((signal) => item.supportedSignals[signal].supported),
+                        monitorsWithLabels: true,
+                    } }));
+            })));
     });
 };
 
@@ -14090,7 +14140,16 @@ const PotentialDestinationsList = ({ items, setSelectedItem }) => {
         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) => (React.createElement(DataTab, { key: `select-potential-destination-${item.type}-${idx}`, "data-id": `select-potential-destination-${item.type}`, title: item.displayName, iconSrc: item.imageUrl, hoverText: 'Select', monitors: Object.keys(item.supportedSignals).filter((signal) => item.supportedSignals[signal].supported), monitorsWithLabels: true, onClick: () => setSelectedItem(item) })))));
+        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$9 = styled.div `
@@ -14212,9 +14271,8 @@ const DestinationModal = ({ isOnboarding, categories, potentialDestinations, cre
                 value: formData.name,
             });
             const storedDestination = {
-                type: selectedItem?.type || '',
-                displayName: selectedItem?.displayName || '',
-                imageUrl: selectedItem?.imageUrl || '',
+                type: selectedItem.type,
+                displayName: selectedItem.displayName,
                 exportedSignals: formData.exportedSignals,
                 destinationTypeDetails,
                 category: '', // Could be handled in a more dynamic way if needed
@@ -14273,12 +14331,22 @@ const ConfiguredList = () => {
     const { configuredDestinations } = useSetupStore();
     return (React.createElement(Container$7, null, configuredDestinations.map(({ stored }, idx) => (React.createElement(ListItem$1, { key: `selected-destination-${stored.type}-${idx}`, "data-id": `selected-destination-${stored.type}`, item: stored, isLastItem: configuredDestinations.length === 1 })))));
 };
-const ListItem$1 = ({ item, isLastItem, ...props }) => {
+const ListItem$1 = ({ item, isLastItem }) => {
     const { removeConfiguredDestination } = useSetupStore();
     const [deleteWarning, setDeleteWarning] = useState(false);
+    const { icon, iconSrc } = getDestinationIcon(item.type);
     return (React.createElement(React.Fragment, null,
-        React.createElement(DataTab, { title: item.displayName, iconSrc: item.imageUrl, monitors: Object.keys(item.exportedSignals).filter((signal) => item.exportedSignals[signal] === true), monitorsWithLabels: true, withExtend: true, renderExtended: () => React.createElement(DataCardFields, { data: item.destinationTypeDetails }), renderActions: () => (React.createElement(IconButton, { onClick: () => setDeleteWarning(true) },
-                React.createElement(TrashIcon, null))), ...props }),
+        React.createElement(DataTab, { title: item.displayName, iconProps: {
+                icon,
+                iconSrc,
+            }, visualProps: {
+                monitors: Object.keys(item.exportedSignals).filter((signal) => item.exportedSignals[signal] === true),
+                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) })));
 };
 
@@ -14336,6 +14404,7 @@ const DestinationTable = ({ metrics, maxHeight, maxWidth }) => {
     const filtered = useMemo(() => filterDestinations(destinations, filters), [destinations, filters]);
     const rows = useMemo(() => filtered.map((dest) => {
         const { hasErrors, hasWarnings, hasDisableds } = getConditionsBooleans(dest.conditions || []);
+        const { icon, iconSrc } = getDestinationIcon(dest.destinationType.type);
         return {
             status: hasErrors ? StatusType.Error : hasWarnings ? StatusType.Warning : undefined,
             faded: hasDisableds,
@@ -14346,7 +14415,7 @@ const DestinationTable = ({ metrics, maxHeight, maxWidth }) => {
             cells: [
                 {
                     columnKey: 'icon',
-                    component: () => React.createElement(IconWrapped, { src: dest.destinationType.imageUrl }),
+                    component: () => React.createElement(IconWrapped, { icon: icon, src: iconSrc }),
                 },
                 {
                     columnKey: 'name',
@@ -14364,7 +14433,7 @@ const DestinationTable = ({ metrics, maxHeight, maxWidth }) => {
                 },
                 {
                     columnKey: 'conditions',
-                    component: () => React.createElement(TableCellConditions, { conditions: dest.conditions || [] }),
+                    component: () => React.createElement(TableCellConditions, { conditions: dest.conditions || [], id: dest.id }),
                 },
                 {
                     columnKey: 'signals',
@@ -14615,12 +14684,9 @@ const FormContainer$1 = styled.div `
 const InstrumentationRuleDrawer = ({ updateInstrumentationRule, deleteInstrumentationRule }) => {
     const { instrumentationRules } = useEntityStore();
     const { addNotification } = useNotificationStore();
-    const { drawerType, drawerEntityId, setDrawerType, setDrawerEntityId } = useDrawerStore();
+    const { drawerType, drawerEntityId } = useDrawerStore();
+    const drawerRef = useRef(null);
     const isOpen = drawerType !== EntityTypes.InstrumentationRule;
-    const onClose = () => {
-        setDrawerType(null);
-        setDrawerEntityId(null);
-    };
     const [isEditing, setIsEditing] = useState(false);
     const [isFormDirty, setIsFormDirty] = useState(false);
     const { formData, formErrors, handleFormChange, resetFormData, validateForm, loadFormWithDrawerItem } = useInstrumentationRuleFormData();
@@ -14672,7 +14738,7 @@ const InstrumentationRuleDrawer = ({ updateInstrumentationRule, deleteInstrument
             setIsFormDirty(false);
             resetFormData();
             // close drawer, all other cases are handled in OverviewDrawer
-            onClose();
+            drawerRef.current?.closeDrawer();
         }
     };
     const handleSave = (newTitle) => {
@@ -14684,7 +14750,7 @@ const InstrumentationRuleDrawer = ({ updateInstrumentationRule, deleteInstrument
             setIsFormDirty(false);
         }
     };
-    return (React.createElement(OverviewDrawer, { title: thisItem.ruleName || thisItem.type, icon: getInstrumentationRuleIcon(thisItem.type), isEdit: isEditing, isFormDirty: isFormDirty, onEdit: handleEdit, onSave: handleSave, onDelete: handleDelete, onCancel: handleCancel }, isEditing && thisOptionType ? (React.createElement(FormContainer$1, null,
+    return (React.createElement(OverviewDrawer, { ref: drawerRef, title: thisItem.ruleName || thisItem.type, icon: getInstrumentationRuleIcon(thisItem.type), isEdit: isEditing, isFormDirty: isFormDirty, onEdit: handleEdit, onSave: handleSave, onDelete: handleDelete, onCancel: handleCancel }, isEditing && thisOptionType ? (React.createElement(FormContainer$1, null,
         React.createElement(InstrumentationRuleForm, { isUpdate: true, rule: thisOptionType, formData: formData, formErrors: formErrors, handleFormChange: (...params) => {
                 setIsFormDirty(true);
                 handleFormChange(...params);
@@ -15220,16 +15286,12 @@ const DataContainer$1 = styled.div `
 `;
 const SourceDrawer = ({ persistSources, updateSource, fetchDescribeSource }) => {
     const { sources } = useEntityStore();
-    const { drawerType, drawerEntityId, setDrawerEntityId, setDrawerType } = useDrawerStore();
-    const [selectedTab, setSelectedTab] = useState(Tabs.Overview);
+    const { drawerType, drawerEntityId } = useDrawerStore();
+    const drawerRef = useRef(null);
     const isOpen = drawerType !== EntityTypes.Source;
-    const onClose = () => {
-        setSelectedTab(Tabs.Overview);
-        setDrawerType(null);
-        setDrawerEntityId(null);
-    };
     const [isEditing, setIsEditing] = useState(false);
     const [isFormDirty, setIsFormDirty] = useState(false);
+    const [selectedTab, setSelectedTab] = useState(Tabs.Overview);
     const { formData, handleFormChange, resetFormData, loadFormWithDrawerItem } = useSourceFormData();
     const thisItem = useMemo(() => {
         if (isOpen)
@@ -15249,27 +15311,27 @@ const SourceDrawer = ({ persistSources, updateSource, fetchDescribeSource }) =>
         setIsEditing(typeof bool === 'boolean' ? bool : true);
     };
     const handleCancel = () => {
-        setIsEditing(false);
         setIsFormDirty(false);
+        setIsEditing(false);
         handleFormChange('otelServiceName', thisItem.otelServiceName || thisItem.name || '');
     };
     const handleDelete = async () => {
         const { namespace } = thisItem;
         persistSources({ [namespace]: [{ ...thisItem, selected: false }] }, {});
-        setIsEditing(false);
         setIsFormDirty(false);
+        setIsEditing(false);
         resetFormData();
         // close drawer, all other cases are handled in OverviewDrawer
-        onClose();
+        drawerRef.current?.closeDrawer();
     };
     const handleSave = async () => {
         const title = formData.otelServiceName !== thisItem.name ? formData.otelServiceName : '';
         handleFormChange('otelServiceName', title);
         await updateSource(drawerEntityId, { ...formData, otelServiceName: title });
-        setIsEditing(false);
         setIsFormDirty(false);
+        setIsEditing(false);
     };
-    return (React.createElement(OverviewDrawer, { title: thisItem.otelServiceName || thisItem.name, titleTooltip: 'This attribute is used to identify the name of the service (service.name) that is generating telemetry data.', icon: getEntityIcon(EntityTypes.Source), 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.', icon: getEntityIcon(EntityTypes.Source), 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: [
             {
                 label: Tabs.Overview,
                 onClick: () => setSelectedTab(Tabs.Overview),
@@ -15344,9 +15406,10 @@ const NoDataFoundWrapper$1 = styled.div `
   max-height: calc(100vh - 360px);
   overflow-y: auto;
 `;
-const List$1 = ({ isModal = false, filterNamespaces, filterSources, namespacesLoading, selectedNamespace, onSelectNamespace, selectedSources, onSelectSource, selectedFutureApps, onSelectFutureApps, onSelectAll, }) => {
+const List$1 = ({ 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$1, null, namespacesLoading ? React.createElement(FadeLoader, { scale: 2 }) : React.createElement(NoDataFound, { title: 'No namespaces found' }));
     }
@@ -15463,7 +15526,8 @@ const NoDataFoundWrapper = styled.div `
   max-height: calc(100vh - 360px);
   overflow-y: auto;
 `;
-const List = ({ isModal = false, namespacesLoading, selectedNamespace, selectedSources, onSelectSource, filterSources, }) => {
+const List = ({ isModal = false, selectedNamespace, selectedSources, onSelectSource, filterSources, }) => {
+    const { namespacesLoading } = useEntityStore();
     const sources = selectedSources[selectedNamespace] || [];
     if (!sources.length) {
         return React.createElement(NoDataFoundWrapper, null, namespacesLoading ? React.createElement(FadeLoader, { scale: 2 }) : React.createElement(NoDataFound, { title: 'No sources found' }));
@@ -15497,7 +15561,7 @@ const ToggleWrapper = styled.div `
   align-items: center;
   gap: 32px;
 `;
-const Controls = ({ namespaces, selectedNamespace, onSelectNamespace, selectedSources, onSelectAll, selectedFutureApps, onSelectFutureApps, searchText, setSearchText, showSelectedOnly, setShowSelectedOnly, }) => {
+const Controls = ({ selectedNamespace, onSelectNamespace, selectedSources, onSelectAll, selectedFutureApps, onSelectFutureApps, searchText, setSearchText, showSelectedOnly, setShowSelectedOnly, }) => {
     const futureApps = selectedFutureApps[selectedNamespace] || false;
     const sources = selectedSources[selectedNamespace] || [];
     const selectedAppsCount = sources.filter(({ selected }) => selected).length;
@@ -15505,7 +15569,7 @@ const Controls = ({ namespaces, selectedNamespace, onSelectNamespace, selectedSo
         React.createElement(SectionTitle, { title: 'Choose sources', description: "Apps will be automatically instrumented, and data will be sent to the relevant APM's destinations." }),
         React.createElement(FlexContainer, { style: { marginTop: 24 } },
             React.createElement(Input, { placeholder: 'Search for sources', icon: SearchIcon, value: searchText, onChange: (e) => setSearchText(e.target.value.toLowerCase()) }),
-            React.createElement(NamespaceDropdown, { namespaces: namespaces, title: '', value: selectedNamespace ? [{ value: selectedNamespace, id: selectedNamespace }] : [], onSelect: ({ id }) => !!id && onSelectNamespace(id), onDeselect: ({ id }) => !!id && onSelectNamespace(id) })),
+            React.createElement(NamespaceDropdown, { title: '', value: selectedNamespace ? [{ value: selectedNamespace, id: selectedNamespace }] : [], onSelect: ({ id }) => !!id && onSelectNamespace(id), onDeselect: ({ id }) => !!id && onSelectNamespace(id) })),
         React.createElement(Divider, { margin: '16px 0' }),
         React.createElement(FlexContainer, null,
             React.createElement(FlexContainer, null,
@@ -15524,8 +15588,8 @@ const Simple = (props) => {
         React.createElement(List, { ...props })));
 };
 
-const SourceSelectionForm = forwardRef(({ componentType, isModal, namespaces, namespace, namespacesLoading, selectedNamespace, onSelectNamespace }, ref) => {
-    const formState = useSourceSelectionFormData({ namespaces, namespace, selectedNamespace, onSelectNamespace });
+const SourceSelectionForm = forwardRef(({ componentType, isModal, selectedNamespace, onSelectNamespace, namespace }, ref) => {
+    const formState = useSourceSelectionFormData({ selectedNamespace, onSelectNamespace, namespace });
     const { recordedInitialSources, getApiSourcesPayload, getApiFutureAppsPayload } = formState;
     useImperativeHandle(ref, () => ({
         getFormValues: () => ({
@@ -15536,15 +15600,15 @@ const SourceSelectionForm = forwardRef(({ componentType, isModal, namespaces, na
     }));
     switch (componentType) {
         case 'SIMPLE':
-            return React.createElement(Simple, { isModal: isModal, namespaces: namespaces, namespacesLoading: namespacesLoading, selectedNamespace: selectedNamespace, onSelectNamespace: onSelectNamespace, ...formState });
+            return React.createElement(Simple, { isModal: isModal, selectedNamespace: selectedNamespace, onSelectNamespace: onSelectNamespace, ...formState });
         case 'FAST':
-            return React.createElement(Fast, { isModal: isModal, namespacesLoading: namespacesLoading, selectedNamespace: selectedNamespace, onSelectNamespace: onSelectNamespace, ...formState });
+            return React.createElement(Fast, { isModal: isModal, selectedNamespace: selectedNamespace, onSelectNamespace: onSelectNamespace, ...formState });
         default:
             return null;
     }
 });
 
-const SourceModal = ({ componentType = 'FAST', namespaces, namespace, namespacesLoading, selectedNamespace, setSelectedNamespace, persistSources }) => {
+const SourceModal = ({ componentType = 'FAST', selectedNamespace, setSelectedNamespace, namespace, persistSources }) => {
     const { currentModal, setCurrentModal } = useModalStore();
     const isOpen = currentModal === EntityTypes.Source;
     const onSelectNamespace = (ns) => {
@@ -15570,7 +15634,7 @@ const SourceModal = ({ componentType = 'FAST', namespaces, namespace, namespaces
                     onClick: handleSubmit,
                 },
             ] }) },
-        React.createElement(SourceSelectionForm, { ref: formRef, componentType: componentType, isModal: true, namespaces: namespaces, namespace: namespace, namespacesLoading: namespacesLoading, selectedNamespace: selectedNamespace, onSelectNamespace: onSelectNamespace })));
+        React.createElement(SourceSelectionForm, { ref: formRef, componentType: componentType, isModal: true, selectedNamespace: selectedNamespace, onSelectNamespace: onSelectNamespace, namespace: namespace })));
 };
 
 const columns = [
@@ -15642,7 +15706,8 @@ const SourceTable = ({ metrics, maxHeight, maxWidth }) => {
         setSelectedSources(payload);
     }, [selectedSources]);
     const rows = useMemo(() => filtered.map((source) => {
-        const id = { namespace: source.namespace, name: source.name, kind: source.kind };
+        const id = getWorkloadId(source);
+        const idString = JSON.stringify(id);
         const { hasErrors, hasWarnings, hasDisableds } = getConditionsBooleans(source.conditions || []);
         const isPending = isThisPending({ entityType: EntityTypes.Source, entityId: id });
         const isChecked = !!selectedSources[id.namespace]?.find((x) => x.namespace === id.namespace && x.name === id.name && x.kind === id.kind);
@@ -15658,7 +15723,7 @@ const SourceTable = ({ metrics, maxHeight, maxWidth }) => {
                     columnKey: 'checkbox-and-icon',
                     component: () => (React.createElement(FlexRow, { "$gap": 16 },
                         React.createElement(Checkbox, { disabled: isPending, value: isChecked, onChange: () => onSelectOne(source) }),
-                        React.createElement(IconGroup, { icons: getContainersIcons(source.containers) }))),
+                        React.createElement(IconGroup, { icons: getContainersIcons(source.containers), id: idString }))),
                 },
                 {
                     columnKey: 'name',
@@ -15681,7 +15746,7 @@ const SourceTable = ({ metrics, maxHeight, maxWidth }) => {
                 },
                 {
                     columnKey: 'conditions',
-                    component: () => React.createElement(TableCellConditions, { conditions: source.conditions || [] }),
+                    component: () => React.createElement(TableCellConditions, { conditions: source.conditions || [], id: idString }),
                 },
                 {
                     columnKey: 'containers',