...
 
Commits (2)
This project was bootstrapped with [Create React App](https://github.com/facebook/create-react-app).
## Available Scripts
In the project directory, you can run:
### `npm start`
Runs the app in the development mode.<br>
Open [http://localhost:3000](http://localhost:3000) to view it in the browser.
The page will reload if you make edits.<br>
You will also see any lint errors in the console.
### `npm test`
Launches the test runner in the interactive watch mode.<br>
See the section about [running tests](https://facebook.github.io/create-react-app/docs/running-tests) for more information.
### `npm run build`
Builds the app for production to the `build` folder.<br>
It correctly bundles React in production mode and optimizes the build for the best performance.
The build is minified and the filenames include the hashes.<br>
Your app is ready to be deployed!
See the section about [deployment](https://facebook.github.io/create-react-app/docs/deployment) for more information.
### `npm run eject`
**Note: this is a one-way operation. Once you `eject`, you can’t go back!**
If you aren’t satisfied with the build tool and configuration choices, you can `eject` at any time. This command will remove the single build dependency from your project.
Instead, it will copy all the configuration files and the transitive dependencies (Webpack, Babel, ESLint, etc) right into your project so you have full control over them. All of the commands except `eject` will still work, but they will point to the copied scripts so you can tweak them. At this point you’re on your own.
You don’t have to ever use `eject`. The curated feature set is suitable for small and middle deployments, and you shouldn’t feel obligated to use this feature. However we understand that this tool wouldn’t be useful if you couldn’t customize it when you are ready for it.
## Learn More
You can learn more in the [Create React App documentation](https://facebook.github.io/create-react-app/docs/getting-started).
To learn React, check out the [React documentation](https://reactjs.org/).
### Code Splitting
This section has moved here: https://facebook.github.io/create-react-app/docs/code-splitting
### Analyzing the Bundle Size
This section has moved here: https://facebook.github.io/create-react-app/docs/analyzing-the-bundle-size
### Making a Progressive Web App
This section has moved here: https://facebook.github.io/create-react-app/docs/making-a-progressive-web-app
### Advanced Configuration
This section has moved here: https://facebook.github.io/create-react-app/docs/advanced-configuration
### Deployment
This section has moved here: https://facebook.github.io/create-react-app/docs/deployment
### `npm run build` fails to minify
This section has moved here: https://facebook.github.io/create-react-app/docs/troubleshooting#npm-run-build-fails-to-minify
{
"compilerOptions": {
"baseUrl": "src"
}
}
......@@ -2,62 +2,56 @@
"name": "maintenancedb_view",
"version": "0.1.0",
"description": "WebPage meant to display the content of the maintenance db in the web browser,",
"proxy": "http://lofarmonitortest.control.lofar:8090",
"scripts": {
"flow": "flow",
"build-css": "node-sass-chokidar src/ -o src/",
"watch-css": "npm run build-css && node-sass-chokidar src/ -o src/ --watch --recursive",
"start-js": "react-scripts start",
"build-js": "react-scripts build",
"start": "npm run -p watch-css & npm run start-js",
"build": "npm run build-css && npm run build-js",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject",
"deploy": "npm run build"
},
"proxy": "http://stationmonitor.control.lofar:8000",
"private": true,
"dependencies": {
"ajv": "^6.5.4",
"axios": "^0.18.0",
"bootstrap": "^4.1.3",
"bootstrap-select": "^1.13.3",
"connected-react-router": "^4.5.0",
"jquery": "^3.3.1",
"moment": "^2.22.2",
"node-sass-chokidar": "^1.3.3",
"query-string": "^6.2.0",
"react": "^16.4.2",
"react-autosuggest": "^9.4.2",
"react-datepicker": "^1.7.0",
"react-dom": "^16.4.2",
"axios": "^0.19.0",
"bootstrap": "^4.3.1",
"connected-react-router": "^6.5.2",
"date-fns": "^2.0.1",
"history": "^4.9.0",
"jquery": "^1.9.1",
"moment": "^2.24.0",
"node-sass": "^4.12.0",
"query-string": "^6.8.2",
"react": "^16.9.0",
"react-autosuggest": "^9.4.3",
"react-datepicker": "^2.8.0",
"react-dom": "^16.9.0",
"react-grid-layout": "^0.16.6",
"react-icons": "^3.2.2",
"react-popout": "^1.0.1",
"react-redux": "^5.0.7",
"react-router": "^4.3.1",
"react-router-dom": "^4.3.1",
"react-select": "^2.1.1",
"react-sticky": "^6.0.3",
"react-table": "^6.8.6",
"react-table-container": "^2.0.1",
"react-icons": "^3.7.0",
"react-redux": "^7.1.1",
"react-router": "^5.0.1",
"react-router-dom": "^5.0.1",
"react-scripts": "3.1.1",
"react-table-container": "^2.0.3",
"react-treeview": "^0.4.7",
"react-vega-lite": "^2.0.2",
"reactstrap": "^6.3.1",
"redux": "^4.0.1",
"react-vega-lite": "^6.1.0",
"reactstrap": "^8.0.1",
"redux": "^4.0.4",
"redux-thunk": "^2.3.0",
"vega": "^4.4.0",
"vega-lite": "^2.6.0",
"vega-tooltip": "^0.13.0"
"vega": "^5.5.0",
"vega-lite": "^3.4.0"
},
"devDependencies": {
"react-docgen": "^3.0.0",
"react-scripts": "latest",
"react-styleguidist": "^8.0.6"
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
"private": true,
"browserslist": [
">0.2%",
"not dead",
"not ie <= 11",
"not op_mini all"
]
"eslintConfig": {
"extends": "react-app"
},
"browserslist": {
"production": [
">0.2%",
"not dead",
"not op_mini all"
],
"development": [
"last 1 chrome version",
"last 1 firefox version",
"last 1 safari version"
]
}
}
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="theme-color" content="#000000">
<meta charset="utf-8" />
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta
name="description"
content="Web site created using create-react-app"
/>
<link rel="apple-touch-icon" href="logo192.png" />
<!--
manifest.json provides metadata used when your web app is added to the
homescreen on Android. See https://developers.google.com/web/fundamentals/engage-and-retain/web-app-manifest/
manifest.json provides metadata used when your web app is installed on a
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-->
<link rel="manifest" href="%PUBLIC_URL%/manifest.json">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico?">
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<!--
Notice the use of %PUBLIC_URL% in the tags above.
It will be replaced with the URL of the `public` folder during the build.
......@@ -20,12 +24,10 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>LOFAR - Tests overview</title>
<title>LOFAR Station Monitor</title>
</head>
<body>
<noscript>
You need to enable JavaScript to run this app.
</noscript>
<noscript>You need to enable JavaScript to run this app.</noscript>
<div id="root"></div>
<!--
This HTML file is a template.
......
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
<g fill="#61DAFB">
<path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
<circle cx="420.9" cy="296.5" r="45.7"/>
<path d="M520.5 78.1z"/>
</g>
</svg>
{
"short_name": "TestOverview",
"name": "Station test overview",
"short_name": "Station Monitor",
"name": "LOFAR Station Monitor",
"icons": [
{
"src": "favicon.ico",
......@@ -8,7 +8,7 @@
"type": "image/x-icon"
}
],
"start_url": "./index.html",
"start_url": ".",
"display": "standalone",
"theme_color": "#000000",
"background_color": "#ffffff"
......
# https://www.robotstxt.org/robotstxt.html
User-agent: *
import React, { Component } from 'react';
//Place on top to get the correct order of loading
import './App.css';
import './App.scss';
import LandingPage from 'pages/LandingPage'
import StationOverviewPage from 'pages/StationOverviewPage'
......
......@@ -4,7 +4,7 @@ import {Button, ButtonGroup} from 'reactstrap';
import {setDateRange} from "redux/actions/mainFiltersActions";
import DatePicker from 'react-datepicker';
import moment from 'moment';
import { format, isAfter, subDays } from 'date-fns';
// CSS
import 'react-datepicker/dist/react-datepicker.css';
......@@ -25,7 +25,7 @@ class DateRangeSelectorC extends Component {
startDate = startDate || this.props.startDate;
endDate = endDate || this.props.endDate;
if (startDate.isAfter(endDate)) {
if (isAfter(startDate, endDate)) {
endDate = startDate;
}
......@@ -49,16 +49,16 @@ class DateRangeSelectorC extends Component {
onPeriodClick = (i) => {
this.handleChange({
startDate: moment().subtract(i, 'days'),
endDate: moment()
startDate: subDays(new Date(), i),
endDate: new Date()
});
}
periodIsActive(ndays) {
let now = moment().format("YYYY-MMM-DD"),
past = moment().subtract(ndays, 'days').format("YYYY-MMM-DD");
if (this.props.endDate.format("YYYY-MMM-DD") === now && this.props.startDate.format("YYYY-MMM-DD") === past) {
let now = format(new Date(), "yyyy-MMM-dd"),
past = format(subDays(new Date(), ndays), "yyyy-MMM-dd");
if (format(this.props.endDate, "yyyy-MMM-dd") === now && format(this.props.startDate, "yyyy-MMM-dd") === past) {
return true;
}
return false;
......@@ -87,7 +87,7 @@ class DateRangeSelectorC extends Component {
<DatePicker
selected={this.props.startDate}
selectsStart
dateFormat="YYYY-MMM-DD"
dateFormat="yyyy-MMM-dd"
className='form-control form-control-sm'
startDate={this.props.startDate}
endDate={this.props.endDate}
......@@ -96,7 +96,7 @@ class DateRangeSelectorC extends Component {
<DatePicker
selected={this.props.endDate}
selectsEnd
dateFormat="YYYY-MMM-DD"
dateFormat="yyyy-MMM-dd"
className='form-control form-control-sm'
startDate={this.props.startDate}
endDate={this.props.endDate}
......
......@@ -2,7 +2,7 @@ import React from 'react';
import ReactDOM from 'react-dom';
import App from './App';
import registerServiceWorker from './registerServiceWorker';
import * as serviceWorker from './serviceWorker';
// Redux
import { Provider } from "react-redux";
......@@ -16,4 +16,7 @@ ReactDOM.render(
document.getElementById('root')
);
registerServiceWorker();
// If you want your app to work offline and load faster, you can change
// unregister() to register() below. Note this comes with some pitfalls.
// Learn more about service workers: https://bit.ly/CRA-PWA
serviceWorker.unregister();
......@@ -8,7 +8,7 @@ import StationStatistics from './components/StationStatistics';
import {Responsive, WidthProvider} from 'react-grid-layout';
import * as moment from 'moment';
import { format, subDays } from 'date-fns';
import { connect } from "react-redux";
import { setNewLayout } from "redux/actions/landingPageActions";
import { composeQueryString } from 'utils/utils.js';
......@@ -59,8 +59,8 @@ class LandingPageC extends Component {
}
getLatestObservationURL() {
let nDaysAgo = moment().add(-this.props.period, 'days');
let nDaysAgo_String = nDaysAgo.format('YYYY-MM-DD');
let nDaysAgo = subDays(new Date(), this.props.period);
let nDaysAgo_String = format(nDaysAgo, 'yyyy-MM-dd');
const url = '/api/view/ctrl_latest_observation?format=json'
const parameters = {}
// ---- Mandatory parameters
......@@ -75,8 +75,8 @@ class LandingPageC extends Component {
}
getStationStatisticsURL() {
let nDaysAgo = moment().add(-this.props.period, 'days').format('YYYY-MM-DD');
let now = moment().format('YYYY-MM-DD');
let nDaysAgo = format(subDays(new Date(), this.props.period), 'yyyy-MM-dd');
let now = format(new Date(), 'yyyy-MM-dd');
let averaging_interval = this.props.station_statistics.averaging_window
let test_type = this.props.station_statistics.test_type
let url = '/api/view/ctrl_stationtest_statistics?format=json'
......
import React, { Component } from 'react';
import {connect} from "react-redux";
import {Alert, Container, Row, Col} from 'reactstrap';
import moment from 'moment';
import { format } from 'date-fns';
import NavigationBar from 'components/NavigationBar'
import StationTestView from './components/StationTestView';
......@@ -62,8 +62,8 @@ class StationOverviewPageC extends Component {
format: 'json',
station_name: this.props.selectedStation,
test_type: this.props.testType,
from_date: moment(this.props.startDate).format('YYYY-MM-DD'),
to_date: moment(this.props.endDate).format('YYYY-MM-DD'),
from_date: format(this.props.startDate, 'yyyy-MM-dd'),
to_date: format(this.props.endDate, 'yyyy-MM-dd'),
error_types: this.props.selectedErrorTypes
};
......
import React, { Component } from 'react';
import NavigationBar from 'components/NavigationBar'
import moment from 'moment'
import { format } from 'date-fns'
import {connect} from "react-redux";
import { Toolbar, StationAutoComplete, DateRangeSelector, TestTypeSelector, AntennaTypeSelector, AntennaIdSelector } from 'components/Toolbar'
import {Alert, Container, Col, Row} from "reactstrap";
......@@ -32,8 +32,8 @@ class TilesPageC extends Component {
// ---- Mandatory parameters
parameters.station_name = this.props.selectedStation;
// ---- Optional parameters
parameters.from_date = moment(this.props.startDate).format('YYYY-MM-DD');
parameters.to_date = moment(this.props.endDate).format('YYYY-MM-DD');
parameters.from_date = format(this.props.startDate, 'yyyy-MM-dd');
parameters.to_date = format(this.props.endDate, 'yyyy-MM-dd');
parameters.component_type = this.props.antennaType;
parameters.antenna_id = this.props.antennaId;
parameters.test_type = this.props.testType === 'B' ? 'A' : this.props.testType;
......
import { combineReducers } from "redux";
import { connectRouter } from 'connected-react-router';
import appInitData from "./appInitDataReducers";
import mainFilters from "./mainFilters";
import landingPageReducers from "./landingPageReducers";
import stationOverviewPageReducers from "./stationOverviewPageReducers";
import antennaOverviePageReducers from "./antennaOverviewPageReducers";
export default combineReducers({
export default (history) => combineReducers({
router: connectRouter(history),
appInitData,
mainFilters,
landing_page: landingPageReducers,
......
import moment from 'moment';
import { subDays } from 'date-fns';
import * as a from "../actions/mainFiltersActions";
import { LOCATION_CHANGE } from "connected-react-router";
import queryString from 'query-string';
......@@ -9,8 +9,8 @@ const initialState = {
testType: 'B', // B, S, R
errorsOnly: false,
period: 7, // days
startDate: moment().subtract(7, 'days'),
endDate: moment(),
startDate: subDays(new Date(), 7),
endDate: new Date(),
selectedErrorTypes: [],
antennaId: 0,
antennaType: 'HBA',
......
import { createStore, applyMiddleware, compose } from "redux";
import rootReducer from "./reducers/index.js";
import thunk from 'redux-thunk';
import { createBrowserHistory } from 'history';
import { connectRouter, routerMiddleware } from 'connected-react-router'
import { routerMiddleware } from 'connected-react-router';
import createRootReducer from './reducers'
// Needed for the chrome Redux DevTools extension
const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
......@@ -11,7 +10,7 @@ const composeEnhancers = window.__REDUX_DEVTOOLS_EXTENSION_COMPOSE__ || compose;
const history = createBrowserHistory();
const store = createStore(
connectRouter(history)(rootReducer),
createRootReducer(history),
/* preloadedState, */
composeEnhancers(
applyMiddleware(
......
// In production, we register a service worker to serve assets from local cache.
// This optional code is used to register a service worker.
// register() is not called by default.
// This lets the app load faster on subsequent visits in production, and gives
// it offline capabilities. However, it also means that developers (and users)
// will only see deployed updates on the "N+1" visit to a page, since previously
// cached resources are updated in the background.
// will only see deployed updates on subsequent visits to a page, after all the
// existing tabs open on the page have been closed, since previously cached
// resources are updated in the background.
// To learn more about the benefits of this model, read https://goo.gl/KwvDNy.
// This link also includes instructions on opting out of this behavior.
// To learn more about the benefits of this model and instructions on how to
// opt-in, read https://bit.ly/CRA-PWA
const isLocalhost = Boolean(
window.location.hostname === 'localhost' ||
......@@ -18,14 +20,14 @@ const isLocalhost = Boolean(
)
);
export default function register() {
export function register(config) {
if (process.env.NODE_ENV === 'production' && 'serviceWorker' in navigator) {
// The URL constructor is available in all browsers that support SW.
const publicUrl = new URL(process.env.PUBLIC_URL, window.location);
const publicUrl = new URL(process.env.PUBLIC_URL, window.location.href);
if (publicUrl.origin !== window.location.origin) {
// Our service worker won't work if PUBLIC_URL is on a different origin
// from what our page is served on. This might happen if a CDN is used to
// serve assets; see https://github.com/facebookincubator/create-react-app/issues/2374
// serve assets; see https://github.com/facebook/create-react-app/issues/2374
return;
}
......@@ -33,44 +35,59 @@ export default function register() {
const swUrl = `${process.env.PUBLIC_URL}/service-worker.js`;
if (isLocalhost) {
// This is running on localhost. Lets check if a service worker still exists or not.
checkValidServiceWorker(swUrl);
// This is running on localhost. Let's check if a service worker still exists or not.
checkValidServiceWorker(swUrl, config);
// Add some additional logging to localhost, pointing developers to the
// service worker/PWA documentation.
navigator.serviceWorker.ready.then(() => {
console.log(
'This web app is being served cache-first by a service ' +
'worker. To learn more, visit https://goo.gl/SC7cgQ'
'worker. To learn more, visit https://bit.ly/CRA-PWA'
);
});
} else {
// Is not local host. Just register service worker
registerValidSW(swUrl);
// Is not localhost. Just register service worker
registerValidSW(swUrl, config);
}
});
}
}
function registerValidSW(swUrl) {
function registerValidSW(swUrl, config) {
navigator.serviceWorker
.register(swUrl)
.then(registration => {
registration.onupdatefound = () => {
const installingWorker = registration.installing;
if (installingWorker == null) {
return;
}
installingWorker.onstatechange = () => {
if (installingWorker.state === 'installed') {
if (navigator.serviceWorker.controller) {
// At this point, the old content will have been purged and
// the fresh content will have been added to the cache.
// It's the perfect time to display a "New content is
// available; please refresh." message in your web app.
console.log('New content is available; please refresh.');
// At this point, the updated precached content has been fetched,
// but the previous service worker will still serve the older
// content until all client tabs are closed.
console.log(
'New content is available and will be used when all ' +
'tabs for this page are closed. See https://bit.ly/CRA-PWA.'
);
// Execute callback
if (config && config.onUpdate) {
config.onUpdate(registration);
}
} else {
// At this point, everything has been precached.
// It's the perfect time to display a
// "Content is cached for offline use." message.
console.log('Content is cached for offline use.');
// Execute callback
if (config && config.onSuccess) {
config.onSuccess(registration);
}
}
}
};
......@@ -81,14 +98,15 @@ function registerValidSW(swUrl) {
});
}
function checkValidServiceWorker(swUrl) {
function checkValidServiceWorker(swUrl, config) {
// Check if the service worker can be found. If it can't reload the page.
fetch(swUrl)
.then(response => {
// Ensure service worker exists, and that we really are getting a JS file.
const contentType = response.headers.get('content-type');
if (
response.status === 404 ||
response.headers.get('content-type').indexOf('javascript') === -1
(contentType != null && contentType.indexOf('javascript') === -1)
) {
// No service worker found. Probably a different app. Reload the page.
navigator.serviceWorker.ready.then(registration => {
......@@ -98,7 +116,7 @@ function checkValidServiceWorker(swUrl) {
});
} else {
// Service worker found. Proceed as normal.
registerValidSW(swUrl);
registerValidSW(swUrl, config);
}
})
.catch(() => {
......