From 76aa83387bcb9cbe90899f27c7b90e4c5dc3f8e5 Mon Sep 17 00:00:00 2001
From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com>
Date: Mon, 28 Jan 2019 10:30:18 -0300
Subject: [PATCH 1/3] Updating operations module
---
client/src/views/layout/header/imports.js | 6 ++++--
server/src/createRemoteSchema.js | 4 ++--
server/src/logger/index.js | 1 +
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/client/src/views/layout/header/imports.js b/client/src/views/layout/header/imports.js
index 092771b76..72283d3db 100644
--- a/client/src/views/layout/header/imports.js
+++ b/client/src/views/layout/header/imports.js
@@ -68,7 +68,8 @@ const operationsMenus = {
icon: Home,
authenticated: true,
submenus: [
- { title: 'Your clones', to: '/operations/browse', icon: ImportContacts },
+ { title: 'Active clones', to: '/operations/browse', icon: ImportContacts },
+ { title: 'History', to: '/operations/history', icon: LibraryAdd },
{ title: 'Clone a bot', to: '/operations/add', icon: AddCircleOutline },
{ title: 'Report a Bug', to: 'https://github.com/Superalgos/OperationsModule/issues/new', icon: BugReport, externalLink: true }
]
@@ -77,6 +78,7 @@ const operationsMenus = {
const financialBeingsMenus = {
title: 'FBs',
to: '/financial-beings',
+ icon: Home,
authenticated: false,
submenus: [
{ title: 'Directory', to: '/financial-beings', icon: ImportContacts }
@@ -87,7 +89,7 @@ const allMenus = [
usersMenus,
teamsMenus,
eventsMenus,
- financialBeingsMenus,
+ // financialBeingsMenus,
keyvaultMenus,
operationsMenus
]
diff --git a/server/src/createRemoteSchema.js b/server/src/createRemoteSchema.js
index 5dcccdc0c..a11e871dc 100644
--- a/server/src/createRemoteSchema.js
+++ b/server/src/createRemoteSchema.js
@@ -45,10 +45,10 @@ export const createRemoteSchema = async (uri, preshared_key) => {
export const createTransformedRemoteSchema = async (prefix, uri, preshared_key) => {
var schema
try {
- logger.info(`About to create ${prefix} schema at ${uri}`)
+ logger.info('About to create %s schema at %s.', prefix, uri)
schema = await createRemoteSchema(uri, preshared_key)
} catch (error) {
- logger.error(`An error occured while fetching ${prefix}, ${uri} schema. Details: ${error}`)
+ logger.error('An error occured while fetching %s, %s schema. Details: %j', prefix, uri, error)
return false
}
const transformedSchema = transformSchema(schema, [
diff --git a/server/src/logger/index.js b/server/src/logger/index.js
index d45a27e85..eb15587e3 100644
--- a/server/src/logger/index.js
+++ b/server/src/logger/index.js
@@ -26,6 +26,7 @@ const logger = createLogger({
level: 'info',
format: format.combine(
format.colorize(),
+ format.splat(),
format.timestamp({ format: 'YY/MM/DD HH:mm' }),
format.printf(
info => `${info.timestamp} - ${info.level}: ${JSON.parse(JSON.stringify(inspect(info.message)))}`
From e89eebdc4eda16e89c233b02d3ff839fe9bbe31e Mon Sep 17 00:00:00 2001
From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com>
Date: Mon, 28 Jan 2019 11:14:05 -0300
Subject: [PATCH 2/3] Operations and Key Vault version update
---
client/package.json | 4 ++--
client/src/App.js | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/client/package.json b/client/package.json
index 8711699ed..72f8b748e 100644
--- a/client/package.json
+++ b/client/package.json
@@ -27,14 +27,14 @@
"devDependencies": {
"@advancedalgos/events-client": "0.0.4",
"@advancedalgos/financial-beings-client": "0.0.5",
- "@advancedalgos/operations-client": "0.0.1",
+ "@superalgos/operations-client": "0.0.2",
"@babel/core": "^7.1.2",
"@babel/plugin-proposal-class-properties": "^7.1.0",
"@babel/plugin-syntax-dynamic-import": "^7.0.0",
"@babel/plugin-transform-runtime": "^7.1.0",
"@babel/preset-env": "^7.1.0",
"@babel/preset-react": "^7.0.0",
- "@superalgos/key-vault-client": "0.0.25",
+ "@superalgos/key-vault-client": "0.0.26",
"@superalgos/teams-client": "0.0.32",
"@superalgos/users-client": "0.0.25",
"@superalgos/web-components": "0.0.18",
diff --git a/client/src/App.js b/client/src/App.js
index 2ba7fb792..73dadf54f 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -19,7 +19,7 @@ import Teams from '@superalgos/teams-client'
import Events from '@advancedalgos/events-client'
import KeyVault from '@superalgos/key-vault-client'
import FinancialBeings from '@advancedalgos/financial-beings-client'
-import Operations from '@advancedalgos/operations-client'
+import Operations from '@superalgos/operations-client'
export const auth = new Auth(
result => console.log('Authentication successful.'),
From 7e6e4f5ec9f62f03a2f616d65207d518fe485e18 Mon Sep 17 00:00:00 2001
From: "mati108@gmail.com" <34651529+matbenitez@users.noreply.github.com>
Date: Tue, 29 Jan 2019 16:12:40 -0300
Subject: [PATCH 3/3] Adding favico
---
client/html/index.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/client/html/index.html b/client/html/index.html
index a6156b7e4..9eb3cc38a 100644
--- a/client/html/index.html
+++ b/client/html/index.html
@@ -10,7 +10,7 @@
-
+