Skip to content

Commit d768a37

Browse files
author
Sung Won Cho
authored
Merge pull request #966 from dgraph-io/dashboard/fix
Browser fix
2 parents f925747 + c74574a commit d768a37

25 files changed

+457
-229
lines changed

‎dashboard/build/asset-manifest.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
2-
"main.css": "static/css/main.4d5f3252.css",
3-
"main.css.map": "static/css/main.4d5f3252.css.map",
4-
"main.js": "static/js/main.27ef2f7f.js",
5-
"main.js.map": "static/js/main.27ef2f7f.js.map",
2+
"main.css": "static/css/main.bb55419c.css",
3+
"main.css.map": "static/css/main.bb55419c.css.map",
4+
"main.js": "static/js/main.107f3438.js",
5+
"main.js.map": "static/js/main.107f3438.js.map",
66
"static/media/addNodeIcon.png": "static/media/addNodeIcon.a1a2d01b.png",
77
"static/media/backIcon.png": "static/media/backIcon.dd0baa69.png",
88
"static/media/connectIcon.png": "static/media/connectIcon.d5267b8d.png",

‎dashboard/build/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="/favicon.ico"><script>window.SERVER_URL=location.protocol+"//"+location.hostname+(location.port?":"+location.port:"")</script><script src="https://use.fontawesome.com/bd4789f5b8.js"></script><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.25.2/theme/neo.css" integrity="sha256-qRnm2qfT/Q52+7DC2rgmj2+ZjTgb9s12gC6tuLb0tv0=" crossorigin="anonymous"/><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.11.0/styles/github.min.css" integrity="sha256-3YM6A3pH4QFCl9WbSU8oXF5N6W/2ylvW0o2g+Z6TmLQ=" crossorigin="anonymous"/><title>Dgraph Browser</title><link href="/static/css/main.4d5f3252.css" rel="stylesheet"></head><body><div id="root"></div><script type="text/javascript" src="/static/js/main.27ef2f7f.js"></script></body></html>
1+
<!DOCTYPE html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="shortcut icon" href="/favicon.ico"><script>window.SERVER_URL=location.protocol+"//"+location.hostname+(location.port?":"+location.port:"")</script><script src="https://use.fontawesome.com/bd4789f5b8.js"></script><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.25.2/theme/neo.css" integrity="sha256-qRnm2qfT/Q52+7DC2rgmj2+ZjTgb9s12gC6tuLb0tv0=" crossorigin="anonymous"/><link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.11.0/styles/github.min.css" integrity="sha256-3YM6A3pH4QFCl9WbSU8oXF5N6W/2ylvW0o2g+Z6TmLQ=" crossorigin="anonymous"/><title>Dgraph Browser</title><script>!function(e,t,r,n,a){if(!e[a]){for(var i=e[a]=[],s=0;s<r.length;s++){var c=r[s];i[c]=i[c]||function(e){return function(){var t=Array.prototype.slice.call(arguments);i.push([e,t])}}(c)}i.SNIPPET_VERSION="1.0.1";var o=t.createElement("script");o.type="text/javascript",o.async=!0,o.src="https://d2yyd1h5u9mauk.cloudfront.net/integrations/web/v1/library/NKLggFBPuCtnmits/"+a+".js";var u=t.getElementsByTagName("script")[0];u.parentNode.insertBefore(o,u)}}(window,document,["survey","reset","config","init","set","get","event","identify","track","page","screen","group","alias"],0,"delighted")</script><link href="/static/css/main.bb55419c.css" rel="stylesheet"></head><body><div id="root"></div><script>!function(){var e,t,r=document,c=r.getElementById,m=r.createElement,a=r.getElementsByTagName,l="typef_orm_share";c.call(r,l)||(e=m.call(r,"script"),e.id=l,e.src="https://embed.typeform.com/embed.js",t=a.call(r,"script")[0],t.parentNode.insertBefore(e,t))}()</script><script type="text/javascript" src="/static/js/main.107f3438.js"></script></body></html>

‎dashboard/build/static/css/main.4d5f3252.css

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎dashboard/build/static/css/main.bb55419c.css

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dashboard/build/static/css/main.4d5f3252.css.map renamed to ‎dashboard/build/static/css/main.bb55419c.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dashboard/build/static/js/main.107f3438.js

Lines changed: 56 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dashboard/build/static/js/main.27ef2f7f.js.map renamed to ‎dashboard/build/static/js/main.107f3438.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dashboard/build/static/js/main.27ef2f7f.js

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎dashboard/public/index.html

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,62 @@
2525
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/codemirror/5.25.2/theme/neo.css" integrity="sha256-qRnm2qfT/Q52+7DC2rgmj2+ZjTgb9s12gC6tuLb0tv0=" crossorigin="anonymous" />
2626
<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.11.0/styles/github.min.css" integrity="sha256-3YM6A3pH4QFCl9WbSU8oXF5N6W/2ylvW0o2g+Z6TmLQ=" crossorigin="anonymous" />
2727
<title>Dgraph Browser</title>
28+
29+
<!--NPS score widget-->
30+
<script>
31+
!(function(e, t, r, n, a) {
32+
if (!e[a]) {
33+
for (var i = (e[a] = []), s = 0; s < r.length; s++) {
34+
var c = r[s];
35+
i[c] =
36+
i[c] ||
37+
(function(e) {
38+
return function() {
39+
var t = Array.prototype.slice.call(arguments);
40+
i.push([e, t]);
41+
};
42+
})(c);
43+
}
44+
i.SNIPPET_VERSION = "1.0.1";
45+
var o = t.createElement("script");
46+
(o.type = "text/javascript"), (o.async = !0), (o.src =
47+
"https://d2yyd1h5u9mauk.cloudfront.net/integrations/web/v1/library/" +
48+
n +
49+
"/" +
50+
a +
51+
".js");
52+
var u = t.getElementsByTagName("script")[0];
53+
u.parentNode.insertBefore(o, u);
54+
}
55+
})(
56+
window,
57+
document,
58+
[
59+
"survey",
60+
"reset",
61+
"config",
62+
"init",
63+
"set",
64+
"get",
65+
"event",
66+
"identify",
67+
"track",
68+
"page",
69+
"screen",
70+
"group",
71+
"alias"
72+
],
73+
"NKLggFBPuCtnmits",
74+
"delighted"
75+
);
76+
</script>
2877
</head>
2978

3079
<body>
3180
<div id="root"></div>
81+
82+
<!--typeform-->
83+
<script> (function() { var qs,js,q,s,d=document, gi=d.getElementById, ce=d.createElement, gt=d.getElementsByTagName, id="typef_orm_share", b="https://embed.typeform.com/"; if(!gi.call(d,id)){ js=ce.call(d,"script"); js.id=id; js.src=b+"embed.js"; q=gt.call(d,"script")[0]; q.parentNode.insertBefore(js,q) } })() </script>
3284
<!--
3385
This HTML file is a template.
3486
If you open it directly in the browser, you will see an empty page.

‎dashboard/src/actions/frames.js

Lines changed: 37 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
export const RECEIVE_FRAME = 'frames/RECEIVE_FRAME';
2-
export const DISCARD_FRAME = 'frames/DISCARD_FRAME';
3-
export const UPDATE_FRAME = 'frames/UPDATE_FRAME';
1+
export const RECEIVE_FRAME = "frames/RECEIVE_FRAME";
2+
export const DISCARD_FRAME = "frames/DISCARD_FRAME";
3+
export const DISCARD_ALL_FRAMES = "frames/DISCARD_ALL_FRAMES";
4+
export const UPDATE_FRAME = "frames/UPDATE_FRAME";
45

56
export function receiveFrame({ id, type, meta, data }) {
67
return {
@@ -11,7 +12,7 @@ export function receiveFrame({ id, type, meta, data }) {
1112
meta,
1213
data
1314
}
14-
}
15+
};
1516
}
1617

1718
export function discardFrame(frameID) {
@@ -21,6 +22,12 @@ export function discardFrame(frameID) {
2122
};
2223
}
2324

25+
export function discardAllFrames() {
26+
return {
27+
type: DISCARD_ALL_FRAMES
28+
};
29+
}
30+
2431
// IDEA: the schema for frame object is getting complext. maybe use class optionally
2532
// with flow?
2633
export function updateFrame({ id, type, meta, data }) {
@@ -32,5 +39,31 @@ export function updateFrame({ id, type, meta, data }) {
3239
meta: meta || {}, // Default argument for meta
3340
data
3441
}
42+
};
43+
}
44+
45+
// helpers
46+
47+
/**
48+
* toggleCollapseFrame returns an action object that will change the `collapsed`
49+
* state of a frame.
50+
*
51+
* @params frame {Object} - target frame
52+
* @params [nextState] {Boolean} - optional param to dictate if the frame should
53+
* collapse. If not provided, the action will toggle the collapsed state
54+
*/
55+
export function toggleCollapseFrame(frame, nextState) {
56+
let shouldCollapse;
57+
if (nextState) {
58+
shouldCollapse = nextState;
59+
} else {
60+
shouldCollapse = !frame.meta.collapsed;
3561
}
62+
63+
return updateFrame({
64+
id: frame.id,
65+
type: frame.type,
66+
data: frame.data,
67+
meta: Object.assign({}, frame.meta, { collapsed: shouldCollapse })
68+
});
3669
}

0 commit comments

Comments
 (0)