Merge Explorer & Nodeinfo apps (#706)

* Merge Explorer & Nodeinfo apps

* Fix block hash component rendering

packages/app-explorer/src/Query.tsx → packages/app-explorer/src/BlockByHash/Query.tsx

@@ -8,9 +8,11 @@ import React from 'react';
 import { Button, Input } from '@polkadot/ui-app/index';
 import { isHex } from '@polkadot/util';
 
-import translate from './translate';
+import translate from '../translate';
 
-type Props = I18nProps & {};
+type Props = I18nProps & {
+  hash?: string
+};
 
 type State = {
   hash: string
@@ -18,10 +20,16 @@ type State = {
 };
 
 class Query extends React.PureComponent<Props, State> {
-  state: State = {
-    hash: '',
-    isValid: false
-  };
+  constructor (props: Props) {
+    super(props);
+
+    const { hash } = this.props;
+
+    this.state = {
+      hash: hash || '',
+      isValid: isHex(hash, 256)
+    };
+  }
 
   render () {
     const { t } = this.props;
@@ -34,6 +42,7 @@ class Query extends React.PureComponent<Props, State> {
           <div className='storage--actionrow medium'>
             <Input
               className='storage--actionrow-value'
+              defaultValue={this.props.hash}
               isError={!isValid && hash.length !== 0}
               placeholder={t('block hash to query')}
               onChange={this.setHash}

packages/app-explorer/src/BlockByHash/index.tsx

@@ -7,6 +7,7 @@ import { BareProps } from '@polkadot/ui-app/types';
 import React from 'react';
 
 import BlockByHash from './BlockByHash';
+import Query from './Query';
 
 type Props = BareProps & {
   match: {
@@ -20,6 +21,17 @@ export default class Entry extends React.PureComponent<Props> {
   render () {
     const { match: { params: { hash } } } = this.props;
 
+    return (
+      <>
+        <Query hash={hash} />
+        {this.renderBlock()}
+      </>
+    );
+  }
+
+  private renderBlock () {
+    const { match: { params: { hash } } } = this.props;
+
     if (!hash) {
       return null;
     }

packages/app-explorer/src/Main.tsx

@@ -8,7 +8,6 @@ import React from 'react';
 
 import BlockHeaders from './BlockHeaders';
 import EventsRecent from './EventsRecent';
-import Query from './Query';
 import Summary from './Summary';
 import translate from './translate';
 
@@ -21,7 +20,6 @@ class Main extends React.PureComponent<Props> {
     return (
       <>
         <Summary />
-        <Query />
         <div className='explorer--Overview ui--flex-medium'>
           <div className='column'>
             <h1>{t('recent blocks')}</h1>

packages/app-nodeinfo/src/index.tsx → packages/app-explorer/src/NodeInfo/index.tsx

@@ -54,7 +54,7 @@ class App extends React.PureComponent<Props, State> {
     const { info = {}, nextRefresh } = this.state;
 
     return (
-      <main className='status--App'>
+      <>
         <Summary
           info={info}
           nextRefresh={nextRefresh}
@@ -64,7 +64,7 @@ class App extends React.PureComponent<Props, State> {
           label={t('pending extrinsics')}
           value={info.extrinsics}
         />
-      </main>
+      </>
     );
   }
 

packages/app-explorer/src/index.tsx

@@ -2,29 +2,70 @@
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-import { AppProps, BareProps } from '@polkadot/ui-app/types';
+import { AppProps, BareProps, I18nProps } from '@polkadot/ui-app/types';
 
 import './index.css';
 
 import React from 'react';
 import { Route, Switch } from 'react-router';
+import Tabs, { TabItem } from '@polkadot/ui-app/Tabs';
+import translate from './translate';
 
 import BlockByHash from './BlockByHash';
-import Main from './Main';
+import Main from './Main';import NodeInfo from './NodeInfo';
 
-type Props = AppProps & BareProps;
+type Props = AppProps & BareProps & I18nProps;
+
+type State = {
+  items: Array<TabItem>
+};
+
+class ExplorerApp extends React.Component<Props, State> {
+  constructor (props: Props) {
+    super(props);
+
+    const { t } = this.props;
+
+    this.state = {
+      items: [
+        {
+          name: 'chain',
+          text: t('Chain info')
+        },
+        {
+          hasParams: true,
+          name: 'hash',
+          text: t('Block query')
+        },
+        {
+          name: 'node',
+          text: t('Node info')
+        }
+      ]
+    };
+  }
 
-export default class ExplorerApp extends React.Component<Props> {
   render () {
     const { basePath } = this.props;
+    const { items } = this.state;
 
     return (
       <main className='explorer--App'>
+        <header>
+          <Tabs
+            basePath={basePath}
+            items={items}
+          />
+        </header>
         <Switch>
           <Route path={`${basePath}/hash/:hash`} component={BlockByHash} />
+          <Route path={`${basePath}/hash`} component={BlockByHash} />
+          <Route path={`${basePath}/node`} component={NodeInfo} />
           <Route component={Main} />
         </Switch>
       </main>
     );
   }
 }
+
+export default translate(ExplorerApp);

packages/app-nodeinfo/LICENSE

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

packages/app-nodeinfo/README.md

@@ -1 +0,0 @@
-# @polkadot/app-nodeinfo

packages/app-nodeinfo/package.json

@@ -1,16 +0,0 @@
-{
-  "name": "@polkadot/app-nodeinfo",
-  "version": "0.23.21",
-  "description": "Node status and information",
-  "main": "index.js",
-  "scripts": {},
-  "author": "Jaco Greeff <jacogr@gmail.com>",
-  "maintainers": [
-    "Jaco Greeff <jacogr@gmail.com>"
-  ],
-  "license": "Apache-2.0",
-  "dependencies": {
-    "@babel/runtime": "^7.2.0",
-    "@polkadot/ui-app": "^0.23.21"
-  }
-}

packages/apps/src/routing/index.ts

@@ -13,7 +13,6 @@ import democracy from './democracy';
 import explorer from './explorer';
 import extrinsics from './extrinsics';
 import js from './js';
-import nodeinfo from './nodeinfo';
 import settings from './settings';
 import staking from './staking';
 import storage from './storage';
@@ -30,7 +29,6 @@ const routes: Routes = appSettings.uiMode === 'light'
     addresses,
     null,
     settings,
-    nodeinfo,
     template
   )
   : ([] as Routes).concat(
@@ -46,7 +44,6 @@ const routes: Routes = appSettings.uiMode === 'light'
     extrinsics,
     null,
     settings,
-    nodeinfo,
     toolbox,
     js,
     template

packages/apps/src/routing/nodeinfo.ts

@@ -1,21 +0,0 @@
-// Copyright 2017-2019 @polkadot/apps 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 { Routes } from '../types';
-
-import Nodeinfo from '@polkadot/app-nodeinfo/index';
-
-export default ([
-  {
-    Component: Nodeinfo,
-    display: {
-      needsApi: []
-    },
-    i18n: {
-      defaultValue: 'Node info'
-    },
-    icon: 'tty',
-    name: 'nodeinfo'
-  }
-] as Routes);

packages/apps/webpack.config.js

@@ -19,7 +19,6 @@ const packages = [
   'app-js',
   'app-settings',
   'app-staking',
-  'app-nodeinfo',
   'app-storage',
   'app-123code',
   'app-toolbox',

tsconfig.json

@@ -12,7 +12,6 @@
       "@polkadot/app-js/*": [ "packages/app-js/src/*" ],
       "@polkadot/app-settings/*": [ "packages/app-settings/src/*" ],
       "@polkadot/app-staking/*": [ "packages/app-staking/src/*" ],
-      "@polkadot/app-nodeinfo/*": [ "packages/app-nodeinfo/src/*" ],
       "@polkadot/app-storage/*": [ "packages/app-storage/src/*" ],
       "@polkadot/app-toolbox/*": [ "packages/app-toolbox/src/*" ],
       "@polkadot/app-transfer/*": [ "packages/app-transfer/src/*" ],