From c0107b2e0cb801684dd3c7fa529d35b57b894afd Mon Sep 17 00:00:00 2001 From: Jaco Date: Sun, 27 Mar 2022 10:07:08 +0200 Subject: [PATCH] Remove contentShorten flags (#7245) --- packages/page-rpc/src/Rpc/Results.tsx | 2 +- packages/page-storage/src/Query.tsx | 10 +++++----- packages/react-params/src/valueToText.tsx | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/page-rpc/src/Rpc/Results.tsx b/packages/page-rpc/src/Rpc/Results.tsx index bf49b7df2c..28656acc01 100644 --- a/packages/page-rpc/src/Rpc/Results.tsx +++ b/packages/page-rpc/src/Rpc/Results.tsx @@ -32,7 +32,7 @@ function Results ({ queue = [] }: Props): React.ReactElement | null { value={ error ? error.message - :
{valueToText('', result as null, false)}
+ :
{valueToText('', result as null)}
} /> ))} diff --git a/packages/page-storage/src/Query.tsx b/packages/page-storage/src/Query.tsx index 43af89cd7a..6ffacb22e2 100644 --- a/packages/page-storage/src/Query.tsx +++ b/packages/page-storage/src/Query.tsx @@ -28,7 +28,7 @@ interface Props { interface CacheInstance { Component: React.ComponentType; render: RenderFn; - refresh: (swallowErrors: boolean, contentShorten: boolean) => React.ComponentType; + refresh: (swallowErrors: boolean) => React.ComponentType; } const cache: CacheInstance[] = []; @@ -66,13 +66,13 @@ function queryTypeToString (registry: Registry, { creator: { meta: { modifier, t : _type; } -function createComponent (type: string, Component: React.ComponentType, defaultProps: DefaultProps, renderHelper: ComponentRenderer): { Component: React.ComponentType; render: (createComponent: RenderFn) => React.ComponentType; refresh: (swallowErrors: boolean, contentShorten: boolean) => React.ComponentType } { +function createComponent (type: string, Component: React.ComponentType, defaultProps: DefaultProps, renderHelper: ComponentRenderer): { Component: React.ComponentType; render: (createComponent: RenderFn) => React.ComponentType; refresh: (swallowErrors: boolean) => React.ComponentType } { return { Component, // In order to modify the parameters which are used to render the default component, we can use this method - refresh: (contentShorten: boolean): React.ComponentType => + refresh: (): React.ComponentType => renderHelper( - (value: unknown) =>
{valueToText(type, value as null, contentShorten)}
, + (value: unknown) =>
{valueToText(type, value as null)}
, defaultProps ), // In order to replace the default component during runtime we can provide a RenderFn to create a new 'plugged' component @@ -131,7 +131,7 @@ function getCachedComponent (registry: Registry, query: QueryTypes): CacheInstan const defaultProps = { className: 'ui--output' }; const Component = renderHelper( // By default we render a simple div node component with the query results in it - (value: unknown) =>
{valueToText(type, value as null, true)}
, + (value: unknown) =>
{valueToText(type, value as null)}
, defaultProps ); diff --git a/packages/react-params/src/valueToText.tsx b/packages/react-params/src/valueToText.tsx index 47f43b2a7f..2501ac9fd0 100644 --- a/packages/react-params/src/valueToText.tsx +++ b/packages/react-params/src/valueToText.tsx @@ -49,7 +49,7 @@ export function toHumanJson (value: any): string { .replace(/\],\[/g, '],\n['); } -export default function valueToText (type: string, value: Codec | undefined | null, contentShorten = true): React.ReactNode { +export default function valueToText (type: string, value: Codec | undefined | null): React.ReactNode { if (isNull(value) || isUndefined(value)) { return div({}, ''); } @@ -57,7 +57,7 @@ export default function valueToText (type: string, value: Codec | undefined | nu return div( {}, ['Bytes', 'Raw', 'Option', 'Keys'].includes(type) && isFunction(value.toU8a) - ? u8aToHex(value.toU8a(true), contentShorten ? 512 : -1) + ? u8aToHex(value.toU8a(true)) // HACK Handle Keys as hex-only (this should go away once the node value is // consistently swapped to `Bytes`) : type === 'Vec<(ValidatorId,Keys)>'