Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
1e1149eb78 | |||
139fb37bef | |||
4c22335313 |
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@cerc-io/console-app",
|
"name": "@cerc-io/console-app",
|
||||||
"version": "0.2.3",
|
"version": "0.2.5",
|
||||||
"description": "Laconic Console",
|
"description": "Laconic Console",
|
||||||
"repository": "https://github.com/cerc-io/laconic-console",
|
"repository": "https://github.com/cerc-io/laconic-console",
|
||||||
"main": "dist/es/index.js",
|
"main": "dist/es/index.js",
|
||||||
@ -31,7 +31,7 @@
|
|||||||
"@apollo/react-components": "^4.0.0",
|
"@apollo/react-components": "^4.0.0",
|
||||||
"@apollo/react-hooks": "^4.0.0",
|
"@apollo/react-hooks": "^4.0.0",
|
||||||
"@babel/runtime": "^7.21.0",
|
"@babel/runtime": "^7.21.0",
|
||||||
"@cerc-io/registry-sdk": "^0.2.2",
|
"@cerc-io/registry-sdk": "^0.2.8",
|
||||||
"@lirewine/debug": "1.0.0-beta.78",
|
"@lirewine/debug": "1.0.0-beta.78",
|
||||||
"@lirewine/gem-core": "1.0.0-beta.28",
|
"@lirewine/gem-core": "1.0.0-beta.28",
|
||||||
"@lirewine/react-ux": "1.1.0-beta.1",
|
"@lirewine/react-ux": "1.1.0-beta.1",
|
||||||
|
@ -11,8 +11,8 @@ rcd_app_version=$(jq -r '.version' package.json | sed 's/null//')
|
|||||||
cat <<EOF > "$CONFIG_FILE"
|
cat <<EOF > "$CONFIG_FILE"
|
||||||
services:
|
services:
|
||||||
registry:
|
registry:
|
||||||
rpcEndpoint: '${CERC_REGISTRY_RPC_ENDPOINT:-http://testnet-a-1.dev.vaasl.io:26657}'
|
rpcEndpoint: '${CERC_REGISTRY_RPC_ENDPOINT:-http://testnet-a-2.dev.vaasl.io:26657}'
|
||||||
gqlEndpoint: '${CERC_REGISTRY_GQL_ENDPOINT:-http://testnet-a-1.dev.vaasl.io:9473/api}'
|
gqlEndpoint: '${CERC_REGISTRY_GQL_ENDPOINT:-http://testnet-a-2.dev.vaasl.io:9473/api}'
|
||||||
chainId: ${CERC_REGISTRY_CHAIN_ID:-laconic-08062024}
|
chainId: ${CERC_REGISTRY_CHAIN_ID:-laconic-08062024}
|
||||||
gas: 900000
|
gas: 900000
|
||||||
fees: 900000alnt
|
fees: 900000alnt
|
||||||
@ -30,6 +30,8 @@ if [ -z "$APP_RECORD" ] || [ "null" == "$APP_RECORD" ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
MY_ACCOUNT=$(laconic -c $CONFIG_FILE registry account get --user-key "${CERC_REGISTRY_USER_KEY}" | jq -r '.[0].address')
|
||||||
|
|
||||||
cat <<EOF | sed '/.*: ""$/d' > "$RECORD_FILE"
|
cat <<EOF | sed '/.*: ""$/d' > "$RECORD_FILE"
|
||||||
record:
|
record:
|
||||||
type: ApplicationDeploymentRequest
|
type: ApplicationDeploymentRequest
|
||||||
@ -38,6 +40,7 @@ record:
|
|||||||
application: "$CERC_REGISTRY_APP_LRN@$rcd_app_version"
|
application: "$CERC_REGISTRY_APP_LRN@$rcd_app_version"
|
||||||
dns: "$CERC_REGISTRY_DEPLOYMENT_HOSTNAME"
|
dns: "$CERC_REGISTRY_DEPLOYMENT_HOSTNAME"
|
||||||
deployment: "$CERC_REGISTRY_DEPLOYMENT_LRN"
|
deployment: "$CERC_REGISTRY_DEPLOYMENT_LRN"
|
||||||
|
to: $MY_ACCOUNT
|
||||||
config:
|
config:
|
||||||
env:
|
env:
|
||||||
CERC_WEBAPP_DEBUG: "$rcd_app_version"
|
CERC_WEBAPP_DEBUG: "$rcd_app_version"
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
//
|
//
|
||||||
|
|
||||||
import moment from 'moment';
|
import moment from 'moment';
|
||||||
import React, { useContext } from 'react';
|
import React, { useContext, useState } from 'react';
|
||||||
import { useQuery } from '@apollo/react-hooks';
|
import { useQuery } from '@apollo/react-hooks';
|
||||||
import { makeStyles } from '@material-ui/core';
|
import { makeStyles } from '@material-ui/core';
|
||||||
import ButtonGroup from '@material-ui/core/ButtonGroup';
|
import ButtonGroup from '@material-ui/core/ButtonGroup';
|
||||||
@ -11,6 +11,8 @@ import Button from '@material-ui/core/Button';
|
|||||||
import TableHead from '@material-ui/core/TableHead';
|
import TableHead from '@material-ui/core/TableHead';
|
||||||
import TableRow from '@material-ui/core/TableRow';
|
import TableRow from '@material-ui/core/TableRow';
|
||||||
import TableBody from '@material-ui/core/TableBody';
|
import TableBody from '@material-ui/core/TableBody';
|
||||||
|
import TablePagination from '@material-ui/core/TablePagination';
|
||||||
|
import { Paper, TableContainer, } from '@material-ui/core';
|
||||||
|
|
||||||
import WNS_RECORDS from '../../../gql/wns_records.graphql';
|
import WNS_RECORDS from '../../../gql/wns_records.graphql';
|
||||||
|
|
||||||
@ -68,9 +70,14 @@ export const RecordType = ({ type = types[0].key, onChange }) => {
|
|||||||
const RegistryRecords = ({ type }) => {
|
const RegistryRecords = ({ type }) => {
|
||||||
const { config } = useContext(ConsoleContext);
|
const { config } = useContext(ConsoleContext);
|
||||||
const [sorter, sortBy] = useSorter('createTime', false);
|
const [sorter, sortBy] = useSorter('createTime', false);
|
||||||
const { data } = useQueryStatusReducer(useQuery(WNS_RECORDS, {
|
const [page, setPage] = useState(0);
|
||||||
|
const [rowsPerPage, setRowsPerPage] = useState(10);
|
||||||
|
|
||||||
|
const offset = page * rowsPerPage;
|
||||||
|
|
||||||
|
const { data, refetch } = useQueryStatusReducer(useQuery(WNS_RECORDS, {
|
||||||
pollInterval: config.api.intervalQuery,
|
pollInterval: config.api.intervalQuery,
|
||||||
variables: { attributes: { type } }
|
variables: { attributes: { type, limit: rowsPerPage, offset: offset } }
|
||||||
}));
|
}));
|
||||||
|
|
||||||
if (!data) {
|
if (!data) {
|
||||||
@ -79,7 +86,32 @@ const RegistryRecords = ({ type }) => {
|
|||||||
|
|
||||||
const records = JSON.parse(data.wns_records.json);
|
const records = JSON.parse(data.wns_records.json);
|
||||||
|
|
||||||
|
const handleChangePage = (event, newPage) => {
|
||||||
|
setPage(newPage);
|
||||||
|
const offset = newPage * rowsPerPage;
|
||||||
|
refetch({ attributes: { type, limit: rowsPerPage, offset } });
|
||||||
|
};
|
||||||
|
|
||||||
|
const handleChangeRowsPerPage = (event) => {
|
||||||
|
const newRowsPerPage = parseInt(event.target.value, 10);
|
||||||
|
setRowsPerPage(newRowsPerPage);
|
||||||
|
setPage(0);
|
||||||
|
refetch({ attributes: { type, limit: newRowsPerPage, offset: 0 } });
|
||||||
|
};
|
||||||
|
|
||||||
|
const labelDisplayedRows = ({ from, to }) => {
|
||||||
|
if (rowsPerPage > records.length) {
|
||||||
|
return `${from}-${from + records.length - 1}`;
|
||||||
|
} else {
|
||||||
|
return `${from}-${to}`;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
<Paper style={{
|
||||||
|
width: '100%',
|
||||||
|
}}>
|
||||||
|
<TableContainer>
|
||||||
<Table>
|
<Table>
|
||||||
<TableHead>
|
<TableHead>
|
||||||
<TableRow>
|
<TableRow>
|
||||||
@ -93,8 +125,7 @@ const RegistryRecords = ({ type }) => {
|
|||||||
</TableRow>
|
</TableRow>
|
||||||
</TableHead>
|
</TableHead>
|
||||||
<TableBody>
|
<TableBody>
|
||||||
{records.sort(sorter)
|
{records.sort(sorter).map((record) => {
|
||||||
.map((record) => {
|
|
||||||
const { id, names, createTime, attributes: { type, name: displayName, fileName, version, description, service, package: pkg } } = record;
|
const { id, names, createTime, attributes: { type, name: displayName, fileName, version, description, service, package: pkg } } = record;
|
||||||
|
|
||||||
let pkgLink;
|
let pkgLink;
|
||||||
@ -122,27 +153,33 @@ const RegistryRecords = ({ type }) => {
|
|||||||
<TableCell monospace>
|
<TableCell monospace>
|
||||||
{appLinks || (names || []).map(name => <div key={name}>{name}</div>)}
|
{appLinks || (names || []).map(name => <div key={name}>{name}</div>)}
|
||||||
</TableCell>
|
</TableCell>
|
||||||
<TableCell monospace>
|
<TableCell monospace>{version}</TableCell>
|
||||||
{version}
|
<TableCell>{displayName || service || fileName || description}</TableCell>
|
||||||
</TableCell>
|
<TableCell>{moment.utc(createTime).fromNow()}</TableCell>
|
||||||
<TableCell>
|
<TableCell monospace>{pkgLink}</TableCell>
|
||||||
{displayName || service || fileName || description}
|
|
||||||
</TableCell>
|
|
||||||
<TableCell>
|
|
||||||
{moment.utc(createTime).fromNow()}
|
|
||||||
</TableCell>
|
|
||||||
<TableCell monospace>
|
|
||||||
{pkgLink}
|
|
||||||
</TableCell>
|
|
||||||
<TableCell>
|
<TableCell>
|
||||||
<QueryLink config={config} id={id} icon />
|
<QueryLink config={config} id={id} icon />
|
||||||
</TableCell>
|
</TableCell>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
);
|
);
|
||||||
}
|
})}
|
||||||
)}
|
|
||||||
</TableBody>
|
</TableBody>
|
||||||
</Table>
|
</Table>
|
||||||
|
</TableContainer>
|
||||||
|
<TablePagination
|
||||||
|
component="td"
|
||||||
|
rowsPerPageOptions={[5, 10, 25]}
|
||||||
|
count={-1}
|
||||||
|
rowsPerPage={rowsPerPage}
|
||||||
|
page={page}
|
||||||
|
onPageChange={handleChangePage}
|
||||||
|
onRowsPerPageChange={handleChangeRowsPerPage}
|
||||||
|
labelDisplayedRows={labelDisplayedRows}
|
||||||
|
nextIconButtonProps={{
|
||||||
|
disabled: records.length < rowsPerPage,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Paper>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -45,7 +45,9 @@ export const createResolvers = config => {
|
|||||||
|
|
||||||
wns_records: async (_, { attributes }) => {
|
wns_records: async (_, { attributes }) => {
|
||||||
log('WNS records...');
|
log('WNS records...');
|
||||||
const data = await registry.queryRecords(attributes);
|
|
||||||
|
const {limit, offset, ...queryAttributes } = attributes || {};
|
||||||
|
const data = await registry.queryRecords(queryAttributes, false, false, limit, offset);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
__typename: 'JSONResult',
|
__typename: 'JSONResult',
|
||||||
|
@ -1037,10 +1037,10 @@
|
|||||||
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
|
resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
|
||||||
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
|
integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==
|
||||||
|
|
||||||
"@cerc-io/registry-sdk@^0.2.2":
|
"@cerc-io/registry-sdk@^0.2.8":
|
||||||
version "0.2.2"
|
version "0.2.8"
|
||||||
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fregistry-sdk/-/0.2.2/registry-sdk-0.2.2.tgz#2e8a533f069b4bb9f4cd4798e783f52e29167d0d"
|
resolved "https://git.vdb.to/api/packages/cerc-io/npm/%40cerc-io%2Fregistry-sdk/-/0.2.8/registry-sdk-0.2.8.tgz#d71837f735d998987055068457fdf8b2e94ca69c"
|
||||||
integrity sha512-ocRMbWtdewOg02ORfK1U+qbTqB46anHP4ApXokGkY4d+mFSApR3sdUEi2geHcs8oh+SG8YAp7LUJ9AAJneNY8g==
|
integrity sha512-utK3Rq5qZrEoRs/eOsOkowcsD740nlnBs6C3KKFRHgKIiR0XedD6t33KukUPLKbGp4mYZOYXRTA7/A04x58lKw==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@cosmjs/amino" "^0.28.1"
|
"@cosmjs/amino" "^0.28.1"
|
||||||
"@cosmjs/crypto" "^0.28.1"
|
"@cosmjs/crypto" "^0.28.1"
|
||||||
|
Loading…
Reference in New Issue
Block a user