@scality/core-ui 0.166.0 → 0.167.0

package/src/lib/components/linetimeseriechart/linetimeseriechart.component.tsx

@@ -91,8 +91,8 @@ const TooltipInstanceValue = styled.div`
 export type Serie = {
   // the name of the resource
   resource: string;
-  // the original data format from prometheus
-  data: [number, string | null][];
+  // the original data format from prometheus, extend the value to include number type.
+  data: [number, number | string | null][];
   // it's mandatory to display tooltip label in the tooltip
   getTooltipLabel: (metricPrefix?: string, resource?: string) => string;
   // the name of the metric prefix with read, write, in, out
@@ -259,7 +259,7 @@ export function LineTimeSerieChart({
     // Initialize an object to hold data points by timestamp
     const dataPointsByTime: Record<
       number,
-      { timestamp: number } & Record<string, string | number | null>
+      { timestamp: number } & Record<string, number | null>
     > = {};
     const seriesToProcess =
       yAxisType === 'symmetrical' && isSymmetricalSeries(normalizedSeries)
@@ -285,8 +285,8 @@ export function LineTimeSerieChart({
     // Convert object to array for Recharts
     return Object.values(dataPointsByTime).sort(
       (
-        a: { timestamp: number } & Record<string, string | number | null>,
-        b: { timestamp: number } & Record<string, string | number | null>,
+        a: { timestamp: number } & Record<string, number | null>,
+        b: { timestamp: number } & Record<string, number | null>,
       ) => (a.timestamp as number) - (b.timestamp as number),
     );
   }, [series, startingTimeStamp, duration, interval, yAxisType]);

package/src/lib/components/selectv2/selectv2.test.tsx

@@ -69,7 +69,7 @@ describe('SelectV2', () => {
   it('should throw error if <Option/> is outside <Select/>', () => {
     // mock console.error as this is the only way to silent expected error thrown by the component
     const consoleErrorFn = jest.spyOn(console, 'error').mockImplementation(() => jest.fn());
-    expect(() => render(<Option value="Option 1" />)).toThrowError();
+    expect(() => render(<Option value="Option 1" />)).toThrow();
     consoleErrorFn.mockRestore();
   });
 

package/src/lib/components/toast/useMutationsHandler.test.tsx

@@ -1,4 +1,4 @@
-import { act, renderHook } from '@testing-library/react-hooks';
+import { renderHook, waitFor } from '@testing-library/react';
 import { useToast } from './ToastProvider';
 import { useMutationsHandler } from './useMutationsHandler';
 
@@ -68,7 +68,7 @@ describe('useMutationsHandler', () => {
       showToast,
     }));
 
-    const { waitFor } = renderHook(() =>
+    renderHook(() =>
       useMutationsHandler({
         mainMutation,
         dependantMutations,
@@ -77,10 +77,8 @@ describe('useMutationsHandler', () => {
       }),
     );
 
-    await act(async () => {
-      await waitFor(() => {
-        expect(onMainMutationSuccess).toHaveBeenCalled();
-      });
+    await waitFor(() => {
+      expect(onMainMutationSuccess).toHaveBeenCalled();
     });
   });
 
@@ -91,7 +89,7 @@ describe('useMutationsHandler', () => {
       showToast,
     }));
 
-    const { waitFor } = renderHook(() =>
+    renderHook(() =>
       useMutationsHandler({
         mainMutation,
         dependantMutations,
@@ -99,13 +97,11 @@ describe('useMutationsHandler', () => {
       }),
     );
 
-    await act(async () => {
-      await waitFor(() => {
-        expect(showToast).toHaveBeenCalledWith({
-          open: true,
-          status: 'success',
-          message: 'message',
-        });
+    await waitFor(() => {
+      expect(showToast).toHaveBeenCalledWith({
+        open: true,
+        status: 'success',
+        message: 'message',
       });
     });
   });
@@ -131,7 +127,7 @@ describe('useMutationsHandler', () => {
       },
     ] as const;
 
-    const { waitFor } = renderHook(() =>
+    renderHook(() =>
       useMutationsHandler({
         mainMutation,
         dependantMutations: mutationsWithError,
@@ -139,13 +135,11 @@ describe('useMutationsHandler', () => {
       }),
     );
 
-    await act(async () => {
-      await waitFor(() => {
-        expect(showToast).toHaveBeenCalledWith({
-          open: true,
-          status: 'error',
-          message: 'message',
-        });
+    await waitFor(() => {
+      expect(showToast).toHaveBeenCalledWith({
+        open: true,
+        status: 'error',
+        message: 'message',
       });
     });
   });
@@ -171,7 +165,7 @@ describe('useMutationsHandler', () => {
       showToast,
     }));
 
-    const { waitFor } = renderHook(() =>
+    renderHook(() =>
       useMutationsHandler({
         mainMutation,
         dependantMutations: otherMutations,
@@ -180,10 +174,8 @@ describe('useMutationsHandler', () => {
       }),
     );
 
-    await act(async () => {
-      await waitFor(() => {
-        expect(onAllMutationsSuccess).toHaveBeenCalled();
-      });
+    await waitFor(() => {
+      expect(onAllMutationsSuccess).toHaveBeenCalled();
     });
   });
 
@@ -220,7 +212,7 @@ describe('useMutationsHandler', () => {
       showToast,
     }));
 
-    const { waitFor } = renderHook(() =>
+    renderHook(() =>
       useMutationsHandler({
         mainMutation: firstMutation,
         dependantMutations: otherMutations,
@@ -229,10 +221,8 @@ describe('useMutationsHandler', () => {
       }),
     );
 
-    await act(async () => {
-      await waitFor(() => {
-        expect(onAllMutationsSuccess).not.toHaveBeenCalled();
-      });
+    await waitFor(() => {
+      expect(onAllMutationsSuccess).not.toHaveBeenCalled();
     });
   });
 });

package/src/lib/index.ts

@@ -1,8 +1,6 @@
 export { Banner } from './components/banner/Banner.component';
 export { Breadcrumb } from './components/breadcrumb/Breadcrumb.component';
-export { Button } from './components/button/Button.component';
 export { Checkbox } from './components/checkbox/Checkbox.component';
-export { Chips } from './components/chips/Chips.component';
 export { Dropdown } from './components/dropdown/Dropdown.component';
 export {
   LOADER_SIZE,
@@ -21,22 +19,18 @@ export { Modal } from './components/modal/Modal.component';
 export { Navbar } from './components/navbar/Navbar.component';
 export { Notifications } from './components/notifications/Notifications.component';
 export { SearchInput } from './components/searchinput/SearchInput.component';
-export { Select } from './components/select/Select.component';
+
 export { Sidebar } from './components/sidebar/Sidebar.component';
 export { Steppers } from './components/steppers/Steppers.component';
 export { Toggle } from './components/toggle/Toggle.component';
 export { Tooltip } from './components/tooltip/Tooltip.component';
-export { MultiSelect } from './components/multiselect/MultiSelect.component';
-export { VegaChart } from './components/vegachart/VegaChart.component';
-export { LineChart } from './components/linechart/LineChart.component';
+
 export { ProgressBar } from './components/progressbar/ProgressBar.component';
 export { TextArea } from './components/textarea/TextArea.component';
-export { CloudProgressBar } from './components/cloudprogressbar/CloudProgressBar.component';
-export { Sparkline } from './components/sparkline/SparkLine.component';
+
 export { BarChart } from './components/barchart/BarChart.component';
 export { CircularProgressBar } from './components/circularprogressbar/CircularProgressBar.component';
-export { AreaChart } from './components/areachart/AreaChart.component';
-export { CollapsiblePanel } from './components/collapsiblepanel/CollapsiblePanel.component';
+
 export { LateralNavbarLayout } from './components/lateralnavbarlayout/LateralNavbarLayout.component';
 export { GlobalHealthBar } from './components/globalhealthbar/GlobalHealthBar.component';
 export { ConstrainedText } from './components/constrainedtext/Constrainedtext.component';
@@ -48,7 +42,7 @@ export { ErrorPage404 } from './components/error-pages/ErrorPage404.component';
 export { ErrorPage500 } from './components/error-pages/ErrorPage500.component';
 export { ErrorPageAuth } from './components/error-pages/ErrorPageAuth.component';
 export { TextBadge } from './components/textbadge/TextBadge.component';
-export { SpacedBox } from './components/spacedbox/SpacedBox';
+
 export { Layout as Layout2 } from './components/layout/v2';
 export { TwoPanelLayout } from './components/layout/v2/panels';
 export { AppContainer } from './components/layout/v2/AppContainer';
@@ -82,3 +76,4 @@ export { InfoMessage } from './components/infomessage/InfoMessage.component';
 export { InputList } from './components/inputlist/InputList.component';
 export { InlineInput } from './components/inlineinput/InlineInput';
 export { UnsuccessfulResult } from './components/UnsuccessfulResult.component';
+export { CoreUITheme } from './style/theme';

package/src/lib/next.ts

@@ -25,3 +25,4 @@ export { ChartTooltip } from './components/barchartv2/ChartTooltip';
 export { ChartLegendWrapper } from './components/chartlegend/ChartLegendWrapper';
 export { ChartLegend } from './components/chartlegend/ChartLegend';
 export { LineTimeSerieChart } from './components/linetimeseriechart/linetimeseriechart.component';
+export { CoreUITheme } from './style/theme';

package/stories/barchart.stories.tsx

@@ -111,7 +111,7 @@ const horizontalBarChartArgs = {
 };
 
 export default {
-  title: 'Components/Data Display/Charts/BarChart',
+  title: 'Components/Deprecated/Charts/BarChart',
   component: BarChart,
   decorators: [
     (story: Component) => <SyncedCursorCharts>{story()}</SyncedCursorCharts>,

package/stories/card.stories.tsx

@@ -7,12 +7,14 @@ import {
   CardBodyContainer,
 } from '../src/lib/components/card/Card.component';
 import { CircularProgressBar } from '../src/lib/components/circularprogressbar/CircularProgressBar.component';
-import { Text, Wrapper } from './common';
-import { brand } from '../src/lib/style/theme';
+import { Text } from './common';
+import { coreUIAvailableThemes } from '../src/lib/style/theme';
 import { action } from '@storybook/addon-actions';
 
 // RGB color in theme provoke an error, excludes from control options
-const colors = Object.keys(brand).filter((color) => !/RGB/.test(color));
+const colors = Object.keys(coreUIAvailableThemes.darkRebrand).filter(
+  (color) => !/RGB/.test(color),
+);
 
 export default {
   title: 'Components/Data Display/Card',
@@ -43,8 +45,8 @@ const Row = styled.div`
 `;
 const defaultBody = (
   <CircularProgressBar
-    color={brand.buttonSecondary}
-    backgroundColor={brand.textPrimary}
+    color={coreUIAvailableThemes.darkRebrand.buttonSecondary}
+    backgroundColor={coreUIAvailableThemes.darkRebrand.textPrimary}
     radius={30}
     strokeWidth={5}
     percent={60}

package/stories/controls.ts

@@ -1,23 +1,23 @@
-import { iconTable } from "../src/lib/components/icon/Icon.component";
+import { iconTable } from '../src/lib/components/icon/Icon.component';
 
 export const iconOptions = Object.keys(iconTable);
 
 export const sizesOptions = ['smaller', 'small', 'base', 'large', 'larger'];
 
 export const placementOptions = [
-    'top',
-    'bottom',
-    'left',
-    'top-start',
-    'top-end',
-    'right',
-    'right-start',
-    'right-end',
-    'bottom-end',
-    'bottom-start',
-    'left-start',
-    'left-end',
-  ];
+  'top',
+  'bottom',
+  'left',
+  'top-start',
+  'top-end',
+  'right',
+  'right-start',
+  'right-end',
+  'bottom-end',
+  'bottom-start',
+  'left-start',
+  'left-end',
+];
 export const localeArgtype = {
   control: { type: 'radio' },
   options: ['en', 'fr'],
@@ -40,9 +40,8 @@ export const variantsOptions = [
   'backgroundLevel1',
 ];
 
-
-export const tooltipArgTypes =  {
-    tooltip: {
+export const tooltipArgTypes = {
+  tooltip: {
     description:
       "Object with 'overlay','placement' and 'overlayStyle' properties",
     control: false,
@@ -53,7 +52,7 @@ export const tooltipArgTypes =  {
     options: placementOptions,
   },
   tooltipOverlayStyle: {
-    control:'object',
+    control: 'object',
     description: 'Object of CSS properties',
-  }}
-
+  },
+};

package/stories/linecharttemporal.stories.tsx

@@ -10,7 +10,7 @@ import { Wrapper } from './common';
 import { dataLineChartV2, dataLineChartV2_readwrite } from './data/linechart';
 import { defaultRenderTooltipSerie } from '../src/lib/components/linetemporalchart/tooltip';
 export default {
-  title: 'Components/Data Display/Charts/LineTemporalChart',
+  title: 'Components/Deprecated/Charts/LineTemporalChart',
   component: LineTemporalChart,
   decorators: [
     (story) => (

package/stories/linetimeseriechart.stories.tsx

@@ -380,6 +380,31 @@ const prometheusData5 = [
   [1740492000, '19859.90'],
 ];
 
+// Data with irregular intervals but gaps under 2 intervals (less than 24 minutes)
+// Sample frequency is 720 seconds (12 minutes), so 2 intervals = 1440 seconds (24 minutes)
+const irregularIntervalData = [
+  [1740405600, '47.55'], // Base timestamp
+  [1740406200, '53.01'], // +600 seconds (10 minutes) - under 2 intervals
+  [1740407100, '40.19'], // +900 seconds (15 minutes) - under 2 intervals
+  [1740408000, '59.19'], // +900 seconds (15 minutes) - under 2 intervals
+  [1740409100, '62.50'], // +1100 seconds (18.3 minutes) - under 2 intervals
+  [1740410300, '57.45'], // +1200 seconds (20 minutes) - under 2 intervals
+  [1740411000, '45.19'], // +700 seconds (11.7 minutes) - under 2 intervals
+  [1740412200, '58.62'], // +1200 seconds (20 minutes) - under 2 intervals
+  [1740413000, '53.08'], // +800 seconds (13.3 minutes) - under 2 intervals
+  [1740414300, '64.91'], // +1300 seconds (21.7 minutes) - under 2 intervals
+  [1740415100, '81.23'], // +800 seconds (13.3 minutes) - under 2 intervals
+  [1740416400, '64.82'], // +1300 seconds (21.7 minutes) - under 2 intervals
+  [1740417200, '67.17'], // +800 seconds (13.3 minutes) - under 2 intervals
+  [1740418500, '55.23'], // +1300 seconds (21.7 minutes) - under 2 intervals
+  [1740419400, '47.92'], // +900 seconds (15 minutes) - under 2 intervals
+  [1740420600, '72.11'], // +1200 seconds (20 minutes) - under 2 intervals
+  [1740421500, '61.91'], // +900 seconds (15 minutes) - under 2 intervals
+  [1740422700, '51.07'], // +1200 seconds (20 minutes) - under 2 intervals
+  [1740423800, '39.50'], // +1100 seconds (18.3 minutes) - under 2 intervals
+  [1740424900, '46.92'], // +1100 seconds (18.3 minutes) - under 2 intervals
+];
+
 export const PercentageChartExample: Story = {
   args: {
     series: [
@@ -488,3 +513,27 @@ export const AutoUnitChartExample: Story = {
     duration: SAMPLE_DURATION_LAST_TWENTY_FOUR_HOURS,
   },
 };
+
+export const IrregularIntervalsExample: Story = {
+  args: {
+    series: [
+      {
+        data: irregularIntervalData,
+        resource: 'ip-10-160-122-207.eu-north-1.compute.internal',
+        metricPrefix: 'instance:10.160.122.207:9100',
+        getTooltipLabel: (prefix, resource) => `${resource}`,
+      },
+    ],
+    title: 'Irregular intervals data',
+    height: 200,
+    startingTimeStamp: irregularIntervalData[0][0],
+    isLoading: false,
+    isLegendHidden: false,
+    helpText:
+      'Data points with irregular timestamps, but all gaps are less than 2 intervals (24 minutes). No missing data points are added.',
+    yAxisType: 'percentage',
+    yAxisTitle: '',
+    interval: SAMPLE_FREQUENCY_LAST_TWENTY_FOUR_HOURS,
+    duration: SAMPLE_DURATION_LAST_TWENTY_FOUR_HOURS,
+  },
+};

package/stories/navbar.stories.tsx

@@ -11,6 +11,7 @@ const tabs = [
     render: (
       <InlineInput
         id="instanceName"
+        // @ts-ignore
         changeMutation={{
           isLoading: false,
           mutate: () => {},
@@ -174,3 +175,105 @@ export const NavbarWithOnlyLinkTabs = {
     tabs: linkTabs,
   },
 };
+
+export const NavbarDropdownShowcase = {
+  args: {
+    rightActions: [
+      {
+        type: 'dropdown',
+        text: 'Language',
+        variant: 'secondary',
+        size: 'default',
+        items: [
+          {
+            label: 'English',
+            name: 'EN',
+            onClick: action('English selected'),
+          },
+          {
+            label: 'Français',
+            name: 'FR',
+            onClick: action('French selected'),
+          },
+          {
+            label: 'Español',
+            name: 'ES',
+            onClick: action('Spanish selected'),
+          },
+        ],
+      },
+      {
+        type: 'dropdown',
+        text: 'Help',
+        icon: <i className="fas fa-question-circle" />,
+        variant: 'outline',
+        size: 'default',
+        items: [
+          {
+            label: 'Documentation',
+            onClick: action('Documentation clicked'),
+          },
+          {
+            label: 'Tutorials',
+            onClick: action('Tutorials clicked'),
+          },
+          {
+            label: 'Contact Support',
+            onClick: action('Contact Support clicked'),
+          },
+          {
+            label: 'Release Notes',
+            onClick: action('Release Notes clicked'),
+          },
+        ],
+      },
+      {
+        type: 'dropdown',
+        icon: <i className="fas fa-user" />,
+        variant: 'primary',
+        size: 'default',
+        caret: false,
+        items: [
+          {
+            label: 'Profile Settings',
+            onClick: action('Profile clicked'),
+          },
+          {
+            label: 'Preferences',
+            onClick: action('Preferences clicked'),
+          },
+          {
+            label: 'API Keys',
+            onClick: action('API Keys clicked'),
+          },
+          {
+            label: 'Log out',
+            onClick: action('Logout clicked'),
+          },
+        ],
+      },
+    ],
+    tabs: [
+      {
+        selected: true,
+        title: 'Dashboard',
+        link: <a href="/dashboard">Dashboard</a>,
+        onClick: action('Dashboard clicked'),
+      },
+      {
+        selected: false,
+        title: 'Analytics',
+        link: <a href="/analytics">Analytics</a>,
+        onClick: action('Analytics clicked'),
+      },
+    ],
+  },
+  parameters: {
+    docs: {
+      description: {
+        story:
+          'This story showcases different dropdown variants within the navbar. The dropdowns use the new ButtonV2 styling with variants: secondary, outline, and primary. Notice how the different variants provide visual hierarchy and the icon-only dropdown uses caret: false for a cleaner look.',
+      },
+    },
+  },
+};

package/stories/tabsv2.stories.tsx

@@ -3,12 +3,13 @@ import { TextBadge } from '../src/lib/components/textbadge/TextBadge.component';
 import { Tabs, Tab } from '../src/lib/components/tabsv2/Tabsv2.component';
 import { Wrapper, Title } from './common';
 import { BrowserRouter } from 'react-router-dom';
-import { brand, spacing } from '../src/lib/style/theme';
+import { coreUIAvailableThemes } from '../src/lib/style/theme';
 import styled from 'styled-components';
-import { MemoryRouter, Route, useLocation } from 'react-router';
+import { useLocation } from 'react-router';
+import { spacing } from '../src/lib';
 
 const Content = styled.div`
-  padding: ${spacing.sp24};
+  padding: ${spacing.r24};
   color: ${(props) => props.theme.textPrimary};
   height: 100%;
 `;
@@ -55,13 +56,13 @@ const generateTab = (n = 10, selectedIndex = 0) => {
 };
 
 const customTabStyle = {
-  activeTabColor: brand.selectedActive,
-  activeTabSeparator: brand.statusHealthy,
-  tabLineColor: brand.backgroundLevel3,
-  inactiveTabColor: brand.highlight,
-  tabContentColor: brand.buttonPrimary,
-  separatorColor: brand.statusCritical,
-  tabHoverColor: brand.statusHealthy,
+  activeTabColor: coreUIAvailableThemes.darkRebrand.selectedActive,
+  activeTabSeparator: coreUIAvailableThemes.darkRebrand.statusHealthy,
+  tabLineColor: coreUIAvailableThemes.darkRebrand.backgroundLevel3,
+  inactiveTabColor: coreUIAvailableThemes.darkRebrand.highlight,
+  tabContentColor: coreUIAvailableThemes.darkRebrand.buttonPrimary,
+  separatorColor: coreUIAvailableThemes.darkRebrand.statusCritical,
+  tabHoverColor: coreUIAvailableThemes.darkRebrand.statusHealthy,
 };
 
 const DefaultTabsDetails = (props) => {
@@ -87,52 +88,46 @@ const DefaultTabsDetails = (props) => {
       <Title>
         {location.pathname} / {location.search}
       </Title>
-      <MemoryRouter initialEntries={['/path?tab=group']} initialIndex={0}>
-        <Route
-          path="/:path?"
-          render={() => (
-            <Tabs {...props}>
-              <Tab path="/path" label="Users" withoutPadding>
-                <Content>Users Content</Content>
-              </Tab>
-              <Tab
-                path="/path1"
-                query={{
-                  tab: 'group',
-                }}
-                label="Groups"
-              >
-                {details()}
-              </Tab>
-              <Tab
-                path="/path1"
-                query={{
-                  tab: 'role',
-                }}
-                label="Roles"
-                withoutPadding
-              >
-                <Content>Roles content</Content>
-              </Tab>
-              <Tab
-                path="/path1"
-                query={{
-                  tab: 'policies',
-                }}
-                label="Policies"
-              >
-                <Content>Policies content</Content>
-              </Tab>
-              <Tab path="/path4" label="Storage Location">
-                <Content>Storage Location Content</Content>
-              </Tab>
-              <Tab path="/path5" label="Properties">
-                <Content>Properties Content</Content>
-              </Tab>
-            </Tabs>
-          )}
-        />
-      </MemoryRouter>
+
+      <Tabs {...props}>
+        <Tab path="/path" label="Users" withoutPadding>
+          <Content>Users Content</Content>
+        </Tab>
+        <Tab
+          path="/path1"
+          query={{
+            tab: 'group',
+          }}
+          label="Groups"
+        >
+          {details()}
+        </Tab>
+        <Tab
+          path="/path1"
+          query={{
+            tab: 'role',
+          }}
+          label="Roles"
+          withoutPadding
+        >
+          <Content>Roles content</Content>
+        </Tab>
+        <Tab
+          path="/path1"
+          query={{
+            tab: 'policies',
+          }}
+          label="Policies"
+        >
+          <Content>Policies content</Content>
+        </Tab>
+        <Tab path="/path4" label="Storage Location">
+          <Content>Storage Location Content</Content>
+        </Tab>
+        <Tab path="/path5" label="Properties">
+          <Content>Properties Content</Content>
+        </Tab>
+      </Tabs>
     </>
   );
 };

package/dist/components/areachart/AreaChart.component.d.ts

@@ -1,13 +0,0 @@
-type Props = {
-    id: string;
-    data: Array<Record<string, any>>;
-    xAxis: Record<string, any>;
-    yAxis: Array<Record<string, any>>;
-    color?: Record<string, any>;
-    areas: Array<Record<string, any>>;
-    width?: number;
-    height?: number;
-};
-declare function AreaChart({ id, data, xAxis, yAxis, color, height, width, areas, ...rest }: Props): import("react/jsx-runtime").JSX.Element;
-export { AreaChart };
-//# sourceMappingURL=AreaChart.component.d.ts.map

package/dist/components/areachart/AreaChart.component.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"AreaChart.component.d.ts","sourceRoot":"","sources":["../../../src/lib/components/areachart/AreaChart.component.tsx"],"names":[],"mappings":"AAEA,KAAK,KAAK,GAAG;IACX,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IACjC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC3B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC5B,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,iBAAS,SAAS,CAAC,EACjB,EAAE,EACF,IAAI,EACJ,KAAK,EACL,KAAK,EACL,KAAK,EACL,MAAY,EACZ,KAAY,EACZ,KAAU,EACV,GAAG,IAAI,EACR,EAAE,KAAK,2CAuBP;AAED,OAAO,EAAE,SAAS,EAAE,CAAC"}