diff --git a/packages/apps-routing/src/index.ts b/packages/apps-routing/src/index.ts index 6f64f24756..9f94034378 100644 --- a/packages/apps-routing/src/index.ts +++ b/packages/apps-routing/src/index.ts @@ -30,6 +30,7 @@ import ranked from './ranked'; import referenda from './referenda'; import rpc from './rpc'; import runtime from './runtime'; +import scheduler from './scheduler'; import settings from './settings'; import signing from './signing'; import society from './society'; @@ -75,6 +76,7 @@ export default function create (t: TFunction): Routes { assets(t), nfts(t), society(t), + scheduler(t), calendar(t), contracts(t), storage(t), diff --git a/packages/apps-routing/src/scheduler.ts b/packages/apps-routing/src/scheduler.ts new file mode 100644 index 0000000000..814f90c559 --- /dev/null +++ b/packages/apps-routing/src/scheduler.ts @@ -0,0 +1,22 @@ +// Copyright 2017-2022 @polkadot/apps-routing authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { TFunction } from 'i18next'; +import type { Route } from './types'; + +import Component from '@polkadot/app-scheduler'; + +export default function create (t: TFunction): Route { + return { + Component, + display: { + needsApi: [ + 'query.scheduler.agenda' + ] + }, + group: 'network', + icon: 'clock', + name: 'scheduler', + text: t('nav.scheduler', 'Scheduler', { ns: 'apps-routing' }) + }; +} diff --git a/packages/page-democracy/src/Execute/index.tsx b/packages/page-democracy/src/Execute/index.tsx deleted file mode 100644 index 2c8d932010..0000000000 --- a/packages/page-democracy/src/Execute/index.tsx +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2017-2022 @polkadot/app-democracy authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import React from 'react'; - -import { useApi } from '@polkadot/react-hooks'; - -import DispatchQueue from './DispatchQueue'; -import Scheduler from './Scheduler'; - -interface Props { - className?: string; -} - -function Execute ({ className }: Props): React.ReactElement { - const { api } = useApi(); - - return ( -
- - {api.query.scheduler && ( - - )} -
- ); -} - -export default React.memo(Execute); diff --git a/packages/page-democracy/src/Execute/useCounter.ts b/packages/page-democracy/src/Execute/useCounter.ts deleted file mode 100644 index 9059d78526..0000000000 --- a/packages/page-democracy/src/Execute/useCounter.ts +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2017-2022 @polkadot/app-democracy authors & contributors -// SPDX-License-Identifier: Apache-2.0 - -import { createNamedHook, useApi, useCall } from '@polkadot/react-hooks'; - -function useCounterImpl (): number { - const { api } = useApi(); - const queued = useCall(api.derive.democracy.dispatchQueue); - - return queued?.length || 0; -} - -export default createNamedHook('useCounter', useCounterImpl); diff --git a/packages/page-democracy/src/index.tsx b/packages/page-democracy/src/index.tsx index 45064f6f97..a152f02d4a 100644 --- a/packages/page-democracy/src/index.tsx +++ b/packages/page-democracy/src/index.tsx @@ -6,9 +6,7 @@ import { Route, Switch } from 'react-router'; import { HelpOverlay, Tabs } from '@polkadot/react-components'; -import useDispatchCounter from './Execute/useCounter'; import basicMd from './md/basic.md'; -import Execute from './Execute'; import Overview from './Overview'; import { useTranslation } from './translate'; @@ -20,20 +18,14 @@ interface Props { function DemocracyApp ({ basePath }: Props): React.ReactElement { const { t } = useTranslation(); - const dispatchCount = useDispatchCounter(); const items = useMemo(() => [ { isRoot: true, name: 'overview', text: t('Overview') - }, - { - count: dispatchCount, - name: 'dispatch', - text: t('Dispatch') } - ], [dispatchCount, t]); + ], [t]); return (
@@ -43,9 +35,6 @@ function DemocracyApp ({ basePath }: Props): React.ReactElement { items={items} /> - - -
diff --git a/packages/page-scheduler/.skip-build b/packages/page-scheduler/.skip-build new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/page-scheduler/.skip-npm b/packages/page-scheduler/.skip-npm new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/page-scheduler/LICENSE b/packages/page-scheduler/LICENSE new file mode 100644 index 0000000000..0d381b2e97 --- /dev/null +++ b/packages/page-scheduler/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/page-scheduler/README.md b/packages/page-scheduler/README.md new file mode 100644 index 0000000000..95da409f21 --- /dev/null +++ b/packages/page-scheduler/README.md @@ -0,0 +1 @@ +# @polkadot/app-scheduler diff --git a/packages/page-scheduler/package.json b/packages/page-scheduler/package.json new file mode 100644 index 0000000000..757d1cd346 --- /dev/null +++ b/packages/page-scheduler/package.json @@ -0,0 +1,18 @@ +{ + "bugs": "https://github.com/polkadot-js/apps/issues", + "homepage": "https://github.com/polkadot-js/apps/tree/master/packages/page-scheduler#readme", + "license": "Apache-2.0", + "name": "@polkadot/app-scheduler", + "private": true, + "repository": { + "directory": "packages/page-scheduler", + "type": "git", + "url": "https://github.com/polkadot-js/apps.git" + }, + "sideEffects": false, + "type": "module", + "version": "0.122.3-83-x", + "dependencies": { + "@babel/runtime": "^7.20.6" + } +} diff --git a/packages/page-democracy/src/Execute/DispatchEntry.tsx b/packages/page-scheduler/src/DispatchEntry.tsx similarity index 85% rename from packages/page-democracy/src/Execute/DispatchEntry.tsx rename to packages/page-scheduler/src/DispatchEntry.tsx index 5969c92c9e..5fdf4b5f8d 100644 --- a/packages/page-democracy/src/Execute/DispatchEntry.tsx +++ b/packages/page-scheduler/src/DispatchEntry.tsx @@ -1,18 +1,17 @@ -// Copyright 2017-2022 @polkadot/app-democracy authors & contributors +// Copyright 2017-2022 @polkadot/app-scheduler authors & contributors // SPDX-License-Identifier: Apache-2.0 import type { DeriveDispatch } from '@polkadot/api-derive/types'; import React from 'react'; +import PreImageButton from '@polkadot/app-democracy/Overview/PreImageButton'; +import ProposalCell from '@polkadot/app-democracy/Overview/ProposalCell'; import { LinkExternal } from '@polkadot/react-components'; import { useBestNumber } from '@polkadot/react-hooks'; import { BlockToTime } from '@polkadot/react-query'; import { formatNumber } from '@polkadot/util'; -import PreImageButton from '../Overview/PreImageButton'; -import ProposalCell from '../Overview/ProposalCell'; - interface Props { value: DeriveDispatch; } diff --git a/packages/page-democracy/src/Execute/DispatchQueue.tsx b/packages/page-scheduler/src/DispatchQueue.tsx similarity index 92% rename from packages/page-democracy/src/Execute/DispatchQueue.tsx rename to packages/page-scheduler/src/DispatchQueue.tsx index 384f626c17..a0e1315375 100644 --- a/packages/page-democracy/src/Execute/DispatchQueue.tsx +++ b/packages/page-scheduler/src/DispatchQueue.tsx @@ -1,4 +1,4 @@ -// Copyright 2017-2022 @polkadot/app-democracy authors & contributors +// Copyright 2017-2022 @polkadot/app-scheduler authors & contributors // SPDX-License-Identifier: Apache-2.0 import type { DeriveDispatch } from '@polkadot/api-derive/types'; @@ -8,8 +8,8 @@ import React, { useMemo, useRef } from 'react'; import { Table } from '@polkadot/react-components'; import { useApi, useBestNumber, useCall } from '@polkadot/react-hooks'; -import { useTranslation } from '../translate'; import DispatchEntry from './DispatchEntry'; +import { useTranslation } from './translate'; interface Props { className?: string; diff --git a/packages/page-democracy/src/Execute/Scheduled.tsx b/packages/page-scheduler/src/Scheduled.tsx similarity index 96% rename from packages/page-democracy/src/Execute/Scheduled.tsx rename to packages/page-scheduler/src/Scheduled.tsx index 023a83f19d..d779c2ead3 100644 --- a/packages/page-democracy/src/Execute/Scheduled.tsx +++ b/packages/page-scheduler/src/Scheduled.tsx @@ -1,4 +1,4 @@ -// Copyright 2017-2022 @polkadot/app-democracy authors & contributors +// Copyright 2017-2022 @polkadot/app-scheduler authors & contributors // SPDX-License-Identifier: Apache-2.0 import type { BlockNumber } from '@polkadot/types/interfaces'; diff --git a/packages/page-democracy/src/Execute/Scheduler.tsx b/packages/page-scheduler/src/Scheduler.tsx similarity index 97% rename from packages/page-democracy/src/Execute/Scheduler.tsx rename to packages/page-scheduler/src/Scheduler.tsx index 882b94e8a0..7a505c0cac 100644 --- a/packages/page-democracy/src/Execute/Scheduler.tsx +++ b/packages/page-scheduler/src/Scheduler.tsx @@ -1,4 +1,4 @@ -// Copyright 2017-2022 @polkadot/app-democracy authors & contributors +// Copyright 2017-2022 @polkadot/app-scheduler authors & contributors // SPDX-License-Identifier: Apache-2.0 import type { ApiPromise } from '@polkadot/api'; @@ -13,8 +13,8 @@ import React, { useMemo, useRef } from 'react'; import { Table } from '@polkadot/react-components'; import { useApi, useBestNumber, useCall } from '@polkadot/react-hooks'; -import { useTranslation } from '../translate'; import ScheduledView from './Scheduled'; +import { useTranslation } from './translate'; interface Props { className?: string; diff --git a/packages/page-scheduler/src/index.tsx b/packages/page-scheduler/src/index.tsx new file mode 100644 index 0000000000..85c6f9834a --- /dev/null +++ b/packages/page-scheduler/src/index.tsx @@ -0,0 +1,49 @@ +// Copyright 2017-2022 @polkadot/app-scheduler authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import React, { useMemo } from 'react'; + +import { Tabs } from '@polkadot/react-components'; +import { useApi } from '@polkadot/react-hooks'; + +import DispatchQueue from './DispatchQueue'; +import Scheduler from './Scheduler'; +import { useTranslation } from './translate'; + +interface Props { + basePath: string; + className?: string; +} + +function App ({ basePath, className }: Props): React.ReactElement { + const { t } = useTranslation(); + const { api } = useApi(); + + const tabs = useMemo( + () => [ + { + isRoot: true, + name: 'overview', + text: t('Overview') + } + ], + [t] + ); + + return ( +
+ + {api.query.democracy && ( + + )} + {api.query.scheduler && ( + + )} +
+ ); +} + +export default React.memo(App); diff --git a/packages/page-scheduler/src/translate.ts b/packages/page-scheduler/src/translate.ts new file mode 100644 index 0000000000..f456590e51 --- /dev/null +++ b/packages/page-scheduler/src/translate.ts @@ -0,0 +1,10 @@ +// Copyright 2017-2022 @polkadot/app-explorer authors & contributors +// SPDX-License-Identifier: Apache-2.0 + +import type { UseTranslationResponse } from 'react-i18next'; + +import { useTranslation as useTranslationBase } from 'react-i18next'; + +export function useTranslation (): UseTranslationResponse<'app-scheduler', undefined> { + return useTranslationBase('app-scheduler'); +} diff --git a/packages/page-democracy/src/Execute/types.ts b/packages/page-scheduler/src/types.ts similarity index 89% rename from packages/page-democracy/src/Execute/types.ts rename to packages/page-scheduler/src/types.ts index 9e31b52c79..004f4bde9e 100644 --- a/packages/page-democracy/src/Execute/types.ts +++ b/packages/page-scheduler/src/types.ts @@ -1,4 +1,4 @@ -// Copyright 2017-2022 @polkadot/app-democracy authors & contributors +// Copyright 2017-2022 @polkadot/app-scheduler authors & contributors // SPDX-License-Identifier: Apache-2.0 import type { Bytes, Option } from '@polkadot/types'; diff --git a/packages/page-scheduler/tsconfig.build.json b/packages/page-scheduler/tsconfig.build.json new file mode 100644 index 0000000000..da24d9f225 --- /dev/null +++ b/packages/page-scheduler/tsconfig.build.json @@ -0,0 +1,9 @@ +{ + "extends": "../../tsconfig.base.json", + "compilerOptions": { + "baseUrl": "..", + "outDir": "./build", + "rootDir": "./src" + }, + "references": [] +} diff --git a/tsconfig.base.json b/tsconfig.base.json index 8262dadc57..19075596a3 100644 --- a/tsconfig.base.json +++ b/tsconfig.base.json @@ -65,6 +65,8 @@ "@polkadot/app-rpc/*": ["page-rpc/src/*"], "@polkadot/app-runtime": ["page-runtime/src"], "@polkadot/app-runtime/*": ["page-runtime/src/*"], + "@polkadot/app-scheduler": ["page-scheduler/src"], + "@polkadot/app-scheduler/*": ["page-scheduler/src/*"], "@polkadot/app-settings": ["page-settings/src"], "@polkadot/app-settings/*": ["page-settings/src/*"], "@polkadot/app-signing": ["page-signing/src"], diff --git a/yarn.lock b/yarn.lock index 18d43701fc..e1480a7888 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3050,6 +3050,14 @@ __metadata: languageName: unknown linkType: soft +"@polkadot/app-scheduler@workspace:packages/page-scheduler": + version: 0.0.0-use.local + resolution: "@polkadot/app-scheduler@workspace:packages/page-scheduler" + dependencies: + "@babel/runtime": ^7.20.6 + languageName: unknown + linkType: soft + "@polkadot/app-settings@workspace:packages/page-settings": version: 0.0.0-use.local resolution: "@polkadot/app-settings@workspace:packages/page-settings"