Merge branch 'develop' into master

client/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@superalgos/operations-client",
-  "version": "0.0.18",
+  "version": "0.0.21",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

server/src/schema/queries/HistoryClones.js

@@ -1,4 +1,4 @@
-import { GraphQLList } from 'graphql'
+import { GraphQLList, GraphQLString } from 'graphql'
 import { AuthentificationError, OperationsError } from '../../errors'
 import { CloneType } from '../types'
 import { Clone } from '../../models'
@@ -6,9 +6,11 @@ import logger from '../../config/logger'
 import cloneDetails from '../cloneDetails'
 import teamQuery from '../../graphQLCalls/teamQuery'
 
-const args = {}
+const args = {
+  botType: { type: GraphQLString }
+}
 
-const resolve = async(parent, args, context) => {
+const resolve = async(parent, { botType }, context) => {
   logger.debug('Retrieving History Clones.')
   try {
     if (!context.userId) {
@@ -25,8 +27,12 @@ const resolve = async(parent, args, context) => {
       clones[i] = await cloneDetails(context.userId, team.data.data.teams_TeamById, clones[i])
       clones[i].botType = clones[i].kind // Only for listing we show the teams value
     }
-
-    return clones
+    if (botType) {
+      var filtered = clones.filter((value) => value.botType === botType)
+      return filtered
+    } else {
+      return clones
+    }
   } catch (err) {
     logger.error('Retrieving History Clones error: %s', err.stack)
     throw new OperationsError('There has been an error retrieving history clones.')

server/src/schema/queries/ListClones.js

@@ -1,4 +1,4 @@
-import { GraphQLList } from 'graphql'
+import { GraphQLList, GraphQLString } from 'graphql'
 import { AuthentificationError, OperationsError } from '../../errors'
 import { CloneType } from '../types'
 import { Clone } from '../../models'
@@ -8,9 +8,11 @@ import getCloneLogs from '../../kubernetes/getClonePodLogs'
 import cloneDetails from '../cloneDetails'
 import teamQuery from '../../graphQLCalls/teamQuery'
 
-const args = {}
+const args = {
+  botType: { type: GraphQLString }
+}
 
-const resolve = async(parent, args, context) => {
+const resolve = async (parent, { botType }, context) => {
   logger.debug('List Clones -> Entering Fuction.')
   try {
     if (!context.userId) {
@@ -32,7 +34,12 @@ const resolve = async(parent, args, context) => {
       clones[i].botType = clones[i].kind // Only for listing we show the teams value
       clones[i].botSlug = clones[i].botSlug
     }
-    return clones
+    if (botType) {
+      var filtered = clones.filter((value) => value.botType === botType)
+      return filtered
+    } else {
+      return clones
+    }
   } catch (err) {
     logger.error('List Clones error: %s', err.stack)
     throw new OperationsError('There has been an error listing the clones.')