ydb-embedded-ui 1.8.8 → 1.10.1

package/CHANGELOG.md

@@ -1,5 +1,56 @@
 # Changelog
 
+## [1.10.1](https://github.com/ydb-platform/ydb-embedded-ui/compare/v1.10.0...v1.10.1) (2022-08-10)
+
+
+### Bug Fixes
+
+* **Tenant:** fix actions set for topics ([0c75bf4](https://github.com/ydb-platform/ydb-embedded-ui/commit/0c75bf4561966dd663ab1cd7c7b81ef6b4632e50))
+
+## [1.10.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v1.9.0...v1.10.0) (2022-08-10)
+
+
+### Features
+
+* **TopShards:** add DataSize column ([cbcd047](https://github.com/ydb-platform/ydb-embedded-ui/commit/cbcd047d277f699a67bc002a5542f3b9f6a0c942))
+* **TopShards:** sort table data on backend ([dc28c5c](https://github.com/ydb-platform/ydb-embedded-ui/commit/dc28c5c75b0036480bf804d49f82fc54eac98c8e))
+
+
+### Bug Fixes
+
+* add concurrentId for sendQuery request ([dc6b32a](https://github.com/ydb-platform/ydb-embedded-ui/commit/dc6b32a8fd51064ddeca2fc60a0f08a725216334))
+* **Storage:** display pdisk type in tooltip ([2b03a35](https://github.com/ydb-platform/ydb-embedded-ui/commit/2b03a35fc11ddeae3bdd30a0690b324ae917f5c3))
+* **Tablet:** change Kill to Restart ([dd585b1](https://github.com/ydb-platform/ydb-embedded-ui/commit/dd585b1d1a6a5ddb484a702523773b169900f582))
+* **Tenant:** add missing schema node types ([62a0ecb](https://github.com/ydb-platform/ydb-embedded-ui/commit/62a0ecb848dbcee53e18535cbf7c03a731d0cfeb))
+* **Tenant:** ensure correct behavior for new schema node types ([f80c381](https://github.com/ydb-platform/ydb-embedded-ui/commit/f80c38152656e8bbbe51ec38b29fc0d954c361cc))
+* **Tenant:** use new schema icons ([389a921](https://github.com/ydb-platform/ydb-embedded-ui/commit/389a9214c64b1adb183fa0c6caa6f2ec536dbef3))
+* **TopShards:** disable virtualization for table ([006d3d9](https://github.com/ydb-platform/ydb-embedded-ui/commit/006d3d9fb9a4744b8bb4ad03e53693199213f80e))
+* **TopShards:** format DataSize value ([c51ce66](https://github.com/ydb-platform/ydb-embedded-ui/commit/c51ce66286f6454f7252d1194628ee5a50aafba2))
+* **TopShards:** only allow DESC sort ([6aa326f](https://github.com/ydb-platform/ydb-embedded-ui/commit/6aa326fc4b8165f00f8b3ecf5becdb0943ed57af))
+* **TopShards:** substring tenant name out of shards path ([9e57672](https://github.com/ydb-platform/ydb-embedded-ui/commit/9e5767222c7dac7734c68abd08067cea507b1e15))
+
+## [1.9.0](https://github.com/ydb-platform/ydb-embedded-ui/compare/v1.8.8...v1.9.0) (2022-07-29)
+
+
+### Features
+
+* **Node:** display endpoints in overview ([89e9e47](https://github.com/ydb-platform/ydb-embedded-ui/commit/89e9e470499b6f458e8949211d97293c0b7d9b97))
+* **Node:** display node basic info above tabs ([aafb15b](https://github.com/ydb-platform/ydb-embedded-ui/commit/aafb15b399bf116026eff36f3c4ac817e2c40e18))
+* **Node:** more informative pdisks panels ([342712b](https://github.com/ydb-platform/ydb-embedded-ui/commit/342712bcaa793971e1ca354da57fb962639ef90c))
+* **Nodes:** show node endpoints in tooltip ([34be559](https://github.com/ydb-platform/ydb-embedded-ui/commit/34be55957e02f947ede30b43f22fde82d21df308))
+* **Tenant:** table index overview ([2aed714](https://github.com/ydb-platform/ydb-embedded-ui/commit/2aed71488cde1175e6569c236ab609bb126f9cf3))
+* **Tenant:** virtualized tree in schema ([815f558](https://github.com/ydb-platform/ydb-embedded-ui/commit/815f5588e5fed6fb86f69653c4937e975465372f))
+* utils for parsing bitfields in pdisk data ([da22b4a](https://github.com/ydb-platform/ydb-embedded-ui/commit/da22b4afde9efe4d9605cefb69ddd51aed989722))
+
+
+### Bug Fixes
+
+* **Node:** fix pdisk title items width ([ca5fec6](https://github.com/ydb-platform/ydb-embedded-ui/commit/ca5fec6388364b7d1d6362f1bda36431d9c29749))
+* **Nodes:** hide tooltip on unmount ([54e4fdc](https://github.com/ydb-platform/ydb-embedded-ui/commit/54e4fdc8045c555338e79d89a93faf58e888fa0e))
+* **ProgressViewer:** apply provided custom class name ([aa60e9d](https://github.com/ydb-platform/ydb-embedded-ui/commit/aa60e9d1b9c0752853f4323d3bcfd220bedd272d))
+* **Tenant:** display all table props in overview ([d70e311](https://github.com/ydb-platform/ydb-embedded-ui/commit/d70e311296f6a4d1781f6e72929c70e0db7c3226))
+* **Tenant:** display PartCount first in table overview ([8c09746](https://github.com/ydb-platform/ydb-embedded-ui/commit/8c09746b026a23a36fe31be94057cc92535aceaa))
+
 ## [1.8.8](https://github.com/ydb-platform/ydb-embedded-ui/compare/v1.8.7...v1.8.8) (2022-07-21)
 
 

package/dist/components/BasicNodeViewer/BasicNodeViewer.scss

@@ -0,0 +1,43 @@
+@import '../../styles/mixins.scss';
+
+.basic-node-viewer {
+    font-size: var(--yc-text-body-2-font-size);
+    line-height: var(--yc-text-body-2-line-height);
+
+    display: flex;
+    align-items: center;
+
+    margin: 15px 0;
+
+    &__title {
+        margin: 0 20px 0 0;
+
+        font-size: var(--yc-text-body-2-font-size);
+        font-weight: 600;
+        line-height: var(--yc-text-body-2-line-height);
+        text-transform: uppercase;
+    }
+
+    &__id {
+        margin: 0 15px 0 24px;
+    }
+
+    &__label {
+        margin-right: 10px;
+
+        font-size: var(--yc-text-body-2-font-size);
+        line-height: 18px;
+        white-space: nowrap;
+
+        color: var(--yc-color-text-hint);
+
+        .yc-root_theme_dark & {
+            color: var(--yc-color-text-hint);
+        }
+    }
+
+    &__link {
+        margin-left: 5px;
+        @extend .link;
+    }
+}

package/dist/components/BasicNodeViewer/BasicNodeViewer.tsx

@@ -0,0 +1,53 @@
+import cn from 'bem-cn-lite';
+
+import EntityStatus from '../EntityStatus/EntityStatus';
+import Tags from '../Tags/Tags';
+import Icon from '../Icon/Icon';
+
+import './BasicNodeViewer.scss';
+
+const b = cn('basic-node-viewer');
+
+interface BasicNodeViewerProps {
+    node: any;
+    additionalNodesInfo?: any;
+    className?: string;
+}
+
+export const BasicNodeViewer = ({node, additionalNodesInfo, className}: BasicNodeViewerProps) => {
+    const nodeHref = additionalNodesInfo?.getNodeRef
+        ? additionalNodesInfo.getNodeRef(node) + 'internal'
+        : undefined;
+
+    return (
+        <div className={b(null, className)}>
+            {node ? (
+                <>
+                    <div className={b('title')}>Node</div>
+                    <EntityStatus status={node.SystemState} name={node.Host} />
+                    {nodeHref && (
+                        <a
+                            rel="noopener noreferrer"
+                            className={b('link', {external: true})}
+                            href={nodeHref}
+                            target="_blank"
+                        >
+                            <Icon name="external" />
+                        </a>
+                    )}
+
+                    <div className={b('id')}>
+                        <label className={b('label')}>NodeID</label>
+                        <label>{node.NodeId}</label>
+                    </div>
+
+                    <Tags tags={[node.DataCenter]} />
+                    <Tags tags={node.Roles} tagsType="blue" />
+                </>
+            ) : (
+                <div className="error">no data</div>
+            )}
+
+        </div>
+    );
+};

package/dist/components/BasicNodeViewer/index.ts

@@ -0,0 +1 @@
+export * from './BasicNodeViewer';

package/dist/components/EntityStatus/EntityStatus.js

@@ -12,6 +12,8 @@ class EntityStatus extends React.Component {
     static propTypes = {
         status: PropTypes.string,
         name: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+        onNameMouseEnter: PropTypes.func,
+        onNameMouseLeave: PropTypes.func,
         path: PropTypes.string,
         size: PropTypes.string,
         label: PropTypes.string,
@@ -49,19 +51,29 @@ class EntityStatus extends React.Component {
         );
     }
     renderLink() {
-        const {externalLink, name, path} = this.props;
+        const {externalLink, name, path, onNameMouseEnter, onNameMouseLeave} = this.props;
 
         if (externalLink) {
             return <ExternalLink href={path}>{name}</ExternalLink>;
         }
 
         return path ? (
-            <Link title={name} to={path}>
+            <Link
+                title={name}
+                to={path}
+                onMouseEnter={onNameMouseEnter}
+                onMouseLeave={onNameMouseLeave}
+            >
                 {name}
             </Link>
         ) : (
             name && (
-                <span className={b('name')} title={name}>
+                <span
+                    className={b('name')}
+                    title={name}
+                    onMouseEnter={onNameMouseEnter}
+                    onMouseLeave={onNameMouseLeave}
+                >
                     {name}
                 </span>
             )

package/dist/components/FullNodeViewer/FullNodeViewer.js

@@ -3,11 +3,8 @@ import cn from 'bem-cn-lite';
 import PropTypes from 'prop-types';
 
 import InfoViewer from '../InfoViewer/InfoViewer';
-import EntityStatus from '../EntityStatus/EntityStatus';
 import ProgressViewer from '../ProgressViewer/ProgressViewer';
 import PoolUsage from '../PoolUsage/PoolUsage';
-import Tags from '../Tags/Tags';
-import Icon from '../Icon/Icon';
 
 import {LOAD_AVERAGE_TIME_INTERVALS} from '../../utils/constants';
 import {calcUptime} from '../../utils';
@@ -22,7 +19,6 @@ class FullNodeViewer extends React.Component {
         node: PropTypes.object.isRequired,
         backend: PropTypes.string,
         singleClusterMode: PropTypes.bool,
-        additionalNodesInfo: PropTypes.object,
     };
 
     static defaultProps = {
@@ -30,10 +26,12 @@ class FullNodeViewer extends React.Component {
     };
 
     render() {
-        const {node, className, additionalNodesInfo={}} = this.props;
-        const nodeHref = additionalNodesInfo.getNodeRef
-            ? additionalNodesInfo.getNodeRef(node) + 'internal'
-            : undefined;
+        const {node, className} = this.props;
+
+        const endpointsInfo = node.Endpoints?.map(({Name, Address}) => ({
+            label: Name,
+            value: Address,
+        }));
 
         const commonInfo = [
             {label: 'Version', value: node.Version},
@@ -50,52 +48,35 @@ class FullNodeViewer extends React.Component {
         return (
             <div className={`${b()} ${className}`}>
                 {node ? (
-                    <div>
-                        <div className={b('row')}>
-                            <div className={b('title')}>Node</div>
-                            <EntityStatus status={node.SystemState} name={node.Host} />
-                            {nodeHref && (
-                                <a
-                                    rel="noopener noreferrer"
-                                    className={b('link', {external: true})}
-                                    href={nodeHref}
-                                    target="_blank"
-                                >
-                                    <Icon name="external" />
-                                </a>
-                            )}
-
-                            <div className={b('row', {id: true})}>
-                                <label className={b('label', {id: true})}>NodeID</label>
-                                <label>{node.NodeId}</label>
+                    <div className={b('common-info')}>
+                        <div>
+                            <div className={b('section-title')}>Pools</div>
+                            <div className={b('section', {pools: true})}>
+                                {node.PoolStats.map((pool, poolIndex) => (
+                                    <PoolUsage key={poolIndex} data={pool} />
+                                ))}
                             </div>
-
-                            <Tags tags={[node.DataCenter]} />
-                            <Tags tags={node.Roles} tagsType="blue" />
                         </div>
 
-                        <div className={b('common-info')}>
-                            <div>
-                                <div className={b('section-title')}>Pools</div>
-                                <div className={b('section', {pools: true})}>
-                                    {node.PoolStats.map((pool, poolIndex) => (
-                                        <PoolUsage key={poolIndex} data={pool} />
-                                    ))}
-                                </div>
-                            </div>
-
+                        {endpointsInfo && endpointsInfo.length && (
                             <InfoViewer
-                                title="Common info"
+                                title="Endpoints"
                                 className={b('section')}
-                                info={commonInfo}
+                                info={endpointsInfo}
                             />
-
-                            <InfoViewer
-                                title="Load average"
-                                className={b('section', {average: true})}
-                                info={averageInfo}
-                            />
-                        </div>
+                        )}
+
+                        <InfoViewer
+                            title="Common info"
+                            className={b('section')}
+                            info={commonInfo}
+                        />
+
+                        <InfoViewer
+                            title="Load average"
+                            className={b('section', {average: true})}
+                            info={averageInfo}
+                        />
                     </div>
                 ) : (
                     <div className="error">no data</div>

package/dist/components/FullNodeViewer/FullNodeViewer.scss

@@ -4,26 +4,6 @@
     font-size: var(--yc-text-body-2-font-size);
     line-height: var(--yc-text-body-2-line-height);
 
-    &__title {
-        margin: 0 20px 0 0;
-
-        font-size: var(--yc-text-body-2-font-size);
-        font-weight: 600;
-        line-height: var(--yc-text-body-2-line-height);
-        text-transform: uppercase;
-    }
-
-    &__row {
-        display: flex;
-        align-items: center;
-
-        margin: 15px 0;
-
-        &_id {
-            margin: 0 15px 0 24px;
-        }
-    }
-
     &__common-info {
         display: flex;
         flex-direction: column;
@@ -46,26 +26,6 @@
         min-width: 60px;
     }
 
-    &__label {
-        min-width: 100px;
-        margin-right: 25px;
-
-        font-size: var(--yc-text-body-2-font-size);
-        line-height: 18px;
-        white-space: nowrap;
-
-        color: var(--yc-color-text-hint);
-
-        .yc-root_theme_dark & {
-            color: var(--yc-color-text-hint);
-        }
-
-        &_id {
-            min-width: auto;
-            margin-right: 10px;
-        }
-    }
-
     &__section-title {
         margin: 15px 0 10px;
 
@@ -73,9 +33,4 @@
         font-weight: 600;
         line-height: var(--yc-text-body-2-line-height);
     }
-
-    &__link {
-        margin-left: 5px;
-        @extend .link;
-    }
 }

package/dist/components/IndexInfoViewer/IndexInfoViewer.tsx

@@ -0,0 +1,52 @@
+import type {TEvDescribeSchemeResult, TIndexDescription} from '../../types/api/schema';
+import {InfoViewer, createInfoFormatter} from '../InfoViewer';
+
+const DISPLAYED_FIELDS: Set<keyof TIndexDescription> = new Set([
+    'Type',
+    'State',
+    'DataSize',
+    'KeyColumnNames',
+    'DataColumnNames',
+]);
+
+const formatItem = createInfoFormatter<TIndexDescription>({
+    Type: (value) => value?.substring(10), // trims EIndexType prefix
+    State: (value) => value?.substring(11), // trims EIndexState prefix
+    KeyColumnNames: (value) => value?.join(', '),
+    DataColumnNames: (value) => value?.join(', '),
+}, {
+    KeyColumnNames: 'Columns',
+    DataColumnNames: 'Includes',
+});
+
+interface IndexInfoViewerProps {
+    data?: TEvDescribeSchemeResult;
+}
+
+export const IndexInfoViewer = ({data}: IndexInfoViewerProps) => {
+    if (!data) {
+        return (
+            <div className="error">no index data</div>
+        );
+    }
+
+    const TableIndex = data.PathDescription?.TableIndex;
+    const info: Array<{label?: string, value?: unknown}> = [];
+
+    let key: keyof TIndexDescription;
+    for (key in TableIndex) {
+        if (DISPLAYED_FIELDS.has(key)) {
+            info.push(formatItem(key, TableIndex?.[key]));
+        }
+    }
+
+    return (
+        <>
+            {info.length ? (
+                <InfoViewer info={info}></InfoViewer>
+            ) : (
+                <>Empty</>
+            )}
+        </>
+    );
+};

package/dist/components/InfoViewer/index.ts

@@ -0,0 +1,4 @@
+import InfoViewer from './InfoViewer';
+
+export {InfoViewer};
+export * from './utils';

package/dist/components/InfoViewer/utils.ts

@@ -0,0 +1,32 @@
+type LabelMap<T> = {
+    [label in keyof T]?: string;
+}
+
+type FieldMappers<T> = {
+    [label in keyof T]?: (value: T[label]) => string | undefined;
+}
+
+function formatLabel<Shape>(label: keyof Shape, map: LabelMap<Shape>) {
+    return map[label] ?? label;
+}
+
+function formatValue<Shape, Key extends keyof Shape>(
+    label: Key,
+    value: Shape[Key],
+    mappers: FieldMappers<Shape>,
+) {
+    const mapper = mappers[label];
+    const mappedValue = mapper ? mapper(value) : value;
+
+    return String(mappedValue ?? '');
+}
+
+export function createInfoFormatter<Shape extends Record<string, any>>(
+    fieldMappers?: FieldMappers<Shape>,
+    labelMap?: LabelMap<Shape>,
+) {
+    return <Key extends keyof Shape>(label: Key, value: Shape[Key]) => ({
+        label: formatLabel(label, labelMap || {}),
+        value: formatValue(label, value, fieldMappers || {}),
+    });
+}

package/dist/components/ProgressViewer/ProgressViewer.js

@@ -76,7 +76,7 @@ export class ProgressViewer extends React.Component {
 
         if (!isNaN(fillWidth)) {
             return (
-                <div className={b({size})}>
+                <div className={b({size}, className)}>
                     <div className={b('line', {bg})} style={lineStyle}></div>
                     <span className={b('text', {text})}>
                         {`${valueText} ${divider} ${capacityText}`}

package/dist/containers/Node/Node.scss

@@ -4,6 +4,10 @@
     overflow: auto;
     @include flex-container();
 
+    &__header {
+        margin: 16px 20px;
+    }
+
     &__content {
         position: relative;
 
@@ -19,7 +23,7 @@
     }
 
     &__tabs {
-        padding: 16px 20px 0;
+        padding: 0 20px;
     }
 
     &__tab {

package/dist/containers/Node/Node.tsx

@@ -13,6 +13,7 @@ import Storage from '../Storage/Storage';
 import NodeOverview from './NodeOverview/NodeOverview';
 import NodeStructure from './NodeStructure/NodeStructure';
 import Loader from '../../components/Loader/Loader';
+import {BasicNodeViewer} from '../../components/BasicNodeViewer';
 
 import {getNodeInfo, resetNode} from '../../store/reducers/node';
 import routes, {CLUSTER_PAGES, createHref} from '../../routes';
@@ -133,7 +134,6 @@ function Node(props: NodeProps) {
             case OVERVIEW: {
                 return (
                     <NodeOverview
-                        additionalNodesInfo={additionalNodesInfo}
                         node={node}
                         className={b('overview-wrapper')}
                     />
@@ -162,6 +162,12 @@ function Node(props: NodeProps) {
         if (node) {
             return (
                 <div className={b(null, props.className)}>
+                    <BasicNodeViewer
+                        node={node}
+                        additionalNodesInfo={props.additionalNodesInfo}
+                        className={b('header')}
+                    />
+
                     {renderTabs()}
 
                     <div className={b('content')}>{renderTabContent()}</div>

package/dist/containers/Node/NodeOverview/NodeOverview.tsx

@@ -5,16 +5,14 @@ import {backend} from '../../../store';
 
 interface NodeOverviewProps {
     node: any;
-    additionalNodesInfo: any;
     className?: string;
 }
 
-function NodeOverview({node, additionalNodesInfo, className}: NodeOverviewProps) {
+function NodeOverview({node, className}: NodeOverviewProps) {
     return (
         <FullNodeViewer
             node={node}
             backend={backend}
-            additionalNodesInfo={additionalNodesInfo}
             className={className}
         />
     );

package/dist/containers/Node/NodeStructure/NodeStructure.scss

@@ -44,9 +44,38 @@
     &__pdisk-title-wrapper {
         display: flex;
         align-items: center;
-        gap: 8px;
+        gap: 16px;
 
         font-weight: 600;
+
+        .entity-status__status-icon {
+            margin-right: 0;
+        }
+    }
+
+    &__pdisk-title-item {
+        display: flex;
+        gap: 4px;
+
+        &-label {
+            font-weight: 400;
+
+            color: var(--yc-color-text-secondary);
+        }
+    }
+
+    &__pdisk-title-id {
+        min-width: 110px;
+    }
+
+    &__pdisk-title-type {
+        justify-content: flex-end;
+
+        min-width: 50px;
+    }
+
+    &__pdisk-title-size {
+        min-width: 150px;
     }
 
     &__pdisk-details {

package/dist/containers/Node/NodeStructure/PDiskTitleBadge.tsx

@@ -0,0 +1,25 @@
+import {ReactNode} from 'react';
+import cn from 'bem-cn-lite';
+
+const b = cn('kv-node-structure');
+
+interface PDiskTitleBadgeProps {
+    label?: string;
+    value: ReactNode;
+    className?: string;
+}
+
+export function PDiskTitleBadge({label, value, className}: PDiskTitleBadgeProps) {
+    return (
+        <span className={b('pdisk-title-item', className)}>
+            {label && (
+                <span className={b('pdisk-title-item-label')}>
+                    {label}:
+                </span>
+            )}
+            <span className={b('pdisk-title-item-value')}>
+                {value}
+            </span>
+        </span>
+    );
+}

package/dist/containers/Node/NodeStructure/Pdisk.tsx

@@ -14,9 +14,11 @@ import {Vdisk} from './Vdisk';
 
 import {bytesToGB, pad9} from '../../../utils/utils';
 import {formatStorageValuesToGb} from '../../../utils';
+import {getPDiskType} from '../../../utils/pdisk';
 
 import {DEFAULT_TABLE_SETTINGS} from '../../../utils/constants';
 import {valueIsDefined} from './NodeStructure';
+import {PDiskTitleBadge} from './PDiskTitleBadge';
 
 const b = cn('kv-node-structure');
 
@@ -230,6 +232,7 @@ export function PDisk(props: PDiskProps) {
         }
         if (valueIsDefined(Category)) {
             pdiskInfo.push({label: 'Category', value: Category});
+            pdiskInfo.push({label: 'Type', value: getPDiskType(data)});
         }
         pdiskInfo.push({
             label: 'Allocated Size',
@@ -286,8 +289,27 @@ export function PDisk(props: PDiskProps) {
         <div className={b('pdisk')} id={props.id}>
             <div className={b('pdisk-header')}>
                 <div className={b('pdisk-title-wrapper')}>
-                    <span>{data.Path}</span>
-                    <EntityStatus status={data.Device} name={`${data.NodeId}-${data.PDiskId}`} />
+                    <EntityStatus status={data.Device} />
+                    <PDiskTitleBadge
+                        label="PDiskID"
+                        value={data.PDiskId}
+                        className={b('pdisk-title-id')}
+                    />
+                    <PDiskTitleBadge
+                        value={getPDiskType(data)}
+                        className={b('pdisk-title-type')}
+                    />
+                    <ProgressViewer
+                        value={data.TotalSize - data.AvailableSize}
+                        capacity={data.TotalSize}
+                        formatValues={formatStorageValuesToGb}
+                        colorizeProgress={true}
+                        className={b('pdisk-title-size')}
+                    />
+                    <PDiskTitleBadge
+                        label="VDisks"
+                        value={data.vDisks.length}
+                    />
                 </div>
                 <Button onClick={unfolded ? onClosePDiskDetails : onOpenPDiskDetails} view="flat-secondary">
                     <ArrowToggle direction={unfolded ? 'top' : 'bottom'} />

package/dist/containers/Nodes/Nodes.js

@@ -63,6 +63,7 @@ class Nodes extends React.Component {
     }
 
     componentWillUnmount() {
+        this.props.hideTooltip();
         clearInterval(this.reloadDescriptor);
     }