Handle undefined attributes in records resolver (#61)

Part of [Create a public laconicd testnet](https://www.notion.so/Create-a-public-laconicd-testnet-896a11bdd8094eff8f1b49c0be0ca3b8)

Handles the error in `LOOKUP` tab in the console:
```bash
Error: Cannot destructure property 'limit' of 'attributes' as it is undefined.
```

Co-authored-by: IshaVenikar <ishavenikar7@gmail.com>
Reviewed-on: #61
Co-authored-by: Prathamesh Musale <prathamesh.musale0@gmail.com>
Co-committed-by: Prathamesh Musale <prathamesh.musale0@gmail.com>

.gitea/workflows/publish-webapp.yaml

@@ -0,0 +1,36 @@
+name: Publish ApplicationRecord to Registry
+on:
+  release:
+    types: [published]
+
+env:
+  CERC_REGISTRY_USER_KEY: ${{ secrets.CICD_VAASL_LACONIC_USER_KEY }}
+  CERC_REGISTRY_BOND_ID: ${{ secrets.CICD_VAASL_LACONIC_BOND_ID }}
+  CERC_REGISTRY_DEPLOYMENT_HOSTNAME: ${{ vars.CERC_REGISTRY_DEPLOYMENT_HOSTNAME }}
+  LACONIC_HOSTED_CONFIG_services_wns_server: ${{ vars.LACONIC_HOSTED_CONFIG_SERVICES_WNS_SERVER }}
+  LACONIC_HOSTED_CONFIG_services_wns_webui: ${{ vars.LACONIC_HOSTED_CONFIG_SERVICES_WNS_WEBUI }}
+  LACONIC_HOSTED_CONFIG_services_signal_api: ${{ vars.LACONIC_HOSTED_CONFIg_SERVICES_SIGNAL_API }}
+  LACONIC_HOSTED_CONFIG_app_api_url: ${{ vars.LACONIC_HOSTED_CONFIg_APP_API_URL }}
+
+jobs:
+  cns_publish:
+    runs-on: ubuntu-latest
+    steps:
+      - name: "Clone project repository"
+        uses: actions/checkout@v3
+      - name: Use Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18
+      - name: "Enable Yarn"
+        run: corepack enable
+      - name: "Install registry CLI"
+        run: |
+          npm config set @cerc-io:registry https://git.vdb.to/api/packages/cerc-io/npm/
+          npm install -g @cerc-io/laconic-registry-cli
+      - name: "Install jq"
+        run: apt -y update && apt -y install jq
+      - name: "Publish Application Record"
+        run: scripts/publish-app-record.sh
+      - name: "Request Deployment"
+        run: scripts/request-app-deployment.sh

build-webapp.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+yarn
+LACONIC_HOSTED_CONFIG_FILE=config-hosted.yml yarn build
+rm -rf dist/es
+
+mv dist/production "$1"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cerc-io/console-app",
-  "version": "0.2.2",
+  "version": "0.2.5",
   "description": "Laconic Console",
   "repository": "https://github.com/cerc-io/laconic-console",
   "main": "dist/es/index.js",
@@ -31,7 +31,7 @@
     "@apollo/react-components": "^4.0.0",
     "@apollo/react-hooks": "^4.0.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/gem-core": "1.0.0-beta.28",
     "@lirewine/react-ux": "1.1.0-beta.1",

scripts/deploy_apps_to_wns.sh

@@ -1,32 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-for appdir in `find ./packages -name '*-app' -type d | grep -v node_modules`; do
-  pushd $appdir
-
-  WNS_ORG="${WNS_ORG:-dxos}"
-  PKG_CHANNEL="${PKG_CHANNEL:-}"
-  PKG_NAME=`cat package.json | jq -r '.name' | cut -d'/' -f2- | sed 's/-app$//'`
-  WNS_NAME="$WNS_ORG/$PKG_NAME"
-  
-  cat <<EOF > app.yml
-name: $PKG_NAME
-build: yarn dist
-EOF
-
-  cat app.yml
-  echo "wrn://${WNS_ORG}/application/${PKG_NAME}${PKG_CHANNEL}"
-
-  yarn clean
-  yarn -s wire app build
-
-  if [ -d "dist/production" ]; then
-    yarn -s wire app publish --path './dist/production'
-  else
-    yarn -s wire app publish
-  fi
-
-  yarn -s wire app register --name "wrn://${WNS_ORG}/application/${PKG_NAME}${PKG_CHANNEL}"
-  popd
-done

scripts/publish-app-record.sh

@@ -0,0 +1,69 @@
+#!/bin/bash
+
+set -e
+
+RECORD_FILE=tmp.rf.$$
+CONFIG_FILE=`mktemp`
+
+CERC_APP_TYPE=${CERC_APP_TYPE:-"webapp"}
+CERC_REPO_REF=${CERC_REPO_REF:-${GITHUB_SHA:-`git log -1 --format="%H"`}}
+CERC_IS_LATEST_RELEASE=${CERC_IS_LATEST_RELEASE:-"true"}
+
+rcd_name=$(jq -r '.name' package.json | sed 's/null//')
+rcd_desc=$(jq -r '.description' package.json | sed 's/null//')
+rcd_repository=$(jq -r '.repository' package.json | sed 's/null//')
+rcd_homepage=$(jq -r '.homepage' package.json | sed 's/null//')
+rcd_license=$(jq -r '.license' package.json | sed 's/null//')
+rcd_author=$(jq -r '.author' package.json | sed 's/null//')
+rcd_app_version=$(jq -r '.version' package.json | sed 's/null//')
+
+cat <<EOF > "$CONFIG_FILE"
+services:
+  registry:
+    rpcEndpoint: '${CERC_REGISTRY_RPC_ENDPOINT:-http://testnet-a-1.dev.vaasl.io:26657}'
+    gqlEndpoint: '${CERC_REGISTRY_GQL_ENDPOINT:-http://testnet-a-1.dev.vaasl.io:9473/api}'
+    chainId: ${CERC_REGISTRY_CHAIN_ID:-laconic-08062024}
+    gas: 900000
+    fees: 900000alnt
+EOF
+
+next_ver=$(laconic -c $CONFIG_FILE registry record list --type ApplicationRecord --all --name "$rcd_name" 2>/dev/null | jq -r -s ".[] | sort_by(.createTime) | reverse | [ .[] | select(.bondId == \"$CERC_REGISTRY_BOND_ID\") ] | .[0].attributes.version" | awk -F. -v OFS=. '{$NF += 1 ; print}')
+
+if [ -z "$next_ver" ] || [ "1" == "$next_ver" ]; then
+  next_ver=0.0.1
+fi
+
+cat <<EOF | sed '/.*: ""$/d' > "$RECORD_FILE"
+record:
+  type: ApplicationRecord
+  version: ${next_ver}
+  name: "$rcd_name"
+  description: "$rcd_desc"
+  homepage: "$rcd_homepage"
+  license: "$rcd_license"
+  author: "$rcd_author"
+  repository:
+    - "$rcd_repository"
+  repository_ref: "$CERC_REPO_REF"
+  app_version: "$rcd_app_version"
+  app_type: "$CERC_APP_TYPE"
+EOF
+
+
+cat $RECORD_FILE
+RECORD_ID=$(laconic -c $CONFIG_FILE registry record publish --filename $RECORD_FILE --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} | jq -r '.id')
+echo $RECORD_ID
+
+if [ -z "$CERC_REGISTRY_APP_LRN" ]; then
+  authority=$(echo "$rcd_name" | cut -d'/' -f1 | sed 's/@//')
+  app=$(echo "$rcd_name" | cut -d'/' -f2-)
+  CERC_REGISTRY_APP_LRN="lrn://$authority/applications/$app"
+fi
+
+laconic -c $CONFIG_FILE registry name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_LRN@${rcd_app_version}" "$RECORD_ID"
+laconic -c $CONFIG_FILE registry name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_LRN@${CERC_REPO_REF}" "$RECORD_ID"
+if [ "true" == "$CERC_IS_LATEST_RELEASE" ]; then
+  laconic -c $CONFIG_FILE registry name set --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} "$CERC_REGISTRY_APP_LRN" "$RECORD_ID"
+fi
+
+rm -f $RECORD_FILE $CONFIG_FILE

scripts/request-app-deployment.sh

@@ -0,0 +1,61 @@
+#!/bin/bash
+
+set -e
+
+RECORD_FILE=tmp.rf.$$
+CONFIG_FILE=`mktemp`
+
+rcd_name=$(jq -r '.name' package.json | sed 's/null//' | sed 's/^@//')
+rcd_app_version=$(jq -r '.version' package.json | sed 's/null//')
+
+cat <<EOF > "$CONFIG_FILE"
+services:
+  registry:
+    rpcEndpoint: '${CERC_REGISTRY_RPC_ENDPOINT:-http://testnet-a-2.dev.vaasl.io:26657}'
+    gqlEndpoint: '${CERC_REGISTRY_GQL_ENDPOINT:-http://testnet-a-2.dev.vaasl.io:9473/api}'
+    chainId: ${CERC_REGISTRY_CHAIN_ID:-laconic-08062024}
+    gas: 900000
+    fees: 900000alnt
+EOF
+
+if [ -z "$CERC_REGISTRY_APP_LRN" ]; then
+  authority=$(echo "$rcd_name" | cut -d'/' -f1 | sed 's/@//')
+  app=$(echo "$rcd_name" | cut -d'/' -f2-)
+  CERC_REGISTRY_APP_LRN="lrn://$authority/applications/$app"
+fi
+
+APP_RECORD=$(laconic -c $CONFIG_FILE registry name resolve "$CERC_REGISTRY_APP_LRN" | jq '.[0]')
+if [ -z "$APP_RECORD" ] || [ "null" == "$APP_RECORD" ]; then
+  echo "No record found for $CERC_REGISTRY_APP_LRN."
+  exit 1
+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"
+record:
+  type: ApplicationDeploymentRequest
+  version: 1.0.0
+  name: "$rcd_name@$rcd_app_version"
+  application: "$CERC_REGISTRY_APP_LRN@$rcd_app_version"
+  dns: "$CERC_REGISTRY_DEPLOYMENT_HOSTNAME"
+  deployment: "$CERC_REGISTRY_DEPLOYMENT_LRN"
+  to: $MY_ACCOUNT
+  config:
+    env:
+      CERC_WEBAPP_DEBUG: "$rcd_app_version"
+      LACONIC_HOSTED_CONFIG_services_wns_server: "$LACONIC_HOSTED_CONFIG_services_wns_server"
+      LACONIC_HOSTED_CONFIG_services_wns_webui: "$LACONIC_HOSTED_CONFIG_services_wns_webui"
+      LACONIC_HOSTED_CONFIG_services_signal_api: "$LACONIC_HOSTED_CONFIG_services_signal_api"
+      LACONIC_HOSTED_CONFIG_app_api_url: "$LACONIC_HOSTED_CONFIG_app_api_url"
+  meta:
+    note: "Added by CI @ `date`"
+    repository: "`git remote get-url origin`"
+    repository_ref: "${GITHUB_SHA:-`git log -1 --format="%H"`}"
+EOF
+
+cat $RECORD_FILE
+RECORD_ID=$(laconic -c $CONFIG_FILE registry record publish --filename $RECORD_FILE --user-key "${CERC_REGISTRY_USER_KEY}" --bond-id ${CERC_REGISTRY_BOND_ID} | jq -r '.id')
+echo $RECORD_ID
+
+rm -f $RECORD_FILE $CONFIG_FILE

src/containers/panels/registry/RegistryRecords.js

@@ -3,7 +3,7 @@
 //
 
 import moment from 'moment';
-import React, { useContext } from 'react';
+import React, { useContext, useState } from 'react';
 import { useQuery } from '@apollo/react-hooks';
 import { makeStyles } from '@material-ui/core';
 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 TableRow from '@material-ui/core/TableRow';
 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';
 
@@ -68,9 +70,14 @@ export const RecordType = ({ type = types[0].key, onChange }) => {
 const RegistryRecords = ({ type }) => {
   const { config } = useContext(ConsoleContext);
   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,
-    variables: { attributes: { type } }
+    variables: { attributes: { type, limit: rowsPerPage, offset: offset } }
   }));
 
   if (!data) {
@@ -79,70 +86,100 @@ const RegistryRecords = ({ type }) => {
 
   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 (
-    <Table>
+    <Paper style={{
-      <TableHead>
+      width: '100%',
-        <TableRow>
+    }}>
-          <TableCell onClick={sortBy('attributes.type')} size='medium'>Type</TableCell>
+      <TableContainer>
-          <TableCell onClick={sortBy('names[0]')}>Registered Names</TableCell>
+        <Table>
-          <TableCell onClick={sortBy('attributes.version')} size='small'>Version</TableCell>
+          <TableHead>
-          <TableCell onClick={sortBy('attributes.name')}>Display Name</TableCell>
+            <TableRow>
-          <TableCell onClick={sortBy('createTime')} size='small'>Created</TableCell>
+              <TableCell onClick={sortBy('attributes.type')} size='medium'>Type</TableCell>
-          <TableCell onClick={sortBy('attributes.package')}>Package</TableCell>
+              <TableCell onClick={sortBy('names[0]')}>Registered Names</TableCell>
-          <TableCell size='icon' />
+              <TableCell onClick={sortBy('attributes.version')} size='small'>Version</TableCell>
-        </TableRow>
+              <TableCell onClick={sortBy('attributes.name')}>Display Name</TableCell>
-      </TableHead>
+              <TableCell onClick={sortBy('createTime')} size='small'>Created</TableCell>
-      <TableBody>
+              <TableCell onClick={sortBy('attributes.package')}>Package</TableCell>
-        {records.sort(sorter)
+              <TableCell size='icon' />
-          .map((record) => {
+            </TableRow>
-            const { id, names, createTime, attributes: { type, name: displayName, fileName, version, description, service, package: pkg } } = record;
+          </TableHead>
+          <TableBody>
+            {records.sort(sorter).map((record) => {
+              const { id, names, createTime, attributes: { type, name: displayName, fileName, version, description, service, package: pkg } } = record;
 
-            let pkgLink;
+              let pkgLink;
-            let appLinks;
+              let appLinks;
 
-            if (pkg) {
+              if (pkg) {
-              pkgLink = (<PackageLink config={config} type={type} pkg={pkg} />);
+                pkgLink = (<PackageLink config={config} type={type} pkg={pkg} />);
-            }
+              }
 
-            if (type === 'lrn:app') {
+              if (type === 'lrn:app') {
-              appLinks = (
+                appLinks = (
-                <>
+                  <>
-                  {(names || []).map(lrn =>
+                    {(names || []).map(lrn =>
-                    <div key={lrn}>
+                      <div key={lrn}>
-                      <AppLink config={config} lrn={lrn} />
+                        <AppLink config={config} lrn={lrn} />
-                    </div>
+                      </div>
-                  )}
+                    )}
-                </>
+                  </>
+                );
+              }
+
+              return (
+                <TableRow key={id} size='small'>
+                  <TableCell monospace>{type}</TableCell>
+                  <TableCell monospace>
+                    {appLinks || (names || []).map(name => <div key={name}>{name}</div>)}
+                  </TableCell>
+                  <TableCell monospace>{version}</TableCell>
+                  <TableCell>{displayName || service || fileName || description}</TableCell>
+                  <TableCell>{moment.utc(createTime).fromNow()}</TableCell>
+                  <TableCell monospace>{pkgLink}</TableCell>
+                  <TableCell>
+                    <QueryLink config={config} id={id} icon />
+                  </TableCell>
+                </TableRow>
               );
-            }
+            })}
-
+          </TableBody>
-            return (
+        </Table>
-              <TableRow key={id} size='small'>
+      </TableContainer>
-                <TableCell monospace>{type}</TableCell>
+      <TablePagination
-                <TableCell monospace>
+        component="td"
-                  {appLinks || (names || []).map(name => <div key={name}>{name}</div>)}
+        rowsPerPageOptions={[5, 10, 25]}
-                </TableCell>
+        count={-1}
-                <TableCell monospace>
+        rowsPerPage={rowsPerPage}
-                  {version}
+        page={page}
-                </TableCell>
+        onPageChange={handleChangePage}
-                <TableCell>
+        onRowsPerPageChange={handleChangeRowsPerPage}
-                  {displayName || service || fileName || description}
+        labelDisplayedRows={labelDisplayedRows}
-                </TableCell>
+        nextIconButtonProps={{
-                <TableCell>
+          disabled: records.length < rowsPerPage,
-                  {moment.utc(createTime).fromNow()}
+        }}
-                </TableCell>
+      />
-                <TableCell monospace>
+    </Paper>
-                  {pkgLink}
-                </TableCell>
-                <TableCell>
-                  <QueryLink config={config} id={id} icon />
-                </TableCell>
-              </TableRow>
-            );
-          }
-          )}
-      </TableBody>
-    </Table>
   );
 };
 

src/resolvers.js

@@ -45,7 +45,9 @@ export const createResolvers = config => {
 
       wns_records: async (_, { attributes }) => {
         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 {
           __typename: 'JSONResult',

yarn.lock

@@ -1037,10 +1037,10 @@
   resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39"
   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:
     "@cosmjs/amino" "^0.28.1"
     "@cosmjs/crypto" "^0.28.1"