From a3df29c72990de6aea5e7252d05503e30895bcb7 Mon Sep 17 00:00:00 2001
From: Ashwin Phatak <ashwinpphatak@gmail.com>
Date: Tue, 28 Jul 2020 15:51:35 +0530
Subject: [PATCH] Update app/bot pages, fix sorting.

---
 .../console-app/src/components/QueryLink.js    |  2 +-
 .../src/containers/panels/apps/AppRecords.js   | 18 +++++++++++-------
 .../src/containers/panels/bots/BotRecords.js   | 12 ++++++------
 .../src/containers/panels/wns/WNSRecords.js    | 12 ++++++------
 4 files changed, 24 insertions(+), 20 deletions(-)

diff --git a/packages/console-app/src/components/QueryLink.js b/packages/console-app/src/components/QueryLink.js
index 6cf6dfa..686df90 100644
--- a/packages/console-app/src/components/QueryLink.js
+++ b/packages/console-app/src/components/QueryLink.js
@@ -11,7 +11,7 @@ import { getServiceUrl } from '../util/config';
 
 const QUERY = `
   query {
-    getRecordsByIds([ "%ID%" ]) {
+    getRecordsByIds(ids: [ "%ID%" ]) {
       id
       names
       bondId
diff --git a/packages/console-app/src/containers/panels/apps/AppRecords.js b/packages/console-app/src/containers/panels/apps/AppRecords.js
index 581945f..68a467d 100644
--- a/packages/console-app/src/containers/panels/apps/AppRecords.js
+++ b/packages/console-app/src/containers/panels/apps/AppRecords.js
@@ -25,7 +25,7 @@ const AppRecords = () => {
   const [sorter, sortBy] = useSorter('createTime', false);
   const appResponse = useQueryStatusReducer(useQuery(WNS_RECORDS, {
     pollInterval: config.api.intervalQuery,
-    variables: { attributes: { type: 'wrn:app' } }
+    variables: { attributes: { type: 'app' } }
   }));
 
   // TODO(telackey): Does this also need an interval?
@@ -42,22 +42,26 @@ const AppRecords = () => {
     <Table>
       <TableHead>
         <TableRow>
-          <TableCell onClick={sortBy('name')}>Identifier</TableCell>
-          <TableCell onClick={sortBy('version')} size='small'>Version</TableCell>
-          <TableCell onClick={sortBy('attributes.displayName')}>Name</TableCell>
+          <TableCell onClick={sortBy('names[0]')}>Identifier</TableCell>
+          <TableCell onClick={sortBy('attributes.version')} size='small'>Version</TableCell>
+          <TableCell onClick={sortBy('attributes.name')}>Name</TableCell>
           <TableCell onClick={sortBy('createTime')} size='small'>Created</TableCell>
           <TableCell size='icon' />
         </TableRow>
       </TableHead>
       <TableBody>
-        {appData.sort(sorter).map(({ id, name, version, createTime, attributes: { displayName, package: hash } }) => {
+        {appData.sort(sorter).map(({ id, names, createTime, attributes: { name: displayName, version, package: hash } }) => {
           return (
             <TableRow key={id} size='small'>
               <TableCell monospace>
-                <AppLink config={config} name={name} />
+                {names.map(name => <>
+                  <AppLink config={config} name={name} />
+                  <br />
+                  </>
+                )}
               </TableCell>
               <TableCell monospace>
-                <AppLink config={config} name={name} version={version} text={version} />
+                {version}
               </TableCell>
               <TableCell>
                 {displayName}
diff --git a/packages/console-app/src/containers/panels/bots/BotRecords.js b/packages/console-app/src/containers/panels/bots/BotRecords.js
index 4b07c66..651edfd 100644
--- a/packages/console-app/src/containers/panels/bots/BotRecords.js
+++ b/packages/console-app/src/containers/panels/bots/BotRecords.js
@@ -22,7 +22,7 @@ const BotRecords = () => {
   const [sorter, sortBy] = useSorter('createTime', false);
   const data = useQueryStatusReducer(useQuery(WNS_RECORDS, {
     pollInterval: config.api.intervalQuery,
-    variables: { attributes: { type: 'wrn:bot' } }
+    variables: { attributes: { type: 'bot' } }
   }));
 
   if (!data) {
@@ -35,18 +35,18 @@ const BotRecords = () => {
     <Table>
       <TableHead>
         <TableRow>
-          <TableCell onClick={sortBy('name')}>Identifier</TableCell>
-          <TableCell onClick={sortBy('version')} size='small'>Version</TableCell>
-          <TableCell onClick={sortBy('attributes.displayName')}>Name</TableCell>
+          <TableCell onClick={sortBy('names[0]')}>Identifier</TableCell>
+          <TableCell onClick={sortBy('attributes.version')} size='small'>Version</TableCell>
+          <TableCell onClick={sortBy('attributes.name')}>Name</TableCell>
           <TableCell onClick={sortBy('createTime')} size='small'>Created</TableCell>
           <TableCell size='icon' />
         </TableRow>
       </TableHead>
       <TableBody>
-        {records.sort(sorter).map(({ id, name, version, createTime, attributes: { displayName } }) => {
+        {records.sort(sorter).map(({ id, names, createTime, attributes: { name: displayName, version } }) => {
           return (
             <TableRow key={id} size='small'>
-              <TableCell monospace>{name}</TableCell>
+              <TableCell monospace>{names}</TableCell>
               <TableCell monospace>{version}</TableCell>
               <TableCell>{displayName}</TableCell>
               <TableCell>{moment.utc(createTime).fromNow()}</TableCell>
diff --git a/packages/console-app/src/containers/panels/wns/WNSRecords.js b/packages/console-app/src/containers/panels/wns/WNSRecords.js
index f36b260..dd3715d 100644
--- a/packages/console-app/src/containers/panels/wns/WNSRecords.js
+++ b/packages/console-app/src/containers/panels/wns/WNSRecords.js
@@ -83,12 +83,12 @@ const WNSRecords = ({ type }) => {
     <Table>
       <TableHead>
         <TableRow>
-          <TableCell onClick={sortBy('type')} size='medium'>Type</TableCell>
-          <TableCell onClick={sortBy('name')}>Identifier</TableCell>
-          <TableCell onClick={sortBy('version')} size='small'>Version</TableCell>
-          <TableCell onClick={sortBy('attributes.displayName')}>Name</TableCell>
+          <TableCell onClick={sortBy('attributes.type')} size='medium'>Type</TableCell>
+          <TableCell onClick={sortBy('names[0]')}>Identifier</TableCell>
+          <TableCell onClick={sortBy('attributes.version')} size='small'>Version</TableCell>
+          <TableCell onClick={sortBy('attributes.name')}>Name</TableCell>
           <TableCell onClick={sortBy('createTime')} size='small'>Created</TableCell>
-          <TableCell onClick={sortBy('package')}>Package</TableCell>
+          <TableCell onClick={sortBy('attributes.package')}>Package</TableCell>
           <TableCell size='icon' />
         </TableRow>
       </TableHead>
@@ -135,7 +135,7 @@ const WNSRecords = ({ type }) => {
                   {pkgLink}
                 </TableCell>
                 <TableCell>
-                  <QueryLink config={config} name={name} icon />
+                  <QueryLink config={config} id={id} icon />
                 </TableCell>
               </TableRow>
             );