ds - fix sort order

Author: prohazko2

README.md

@@ -52,3 +52,15 @@ Or docker installation:
 2. Paste access token to `Token` config field
 
 ![Rightech IoT Token Config](https://raw.githubusercontent.com/Rightech/ric-datasource/master/docs/img/config.png)
+
+
+## Development
+
+```
+> npm start
+> docker run -it -p 3000:3000 \
+  -e GF_APP_MODE=development \
+  -e GF_PLUGINS_ALLOW_LOADING_UNSIGNED_PLUGINS=rightech-ric-datasource \
+  -v "$(pwd)"/dist:/var/lib/grafana/plugins/rightech-ric-datasource \
+  --name=grafana grafana/grafana:8.3.1
+```

src/datasource.ts

@@ -47,14 +47,14 @@ export class DataSource extends DataSourceApi<RicQuery, RicDataSourceOptions> {
 
         const id = object._id;
         const name = object.name;
-        const only = ['_ts', 'time', ...params.map(({ id }) => id)];
+        const only = ['_ts', 'time', 'online', ...params.map(({ id }) => id)];
 
         const packetsUrl = this.proxyApiUrl(
           `objects/${id}/packets?${qs({ from, to, only, nolimit: true, streamed: true })}`
         );
 
         let packets: Packet[] = await getBackendSrv().get(packetsUrl);
-        packets.sort((a, b) => b.time! - a.time!);
+        packets.sort((a, b) => a.time! - b.time!);
 
         const slice = new MutableDataFrame({
           refId: target.refId,

src/util/store.ts

@@ -61,6 +61,16 @@ export function isArgumentNode(node: ModelNode): node is ArgumentNode {
   return node.type === 'argument';
 }
 
+function getOnlineNode(): ArgumentNode {
+  return {
+    active: true,
+    dataType: 'boolean',
+    type: 'argument',
+    id: 'online',
+    name: 'online',
+  };
+}
+
 export function getArgumentsOf(ids: string[]): ArgumentNode[] {
   return ids.flatMap((objectId) => {
     const object = objects.getById(objectId);
@@ -71,7 +81,12 @@ export function getArgumentsOf(ids: string[]): ArgumentNode[] {
     if (!model) {
       return [];
     }
-    const xs = filterNodes<ArgumentNode>(model.data as any, (x) => isArgumentNode(x));
+    let xs = filterNodes<ArgumentNode>(model.data as any, (x) => isArgumentNode(x));
+
+    if (!xs.find((x) => x.id === 'online')) {
+      xs = [getOnlineNode(), ...xs];
+    }
+
     return xs;
   });
 }