Skip to content

Commit 6e2afd3

Browse files
adejanovskiadejanovski
committed
Ninja fix for hardcoded urls
1 parent a07d2e6 commit 6e2afd3

15 files changed

+21
-20
lines changed

‎src/server/src/main/resources/assets/deps.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/server/src/main/resources/assets/index.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
2121
<![endif]-->
2222

23-
<script type="text/javascript" src="deps.js?d9db53a91d2936ce0bb4"></script><script type="text/javascript" src="index.js?d9db53a91d2936ce0bb4"></script></head>
23+
<script type="text/javascript" src="deps.js?dd6773b53f77cf1b5728"></script><script type="text/javascript" src="index.js?dd6773b53f77cf1b5728"></script></head>
2424

2525
<body>
2626

‎src/server/src/main/resources/assets/index.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/server/src/main/resources/assets/repair.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
2121
<![endif]-->
2222

23-
<script type="text/javascript" src="deps.js?d9db53a91d2936ce0bb4"></script><script type="text/javascript" src="repair.js?d9db53a91d2936ce0bb4"></script></head>
23+
<script type="text/javascript" src="deps.js?dd6773b53f77cf1b5728"></script><script type="text/javascript" src="repair.js?dd6773b53f77cf1b5728"></script></head>
2424

2525
<body>
2626

‎src/server/src/main/resources/assets/repair.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/server/src/main/resources/assets/schedules.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
2121
<![endif]-->
2222

23-
<script type="text/javascript" src="deps.js?d9db53a91d2936ce0bb4"></script><script type="text/javascript" src="schedules.js?d9db53a91d2936ce0bb4"></script></head>
23+
<script type="text/javascript" src="deps.js?dd6773b53f77cf1b5728"></script><script type="text/javascript" src="schedules.js?dd6773b53f77cf1b5728"></script></head>
2424

2525
<body>
2626

‎src/server/src/main/resources/assets/schedules.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/server/src/main/resources/assets/segments.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<script src="https://oss.maxcdn.com/libs/respond.js/1.4.2/respond.min.js"></script>
2121
<![endif]-->
2222

23-
<script type="text/javascript" src="deps.js?d9db53a91d2936ce0bb4"></script><script type="text/javascript" src="segments.js?d9db53a91d2936ce0bb4"></script></head>
23+
<script type="text/javascript" src="deps.js?dd6773b53f77cf1b5728"></script><script type="text/javascript" src="segments.js?dd6773b53f77cf1b5728"></script></head>
2424

2525
<body>
2626

‎src/server/src/main/resources/assets/segments.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/ui/app/jsx/cluster-list.jsx

+3-2
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,15 @@ const Cluster = React.createClass({
8888
},
8989

9090
getInitialState: function() {
91-
const isDev = window != window.top;
91+
const isDev = window.top.location.pathname.includes('webpack-dev-server');
9292
const URL_PREFIX = isDev ? 'http://127.0.0.1:8080' : '';
93-
return {clusterStatus: {}, clusterStatuses: null, urlPrefix: URL_PREFIX, nbNodes: 0, nodesDown:0};
93+
return {clusterStatus: {}, clusterStatuses: null, urlPrefix: URL_PREFIX , nbNodes: 0, nodesDown:0};
9494
},
9595

9696
componentWillMount: function() {
9797
this._refreshClusterStatus();
9898
this.setState({clusterStatuses: setInterval(this._refreshClusterStatus, 10000)});
99+
console.log("Path " + window.location.pathname);
99100
},
100101

101102
_refreshClusterStatus: function() {

‎src/ui/app/jsx/navbar.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const NavBar = React.createClass({
3333
</div>
3434
</div>
3535
<div className="col-lg-4">
36-
<span className="navbar-brand" style={floatRight}><Button href="https://github.com/thelastpickle/cassandra-reaper/issues/new?body=**Spotted on 1.1.0-SNAPSHOT (8eedba0)**" bsStyle="warning" bsSize="xsmall">Report a bug</Button>
36+
<span className="navbar-brand" style={floatRight}><Button href="https://github.com/thelastpickle/cassandra-reaper/issues/new?body=**Spotted on 1.1.0-SNAPSHOT (a07d2e6)**" bsStyle="warning" bsSize="xsmall">Report a bug</Button>
3737
</span>
3838
</div>
3939
<Modal show={this.state.showModal} onHide={this.close}>
@@ -42,9 +42,9 @@ const NavBar = React.createClass({
4242
</Modal.Header>
4343
<Modal.Body>
4444
<h4>Git commit :</h4>
45-
<p><a href="https://github.com/thelastpickle/cassandra-reaper/commit/8eedba0" target="_blank">https://github.com/thelastpickle/cassandra-reaper/commit/8eedba0</a></p>
45+
<p><a href="https://github.com/thelastpickle/cassandra-reaper/commit/a07d2e6" target="_blank">https://github.com/thelastpickle/cassandra-reaper/commit/a07d2e6</a></p>
4646
<h4>Build date :</h4>
47-
<p>2018-02-02 17:55:27</p>
47+
<p>2018-02-09 06:58:31</p>
4848
</Modal.Body>
4949
<Modal.Footer>
5050
<Button onClick={this.close}>Close</Button>

‎src/ui/app/jsx/repair-form.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ const repairForm = React.createClass({
1212
},
1313

1414
getInitialState: function() {
15-
const isDev = window != window.top;
15+
const isDev = window.top.location.pathname.includes('webpack-dev-server');
1616
const URL_PREFIX = isDev ? 'http://127.0.0.1:8080' : '';
1717

1818
return {

‎src/ui/app/jsx/schedule-form.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const scheduleForm = React.createClass({
1313
},
1414

1515
getInitialState: function() {
16-
const isDev = window != window.top;
16+
const isDev = window.top.location.pathname.includes('webpack-dev-server');
1717
const URL_PREFIX = isDev ? 'http://127.0.0.1:8080' : '';
1818

1919
return {

‎src/ui/app/jsx/segment-list.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const SegmentList = React.createClass({
1414
},
1515

1616
getInitialState: function() {
17-
const isDev = window != window.top;
17+
const isDev = window.top.location.pathname.includes('webpack-dev-server');
1818
const URL_PREFIX = isDev ? 'http://127.0.0.1:8080' : '';
1919
return {segments: [], repairRunId:this.props.repairRunId, scheduler:{}, urlPrefix: URL_PREFIX,
2020
runningCollapsed: false, doneCollapsed: false, notStartedCollapsed: false};

‎src/ui/app/observable.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import $ from "jquery";
66
const POLLING_INTERVAL = 2000;
77

88
// use reaper server url for ajax calls if running on dev server (will be run in iframe)
9-
const isDev = window != window.top;
10-
const URL_PREFIX = isDev ? 'http://127.0.0.1:8080' : '';
9+
const isDev = window.top.location.pathname.includes('webpack-dev-server');
10+
const URL_PREFIX = isDev ? 'http://128.0.0.1:8080' : '';
1111

1212
export const statusObservableTimer = Rx.Observable.timer(0, POLLING_INTERVAL).map(t => {
1313
console.debug("Pinging reaper server..");

0 commit comments

Comments
 (0)