ydb-embedded-ui 4.32.0 → 5.0.0

package/dist/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TenantCpu.tsx

@@ -1,23 +0,0 @@
-import type {AdditionalNodesProps} from '../../../../../types/additionalProps';
-import {CpuDashboard} from './CpuDashboard';
-import {TopNodesByLoad} from './TopNodesByLoad';
-import {TopNodesByCpu} from './TopNodesByCpu';
-import {TopShards} from './TopShards';
-import {TopQueries} from './TopQueries';
-
-interface TenantCpuProps {
-    path: string;
-    additionalNodesProps?: AdditionalNodesProps;
-}
-
-export function TenantCpu({path, additionalNodesProps}: TenantCpuProps) {
-    return (
-        <>
-            <CpuDashboard />
-            <TopNodesByLoad path={path} additionalNodesProps={additionalNodesProps} />
-            <TopNodesByCpu path={path} additionalNodesProps={additionalNodesProps} />
-            <TopShards path={path} />
-            <TopQueries path={path} />
-        </>
-    );
-}

package/dist/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopNodesByCpu.tsx

@@ -1,68 +0,0 @@
-import {useDispatch} from 'react-redux';
-import {useCallback} from 'react';
-
-import {useAutofetcher, useSearchQuery, useTypedSelector} from '../../../../../utils/hooks';
-import {
-    getTopNodesByCpu,
-    selectTopNodesByCpu,
-    setDataWasNotLoaded,
-} from '../../../../../store/reducers/tenantOverview/topNodesByCpu/topNodesByCpu';
-import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
-import type {AdditionalNodesProps} from '../../../../../types/additionalProps';
-import {getTopNodesByCpuColumns} from '../../../../Nodes/getNodesColumns';
-
-import {TenantTabsGroups, getTenantPath} from '../../../TenantPages';
-
-import {TenantOverviewTableLayout} from '../TenantOverviewTableLayout';
-import {getSectionTitle} from '../getSectionTitle';
-import i18n from '../i18n';
-
-interface TopNodesByCpuProps {
-    path: string;
-    additionalNodesProps?: AdditionalNodesProps;
-}
-
-export function TopNodesByCpu({path, additionalNodesProps}: TopNodesByCpuProps) {
-    const dispatch = useDispatch();
-
-    const query = useSearchQuery();
-
-    const {wasLoaded, loading, error} = useTypedSelector((state) => state.topNodesByCpu);
-    const {autorefresh} = useTypedSelector((state) => state.schema);
-    const topNodes = useTypedSelector(selectTopNodesByCpu);
-    const columns = getTopNodesByCpuColumns(additionalNodesProps?.getNodeRef);
-
-    const fetchNodes = useCallback(
-        (isBackground) => {
-            if (!isBackground) {
-                dispatch(setDataWasNotLoaded());
-            }
-
-            dispatch(getTopNodesByCpu({tenant: path}));
-        },
-        [dispatch, path],
-    );
-
-    useAutofetcher(fetchNodes, [fetchNodes], autorefresh);
-
-    const title = getSectionTitle({
-        entity: i18n('nodes'),
-        postfix: i18n('by-pools-usage'),
-        link: getTenantPath({
-            ...query,
-            [TenantTabsGroups.diagnosticsTab]: TENANT_DIAGNOSTICS_TABS_IDS.nodes,
-        }),
-    });
-
-    return (
-        <TenantOverviewTableLayout
-            data={topNodes || []}
-            columns={columns}
-            title={title}
-            loading={loading}
-            wasLoaded={wasLoaded}
-            error={error}
-            emptyDataMessage={i18n('top-nodes.empty-data')}
-        />
-    );
-}

package/dist/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopNodesByLoad.tsx

@@ -1,68 +0,0 @@
-import {useDispatch} from 'react-redux';
-import {useCallback} from 'react';
-
-import {useAutofetcher, useSearchQuery, useTypedSelector} from '../../../../../utils/hooks';
-import {
-    getTopNodesByLoad,
-    selectTopNodesByLoad,
-    setDataWasNotLoaded,
-} from '../../../../../store/reducers/tenantOverview/topNodesByLoad/topNodesByLoad';
-import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
-import type {AdditionalNodesProps} from '../../../../../types/additionalProps';
-import {getTopNodesByLoadColumns} from '../../../../Nodes/getNodesColumns';
-
-import {TenantTabsGroups, getTenantPath} from '../../../TenantPages';
-
-import {TenantOverviewTableLayout} from '../TenantOverviewTableLayout';
-import {getSectionTitle} from '../getSectionTitle';
-import i18n from '../i18n';
-
-interface TopNodesByLoadProps {
-    path: string;
-    additionalNodesProps?: AdditionalNodesProps;
-}
-
-export function TopNodesByLoad({path, additionalNodesProps}: TopNodesByLoadProps) {
-    const dispatch = useDispatch();
-
-    const query = useSearchQuery();
-
-    const {wasLoaded, loading, error} = useTypedSelector((state) => state.topNodesByLoad);
-    const {autorefresh} = useTypedSelector((state) => state.schema);
-    const topNodes = useTypedSelector(selectTopNodesByLoad);
-    const columns = getTopNodesByLoadColumns(additionalNodesProps?.getNodeRef);
-
-    const fetchNodes = useCallback(
-        (isBackground) => {
-            if (!isBackground) {
-                dispatch(setDataWasNotLoaded());
-            }
-
-            dispatch(getTopNodesByLoad({tenant: path}));
-        },
-        [dispatch, path],
-    );
-
-    useAutofetcher(fetchNodes, [fetchNodes], autorefresh);
-
-    const title = getSectionTitle({
-        entity: i18n('nodes'),
-        postfix: i18n('by-load'),
-        link: getTenantPath({
-            ...query,
-            [TenantTabsGroups.diagnosticsTab]: TENANT_DIAGNOSTICS_TABS_IDS.nodes,
-        }),
-    });
-
-    return (
-        <TenantOverviewTableLayout
-            data={topNodes || []}
-            columns={columns}
-            title={title}
-            loading={loading}
-            wasLoaded={wasLoaded}
-            error={error}
-            emptyDataMessage={i18n('top-nodes.empty-data')}
-        />
-    );
-}

package/dist/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopQueries.tsx

@@ -1,99 +0,0 @@
-import {useDispatch} from 'react-redux';
-import {useHistory, useLocation} from 'react-router';
-import {useCallback} from 'react';
-
-import {
-    TENANT_DIAGNOSTICS_TABS_IDS,
-    TENANT_PAGE,
-    TENANT_PAGES_IDS,
-    TENANT_QUERY_TABS_ID,
-} from '../../../../../store/reducers/tenant/constants';
-import {
-    fetchTenantOverviewTopQueries,
-    setDataWasNotLoaded,
-} from '../../../../../store/reducers/tenantOverview/topQueries/tenantOverviewTopQueries';
-import {changeUserInput} from '../../../../../store/reducers/executeQuery';
-import {useAutofetcher, useTypedSelector} from '../../../../../utils/hooks';
-import {parseQuery} from '../../../../../routes';
-
-import {TenantTabsGroups, getTenantPath} from '../../../TenantPages';
-import {getTenantOverviewTopQueriesColumns} from '../../TopQueries/getTopQueriesColumns';
-
-import {TenantOverviewTableLayout} from '../TenantOverviewTableLayout';
-import {getSectionTitle} from '../getSectionTitle';
-import i18n from '../i18n';
-
-interface TopQueriesProps {
-    path: string;
-}
-
-export function TopQueries({path}: TopQueriesProps) {
-    const dispatch = useDispatch();
-    const location = useLocation();
-    const history = useHistory();
-
-    const query = parseQuery(location);
-
-    const {autorefresh} = useTypedSelector((state) => state.schema);
-
-    const {
-        loading,
-        wasLoaded,
-        error,
-        data: {result: data = undefined} = {},
-    } = useTypedSelector((state) => state.tenantOverviewTopQueries);
-    const columns = getTenantOverviewTopQueriesColumns();
-
-    useAutofetcher(
-        (isBackground) => {
-            if (!isBackground) {
-                dispatch(setDataWasNotLoaded());
-            }
-
-            dispatch(fetchTenantOverviewTopQueries(path));
-        },
-        [dispatch, path],
-        autorefresh,
-    );
-
-    const handleRowClick = useCallback(
-        (row) => {
-            const {QueryText: input} = row;
-
-            dispatch(changeUserInput({input}));
-
-            const queryParams = parseQuery(location);
-
-            const queryPath = getTenantPath({
-                ...queryParams,
-                [TENANT_PAGE]: TENANT_PAGES_IDS.query,
-                [TenantTabsGroups.queryTab]: TENANT_QUERY_TABS_ID.newQuery,
-            });
-
-            history.push(queryPath);
-        },
-        [dispatch, history, location],
-    );
-
-    const title = getSectionTitle({
-        entity: i18n('queries'),
-        postfix: i18n('by-cpu-time'),
-        link: getTenantPath({
-            ...query,
-            [TenantTabsGroups.diagnosticsTab]: TENANT_DIAGNOSTICS_TABS_IDS.topQueries,
-        }),
-    });
-
-    return (
-        <TenantOverviewTableLayout
-            data={data || []}
-            columns={columns}
-            onRowClick={handleRowClick}
-            title={title}
-            loading={loading}
-            wasLoaded={wasLoaded}
-            error={error}
-            tableClassNameModifiers={{'top-queries': true}}
-        />
-    );
-}

package/dist/containers/Tenant/Diagnostics/TenantOverview/TenantCpu/TopShards.tsx

@@ -1,72 +0,0 @@
-import {useDispatch} from 'react-redux';
-import {useLocation} from 'react-router';
-
-import {useAutofetcher, useTypedSelector} from '../../../../../utils/hooks';
-import {parseQuery} from '../../../../../routes';
-
-import {
-    sendTenantOverviewTopShardsQuery,
-    setDataWasNotLoaded,
-} from '../../../../../store/reducers/tenantOverview/topShards/tenantOverviewTopShards';
-import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
-import {getTopShardsColumns} from '../../TopShards/getTopShardsColumns';
-
-import {TenantTabsGroups, getTenantPath} from '../../../TenantPages';
-
-import {TenantOverviewTableLayout} from '../TenantOverviewTableLayout';
-import {getSectionTitle} from '../getSectionTitle';
-import i18n from '../i18n';
-
-interface TopShardsProps {
-    path: string;
-}
-
-export const TopShards = ({path}: TopShardsProps) => {
-    const dispatch = useDispatch();
-    const location = useLocation();
-
-    const query = parseQuery(location);
-
-    const {autorefresh, currentSchemaPath} = useTypedSelector((state) => state.schema);
-
-    const {
-        loading,
-        data: {result: data = undefined} = {},
-        error,
-        wasLoaded,
-    } = useTypedSelector((state) => state.tenantOverviewTopShards);
-
-    useAutofetcher(
-        (isBackground) => {
-            if (!isBackground) {
-                dispatch(setDataWasNotLoaded());
-            }
-            dispatch(sendTenantOverviewTopShardsQuery(path, currentSchemaPath));
-        },
-        [dispatch, path, currentSchemaPath],
-        autorefresh,
-    );
-
-    const columns = getTopShardsColumns(path, location);
-
-    const title = getSectionTitle({
-        entity: i18n('shards'),
-        postfix: i18n('by-cpu-usage'),
-        link: getTenantPath({
-            ...query,
-            [TenantTabsGroups.diagnosticsTab]: TENANT_DIAGNOSTICS_TABS_IDS.topShards,
-        }),
-    });
-
-    return (
-        <TenantOverviewTableLayout
-            data={data || []}
-            columns={columns}
-            title={title}
-            loading={loading}
-            wasLoaded={wasLoaded}
-            error={error}
-            tableClassNameModifiers={{'top-queries': true}}
-        />
-    );
-};

package/dist/containers/Tenant/Diagnostics/TenantOverview/TenantDashboard/TenantDashboard.tsx

@@ -1,71 +0,0 @@
-import {StringParam, useQueryParam} from 'use-query-params';
-
-import {cn} from '../../../../../utils/cn';
-import type {TimeFrame} from '../../../../../utils/timeframes';
-import {useSetting, useTypedSelector} from '../../../../../utils/hooks';
-import {DISPLAY_CHARTS_IN_DB_DIAGNOSTICS_KEY} from '../../../../../utils/constants';
-import {TimeFrameSelector} from '../../../../../components/TimeFrameSelector/TimeFrameSelector';
-import {
-    type ChartOptions,
-    MetricChart,
-    type MetricDescription,
-} from '../../../../../components/MetricChart';
-
-import './TenantDashboard.scss';
-
-const CHART_WIDTH = 428;
-const CHART_WIDTH_FULL = 872;
-
-const b = cn('ydb-tenant-dashboard');
-
-export interface ChartConfig {
-    metrics: MetricDescription[];
-    title: string;
-    options?: ChartOptions;
-}
-
-interface TenantDashboardProps {
-    charts: ChartConfig[];
-}
-
-export const TenantDashboard = ({charts}: TenantDashboardProps) => {
-    const [timeFrame = '1h', setTimeframe] = useQueryParam('timeframe', StringParam);
-
-    const {autorefresh} = useTypedSelector((state) => state.schema);
-
-    const [chartsEnabled] = useSetting(DISPLAY_CHARTS_IN_DB_DIAGNOSTICS_KEY);
-
-    if (!chartsEnabled) {
-        return null;
-    }
-
-    // If there is only one chart, display it with full width
-    const chartWidth = charts.length === 1 ? CHART_WIDTH_FULL : CHART_WIDTH;
-    const chartHeight = CHART_WIDTH / 1.5;
-
-    const renderContent = () => {
-        return charts.map((chartConfig) => {
-            return (
-                <MetricChart
-                    key={chartConfig.metrics.map(({target}) => target).join('&')}
-                    title={chartConfig.title}
-                    metrics={chartConfig.metrics}
-                    timeFrame={timeFrame as TimeFrame}
-                    chartOptions={chartConfig.options}
-                    autorefresh={autorefresh}
-                    width={chartWidth}
-                    height={chartHeight}
-                />
-            );
-        });
-    };
-
-    return (
-        <div className={b(null)}>
-            <div className={b('controls')}>
-                <TimeFrameSelector value={timeFrame as TimeFrame} onChange={setTimeframe} />
-            </div>
-            <div className={b('charts')}>{renderContent()}</div>
-        </div>
-    );
-};

package/dist/containers/Tenant/Diagnostics/TenantOverview/TenantMemory/MemoryDashboard.tsx

@@ -1,21 +0,0 @@
-import {type ChartConfig, TenantDashboard} from '../TenantDashboard/TenantDashboard';
-import i18n from '../i18n';
-
-const memoryDashboardConfig: ChartConfig[] = [
-    {
-        title: i18n('charts.memory-usage'),
-        metrics: [
-            {
-                target: 'resources.memory.used_bytes',
-                title: i18n('charts.memory-usage'),
-            },
-        ],
-        options: {
-            dataType: 'size',
-        },
-    },
-];
-
-export const MemoryDashboard = () => {
-    return <TenantDashboard charts={memoryDashboardConfig} />;
-};

package/dist/containers/Tenant/Diagnostics/TenantOverview/TenantMemory/TenantMemory.tsx

@@ -1,15 +0,0 @@
-import {MemoryDashboard} from './MemoryDashboard';
-import {TopNodesByMemory} from './TopNodesByMemory';
-
-interface TenantMemoryProps {
-    path: string;
-}
-
-export function TenantMemory({path}: TenantMemoryProps) {
-    return (
-        <>
-            <MemoryDashboard />
-            <TopNodesByMemory path={path} />
-        </>
-    );
-}

package/dist/containers/Tenant/Diagnostics/TenantOverview/TenantMemory/TopNodesByMemory.tsx

@@ -1,70 +0,0 @@
-import {useDispatch} from 'react-redux';
-import {useCallback} from 'react';
-
-import {useAutofetcher, useTypedSelector, useSearchQuery} from '../../../../../utils/hooks';
-import {
-    getTopNodesByMemory,
-    selectTopNodesByMemory,
-    setDataWasNotLoaded,
-} from '../../../../../store/reducers/tenantOverview/topNodesByMemory/topNodesByMemory';
-import {TENANT_DIAGNOSTICS_TABS_IDS} from '../../../../../store/reducers/tenant/constants';
-import type {AdditionalNodesProps} from '../../../../../types/additionalProps';
-import {getTopNodesByMemoryColumns} from '../../../../Nodes/getNodesColumns';
-
-import {TenantTabsGroups, getTenantPath} from '../../../TenantPages';
-
-import {TenantOverviewTableLayout} from '../TenantOverviewTableLayout';
-import {getSectionTitle} from '../getSectionTitle';
-import i18n from '../i18n';
-
-interface TopNodesByMemoryProps {
-    path: string;
-    additionalNodesProps?: AdditionalNodesProps;
-}
-
-export function TopNodesByMemory({path, additionalNodesProps}: TopNodesByMemoryProps) {
-    const dispatch = useDispatch();
-
-    const query = useSearchQuery();
-
-    const {wasLoaded, loading, error} = useTypedSelector((state) => state.topNodesByMemory);
-    const {autorefresh} = useTypedSelector((state) => state.schema);
-    const topNodes = useTypedSelector(selectTopNodesByMemory);
-    const columns = getTopNodesByMemoryColumns({
-        getNodeRef: additionalNodesProps?.getNodeRef,
-    });
-
-    const fetchNodes = useCallback(
-        (isBackground) => {
-            if (!isBackground) {
-                dispatch(setDataWasNotLoaded());
-            }
-
-            dispatch(getTopNodesByMemory({tenant: path}));
-        },
-        [dispatch, path],
-    );
-
-    useAutofetcher(fetchNodes, [fetchNodes], autorefresh);
-
-    const title = getSectionTitle({
-        entity: i18n('nodes'),
-        postfix: i18n('by-memory'),
-        link: getTenantPath({
-            ...query,
-            [TenantTabsGroups.diagnosticsTab]: TENANT_DIAGNOSTICS_TABS_IDS.nodes,
-        }),
-    });
-
-    return (
-        <TenantOverviewTableLayout
-            data={topNodes || []}
-            columns={columns}
-            title={title}
-            loading={loading}
-            wasLoaded={wasLoaded}
-            error={error}
-            emptyDataMessage={i18n('top-nodes.empty-data')}
-        />
-    );
-}

package/dist/containers/Tenant/Diagnostics/TenantOverview/TenantOverview.tsx

@@ -1,178 +0,0 @@
-import cn from 'bem-cn-lite';
-import {useCallback} from 'react';
-import {useDispatch} from 'react-redux';
-
-import {Loader} from '@gravity-ui/uikit';
-
-import EntityStatus from '../../../../components/EntityStatus/EntityStatus';
-import {TENANT_DEFAULT_TITLE} from '../../../../utils/constants';
-import {TENANT_METRICS_TABS_IDS} from '../../../../store/reducers/tenant/constants';
-import {mapDatabaseTypeToDBName} from '../../utils/schema';
-import {useAutofetcher, useTypedSelector} from '../../../../utils/hooks';
-import type {AdditionalNodesProps, AdditionalTenantsProps} from '../../../../types/additionalProps';
-import {getTenantInfo, setDataWasNotLoaded} from '../../../../store/reducers/tenant/tenant';
-import {calculateTenantMetrics} from '../../../../store/reducers/tenants/utils';
-import {TenantCpu} from './TenantCpu/TenantCpu';
-import {HealthcheckDetails} from './Healthcheck/HealthcheckDetails';
-import {MetricsCards, type TenantMetrics} from './MetricsCards/MetricsCards';
-import {TenantStorage} from './TenantStorage/TenantStorage';
-import {TenantMemory} from './TenantMemory/TenantMemory';
-import {DefaultDashboard} from './DefaultDashboard';
-import {useHealthcheck} from './useHealthcheck';
-
-import './TenantOverview.scss';
-
-const b = cn('tenant-overview');
-
-interface TenantOverviewProps {
-    tenantName: string;
-    additionalTenantProps?: AdditionalTenantsProps;
-    additionalNodesProps?: AdditionalNodesProps;
-}
-
-export function TenantOverview({
-    tenantName,
-    additionalTenantProps,
-    additionalNodesProps,
-}: TenantOverviewProps) {
-    const dispatch = useDispatch();
-
-    const {
-        tenant,
-        loading: tenantLoading,
-        wasLoaded: tenantWasLoaded,
-        metricsTab,
-    } = useTypedSelector((state) => state.tenant);
-    const {autorefresh} = useTypedSelector((state) => state.schema);
-
-    const {
-        issueTrees,
-        issuesStatistics,
-        selfCheckResult,
-        fetchHealthcheck,
-        loading: healthcheckLoading,
-        wasLoaded: healthCheckWasLoaded,
-        error: healthcheckError,
-    } = useHealthcheck(tenantName);
-
-    const fetchTenant = useCallback(
-        (isBackground = true) => {
-            if (!isBackground) {
-                dispatch(setDataWasNotLoaded());
-            }
-            dispatch(getTenantInfo({path: tenantName}));
-        },
-        [dispatch, tenantName],
-    );
-
-    useAutofetcher(
-        (isBackground) => {
-            fetchTenant(isBackground);
-            fetchHealthcheck(isBackground);
-        },
-        [fetchTenant, fetchHealthcheck],
-        autorefresh,
-    );
-
-    const {Name, State, Type} = tenant || {};
-
-    const tenantType = mapDatabaseTypeToDBName(Type);
-
-    const {
-        cpu,
-        blobStorage,
-        tableStorage,
-        memory,
-        cpuUsage,
-        blobStorageLimit,
-        tableStorageLimit,
-        memoryLimit,
-    } = calculateTenantMetrics(tenant);
-
-    const calculatedMetrics: TenantMetrics = {
-        memoryUsed: memory,
-        memoryLimit,
-        cpuUsed: cpu,
-        cpuUsage,
-        storageUsed: blobStorage,
-        storageLimit: blobStorageLimit,
-    };
-
-    const storageMetrics = {
-        blobStorageUsed: blobStorage,
-        blobStorageLimit,
-        tableStorageUsed: tableStorage,
-        tableStorageLimit,
-    };
-
-    const renderName = () => {
-        return (
-            <div className={b('tenant-name-wrapper')}>
-                <EntityStatus
-                    status={State}
-                    name={Name || TENANT_DEFAULT_TITLE}
-                    withLeftTrim
-                    hasClipboardButton={Boolean(tenant)}
-                    clipboardButtonAlwaysVisible
-                />
-            </div>
-        );
-    };
-
-    const renderTabContent = () => {
-        switch (metricsTab) {
-            case TENANT_METRICS_TABS_IDS.cpu: {
-                return <TenantCpu path={tenantName} additionalNodesProps={additionalNodesProps} />;
-            }
-            case TENANT_METRICS_TABS_IDS.storage: {
-                return <TenantStorage tenantName={tenantName} metrics={storageMetrics} />;
-            }
-            case TENANT_METRICS_TABS_IDS.memory: {
-                return <TenantMemory path={tenantName} />;
-            }
-            case TENANT_METRICS_TABS_IDS.healthcheck: {
-                return (
-                    <HealthcheckDetails
-                        issueTrees={issueTrees}
-                        loading={healthcheckLoading}
-                        wasLoaded={healthCheckWasLoaded}
-                        error={healthcheckError}
-                    />
-                );
-            }
-            default: {
-                return <DefaultDashboard />;
-            }
-        }
-    };
-
-    if (tenantLoading && !tenantWasLoaded) {
-        return (
-            <div className={b('loader')}>
-                <Loader size="m" />
-            </div>
-        );
-    }
-
-    return (
-        <div className={b()}>
-            <div className={b('info')}>
-                <div className={b('top-label')}>{tenantType}</div>
-                <div className={b('top')}>
-                    {renderName()}
-                    {additionalTenantProps?.getMonitoringLink?.(Name, Type)}
-                </div>
-                <MetricsCards
-                    metrics={calculatedMetrics}
-                    issuesStatistics={issuesStatistics}
-                    selfCheckResult={selfCheckResult}
-                    fetchHealthcheck={fetchHealthcheck}
-                    healthcheckLoading={healthcheckLoading}
-                    healthCheckWasLoaded={healthCheckWasLoaded}
-                    healthcheckError={healthcheckError}
-                />
-            </div>
-            {renderTabContent()}
-        </div>
-    );
-}