From d93169e17262a709fafafe2265b2513367ee8ee9 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Thu, 10 Jan 2019 15:48:07 +0100 Subject: [PATCH] Rework Params & Params Vector (#581) * Split Params into ui-params * Fix Vector value detection/adding * Update jest config --- jest.config.js | 2 +- packages/app-democracy/src/Referendum.tsx | 4 +- .../app-explorer/src/BlockByHash/Logs.tsx | 2 +- packages/app-extrinsics/package.json | 1 + packages/app-extrinsics/src/Extrinsic.tsx | 7 +- .../app-extrinsics/src/Params/Account.tsx | 2 +- packages/app-extrinsics/src/Params/Call.tsx | 2 +- .../app-extrinsics/src/Params/Extrinsic.tsx | 2 +- .../app-extrinsics/src/Params/Proposal.tsx | 2 +- packages/app-extrinsics/src/Params/index.ts | 2 +- packages/app-rpc/src/Selection.tsx | 5 +- packages/app-storage/package.json | 3 +- packages/app-storage/src/Query.tsx | 2 +- .../app-storage/src/Selection/Modules.tsx | 5 +- packages/app-storage/src/types.ts | 2 +- packages/apps/webpack.config.js | 1 + packages/ui-app/src/Call.tsx | 2 +- packages/ui-app/src/Event.tsx | 2 +- .../ui-app/src/Params/Param/Balance.spec.js | 33 --- packages/ui-app/src/index.tsx | 2 - packages/ui-params/LICENSE | 201 ++++++++++++++++++ packages/ui-params/README.md | 1 + packages/ui-params/package.json | 16 ++ .../src}/Param/Account.tsx | 2 +- .../Params => ui-params/src}/Param/Amount.tsx | 2 +- .../src}/Param/Balance.tsx | 6 +- .../Params => ui-params/src}/Param/Bare.tsx | 5 +- .../Params => ui-params/src}/Param/Base.tsx | 4 +- .../src}/Param/BaseBytes.tsx | 2 +- .../Params => ui-params/src}/Param/Bool.tsx | 2 +- .../Params => ui-params/src}/Param/Bytes.tsx | 2 +- .../Params => ui-params/src}/Param/Code.tsx | 0 .../Params => ui-params/src}/Param/File.tsx | 4 +- .../Params => ui-params/src}/Param/Hash.tsx | 0 .../src}/Param/KeyValue.tsx | 2 +- .../src}/Param/KeyValueArray.tsx | 2 +- .../src}/Param/Proposal.tsx | 5 +- .../Params => ui-params/src}/Param/String.tsx | 2 +- .../src}/Param/Timestamp.tsx | 2 +- .../Params => ui-params/src}/Param/Tuple.tsx | 0 .../src}/Param/Unknown.tsx | 4 +- .../Params => ui-params/src}/Param/Vector.tsx | 20 +- .../Params => ui-params/src}/Param/Vote.tsx | 2 +- .../src}/Param/VoteThreshold.tsx | 2 +- .../src}/Param/findComponent.ts | 0 .../Params => ui-params/src}/Param/index.tsx | 6 +- .../src/Params => ui-params/src}/Params.css | 0 .../src/Params => ui-params/src}/index.tsx | 6 +- .../src/Params => ui-params/src}/initValue.ts | 0 .../src/Params => ui-params/src}/types.ts | 2 +- .../Params => ui-params/src}/valueToText.tsx | 3 +- .../src/Params => ui-params/src}/values.ts | 0 tsconfig.json | 1 + 53 files changed, 292 insertions(+), 97 deletions(-) delete mode 100644 packages/ui-app/src/Params/Param/Balance.spec.js create mode 100644 packages/ui-params/LICENSE create mode 100644 packages/ui-params/README.md create mode 100644 packages/ui-params/package.json rename packages/{ui-app/src/Params => ui-params/src}/Param/Account.tsx (96%) rename packages/{ui-app/src/Params => ui-params/src}/Param/Amount.tsx (96%) rename packages/{ui-app/src/Params => ui-params/src}/Param/Balance.tsx (89%) rename packages/{ui-app/src/Params => ui-params/src}/Param/Bare.tsx (84%) rename packages/{ui-app/src/Params => ui-params/src}/Param/Base.tsx (89%) rename packages/{ui-app/src/Params => ui-params/src}/Param/BaseBytes.tsx (97%) rename packages/{ui-app/src/Params => ui-params/src}/Param/Bool.tsx (96%) rename packages/{ui-app/src/Params => ui-params/src}/Param/Bytes.tsx (97%) rename packages/{ui-app/src/Params => ui-params/src}/Param/Code.tsx (100%) rename packages/{ui-app/src/Params => ui-params/src}/Param/File.tsx (90%) rename packages/{ui-app/src/Params => ui-params/src}/Param/Hash.tsx (100%) rename packages/{ui-app/src/Params => ui-params/src}/Param/KeyValue.tsx (98%) rename packages/{ui-app/src/Params => ui-params/src}/Param/KeyValueArray.tsx (98%) rename packages/{ui-app/src/Params => ui-params/src}/Param/Proposal.tsx (90%) rename packages/{ui-app/src/Params => ui-params/src}/Param/String.tsx (95%) rename packages/{ui-app/src/Params => ui-params/src}/Param/Timestamp.tsx (96%) rename packages/{ui-app/src/Params => ui-params/src}/Param/Tuple.tsx (100%) rename packages/{ui-app/src/Params => ui-params/src}/Param/Unknown.tsx (93%) rename packages/{ui-app/src/Params => ui-params/src}/Param/Vector.tsx (89%) rename packages/{ui-app/src/Params => ui-params/src}/Param/Vote.tsx (96%) rename packages/{ui-app/src/Params => ui-params/src}/Param/VoteThreshold.tsx (96%) rename packages/{ui-app/src/Params => ui-params/src}/Param/findComponent.ts (100%) rename packages/{ui-app/src/Params => ui-params/src}/Param/index.tsx (90%) rename packages/{ui-app/src/Params => ui-params/src}/Params.css (100%) rename packages/{ui-app/src/Params => ui-params/src}/index.tsx (95%) rename packages/{ui-app/src/Params => ui-params/src}/initValue.ts (100%) rename packages/{ui-app/src/Params => ui-params/src}/types.ts (96%) rename packages/{ui-app/src/Params => ui-params/src}/valueToText.tsx (98%) rename packages/{ui-app/src/Params => ui-params/src}/values.ts (100%) diff --git a/jest.config.js b/jest.config.js index 9fc3bdb403..aaf22b1194 100644 --- a/jest.config.js +++ b/jest.config.js @@ -3,7 +3,7 @@ const config = require('@polkadot/dev-react/config/jest'); module.exports = Object.assign({}, config, { moduleNameMapper: { '@polkadot/app-(accounts|addresses|democracy|explorer|extrinsics|rpc|settings|staking|storage|toolbox|transfer|vanitygen)(.*)$': '/packages/app-$1/src/$2', - '@polkadot/ui-(app|react-rx|signer)(.*)$': '/packages/ui-$1/src/$2', + '@polkadot/ui-(app|params|react-rx|signer)(.*)$': '/packages/ui-$1/src/$2', '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': 'empty/object', '\\.(css|less)$': 'empty/object' } diff --git a/packages/app-democracy/src/Referendum.tsx b/packages/app-democracy/src/Referendum.tsx index e2c2e0829e..da5c858998 100644 --- a/packages/app-democracy/src/Referendum.tsx +++ b/packages/app-democracy/src/Referendum.tsx @@ -3,14 +3,14 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { I18nProps } from '@polkadot/ui-app/types'; -import { RawParam } from '@polkadot/ui-app/Params/types'; +import { RawParam } from '@polkadot/ui-params/types'; import { DerivedReferendumVote } from '@polkadot/ui-react-rx/derive/types'; import BN from 'bn.js'; import React from 'react'; import { ReferendumInfo } from '@polkadot/types'; import { Chart, Static } from '@polkadot/ui-app/index'; -import VoteThreshold from '@polkadot/ui-app/Params/Param/VoteThreshold'; +import VoteThreshold from '@polkadot/ui-params/Param/VoteThreshold'; import { withCall, withMulti } from '@polkadot/ui-react-rx/with/index'; import { balanceFormat, numberFormat } from '@polkadot/ui-react-rx/util/index'; import settings from '@polkadot/ui-settings'; diff --git a/packages/app-explorer/src/BlockByHash/Logs.tsx b/packages/app-explorer/src/BlockByHash/Logs.tsx index b1db47b8e9..2020c81e9d 100644 --- a/packages/app-explorer/src/BlockByHash/Logs.tsx +++ b/packages/app-explorer/src/BlockByHash/Logs.tsx @@ -7,7 +7,7 @@ import { I18nProps } from '@polkadot/ui-app/types'; import React from 'react'; import { Struct, Tuple, Vector, getTypeDef } from '@polkadot/types/codec'; import { DigestItem } from '@polkadot/types/Digest'; -import { Params } from '@polkadot/ui-app/index'; +import Params from '@polkadot/ui-params/index'; import translate from '../translate'; diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 7dfa678ab2..733d463f24 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -12,6 +12,7 @@ "dependencies": { "@babel/runtime": "^7.2.0", "@polkadot/ui-app": "^0.22.3", + "@polkadot/ui-params": "^0.22.3", "@polkadot/ui-signer": "^0.22.3" } } diff --git a/packages/app-extrinsics/src/Extrinsic.tsx b/packages/app-extrinsics/src/Extrinsic.tsx index f988dfb183..718508355b 100644 --- a/packages/app-extrinsics/src/Extrinsic.tsx +++ b/packages/app-extrinsics/src/Extrinsic.tsx @@ -5,15 +5,16 @@ import { MethodFunction } from '@polkadot/types/Method'; import { BareProps } from '@polkadot/ui-app/types'; import { ApiProps } from '@polkadot/ui-react-rx/types'; -import { RawParam } from '@polkadot/ui-app/Params/types'; +import { RawParam } from '@polkadot/ui-params/types'; import React from 'react'; import { TypeDef, getTypeDef } from '@polkadot/types/codec'; import { Method } from '@polkadot/types'; -import { InputExtrinsic, Params } from '@polkadot/ui-app/index'; -import { isUndefined } from '@polkadot/util'; +import { InputExtrinsic } from '@polkadot/ui-app/index'; +import Params from '@polkadot/ui-params/index'; import { withApi } from '@polkadot/ui-react-rx/with/index'; +import { isUndefined } from '@polkadot/util'; import paramComponents from './Params'; diff --git a/packages/app-extrinsics/src/Params/Account.tsx b/packages/app-extrinsics/src/Params/Account.tsx index c9d8fdffda..406f4aed55 100644 --- a/packages/app-extrinsics/src/Params/Account.tsx +++ b/packages/app-extrinsics/src/Params/Account.tsx @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Props } from '@polkadot/ui-app/Params/types'; +import { Props } from '@polkadot/ui-params/types'; import React from 'react'; import { decodeAddress } from '@polkadot/keyring'; diff --git a/packages/app-extrinsics/src/Params/Call.tsx b/packages/app-extrinsics/src/Params/Call.tsx index e6bb292890..982ba7951a 100644 --- a/packages/app-extrinsics/src/Params/Call.tsx +++ b/packages/app-extrinsics/src/Params/Call.tsx @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Props as BaseProps } from '@polkadot/ui-app/Params/types'; +import { Props as BaseProps } from '@polkadot/ui-params/types'; import { ApiProps } from '@polkadot/ui-react-rx/types'; import React from 'react'; diff --git a/packages/app-extrinsics/src/Params/Extrinsic.tsx b/packages/app-extrinsics/src/Params/Extrinsic.tsx index 381535cf32..372922cc91 100644 --- a/packages/app-extrinsics/src/Params/Extrinsic.tsx +++ b/packages/app-extrinsics/src/Params/Extrinsic.tsx @@ -4,7 +4,7 @@ import { MethodFunction } from '@polkadot/types/Method'; import { I18nProps } from '@polkadot/ui-app/types'; -import { RawParam$OnChange } from '@polkadot/ui-app/Params/types'; +import { RawParam$OnChange } from '@polkadot/ui-params/types'; import React from 'react'; import { Method } from '@polkadot/types'; diff --git a/packages/app-extrinsics/src/Params/Proposal.tsx b/packages/app-extrinsics/src/Params/Proposal.tsx index 50d45bacf8..328db0b539 100644 --- a/packages/app-extrinsics/src/Params/Proposal.tsx +++ b/packages/app-extrinsics/src/Params/Proposal.tsx @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { Props as BaseProps, RawParam } from '@polkadot/ui-app/Params/types'; +import { Props as BaseProps, RawParam } from '@polkadot/ui-params/types'; import { ApiProps } from '@polkadot/ui-react-rx/types'; import React from 'react'; diff --git a/packages/app-extrinsics/src/Params/index.ts b/packages/app-extrinsics/src/Params/index.ts index 87d9aeec54..70c61ca7a5 100644 --- a/packages/app-extrinsics/src/Params/index.ts +++ b/packages/app-extrinsics/src/Params/index.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { ComponentMap } from '@polkadot/ui-app/Params/types'; +import { ComponentMap } from '@polkadot/ui-params/types'; import Account from './Account'; import Call from './Call'; diff --git a/packages/app-rpc/src/Selection.tsx b/packages/app-rpc/src/Selection.tsx index c22507bfb4..232e6aba6e 100644 --- a/packages/app-rpc/src/Selection.tsx +++ b/packages/app-rpc/src/Selection.tsx @@ -3,7 +3,7 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { RpcMethod } from '@polkadot/jsonrpc/types'; -import { RawParam } from '@polkadot/ui-app/Params/types'; +import { RawParam } from '@polkadot/ui-params/types'; import { I18nProps } from '@polkadot/ui-app/types'; import { QueueTx$RpcAdd } from '@polkadot/ui-app/Status/types'; @@ -13,7 +13,8 @@ import BN from 'bn.js'; import React from 'react'; import rpc from '@polkadot/jsonrpc'; import { getTypeDef } from '@polkadot/types/codec'; -import { Button, InputRpc, Params } from '@polkadot/ui-app/index'; +import { Button, InputRpc } from '@polkadot/ui-app/index'; +import Params from '@polkadot/ui-params/index'; // import Account from './Account'; import translate from './translate'; diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index 8ebef970df..ff0c1028cf 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -11,6 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.2.0", - "@polkadot/ui-app": "^0.22.3" + "@polkadot/ui-app": "^0.22.3", + "@polkadot/ui-params": "^0.22.3" } } diff --git a/packages/app-storage/src/Query.tsx b/packages/app-storage/src/Query.tsx index 54b8da0a29..0422c3148e 100644 --- a/packages/app-storage/src/Query.tsx +++ b/packages/app-storage/src/Query.tsx @@ -9,7 +9,7 @@ import { QueryTypes, StorageModuleQuery } from './types'; import React from 'react'; import { Compact } from '@polkadot/types/codec'; import { Button, Labelled } from '@polkadot/ui-app/index'; -import valueToText from '@polkadot/ui-app/Params/valueToText'; +import valueToText from '@polkadot/ui-params/valueToText'; import { withCallDiv } from '@polkadot/ui-react-rx/with/index'; import { isU8a, u8aToHex, u8aToString } from '@polkadot/util'; diff --git a/packages/app-storage/src/Selection/Modules.tsx b/packages/app-storage/src/Selection/Modules.tsx index 63fcf7cf90..9907db3c13 100644 --- a/packages/app-storage/src/Selection/Modules.tsx +++ b/packages/app-storage/src/Selection/Modules.tsx @@ -5,12 +5,13 @@ import { TypeDef, getTypeDef } from '@polkadot/types/codec'; import { StorageFunction } from '@polkadot/types/StorageKey'; import { I18nProps } from '@polkadot/ui-app/types'; -import { RawParams } from '@polkadot/ui-app/Params/types'; +import { RawParams } from '@polkadot/ui-params/types'; import { ApiProps } from '@polkadot/ui-react-rx/types'; import { PartialModuleQuery } from '../types'; import React from 'react'; -import { Button, InputStorage, Labelled, Params } from '@polkadot/ui-app/index'; +import { Button, InputStorage, Labelled } from '@polkadot/ui-app/index'; +import Params from '@polkadot/ui-params/index'; import { withApi, withMulti } from '@polkadot/ui-react-rx/with'; import { isUndefined } from '@polkadot/util'; diff --git a/packages/app-storage/src/types.ts b/packages/app-storage/src/types.ts index 2a9716e5f3..faa03ef01e 100644 --- a/packages/app-storage/src/types.ts +++ b/packages/app-storage/src/types.ts @@ -3,7 +3,7 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { StorageFunction } from '@polkadot/types/StorageKey'; -import { RawParams } from '@polkadot/ui-app/Params/types'; +import { RawParams } from '@polkadot/ui-params/types'; type IdQuery = { id: number diff --git a/packages/apps/webpack.config.js b/packages/apps/webpack.config.js index fb48c260a5..15cd5bbc94 100644 --- a/packages/apps/webpack.config.js +++ b/packages/apps/webpack.config.js @@ -24,6 +24,7 @@ const packages = [ 'app-transfer', 'app-vanitygen', 'ui-app', + 'ui-params', 'ui-react-rx', 'ui-signer' ]; diff --git a/packages/ui-app/src/Call.tsx b/packages/ui-app/src/Call.tsx index 3d248f9531..9a3d0bad98 100644 --- a/packages/ui-app/src/Call.tsx +++ b/packages/ui-app/src/Call.tsx @@ -7,9 +7,9 @@ import { BareProps } from './types'; import React from 'react'; import { Extrinsic, Method, Proposal } from '@polkadot/types'; +import Params from '@polkadot/ui-params/index'; import classes from './util/classes'; -import Params from './Params'; export type Props = BareProps & { children?: React.ReactNode, diff --git a/packages/ui-app/src/Event.tsx b/packages/ui-app/src/Event.tsx index 9ff71e875c..b2517b9aa9 100644 --- a/packages/ui-app/src/Event.tsx +++ b/packages/ui-app/src/Event.tsx @@ -7,9 +7,9 @@ import { BareProps } from './types'; import React from 'react'; import { Event } from '@polkadot/types'; +import Params from '@polkadot/ui-params/index'; import classes from './util/classes'; -import Params from './Params'; export type Props = BareProps & { children?: React.ReactNode, diff --git a/packages/ui-app/src/Params/Param/Balance.spec.js b/packages/ui-app/src/Params/Param/Balance.spec.js deleted file mode 100644 index 2914191b54..0000000000 --- a/packages/ui-app/src/Params/Param/Balance.spec.js +++ /dev/null @@ -1,33 +0,0 @@ -// Copyright 2017-2019 @polkadot/ui-app authors & contributors -// This software may be modified and distributed under the terms -// of the Apache-2.0 license. See the LICENSE file for details. - -import React from 'react'; - -import { shallow } from '../../../../../test/enzyme'; -import InputNumber from '../../InputNumber'; -import { Balance } from './Balance'; - -const mockT = (key, options) => (key); - -describe('Balance', () => { - let wrapper, defaultValue; - - beforeEach(() => { - defaultValue = { value: '0' }; - wrapper = shallow( - , {} - ); - }); - - it('creates the element', () => { - expect(wrapper).toHaveLength(1); - }); - - it('should display InputNumber component', () => { - expect(wrapper.find(InputNumber)).toHaveLength(1); - }); -}); diff --git a/packages/ui-app/src/index.tsx b/packages/ui-app/src/index.tsx index 29fefe5daa..d2b9216b13 100644 --- a/packages/ui-app/src/index.tsx +++ b/packages/ui-app/src/index.tsx @@ -38,7 +38,6 @@ import Labelled from './Labelled'; import Menu from './Menu'; import Modal from './Modal'; import Output from './Output'; -import Params from './Params'; import Password from './Password'; import Progress from './Progress'; import Static from './Static'; @@ -75,7 +74,6 @@ export { Menu, Modal, Output, - Params, Password, Progress, Static, diff --git a/packages/ui-params/LICENSE b/packages/ui-params/LICENSE new file mode 100644 index 0000000000..0d381b2e97 --- /dev/null +++ b/packages/ui-params/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/packages/ui-params/README.md b/packages/ui-params/README.md new file mode 100644 index 0000000000..3bcde29731 --- /dev/null +++ b/packages/ui-params/README.md @@ -0,0 +1 @@ +# @polkadot/ui-params diff --git a/packages/ui-params/package.json b/packages/ui-params/package.json new file mode 100644 index 0000000000..88d6a85371 --- /dev/null +++ b/packages/ui-params/package.json @@ -0,0 +1,16 @@ +{ + "name": "@polkadot/ui-params", + "version": "0.22.3", + "main": "index.js", + "repository": "https://github.com/polkadot-js/apps.git", + "author": "Jaco Greeff ", + "maintainers": [ + "Jaco Greeff " + ], + "contributors": [], + "license": "Apache-2.0", + "dependencies": { + "@babel/runtime": "^7.2.0", + "@polkadot/ui-app": "^0.22.3" + } +} diff --git a/packages/ui-app/src/Params/Param/Account.tsx b/packages/ui-params/src/Param/Account.tsx similarity index 96% rename from packages/ui-app/src/Params/Param/Account.tsx rename to packages/ui-params/src/Param/Account.tsx index c130592852..c78aec4515 100644 --- a/packages/ui-app/src/Params/Param/Account.tsx +++ b/packages/ui-params/src/Param/Account.tsx @@ -6,8 +6,8 @@ import { Props } from '../types'; import React from 'react'; import { decodeAddress } from '@polkadot/keyring'; +import { InputAddress } from '@polkadot/ui-app/index'; -import InputAddress from '../../InputAddress'; import Bare from './Bare'; export default class Account extends React.PureComponent { diff --git a/packages/ui-app/src/Params/Param/Amount.tsx b/packages/ui-params/src/Param/Amount.tsx similarity index 96% rename from packages/ui-app/src/Params/Param/Amount.tsx rename to packages/ui-params/src/Param/Amount.tsx index ed31a87d85..c6b6021480 100644 --- a/packages/ui-app/src/Params/Param/Amount.tsx +++ b/packages/ui-params/src/Param/Amount.tsx @@ -6,9 +6,9 @@ import { Props } from '../types'; import BN from 'bn.js'; import React from 'react'; +import { Input } from '@polkadot/ui-app/index'; import numberFormat from '@polkadot/ui-react-rx/util/numberFormat'; -import Input from '../../Input'; import Bare from './Bare'; export default class Amount extends React.PureComponent { diff --git a/packages/ui-app/src/Params/Param/Balance.tsx b/packages/ui-params/src/Param/Balance.tsx similarity index 89% rename from packages/ui-app/src/Params/Param/Balance.tsx rename to packages/ui-params/src/Param/Balance.tsx index 2042561cb8..b7bd1487e0 100644 --- a/packages/ui-app/src/Params/Param/Balance.tsx +++ b/packages/ui-params/src/Param/Balance.tsx @@ -2,15 +2,15 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { BitLength } from '../../types'; +import { BitLength } from '@polkadot/ui-app/types'; import { Props as BareProps } from '../types'; import BN from 'bn.js'; import React from 'react'; +import { BitLengthOption } from '@polkadot/ui-app/constants'; +import { InputNumber } from '@polkadot/ui-app/index'; import { balanceFormat } from '@polkadot/ui-react-rx/util/index'; -import { BitLengthOption } from '../../constants'; -import InputNumber from '../../InputNumber'; import Bare from './Bare'; type Props = BareProps; diff --git a/packages/ui-app/src/Params/Param/Bare.tsx b/packages/ui-params/src/Param/Bare.tsx similarity index 84% rename from packages/ui-app/src/Params/Param/Bare.tsx rename to packages/ui-params/src/Param/Bare.tsx index 4c1405f181..8d96e33b0f 100644 --- a/packages/ui-app/src/Params/Param/Bare.tsx +++ b/packages/ui-params/src/Param/Bare.tsx @@ -2,11 +2,10 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { BareProps } from '../../types'; +import { BareProps } from '@polkadot/ui-app/types'; import React from 'react'; - -import classes from '../../util/classes'; +import classes from '@polkadot/ui-app/util/classes'; type Props = BareProps & { children: React.ReactNode diff --git a/packages/ui-app/src/Params/Param/Base.tsx b/packages/ui-params/src/Param/Base.tsx similarity index 89% rename from packages/ui-app/src/Params/Param/Base.tsx rename to packages/ui-params/src/Param/Base.tsx index 6835b241aa..f59e26762d 100644 --- a/packages/ui-app/src/Params/Param/Base.tsx +++ b/packages/ui-params/src/Param/Base.tsx @@ -2,12 +2,12 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { BareProps } from '../../types'; +import { BareProps } from '@polkadot/ui-app/types'; import { Size } from '../types'; import React from 'react'; +import { Labelled } from '@polkadot/ui-app/index'; -import Labelled from '../../Labelled'; import Bare from './Bare'; type Props = BareProps & { diff --git a/packages/ui-app/src/Params/Param/BaseBytes.tsx b/packages/ui-params/src/Param/BaseBytes.tsx similarity index 97% rename from packages/ui-app/src/Params/Param/BaseBytes.tsx rename to packages/ui-params/src/Param/BaseBytes.tsx index dd09dca540..d260dbec7e 100644 --- a/packages/ui-app/src/Params/Param/BaseBytes.tsx +++ b/packages/ui-params/src/Param/BaseBytes.tsx @@ -6,9 +6,9 @@ import { Props as BaseProps, Size } from '../types'; import React from 'react'; import { Compact } from '@polkadot/types/codec'; +import { Input } from '@polkadot/ui-app/index'; import { hexToU8a, u8aToHex } from '@polkadot/util'; -import Input from '../../Input'; import Bare from './Bare'; type Props = BaseProps & { diff --git a/packages/ui-app/src/Params/Param/Bool.tsx b/packages/ui-params/src/Param/Bool.tsx similarity index 96% rename from packages/ui-app/src/Params/Param/Bool.tsx rename to packages/ui-params/src/Param/Bool.tsx index f2d00e25e9..25fde1759e 100644 --- a/packages/ui-app/src/Params/Param/Bool.tsx +++ b/packages/ui-params/src/Param/Bool.tsx @@ -5,8 +5,8 @@ import { Props } from '../types'; import React from 'react'; +import { Dropdown } from '@polkadot/ui-app/index'; -import Dropdown from '../../Dropdown'; import Bare from './Bare'; const options = [ diff --git a/packages/ui-app/src/Params/Param/Bytes.tsx b/packages/ui-params/src/Param/Bytes.tsx similarity index 97% rename from packages/ui-app/src/Params/Param/Bytes.tsx rename to packages/ui-params/src/Param/Bytes.tsx index edea963a03..6e96fe0c9f 100644 --- a/packages/ui-app/src/Params/Param/Bytes.tsx +++ b/packages/ui-params/src/Param/Bytes.tsx @@ -6,8 +6,8 @@ import { Props } from '../types'; import React from 'react'; import { Compact } from '@polkadot/types/codec'; +import { Button } from '@polkadot/ui-app/index'; -import Button from '../../Button'; import BaseBytes from './BaseBytes'; import File from './File'; diff --git a/packages/ui-app/src/Params/Param/Code.tsx b/packages/ui-params/src/Param/Code.tsx similarity index 100% rename from packages/ui-app/src/Params/Param/Code.tsx rename to packages/ui-params/src/Param/Code.tsx diff --git a/packages/ui-app/src/Params/Param/File.tsx b/packages/ui-params/src/Param/File.tsx similarity index 90% rename from packages/ui-app/src/Params/Param/File.tsx rename to packages/ui-params/src/Param/File.tsx index 46bd935275..687056535b 100644 --- a/packages/ui-app/src/Params/Param/File.tsx +++ b/packages/ui-params/src/Param/File.tsx @@ -2,11 +2,11 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { BareProps } from '../../types'; +import { BareProps } from '@polkadot/ui-app/types'; import React from 'react'; +import { InputFile } from '@polkadot/ui-app/index'; -import InputFile from '../../InputFile'; import Bare from './Bare'; type Props = BareProps & { diff --git a/packages/ui-app/src/Params/Param/Hash.tsx b/packages/ui-params/src/Param/Hash.tsx similarity index 100% rename from packages/ui-app/src/Params/Param/Hash.tsx rename to packages/ui-params/src/Param/Hash.tsx diff --git a/packages/ui-app/src/Params/Param/KeyValue.tsx b/packages/ui-params/src/Param/KeyValue.tsx similarity index 98% rename from packages/ui-app/src/Params/Param/KeyValue.tsx rename to packages/ui-params/src/Param/KeyValue.tsx index 7f36802180..6ea066e104 100644 --- a/packages/ui-app/src/Params/Param/KeyValue.tsx +++ b/packages/ui-params/src/Param/KeyValue.tsx @@ -6,9 +6,9 @@ import { Props } from '../types'; import React from 'react'; import { Compact } from '@polkadot/types/codec'; +import { Input } from '@polkadot/ui-app/index'; import { hexToU8a, u8aConcat } from '@polkadot/util'; -import Input from '../../Input'; import Bare from './Bare'; type State$Param = { diff --git a/packages/ui-app/src/Params/Param/KeyValueArray.tsx b/packages/ui-params/src/Param/KeyValueArray.tsx similarity index 98% rename from packages/ui-app/src/Params/Param/KeyValueArray.tsx rename to packages/ui-params/src/Param/KeyValueArray.tsx index 86d0bfb902..7a5838b9fb 100644 --- a/packages/ui-app/src/Params/Param/KeyValueArray.tsx +++ b/packages/ui-params/src/Param/KeyValueArray.tsx @@ -8,9 +8,9 @@ import { Props as BaseProps, RawParam } from '../types'; import React from 'react'; import { Vector } from '@polkadot/types/codec'; import { KeyValue as Pair } from '@polkadot/types'; +import translate from '@polkadot/ui-app/translate'; import { assert, isHex, u8aToHex, u8aToString } from '@polkadot/util'; -import translate from '../../translate'; import Base from './Base'; import Bytes from './Bytes'; import File from './File'; diff --git a/packages/ui-app/src/Params/Param/Proposal.tsx b/packages/ui-params/src/Param/Proposal.tsx similarity index 90% rename from packages/ui-app/src/Params/Param/Proposal.tsx rename to packages/ui-params/src/Param/Proposal.tsx index 5c62dd8e87..768a9174e8 100644 --- a/packages/ui-app/src/Params/Param/Proposal.tsx +++ b/packages/ui-params/src/Param/Proposal.tsx @@ -6,10 +6,9 @@ import { Props } from '../types'; import React from 'react'; import { Extrinsic, Method } from '@polkadot/types'; +import { Call, Static } from '@polkadot/ui-app/index'; +import classes from '@polkadot/ui-app/util/classes'; -import Call from '../../Call'; -import Static from '../../Static'; -import classes from '../../util/classes'; import Bare from './Bare'; import Unknown from './Unknown'; diff --git a/packages/ui-app/src/Params/Param/String.tsx b/packages/ui-params/src/Param/String.tsx similarity index 95% rename from packages/ui-app/src/Params/Param/String.tsx rename to packages/ui-params/src/Param/String.tsx index e5d6481388..dee6d246b5 100644 --- a/packages/ui-app/src/Params/Param/String.tsx +++ b/packages/ui-params/src/Param/String.tsx @@ -5,8 +5,8 @@ import { Props } from '../types'; import React from 'react'; +import { Input } from '@polkadot/ui-app/index'; -import Input from '../../Input'; import Bare from './Bare'; export default class StringParam extends React.PureComponent { diff --git a/packages/ui-app/src/Params/Param/Timestamp.tsx b/packages/ui-params/src/Param/Timestamp.tsx similarity index 96% rename from packages/ui-app/src/Params/Param/Timestamp.tsx rename to packages/ui-params/src/Param/Timestamp.tsx index 544787c7ce..bf9ff5ded2 100644 --- a/packages/ui-app/src/Params/Param/Timestamp.tsx +++ b/packages/ui-params/src/Param/Timestamp.tsx @@ -5,9 +5,9 @@ import { Props, RawParam$OnChange$Value } from '../types'; import React from 'react'; +import { Static } from '@polkadot/ui-app/index'; import Amount from './Amount'; -import Static from '../../Static'; export default class Code extends React.PureComponent { render () { diff --git a/packages/ui-app/src/Params/Param/Tuple.tsx b/packages/ui-params/src/Param/Tuple.tsx similarity index 100% rename from packages/ui-app/src/Params/Param/Tuple.tsx rename to packages/ui-params/src/Param/Tuple.tsx diff --git a/packages/ui-app/src/Params/Param/Unknown.tsx b/packages/ui-params/src/Param/Unknown.tsx similarity index 93% rename from packages/ui-app/src/Params/Param/Unknown.tsx rename to packages/ui-params/src/Param/Unknown.tsx index 4669a8cf4f..7f0a92e36c 100644 --- a/packages/ui-app/src/Params/Param/Unknown.tsx +++ b/packages/ui-params/src/Param/Unknown.tsx @@ -6,9 +6,9 @@ import { WithNamespaces } from 'react-i18next'; import { Props as BareProps, RawParam } from '../types'; import React from 'react'; +import { Static } from '@polkadot/ui-app/index'; +import translate from '@polkadot/ui-app/translate'; -import Static from '../../Static'; -import translate from '../../translate'; import Bare from './Bare'; import BaseBytes from './BaseBytes'; diff --git a/packages/ui-app/src/Params/Param/Vector.tsx b/packages/ui-params/src/Param/Vector.tsx similarity index 89% rename from packages/ui-app/src/Params/Param/Vector.tsx rename to packages/ui-params/src/Param/Vector.tsx index 2a682eb9ed..3cb8a5a4ba 100644 --- a/packages/ui-app/src/Params/Param/Vector.tsx +++ b/packages/ui-params/src/Param/Vector.tsx @@ -7,9 +7,10 @@ import { TypeDef } from '@polkadot/types/codec'; import { Props as BareProps, RawParam } from '../types'; import React from 'react'; +import { Button } from '@polkadot/ui-app/index'; +import translate from '@polkadot/ui-app/translate'; +import { isUndefined } from '@polkadot/util'; -import Button from '../../Button'; -import translate from '../../translate'; import getInitValue from '../initValue'; import Bare from './Bare'; import findComponent from './findComponent'; @@ -42,12 +43,12 @@ class Vector extends React.PureComponent { type, values: isDisabled || prevState.values.length === 0 ? value.map((value: any) => - !isDisabled || value.isValid - ? value - : { - isValid: true, + isUndefined(value) || isUndefined(value.isValid) + ? { + isValid: isUndefined(value), value } + : value ) : prevState.values }; @@ -140,8 +141,13 @@ class Vector extends React.PureComponent { const { type } = this.props; const { values } = this.state; + const value = getInitValue(type); + this.setState({ - values: values.concat(getInitValue(type)) + values: values.concat({ + isValid: !isUndefined(value), + value + }) }); } diff --git a/packages/ui-app/src/Params/Param/Vote.tsx b/packages/ui-params/src/Param/Vote.tsx similarity index 96% rename from packages/ui-app/src/Params/Param/Vote.tsx rename to packages/ui-params/src/Param/Vote.tsx index 5fc89e510a..259d699fd6 100644 --- a/packages/ui-app/src/Params/Param/Vote.tsx +++ b/packages/ui-params/src/Param/Vote.tsx @@ -6,8 +6,8 @@ import { Props } from '../types'; import BN from 'bn.js'; import React from 'react'; +import { Dropdown } from '@polkadot/ui-app/index'; -import Dropdown from '../../Dropdown'; import Bare from './Bare'; const options = [ diff --git a/packages/ui-app/src/Params/Param/VoteThreshold.tsx b/packages/ui-params/src/Param/VoteThreshold.tsx similarity index 96% rename from packages/ui-app/src/Params/Param/VoteThreshold.tsx rename to packages/ui-params/src/Param/VoteThreshold.tsx index 0651d81e0a..dd5ba834b5 100644 --- a/packages/ui-app/src/Params/Param/VoteThreshold.tsx +++ b/packages/ui-params/src/Param/VoteThreshold.tsx @@ -6,9 +6,9 @@ import { Props } from '../types'; import React from 'react'; import { VoteThreshold } from '@polkadot/types'; +import { Dropdown } from '@polkadot/ui-app/index'; import { bnToBn } from '@polkadot/util'; -import Dropdown from '../../Dropdown'; import Bare from './Bare'; type TextMap = { [index: number]: string }; diff --git a/packages/ui-app/src/Params/Param/findComponent.ts b/packages/ui-params/src/Param/findComponent.ts similarity index 100% rename from packages/ui-app/src/Params/Param/findComponent.ts rename to packages/ui-params/src/Param/findComponent.ts diff --git a/packages/ui-app/src/Params/Param/index.tsx b/packages/ui-params/src/Param/index.tsx similarity index 90% rename from packages/ui-app/src/Params/Param/index.tsx rename to packages/ui-params/src/Param/index.tsx index 77b392414f..5bdaa3857c 100644 --- a/packages/ui-app/src/Params/Param/index.tsx +++ b/packages/ui-params/src/Param/index.tsx @@ -2,14 +2,14 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -import { I18nProps } from '../../types'; +import { I18nProps } from '@polkadot/ui-app/types'; import { BaseProps, Props as ComponentProps, ComponentMap } from '../types'; import React from 'react'; +import classes from '@polkadot/ui-app/util/classes'; +import translate from '@polkadot/ui-app/translate'; import { isUndefined } from '@polkadot/util'; -import classes from '../../util/classes'; -import translate from '../../translate'; import findComponent from './findComponent'; type Props = I18nProps & BaseProps & { diff --git a/packages/ui-app/src/Params/Params.css b/packages/ui-params/src/Params.css similarity index 100% rename from packages/ui-app/src/Params/Params.css rename to packages/ui-params/src/Params.css diff --git a/packages/ui-app/src/Params/index.tsx b/packages/ui-params/src/index.tsx similarity index 95% rename from packages/ui-app/src/Params/index.tsx rename to packages/ui-params/src/index.tsx index 01af4d3487..f4d0782db6 100644 --- a/packages/ui-app/src/Params/index.tsx +++ b/packages/ui-params/src/index.tsx @@ -3,15 +3,15 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { TypeDef } from '@polkadot/types/codec'; -import { I18nProps } from '../types'; +import { I18nProps } from '@polkadot/ui-app/types'; import { ComponentMap, RawParams, RawParam$OnChange, RawParam$OnChange$Value } from './types'; import './Params.css'; import React from 'react'; +import classes from '@polkadot/ui-app/util/classes'; +import translate from '@polkadot/ui-app/translate'; -import classes from '../util/classes'; -import translate from '../translate'; import Param from './Param'; import createValues from './values'; diff --git a/packages/ui-app/src/Params/initValue.ts b/packages/ui-params/src/initValue.ts similarity index 100% rename from packages/ui-app/src/Params/initValue.ts rename to packages/ui-params/src/initValue.ts diff --git a/packages/ui-app/src/Params/types.ts b/packages/ui-params/src/types.ts similarity index 96% rename from packages/ui-app/src/Params/types.ts rename to packages/ui-params/src/types.ts index c88384a755..b48eaa048b 100644 --- a/packages/ui-app/src/Params/types.ts +++ b/packages/ui-params/src/types.ts @@ -3,7 +3,7 @@ // of the Apache-2.0 license. See the LICENSE file for details. import { TypeDef } from '@polkadot/types/codec'; -import { BareProps } from '../types'; +import { BareProps } from '@polkadot/ui-app/types'; // FIXME Ideally, we want these as Base from api-codec - as a stop-gap, any this until we have // params returning types extending Base (i.e. anything from api-codec) diff --git a/packages/ui-app/src/Params/valueToText.tsx b/packages/ui-params/src/valueToText.tsx similarity index 98% rename from packages/ui-app/src/Params/valueToText.tsx rename to packages/ui-params/src/valueToText.tsx index 227a504bdf..cb8637a1b6 100644 --- a/packages/ui-app/src/Params/valueToText.tsx +++ b/packages/ui-params/src/valueToText.tsx @@ -5,7 +5,9 @@ import './Params.css'; import React from 'react'; +import classes from '@polkadot/ui-app/util/classes'; import { isNull, isUndefined, u8aToHex } from '@polkadot/util'; + // import { decodeAddress } from '@polkadot/keyring'; // import IdentityIcon from '@polkadot/ui-react/IdentityIcon'; // import numberFormat from '@polkadot/ui-react-rx/util/numberFormat'; @@ -13,7 +15,6 @@ import { isNull, isUndefined, u8aToHex } from '@polkadot/util'; // import isBn from '@polkadot/util/is/bn'; // import isU8a from '@polkadot/util/is/u8a'; -import classes from '../util/classes'; // import { textMap as thresholdTextMap } from './Param/VoteThreshold'; // const empty = div({}, ''); diff --git a/packages/ui-app/src/Params/values.ts b/packages/ui-params/src/values.ts similarity index 100% rename from packages/ui-app/src/Params/values.ts rename to packages/ui-params/src/values.ts diff --git a/tsconfig.json b/tsconfig.json index 6f1890fd51..67e01780ee 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -17,6 +17,7 @@ "@polkadot/app-vanitygen/*": [ "packages/app-vanitygen/src/*" ], "@polkadot/apps/*": [ "packages/apps/src/*" ], "@polkadot/ui-app/*": [ "packages/ui-app/src/*" ], + "@polkadot/ui-params/*": [ "packages/ui-params/src/*" ], "@polkadot/ui-react-rx/*": [ "packages/ui-react-rx/src/*" ], "@polkadot/ui-signer/*": [ "packages/ui-signer/src/*" ] },