From 0af6e810f15709eb60d57841350114850e524dc6 Mon Sep 17 00:00:00 2001 From: Barry Low Date: Sat, 23 Mar 2019 13:46:45 +0100 Subject: [PATCH 1/2] Publish 0.0.23 --- client/package-lock.json | 2 +- client/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 60295d23c..ee733b83d 100644 --- a/client/package-lock.json +++ b/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": { diff --git a/client/package.json b/client/package.json index 483789cf3..2c450f830 100644 --- a/client/package.json +++ b/client/package.json @@ -1,6 +1,6 @@ { "name": "@superalgos/operations-client", - "version": "0.0.21", + "version": "0.0.23", "description": "Superalgos Operations client-side web app", "main": "src/index.js", "dependencies": { From b4a2950e48ac95aee49a22e5c45773ab24aa9e61 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sat, 23 Mar 2019 15:56:01 +0100 Subject: [PATCH 2/2] Making the clones filterable by botType (optional) --- server/src/schema/queries/HistoryClones.js | 16 +++++++++++----- server/src/schema/queries/ListClones.js | 15 +++++++++++---- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/server/src/schema/queries/HistoryClones.js b/server/src/schema/queries/HistoryClones.js index 23bcd6d2f..de5ec8232 100644 --- a/server/src/schema/queries/HistoryClones.js +++ b/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.') diff --git a/server/src/schema/queries/ListClones.js b/server/src/schema/queries/ListClones.js index bb418b293..bb911dd70 100644 --- a/server/src/schema/queries/ListClones.js +++ b/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.')