Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added updates as per issue #10 fixes all of them #34

Merged
merged 4 commits into from
Mar 10, 2020
Merged

Added updates as per issue #10 fixes all of them #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
80960dc
Set the GET operation as default operation to fast quering around end…
sudipt1999 Mar 7, 2020
784ffcc
added a clear form button also used local storage to store the field …
sudipt1999 Mar 10, 2020
02f6c37
saved the states of properties and resourceIDs to localstorage making…
sudipt1999 Mar 10, 2020
e85c5b4
changed the button position as well as fixed the localstorage check e…
sudipt1999 Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions console-frontend/build/asset-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"files": {
"main.css": "/static/css/main.b015b8f6.chunk.css",
"main.js": "/static/js/main.2e5459c8.chunk.js",
"main.js.map": "/static/js/main.2e5459c8.chunk.js.map",
"main.js": "/static/js/main.4752fb84.chunk.js",
"main.js.map": "/static/js/main.4752fb84.chunk.js.map",
"runtime~main.js": "/static/js/runtime~main.a8a9905a.js",
"runtime~main.js.map": "/static/js/runtime~main.a8a9905a.js.map",
"static/js/2.cd05a796.chunk.js": "/static/js/2.cd05a796.chunk.js",
"static/js/2.cd05a796.chunk.js.map": "/static/js/2.cd05a796.chunk.js.map",
"index.html": "/index.html",
"precache-manifest.dbd30e7bbeb78a0eae5dcb8a4e9d52e9.js": "/precache-manifest.dbd30e7bbeb78a0eae5dcb8a4e9d52e9.js",
"precache-manifest.a47b7618a9685028effd132c1ebe7989.js": "/precache-manifest.a47b7618a9685028effd132c1ebe7989.js",
"service-worker.js": "/service-worker.js",
"static/css/main.b015b8f6.chunk.css.map": "/static/css/main.b015b8f6.chunk.css.map"
}
Expand Down
2 changes: 1 addition & 1 deletion console-frontend/build/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="manifest" crossorigin="use-credentials" href="/manifest.json"/><title>Hydra Agent</title><link href="/static/css/main.b015b8f6.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u||[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={1:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=window.webpackJsonp=window.webpackJsonp||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/2.cd05a796.chunk.js"></script><script src="/static/js/main.2e5459c8.chunk.js"></script></body></html>
<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="shortcut icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><meta name="theme-color" content="#000000"/><link rel="manifest" crossorigin="use-credentials" href="/manifest.json"/><title>Hydra Agent</title><link href="/static/css/main.b015b8f6.chunk.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div><script>!function(l){function e(e){for(var r,t,n=e[0],o=e[1],u=e[2],f=0,i=[];f<n.length;f++)t=n[f],p[t]&&i.push(p[t][0]),p[t]=0;for(r in o)Object.prototype.hasOwnProperty.call(o,r)&&(l[r]=o[r]);for(s&&s(e);i.length;)i.shift()();return c.push.apply(c,u||[]),a()}function a(){for(var e,r=0;r<c.length;r++){for(var t=c[r],n=!0,o=1;o<t.length;o++){var u=t[o];0!==p[u]&&(n=!1)}n&&(c.splice(r--,1),e=f(f.s=t[0]))}return e}var t={},p={1:0},c=[];function f(e){if(t[e])return t[e].exports;var r=t[e]={i:e,l:!1,exports:{}};return l[e].call(r.exports,r,r.exports,f),r.l=!0,r.exports}f.m=l,f.c=t,f.d=function(e,r,t){f.o(e,r)||Object.defineProperty(e,r,{enumerable:!0,get:t})},f.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},f.t=function(r,e){if(1&e&&(r=f(r)),8&e)return r;if(4&e&&"object"==typeof r&&r&&r.__esModule)return r;var t=Object.create(null);if(f.r(t),Object.defineProperty(t,"default",{enumerable:!0,value:r}),2&e&&"string"!=typeof r)for(var n in r)f.d(t,n,function(e){return r[e]}.bind(null,n));return t},f.n=function(e){var r=e&&e.__esModule?function(){return e.default}:function(){return e};return f.d(r,"a",r),r},f.o=function(e,r){return Object.prototype.hasOwnProperty.call(e,r)},f.p="/";var r=window.webpackJsonp=window.webpackJsonp||[],n=r.push.bind(r);r.push=e,r=r.slice();for(var o=0;o<r.length;o++)e(r[o]);var s=n;a()}([])</script><script src="/static/js/2.cd05a796.chunk.js"></script><script src="/static/js/main.4752fb84.chunk.js"></script></body></html>
8 changes: 4 additions & 4 deletions ...ifest.02b26fb4dc23ffa64a91945b5e98557b.js → ...ifest.a47b7618a9685028effd132c1ebe7989.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
self.__precacheManifest = (self.__precacheManifest || []).concat([
{
"revision": "fe4a385bf4b516d55b7c060d62114bb1",
"revision": "57112bdbc86edf3973a4712603b809c8",
"url": "/index.html"
},
{
"revision": "f7ef9ccbb1937dd42789",
"revision": "e7064fa8b665d67aabd1",
"url": "/static/css/main.b015b8f6.chunk.css"
},
{
"revision": "a60891681800a984f7f5",
"url": "/static/js/2.cd05a796.chunk.js"
},
{
"revision": "f7ef9ccbb1937dd42789",
"url": "/static/js/main.a1aa2e85.chunk.js"
"revision": "e7064fa8b665d67aabd1",
"url": "/static/js/main.4752fb84.chunk.js"
},
{
"revision": "42ac5946195a7306e2a5",
Expand Down
22 changes: 0 additions & 22 deletions console-frontend/build/precache-manifest.dbd30e7bbeb78a0eae5dcb8a4e9d52e9.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion console-frontend/build/service-worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
importScripts("https://storage.googleapis.com/workbox-cdn/releases/4.3.1/workbox-sw.js");

importScripts(
"/precache-manifest.dbd30e7bbeb78a0eae5dcb8a4e9d52e9.js"
"/precache-manifest.a47b7618a9685028effd132c1ebe7989.js"
);

self.addEventListener('message', (event) => {
Expand Down
2 changes: 0 additions & 2 deletions console-frontend/build/static/js/main.2e5459c8.chunk.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion console-frontend/build/static/js/main.2e5459c8.chunk.js.map
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions console-frontend/build/static/js/main.4752fb84.chunk.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions console-frontend/build/static/js/main.4752fb84.chunk.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions console-frontend/build/static/js/main.a1aa2e85.chunk.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion console-frontend/build/static/js/main.a1aa2e85.chunk.js.map
View file
Open in desktop

This file was deleted.

121 changes: 110 additions & 11 deletions console-frontend/src/components/hydra-console/HydraConsole.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,16 @@ const styles = theme => ({
boxShadow: '0 3px 5px 2px rgba(255, 255, 255, .3)',
height: 48,
width: '22%',
},
deleteIconButton: {
marginLeft: '60% !important',
marginBottom: '10px',
backgroundColor: GuiTheme.palette.primary.light,
color: GuiTheme.palette.primary.dark,
'&:hover': {
backgroundColor: GuiTheme.palette.secondary.light,
color: GuiTheme.palette.primary.dark,
},
}
});

Expand All @@ -110,6 +120,14 @@ class HydraConsole extends React.Component {
var endpoints = null;
var classesMapping = []
this.agentEndpoint = ""
let selectedOperationIndex = 0

// util variables
this.temporaryEndpoint = null;
this.previousEndpointIndex = 0; // for managing the state and local storage
this.selectedEndpoint = null;
this.selectedOperation = null;
this.getURL = true;

// Modifying reference from indexed array[0, 1, 2] to name ["vocab:Drone", "vocab:.."]
for(var index in this.props.hydraClasses){
Expand All @@ -132,6 +150,20 @@ class HydraConsole extends React.Component {
classesMapping[auxClass].supportedProperty[auxProperty].title] = ""
}
}

// Initialize the local storage with the empty values
if (localStorage.getItem('properties') === null) {
localStorage.setItem('properties', JSON.stringify(classesProperties))
}else{
classesProperties = JSON.parse(localStorage.getItem('properties'))
}

if (localStorage.getItem('resourceIDs') === null) {
localStorage.setItem('resourceIDs', JSON.stringify(resourcesIDs))
}else{
resourcesIDs = JSON.parse(localStorage.getItem('resourceIDs'))
}

this.state = {
hydraClasses: classesMapping,
endpoints: endpoints,
Expand All @@ -141,20 +173,51 @@ class HydraConsole extends React.Component {
selectedOperationIndex: 0,
outputText: " Your request output will be displayed here..."
};
this.temporaryEndpoint = null;
this.selectedEndpoint = null;
this.selectedOperation = null;
this.getURL = true;

}

componentDidMount() {
}

componentDidUpdate() {
this.restorePropertiesAndResourceIDs()
}

restorePropertiesAndResourceIDs() {
if(this.previousEndpointIndex != this.state.selectedEndpointIndex) {
const storedProperties = JSON.parse(localStorage.getItem('properties'))
const storedResourceIDs = JSON.parse(localStorage.getItem('resourceIDs'))

this.setState({
properties: storedProperties,
resourcesIDs: storedResourceIDs
})

// updating for next time
this.previousEndpointIndex = this.state.selectedEndpointIndex
}
}

selectEndpoint(endpointIndex) {
this.setState(
{selectedEndpointIndex: endpointIndex,
selectedOperationIndex: 0}
)
const selectedEndpoint = this.state.endpoints[endpointIndex];
this.selectedEndpoint = selectedEndpoint;

const temporaryEndpoint = selectedEndpoint.property.range.replace("Collection", "")
this.temporaryEndpoint = temporaryEndpoint;

const selectedHydraClass = this.state.hydraClasses[temporaryEndpoint];
const operations = selectedHydraClass.supportedOperation

let selectedOperationIndex = 0;
operations.map((operation, index) => {
if(operation.method == "GET")
selectedOperationIndex = index
})

this.setState({
selectedEndpointIndex: endpointIndex,
selectedOperationIndex: selectedOperationIndex
})
}

selectOperation(operationIndex) {
Expand All @@ -169,6 +232,9 @@ class HydraConsole extends React.Component {

let auxProperties = Object.assign({}, this.state.properties);
auxProperties[this.temporaryEndpoint][e.target.name] = e.target.value;

localStorage.setItem('properties', JSON.stringify(auxProperties))

this.setState({
properties: auxProperties
})
Expand All @@ -180,11 +246,38 @@ class HydraConsole extends React.Component {

let resourcesIDs = Object.assign({}, this.state.resourcesIDs);
resourcesIDs[e.target.name]['ResourceID'] = e.target.value;

localStorage.setItem('resourceIDs', JSON.stringify(resourcesIDs))

this.setState({
resourcesIDs: resourcesIDs
})
}

clearAllInputs(e) {
// Will clear the current endpoints input
let auxProperties = Object.assign({}, this.state.properties);
Object.keys(auxProperties[this.temporaryEndpoint]).map(name => {
auxProperties[this.temporaryEndpoint][name] = ""
})

let resourcesIDs = Object.assign({}, this.state.resourcesIDs);
Object.keys(resourcesIDs).map(name => {
resourcesIDs[name]['ResourceID'] = ""
})

localStorage.setItem('properties', JSON.stringify(auxProperties))
localStorage.setItem('resourceIDs', JSON.stringify(resourcesIDs))


this.setState({
properties: auxProperties,
resourcesIDs: resourcesIDs
})
}



sendCommand(){
const properties = this.state.properties[this.temporaryEndpoint];
var filteredProperties = {}
Expand Down Expand Up @@ -312,11 +405,10 @@ class HydraConsole extends React.Component {

const temporaryEndpoint = selectedEndpoint.property.range.replace("Collection", "")
this.temporaryEndpoint = temporaryEndpoint;

var selectedHydraClass = this.state.hydraClasses[temporaryEndpoint];

const selectedOperation = selectedHydraClass.supportedOperation[
this.state.selectedOperationIndex];
const selectedOperation = selectedHydraClass.supportedOperation[this.state.selectedOperationIndex];
this.selectedOperation = selectedOperation;

var stringProps = JSON.stringify(this.state.properties[temporaryEndpoint], this.jsonStringifyReplacer);
Expand Down Expand Up @@ -363,6 +455,13 @@ class HydraConsole extends React.Component {
direction="column"
justify="center"
alignItems="center">
<Button aria-label="delete"
size="medium"
variant="contained"
className={classes.deleteIconButton}
onClick={(e) => this.clearAllInputs(e)}>
CLEAR
</Button>
<Grid className={classes.propertiesContainer}
container
direction="row"
Expand Down
9 changes: 7 additions & 2 deletions console-frontend/src/components/hydra-console/operations-buttons/OperationsButtons.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,16 @@ class OperationsButtons extends React.Component {
super(props);
var buttons = []

Object.keys(this.props.operations).forEach( (operation) => {
let selectedButton = 0;

const operationsArray = Object.keys(this.props.operations);
operationsArray.forEach( (operation, index) => {
buttons[operation] = false
if(this.props.operations[operation].method == "GET")
selectedButton = index
})

const selectedButton = 0;

buttons[ selectedButton ] = true

this.state = {
Expand Down