Merge branch 'release/2.0.0rc3'

cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "optic-cli",
-  "version": "2.0.0rc1",
+  "version": "2.0.0rc3",
   "description": "",
   "main": "./lib/Cli.js",
   "scripts": {
@@ -21,7 +21,7 @@
     "@babel/core": "^7.1.0",
     "@babel/preset-env": "^7.1.0",
     "@babel/preset-react": "^7.0.0",
-    "mocha": "^3.4.2"
+    "mocha": "^5.2.0"
   },
   "dependencies": {
     "ajv": "^5.2.3",
@@ -52,7 +52,7 @@
     "node-persist": "2.1.0",
     "object-path": "^0.11.4",
     "opn": "^5.4.0",
-    "optic-editor-sdk": "^0.3.0",
+    "optic-editor-sdk": "^0.3.2",
     "os": "^0.1.1",
     "platform": "^1.3.5",
     "progress": "^1.1.8",

cli/src/Cli.js

@@ -47,7 +47,7 @@ commands.attachCommand(refreshCmd)
 // commands.attachCommand(createuserCmd)
 // commands.attachCommand(adduserCmd)
 
-export const standardHelp = program.helpInformation()
+export const standardHelp = () => program.helpInformation()
 
 if (!notifier.update || isDev) { //let's force updates
 	processInput()

cli/src/config.js

@@ -1,7 +1,7 @@
 import {driver} from './jre/jre-install'
 import "regenerator-runtime/runtime";
 
-export const isDev = true
+export const isDev = false
 
 export default (() => {
 

cli/src/interactive/Interactive.js

@@ -34,6 +34,7 @@ global.destructiveLogger = (log) => {
 const editorDisplayManager = new EditorDisplayManager()
 
 const defaultState = {
+	inspectMode: false,
 	inputValue: '',
 	ide: '',
 	context: null,
@@ -51,7 +52,7 @@ export function shouldStart() {
 			resolve()
 		})
 
-		agentC.onError(() => {
+		agentC.onError((e) => {
 			console.error(colors.red(`Current directory does not include Optic project. Run 'optic init' to create one`))
 			process.exit(0)
 		})
@@ -110,6 +111,11 @@ export function startInteractive(initialState = {}) {
 		})
 
 		agentConnection().onContextFound((data) => {
+
+			if (!getState().inspectMode) {
+				return
+			}
+
 			if (data.results.models.length) {
 
 				const currentIntent = getState().intent

cli/src/interactive/actions/Actions.js

@@ -32,6 +32,12 @@ export const actionHandler = (setState, getCurrentState) => {
 					setState({contentMode: contentModesEnum.SYNC, inputValue: '', intent: sync})
 					sync.start()
 					break;
+				case 'inspect':
+					setState({inspectMode: true, inputValue: ''})
+					break;
+				case 'no inspect':
+					setState({inspectMode: false, inputValue: ''})
+					break;
 				default:
 					if (getCurrentState().contentMode === contentModesEnum.EMPTY) {
 						const searchItem = getCurrentState().selectedSearchItem

cli/src/interactive/components/BottomInput.js

@@ -11,7 +11,6 @@ export const bottomInput = () => new Child((initialState, setState, actionHandle
 	const input =  blessed.textbox({
 		style: {
 			fg: 'default',
-			bg: '#e2e2e2',
 			bar: {
 				bg: 'default',
 				fg: 'blue'

cli/src/interactive/components/Content.js

@@ -1,12 +1,12 @@
 import blessed from "blessed";
 import {Child} from "../reactive-blessed/Child";
 import {contentModesEnum} from "../constants/ContentModes";
-import {helpText} from "../constants/Help";
 import {searchList} from "./SearchList";
 import {atBottomAndDown, jsonForm} from "./form/JSONForm";
 import {toggleOnAssertion} from "../util/ToggleOnAssertion";
 import {topFormHelp} from "./form/TopFormHelp";
 import {indicatorContent} from "./IndicatorContent";
+import {standardHelp} from "../../Cli";
 
 let lastState = {}
 let lastIsConfirm = false
@@ -75,7 +75,7 @@ export const content = () => new Child((initialState, setState, actionHandler) =
 function contentForMode(state) {
 	switch (state.contentMode) {
 		case contentModesEnum.HELP:
-			return helpText
+			return standardHelp()
 			break;
 		default:
 			return ''

cli/src/interactive/components/SearchList.js

@@ -85,10 +85,7 @@ export const searchList = () => new Child((initialState, setState, actionHandler
 
 const knowledgeGraphToSearchResults = (inputValue, knowledgeGraph) => {
 
-	if (!inputValue) {
-		return []
-	}
-	const nodes = knowledgeGraph.nodes.filter((i) => !i.internal)
+	const nodes = knowledgeGraph.nodes.filter((i) => !i.internal && i.name.includes(' '))
 	const relationships = knowledgeGraph.edges.filter((i) => i.isTransformation)
 
 	const array = nodes.map((i) => {

cli/src/interactive/components/form/BottomFormInput.js

@@ -12,7 +12,6 @@ export const bottomFormInput = () => new Child((initialState, setState, actionHa
 	const input =  blessed.textbox({
 		style: {
 			fg: 'default',
-			bg: '#e2e2e2',
 			bar: {
 				bg: 'default',
 				fg: 'blue'

cli/src/interactive/intent/GenerateIntent.js

@@ -1,6 +1,5 @@
 import {IntentBase} from "./base/IntentBase";
 import {JSONStage} from "./stages/JSONStage";
-import {routeSchema} from "../json-editor/test/ExampleSchemas";
 import {IndicatorStage} from "./stages/IndicatorStage";
 import {resetToMain} from "../actions/StateMutations";
 import {AsChildOf, Clipboard} from "../../optic/PostChangesInterfaces";
@@ -15,7 +14,7 @@ export class GenerateIntent extends IntentBase {
 		super({stages: [
 			new JSONStage({
 				initialValue: {},
-				schema: routeSchema
+				schema: searchItem.schema
 			}),
 			new IndicatorStage(() => {
 				const jsonStage = this.stages[0]

cli/src/interactive/reactive-blessed/Child.js

@@ -56,6 +56,13 @@ export class Child {
 			return process.exit(0);
 		});
 
+		node.key(['escape'], (ch, key) => {
+			const intent = screen.currentState().intent
+			if (intent) {
+				intent.finish()
+			}
+		});
+
 		this._blessedInstance = node
 		this.addChildren(this._children, screen)
 		screen.registerChild(this)

cli/src/optic/AgentSocket.js

@@ -6,6 +6,10 @@ let _agentConnection = null
 export function agentConnection(connectCallback) {
 	if (!_agentConnection) {
 		_agentConnection = AgentConnection({name: config.projectDirectory})
+
+		setInterval(() => {
+			_agentConnection.socket.send('ping')
+		}, 30000)
 	}
 
 	if (typeof connectCallback === 'function') {