Please enter a public key so you can log into the servers after they are installed.
diff --git a/src/containers/Deploy.js b/src/containers/Deploy.js
index e61b3ca..dc1ca26 100644
--- a/src/containers/Deploy.js
+++ b/src/containers/Deploy.js
@@ -48,7 +48,8 @@ class Deploy extends Component {
}
destroyFunc = (event) => {
- this.props.destroy()
+ this.props.destroy();
+ document.getElementById('destroyoverlay').style.display = 'none';
}
render() {
diff --git a/src/containers/Settings.js b/src/containers/Settings.js
index 1335b90..e40fbe5 100644
--- a/src/containers/Settings.js
+++ b/src/containers/Settings.js
@@ -1,6 +1,6 @@
import React, { Component } from 'react'
import { connect } from 'react-redux'
-import { getKUBAMIP, getKeys, getProxy, updateSettings } from '../actions'
+import { getKUBAMIP, getKeys, getProxy, getOrg, updateSettings } from '../actions'
import SettingsPanel from '../components/panels/settings/'
import Error from '../components/Error'
@@ -10,6 +10,7 @@ class Settings extends Component {
this.state = {
keys: this.props.keys ,
kubam_ip: this.props.kubam_ip,
+ org: this.props.org,
proxy: this.props.proxy,
working: this.props.working,
}
@@ -21,6 +22,7 @@ class Settings extends Component {
this.props.getKUBAMIP()
this.props.getKeys()
this.props.getProxy()
+ this.props.getOrg()
}
componentWillReceiveProps(nextProps) {
@@ -28,6 +30,7 @@ class Settings extends Component {
keys: Array.isArray(nextProps.keys) ? nextProps.keys[0] : "",
kubam_ip: nextProps.kubam_ip,
proxy: nextProps.proxy,
+ org: nextProps.org,
working: nextProps.working,
})
}
@@ -44,6 +47,9 @@ class Settings extends Component {
case "proxy":
s.proxy = event.target.value;
break;
+ case "org":
+ s.org = event.target.value;
+ break;
default:
}
@@ -53,14 +59,14 @@ class Settings extends Component {
updateFunc = (event) => {
// get the ip and the key.
// the keys should be in an array. Right now the interface only allows for one key.
- this.props.updateSettings(this.state.kubam_ip, [this.state.keys], this.state.proxy);
+ this.props.updateSettings(this.state.kubam_ip, [this.state.keys], this.state.proxy, this.state.org);
}
render() {
return (
-
+
)
}
@@ -70,6 +76,7 @@ const mapStateToProps = (state, ownProps) => ({
keys: state.settings.keys,
kubam_ip: state.settings.kubam_ip,
proxy: state.settings.proxy,
+ org: state.settings.org,
working: state.settings.fetching,
error: state.settings.error,
})
@@ -78,7 +85,8 @@ const mapDispatchToProps = (dispatch) => ({
getKUBAMIP: () => dispatch(getKUBAMIP()),
getKeys: () => dispatch(getKeys()),
getProxy: () => dispatch(getProxy()),
- updateSettings: (kubam_ip, keys, proxy) => dispatch(updateSettings(kubam_ip, keys, proxy)),
+ getOrg: () => dispatch(getOrg()),
+ updateSettings: (kubam_ip, keys, proxy, org) => dispatch(updateSettings(kubam_ip, keys, proxy, org)),
})
export default connect(
diff --git a/src/reducers/index.js b/src/reducers/index.js
index 1f01b39..d4ebcbd 100644
--- a/src/reducers/index.js
+++ b/src/reducers/index.js
@@ -7,6 +7,7 @@ import server from './server'
import os from './os'
import settings from './settings'
import deploy from './deploy'
+import kubam from './kubam'
const kubamApp = combineReducers({
tabs,
@@ -17,6 +18,7 @@ const kubamApp = combineReducers({
os,
settings,
deploy,
+ kubam,
})
export default kubamApp
diff --git a/src/reducers/kubam.js b/src/reducers/kubam.js
new file mode 100644
index 0000000..b88b926
--- /dev/null
+++ b/src/reducers/kubam.js
@@ -0,0 +1,22 @@
+import {
+ POST_FEEDBACK,
+ POSTED_FEEDBACK,
+} from '../actions'
+
+const kubam = (state = {
+ feedback: "",
+ }, action) => {
+ switch (action.type) {
+ case POST_FEEDBACK:
+ return Object.assign({}, state, {
+ feedback: action.feedback,
+ })
+ case POSTED_FEEDBACK:
+ return Object.assign({}, state, {
+ feedback: "",
+ })
+ default:
+ return state
+ }
+}
+export default kubam
diff --git a/src/reducers/settings.js b/src/reducers/settings.js
index 31c7e81..8c2b26a 100644
--- a/src/reducers/settings.js
+++ b/src/reducers/settings.js
@@ -2,6 +2,7 @@ import {
RECEIVED_KEYS,
RECEIVED_KUBAM_IP,
RECEIVED_PROXY,
+ RECEIVED_ORG,
KUBAM_ERROR,
UPDATE_SETTINGS,
DID_UPDATE_SETTINGS,
@@ -12,6 +13,7 @@ const settings = (state = {
kubam_ip: "",
fetching: false,
proxy: "",
+ org: "",
msg: "",
error: "",
}, action) => {
@@ -34,6 +36,12 @@ const settings = (state = {
fetching: false,
error: "",
})
+ case RECEIVED_ORG:
+ return Object.assign({}, state, {
+ org: action.org,
+ fetching: false,
+ error: "",
+ })
case KUBAM_ERROR:
return Object.assign({}, state, {
fetching: false,
@@ -44,6 +52,7 @@ const settings = (state = {
keys: action.keys,
kubam_ip: action.kubam_ip,
proxy: action.proxy,
+ org: action.org,
fetching: true,
error: "",
})
diff --git a/src/sagas/index.js b/src/sagas/index.js
index 0a59c91..d456f33 100644
--- a/src/sagas/index.js
+++ b/src/sagas/index.js
@@ -5,6 +5,7 @@ import serverApi from '../services/server'
import osApi from '../services/os'
import settingsApi from '../services/settings'
import deployApi from '../services/deploy'
+import kubamApi from '../services/kubam'
import * as actions from '../actions'
export function* login(action) {
@@ -111,8 +112,16 @@ export function* getProxy() {
yield put(actions.receivedProxy(response.proxy))
}
+export function* getOrg() {
+ let response = yield call(settingsApi.fetchOrg)
+ if (response.error) {
+ return yield put (actions.kubamError(response.error))
+ }
+ yield put(actions.receivedOrg(response.org))
+}
+
export function* updateSettings(action) {
- let response = yield call(settingsApi.updateSettings, { keys : action.keys, kubam_ip: action.kubam_ip, proxy: action.proxy})
+ let response = yield call(settingsApi.updateSettings, { keys : action.keys, kubam_ip: action.kubam_ip, proxy: action.proxy, org: action.org })
if (response.error) {
return yield put (actions.kubamError(response.error))
}
@@ -161,6 +170,15 @@ export function* updateISOMap(action) {
yield put(actions.receivedISOMap(response.iso_map))
}
+export function* postFeedback(action) {
+ console.log("posting feedback!")
+ let response = yield call(kubamApi.postFeedback, { feedback: action.feedback})
+ if (response.error) {
+ return yield put (actions.kubamError(response.error))
+ }
+ yield put(actions.postedFeedback(response))
+}
+
export function* watchLoginRequest() {
yield takeEvery(actions.SUBMIT_CREDS, login);
yield takeEvery(actions.CHECK_LOGIN, get_login);
@@ -183,6 +201,8 @@ export function* watchUCSRequest() {
yield takeEvery(actions.MAKE_ISO_IMAGES, makeISOImages)
yield takeEvery(actions.GET_CATALOG, getCatalog)
yield takeEvery(actions.GET_PROXY, getProxy)
+ yield takeEvery(actions.GET_ORG, getOrg)
+ yield takeEvery(actions.POST_FEEDBACK, postFeedback)
}
export default function* rootSaga() {
diff --git a/src/services/kubam.js b/src/services/kubam.js
new file mode 100644
index 0000000..93d796b
--- /dev/null
+++ b/src/services/kubam.js
@@ -0,0 +1,39 @@
+const kurl = "https://feedback.kubam.io"
+
+// this is the kubam.io api
+const kubamApi = {
+ postFeedback(userData) {
+ return fetch(kurl + '/v1/feedback', {
+ method: 'POST',
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json'
+ },
+ body: JSON.stringify({
+ message: userData.feedback,
+ }),
+ })
+ .then(statusHelper)
+ .then(data => {
+ return data
+ })
+ .catch( (error) => {
+ return error
+ })
+ },
+}
+
+// thanks: https://github.com/redux-saga/redux-saga/issues/561
+function statusHelper (response) {
+ let json = response.json(); // there's always a body.
+ if (response.status >= 200 && response.status < 300) {
+ return json.then(Promise.resolve(response))
+ } else {
+ if (! json.error) {
+ json.error = "Unable to get network settings."
+ }
+ return json.then(Promise.reject.bind(Promise))
+ }
+}
+
+export default kubamApi
diff --git a/src/services/settings.js b/src/services/settings.js
index 96a3c38..9e51464 100644
--- a/src/services/settings.js
+++ b/src/services/settings.js
@@ -50,6 +50,22 @@ const settingsApi = {
return error
})
},
+ fetchOrg(userData) {
+ return fetch(url + '/org', {
+ method: 'GET',
+ headers: {
+ 'Accept': 'application/json',
+ 'Content-Type': 'application/json'
+ },
+ })
+ .then(statusHelper)
+ .then(data => {
+ return data
+ })
+ .catch( (error) => {
+ return error
+ })
+ },
updateSettings(userData) {
return fetch(url + '/settings', {
method: 'POST',
@@ -61,6 +77,7 @@ const settingsApi = {
kubam_ip: userData.kubam_ip,
keys: userData.keys,
proxy: userData.proxy,
+ org: userData.org,
}),
})
.then(statusHelper)