Browse Source

Rework Params & Params Vector (#581)

* Split Params into ui-params

* Fix Vector value detection/adding

* Update jest config
Jaco Greeff 6 years ago
parent
commit
d93169e172
53 changed files with 292 additions and 97 deletions
  1. 1 1
      jest.config.js
  2. 2 2
      packages/app-democracy/src/Referendum.tsx
  3. 1 1
      packages/app-explorer/src/BlockByHash/Logs.tsx
  4. 1 0
      packages/app-extrinsics/package.json
  5. 4 3
      packages/app-extrinsics/src/Extrinsic.tsx
  6. 1 1
      packages/app-extrinsics/src/Params/Account.tsx
  7. 1 1
      packages/app-extrinsics/src/Params/Call.tsx
  8. 1 1
      packages/app-extrinsics/src/Params/Extrinsic.tsx
  9. 1 1
      packages/app-extrinsics/src/Params/Proposal.tsx
  10. 1 1
      packages/app-extrinsics/src/Params/index.ts
  11. 3 2
      packages/app-rpc/src/Selection.tsx
  12. 2 1
      packages/app-storage/package.json
  13. 1 1
      packages/app-storage/src/Query.tsx
  14. 3 2
      packages/app-storage/src/Selection/Modules.tsx
  15. 1 1
      packages/app-storage/src/types.ts
  16. 1 0
      packages/apps/webpack.config.js
  17. 1 1
      packages/ui-app/src/Call.tsx
  18. 1 1
      packages/ui-app/src/Event.tsx
  19. 0 33
      packages/ui-app/src/Params/Param/Balance.spec.js
  20. 0 2
      packages/ui-app/src/index.tsx
  21. 201 0
      packages/ui-params/LICENSE
  22. 1 0
      packages/ui-params/README.md
  23. 16 0
      packages/ui-params/package.json
  24. 1 1
      packages/ui-params/src/Param/Account.tsx
  25. 1 1
      packages/ui-params/src/Param/Amount.tsx
  26. 3 3
      packages/ui-params/src/Param/Balance.tsx
  27. 2 3
      packages/ui-params/src/Param/Bare.tsx
  28. 2 2
      packages/ui-params/src/Param/Base.tsx
  29. 1 1
      packages/ui-params/src/Param/BaseBytes.tsx
  30. 1 1
      packages/ui-params/src/Param/Bool.tsx
  31. 1 1
      packages/ui-params/src/Param/Bytes.tsx
  32. 0 0
      packages/ui-params/src/Param/Code.tsx
  33. 2 2
      packages/ui-params/src/Param/File.tsx
  34. 0 0
      packages/ui-params/src/Param/Hash.tsx
  35. 1 1
      packages/ui-params/src/Param/KeyValue.tsx
  36. 1 1
      packages/ui-params/src/Param/KeyValueArray.tsx
  37. 2 3
      packages/ui-params/src/Param/Proposal.tsx
  38. 1 1
      packages/ui-params/src/Param/String.tsx
  39. 1 1
      packages/ui-params/src/Param/Timestamp.tsx
  40. 0 0
      packages/ui-params/src/Param/Tuple.tsx
  41. 2 2
      packages/ui-params/src/Param/Unknown.tsx
  42. 13 7
      packages/ui-params/src/Param/Vector.tsx
  43. 1 1
      packages/ui-params/src/Param/Vote.tsx
  44. 1 1
      packages/ui-params/src/Param/VoteThreshold.tsx
  45. 0 0
      packages/ui-params/src/Param/findComponent.ts
  46. 3 3
      packages/ui-params/src/Param/index.tsx
  47. 0 0
      packages/ui-params/src/Params.css
  48. 3 3
      packages/ui-params/src/index.tsx
  49. 0 0
      packages/ui-params/src/initValue.ts
  50. 1 1
      packages/ui-params/src/types.ts
  51. 2 1
      packages/ui-params/src/valueToText.tsx
  52. 0 0
      packages/ui-params/src/values.ts
  53. 1 0
      tsconfig.json

+ 1 - 1
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)(.*)$': '<rootDir>/packages/app-$1/src/$2',
-    '@polkadot/ui-(app|react-rx|signer)(.*)$': '<rootDir>/packages/ui-$1/src/$2',
+    '@polkadot/ui-(app|params|react-rx|signer)(.*)$': '<rootDir>/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'
   }

+ 2 - 2
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';

+ 1 - 1
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';
 

+ 1 - 0
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"
   }
 }

+ 4 - 3
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';
 

+ 1 - 1
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';

+ 1 - 1
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';

+ 1 - 1
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';

+ 1 - 1
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';

+ 1 - 1
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';

+ 3 - 2
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';

+ 2 - 1
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"
   }
 }

+ 1 - 1
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';
 

+ 3 - 2
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';
 

+ 1 - 1
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

+ 1 - 0
packages/apps/webpack.config.js

@@ -24,6 +24,7 @@ const packages = [
   'app-transfer',
   'app-vanitygen',
   'ui-app',
+  'ui-params',
   'ui-react-rx',
   'ui-signer'
 ];

+ 1 - 1
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,

+ 1 - 1
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,

+ 0 - 33
packages/ui-app/src/Params/Param/Balance.spec.js

@@ -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(
-      <Balance
-        defaultValue={defaultValue}
-        t={mockT}
-      />, {}
-    );
-  });
-
-  it('creates the element', () => {
-    expect(wrapper).toHaveLength(1);
-  });
-
-  it('should display InputNumber component', () => {
-    expect(wrapper.find(InputNumber)).toHaveLength(1);
-  });
-});

+ 0 - 2
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,

+ 201 - 0
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.

+ 1 - 0
packages/ui-params/README.md

@@ -0,0 +1 @@
+# @polkadot/ui-params

+ 16 - 0
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 <jacogr@gmail.com>",
+  "maintainers": [
+    "Jaco Greeff <jacogr@gmail.com>"
+  ],
+  "contributors": [],
+  "license": "Apache-2.0",
+  "dependencies": {
+    "@babel/runtime": "^7.2.0",
+    "@polkadot/ui-app": "^0.22.3"
+  }
+}

+ 1 - 1
packages/ui-app/src/Params/Param/Account.tsx → 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<Props> {

+ 1 - 1
packages/ui-app/src/Params/Param/Amount.tsx → 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<Props> {

+ 3 - 3
packages/ui-app/src/Params/Param/Balance.tsx → 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;

+ 2 - 3
packages/ui-app/src/Params/Param/Bare.tsx → 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

+ 2 - 2
packages/ui-app/src/Params/Param/Base.tsx → 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 & {

+ 1 - 1
packages/ui-app/src/Params/Param/BaseBytes.tsx → 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 & {

+ 1 - 1
packages/ui-app/src/Params/Param/Bool.tsx → 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 = [

+ 1 - 1
packages/ui-app/src/Params/Param/Bytes.tsx → 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';
 

+ 0 - 0
packages/ui-app/src/Params/Param/Code.tsx → packages/ui-params/src/Param/Code.tsx


+ 2 - 2
packages/ui-app/src/Params/Param/File.tsx → 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 & {

+ 0 - 0
packages/ui-app/src/Params/Param/Hash.tsx → packages/ui-params/src/Param/Hash.tsx


+ 1 - 1
packages/ui-app/src/Params/Param/KeyValue.tsx → 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 = {

+ 1 - 1
packages/ui-app/src/Params/Param/KeyValueArray.tsx → 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';

+ 2 - 3
packages/ui-app/src/Params/Param/Proposal.tsx → 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';
 

+ 1 - 1
packages/ui-app/src/Params/Param/String.tsx → 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<Props> {

+ 1 - 1
packages/ui-app/src/Params/Param/Timestamp.tsx → 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<Props> {
   render () {

+ 0 - 0
packages/ui-app/src/Params/Param/Tuple.tsx → packages/ui-params/src/Param/Tuple.tsx


+ 2 - 2
packages/ui-app/src/Params/Param/Unknown.tsx → 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';
 

+ 13 - 7
packages/ui-app/src/Params/Param/Vector.tsx → 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<Props, State> {
       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<Props, State> {
     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
+      })
     });
   }
 

+ 1 - 1
packages/ui-app/src/Params/Param/Vote.tsx → 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 = [

+ 1 - 1
packages/ui-app/src/Params/Param/VoteThreshold.tsx → 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 };

+ 0 - 0
packages/ui-app/src/Params/Param/findComponent.ts → packages/ui-params/src/Param/findComponent.ts


+ 3 - 3
packages/ui-app/src/Params/Param/index.tsx → 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 & {

+ 0 - 0
packages/ui-app/src/Params/Params.css → packages/ui-params/src/Params.css


+ 3 - 3
packages/ui-app/src/Params/index.tsx → 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';
 

+ 0 - 0
packages/ui-app/src/Params/initValue.ts → packages/ui-params/src/initValue.ts


+ 1 - 1
packages/ui-app/src/Params/types.ts → 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)

+ 2 - 1
packages/ui-app/src/Params/valueToText.tsx → 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({}, '<empty>');

+ 0 - 0
packages/ui-app/src/Params/values.ts → packages/ui-params/src/values.ts


+ 1 - 0
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/*" ]
     },