@@ -142,9 +158,13 @@ const SortableTable = ({
{headerGroups.map(headerGroup => (
{headerGroup.headers.map(column => {
+ let columnClassName = '';
+ if (column.canSort) {
+ columnClassName = `table__sort${column.isSortedDesc === true ? '--desc' : (column.isSortedDesc === false ? '--asc' : '')}`;
+ }
return (
-
+
{column.render('Header')}
- {rows.map((row, i) => {
+ {tableRows.map((row, i) => {
prepareRow(row);
return (
@@ -182,25 +202,34 @@ const SortableTable = ({
})}
+ {shouldUsePagination &&
+
}
);
};
SortableTable.propTypes = {
- primaryIdx: PropTypes.number,
data: PropTypes.array,
- header: PropTypes.array,
order: PropTypes.string,
- row: PropTypes.array,
- sortIdx: PropTypes.string,
+ sortId: PropTypes.string,
+ initialSortId: PropTypes.string,
changeSortProps: PropTypes.func,
onSelect: PropTypes.func,
canSelect: PropTypes.bool,
- collapsible: PropTypes.bool,
rowId: PropTypes.any,
tableColumns: PropTypes.array,
- clearSelected: PropTypes.bool
+ clearSelected: PropTypes.bool,
+ shouldUsePagination: PropTypes.bool
};
export default SortableTable;
diff --git a/app/src/js/components/Table/Table.js b/app/src/js/components/Table/Table.js
index c4a9a1945..d735ec8c7 100644
--- a/app/src/js/components/Table/Table.js
+++ b/app/src/js/components/Table/Table.js
@@ -16,7 +16,6 @@ import ListActions from '../ListActions/ListActions';
class List extends React.Component {
constructor (props) {
super(props);
- this.displayName = 'List';
this.queryNewPage = this.queryNewPage.bind(this);
this.queryNewSort = this.queryNewSort.bind(this);
this.updateSelection = this.updateSelection.bind(this);
@@ -25,12 +24,12 @@ class List extends React.Component {
this.getQueryConfig = this.getQueryConfig.bind(this);
const initialPage = 1;
- const initialSortIdx = props.sortIdx || 0;
+ const initialSortId = props.sortId;
const initialOrder = 'desc';
this.state = {
page: initialPage,
- sortIdx: initialSortIdx,
+ sortId: initialSortId,
order: initialOrder,
selected: [],
clearSelected: false,
@@ -38,7 +37,7 @@ class List extends React.Component {
queryConfig: {
page: initialPage,
order: initialOrder,
- sort_by: initialSortIdx,
+ sort_by: initialSortId,
...(props.query || {})
},
params: {},
@@ -79,7 +78,7 @@ class List extends React.Component {
...sortProps,
queryConfig: this.getQueryConfig({
order: sortProps.order,
- sort_by: sortProps.sortIdx
+ sort_by: sortProps.sortId
}),
clearSelected: true
});
@@ -117,7 +116,7 @@ class List extends React.Component {
return omitBy({
page: this.state.page,
order: this.state.order,
- sort_by: this.state.sortIdx,
+ sort_by: this.state.sortId,
...this.state.params,
...config,
...query
@@ -131,6 +130,7 @@ class List extends React.Component {
children,
bulkActions,
rowId,
+ sortId: initialSortId,
list,
tableColumns,
data
@@ -140,7 +140,7 @@ class List extends React.Component {
const tableData = data || listData;
const {
page,
- sortIdx,
+ sortId,
order,
selected,
clearSelected,
@@ -182,7 +182,8 @@ class List extends React.Component {
canSelect={hasActions}
rowId={rowId}
onSelect={this.updateSelection}
- sortIdx={sortIdx}
+ initialSortId={initialSortId}
+ sortId={sortId}
changeSortProps={this.queryNewSort}
order={order}
clearSelected={clearSelected}
@@ -206,7 +207,7 @@ List.propTypes = {
dispatch: PropTypes.func,
action: PropTypes.func,
children: PropTypes.node,
- sortIdx: PropTypes.string,
+ sortId: PropTypes.string,
query: PropTypes.object,
bulkActions: PropTypes.array,
rowId: PropTypes.any,
diff --git a/app/src/js/components/Timer/timer.js b/app/src/js/components/Timer/timer.js
index 7fa282fa7..8a8adda55 100644
--- a/app/src/js/components/Timer/timer.js
+++ b/app/src/js/components/Timer/timer.js
@@ -1,92 +1,122 @@
'use strict';
import React from 'react';
+import { connect } from 'react-redux';
import PropTypes from 'prop-types';
import _config from '../../config';
+import {
+ TIMER_START,
+ TIMER_STOP,
+ TIMER_SET_COUNTDOWN,
+} from '../../actions/types';
+import isEqual from 'lodash.isequal';
const { updateInterval } = _config;
-const delay = updateInterval / 1000;
+const oneSecondTick = 1000;
+const secondsToRefresh = updateInterval / 1000;
class Timer extends React.Component {
- constructor () {
- super();
- this.state = {
- running: true,
- seconds: delay
- };
+ constructor(props) {
+ super(props);
this.stop = this.stop.bind(this);
this.start = this.start.bind(this);
this.toggle = this.toggle.bind(this);
- this.createTimer = this.createTimer.bind(this);
+ this.refreshTimer = this.refreshTimer.bind(this);
this.interval = this.interval.bind(this);
this.parentClass = this.parentClass.bind(this);
}
- componentDidMount () {
- this.createTimer(this.props.config);
+ componentDidMount() {
+ this.refreshTimer(this.props.config);
}
- componentDidUpdate (prevProps) {
- if (JSON.stringify(prevProps.config) !== JSON.stringify(this.props.config) ||
- (this.props.reload && prevProps.reload !== this.props.reload)) {
- this.createTimer(this.props.config);
+ componentDidUpdate(prevProps) {
+ if (
+ JSON.stringify(prevProps.config) !== JSON.stringify(this.props.config) ||
+ (this.props.reload && prevProps.reload !== this.props.reload) ||
+ !isEqual(prevProps.datepicker, this.props.datepicker)
+ ) {
+ this.refreshTimer(this.props.config);
}
}
- componentWillUnmount () {
- if (this.cancelInterval) { this.cancelInterval(); }
+ componentWillUnmount() {
+ if (this.cancelInterval) {
+ this.cancelInterval();
+ }
}
- stop () {
- if (this.cancelInterval) { this.cancelInterval(); }
- this.setState({ seconds: -1, running: false });
+ stop() {
+ if (this.cancelInterval) {
+ this.cancelInterval();
+ }
+ this.props.dispatch({ type: TIMER_STOP });
}
- start () {
- this.setState({ seconds: 0, running: true });
- this.createTimer(this.props.config);
+ start() {
+ this.props.dispatch({ type: TIMER_START, secondsToRefresh });
+ this.refreshTimer(this.props.config, true);
}
- toggle () {
- if (this.state.running) this.stop();
- else this.start();
+ toggle() {
+ this.props.timer.running ? this.stop() : this.start();
}
- createTimer (config) {
- if (this.cancelInterval) { this.cancelInterval(); }
+ refreshTimer(config, startCountdown) {
+ if (this.cancelInterval) {
+ this.cancelInterval();
+ }
const { dispatch, action } = this.props;
- this.cancelInterval = this.interval(() => dispatch(action(config)), delay);
+ dispatch(action(config));
+ if (this.props.timer.running || startCountdown) {
+ this.cancelInterval = this.interval(
+ () => dispatch(action(config)),
+ secondsToRefresh
+ );
+ }
}
- interval (action, seconds) {
- action();
+ interval(action, seconds) {
const intervalId = setInterval(() => {
- this.setState({ seconds: seconds });
if (seconds === 0) {
- seconds = delay;
+ seconds = secondsToRefresh;
action();
} else {
seconds -= 1;
}
- }, 1000);
+ this.props.dispatch({
+ type: TIMER_SET_COUNTDOWN,
+ secondsToRefresh: seconds,
+ });
+ }, oneSecondTick);
return () => clearInterval(intervalId);
}
- parentClass () {
+ parentClass() {
const className = 'form__element__updateToggle';
- return this.props.noheader ? className + ' form__element__updateToggle-noHeader' : className;
+ return this.props.noheader
+ ? className + ' form__element__updateToggle-noHeader'
+ : className;
}
- render () {
- const { seconds } = this.state;
+ render() {
+ const { seconds, running } = this.props.timer;
return (
- this.createTimer(this.props.config)}>
-
- Next update in: { seconds === -1 ? '-' : seconds }
+ this.refreshTimer(this.props.config)}
+ >
+
+ {running ? `Next update in: ${seconds}` : 'Update'}
-
- {seconds === -1 ? 'Start automatic updates' : 'Stop automatic updates'}
+
+ {running ? 'Stop automatic updates' : 'Start automatic updates'}
);
@@ -94,11 +124,16 @@ class Timer extends React.Component {
}
Timer.propTypes = {
- noheader: PropTypes.bool,
- dispatch: PropTypes.func,
action: PropTypes.func,
config: PropTypes.object,
- reload: PropTypes.any
+ datepicker: PropTypes.object,
+ dispatch: PropTypes.func,
+ noheader: PropTypes.bool,
+ reload: PropTypes.any,
+ timer: PropTypes.object,
};
-export default Timer;
+export default connect((state) => ({
+ datepicker: state.datepicker,
+ timer: state.timer,
+}))(Timer);
diff --git a/app/src/js/components/Workflows/overview.js b/app/src/js/components/Workflows/overview.js
index 7fd44502a..04ed43572 100644
--- a/app/src/js/components/Workflows/overview.js
+++ b/app/src/js/components/Workflows/overview.js
@@ -46,7 +46,7 @@ const WorkflowOverview = ({ workflows }) => {
action={listWorkflows}
tableColumns={tableColumns}
query={{}}
- sortIdx='name'
+ sortId='name'
rowId='name'
/>
diff --git a/app/src/js/components/home.js b/app/src/js/components/home.js
index fef87ed79..d0d73f7a4 100644
--- a/app/src/js/components/home.js
+++ b/app/src/js/components/home.js
@@ -55,7 +55,7 @@ class Home extends React.Component {
componentDidMount () {
const { dispatch } = this.props;
- this.cancelInterval = interval(this.query, updateInterval, true);
+ this.refreshQuery();
dispatch(getCumulusInstanceMetadata())
.then(() => {
dispatch(getDistApiGatewayMetrics(this.props.cumulusInstance));
@@ -222,7 +222,7 @@ class Home extends React.Component {
dispatch={this.props.dispatch}
action={listGranules}
tableColumns={errorTableColumns}
- sortIdx='timestamp'
+ sortId='timestamp'
query={this.generateQuery()}
/>
diff --git a/app/src/js/components/locale.js b/app/src/js/components/locale.js
index 74908dbd7..79a4c86a7 100644
--- a/app/src/js/components/locale.js
+++ b/app/src/js/components/locale.js
@@ -34,6 +34,7 @@ export const strings = new LocalizedStrings({
logo: 'cumulus-logo.png',
operations: 'Operations',
pdrs: 'Pdrs',
+ reconciliation_reports: 'Reconciliation Reports',
remove_from_cmr: 'Remove from CMR',
running_granules: 'Running Granules',
total_granules: 'Total Granules',
@@ -41,6 +42,7 @@ export const strings = new LocalizedStrings({
view_granules_overview: 'View Granule Overview'
},
gitc: {
+ active_collections: 'Active Layers',
add_collection: 'Add Layer',
all_collections: 'All Layers',
all_granules: 'All Products',
@@ -68,8 +70,10 @@ export const strings = new LocalizedStrings({
logo: 'gitc-logo.png',
operations: 'Operations',
pdrs: 'Pdrs',
+ reconciliation_reports: 'Reconciliation Reports',
remove_from_cmr: 'Remove from OnEarth',
running_granules: 'Running Products',
+ total_granules: 'Total Products',
view_all_granules: 'View All Products',
view_granules_overview: 'View Product Overview'
}
diff --git a/app/src/js/components/oauth.js b/app/src/js/components/oauth.js
index 6b3f13fe0..d95900966 100644
--- a/app/src/js/components/oauth.js
+++ b/app/src/js/components/oauth.js
@@ -33,7 +33,7 @@ class OAuth extends React.Component {
if (pathname !== '/auth' && window.location && window.location.reload) {
setTimeout(() => window.location.reload(), updateDelay);
} else if (pathname === '/auth') {
- setTimeout(() => this.props.history.push('/'), updateDelay); // react isn't seeing this a function
+ setTimeout(() => this.props.history.push('/?new_session=true'), updateDelay); // react isn't seeing this a function
}
}
}
diff --git a/app/src/js/config/index.js b/app/src/js/config/index.js
index 1f37ac0df..917269347 100644
--- a/app/src/js/config/index.js
+++ b/app/src/js/config/index.js
@@ -10,7 +10,7 @@ const baseConfig = {
environment: 'development',
requireEarthdataLogin: false,
apiRoot: 'https://wjdkfyb6t6.execute-api.us-east-1.amazonaws.com/dev/',
- minCompatibleApiVersion: '1.22.1',
+ minCompatibleApiVersion: '1.23.2',
oauthMethod: 'earthdata',
graphicsPath: '/src/assets/images/',
diff --git a/app/src/js/middleware/request.js b/app/src/js/middleware/request.js
index c94b7e827..6083133ce 100644
--- a/app/src/js/middleware/request.js
+++ b/app/src/js/middleware/request.js
@@ -1,6 +1,3 @@
-import requestPromise from 'request-promise';
-
-import { loginError } from '../actions';
import { CALL_API } from '../actions/types';
import {
configureRequest,
@@ -10,30 +7,28 @@ import {
import log from '../utils/log';
import { isValidApiRequestAction } from './validate';
-const handleError = ({ id, type, error, requestAction }, next) => {
+// Use require to allow for mocking
+const requestPromise = require('request-promise');
+const { loginError } = require('../actions');
+
+const handleError = ({
+ id,
+ type,
+ error,
+ requestAction,
+ statusCode
+}, next) => {
console.groupCollapsed('handleError');
console.log(`id: ${id}`);
console.log(`type: ${type}`);
console.dir(error);
console.dir(requestAction);
console.groupEnd();
- if (error.message) {
- // Temporary fix until the 'logs' endpoint is fixed
- // TODO: is this still relevant?
- if (error.message.includes('Invalid Authorization token') &&
- requestAction.url.includes('logs')) {
- const data = { results: [] };
- return next({ id, type, data, config: requestAction });
- }
- // Catch the session expired error
- // Weirdly error.message shows up as " : Session expired"
- // So it's using indexOf instead of a direct comparison
- if (error.message.includes('Your session has expired. Please login again.') ||
- error.message.includes('Invalid Authorization token') ||
- error.message.includes('Access token has expired')) {
- return next(loginError(error.message.replace('Bad Request: ', '')));
- }
+ // If the error response indicates lack or failure of request
+ // authorization, then the log user out
+ if ([401, 403].includes(+statusCode)) {
+ return next(loginError(error.message));
}
const errorType = type + '_ERROR';
@@ -70,11 +65,19 @@ export const requestMiddleware = ({ dispatch, getState }) => next => action => {
const start = new Date();
return requestPromise(requestAction)
.then((response) => {
- const { body } = response;
-
- if (+response.statusCode >= 400) {
+ const { body, statusCode } = response;
+ if (+statusCode >= 400) {
const error = new Error(getErrorMessage(response));
- return handleError({ id, type, error, requestAction }, next);
+ return handleError(
+ {
+ id,
+ type,
+ error,
+ requestAction,
+ statusCode
+ },
+ next
+ );
}
const duration = new Date() - start;
diff --git a/app/src/js/reducers/api-version.js b/app/src/js/reducers/api-version.js
index 4e5ab11de..db3dc3c5e 100644
--- a/app/src/js/reducers/api-version.js
+++ b/app/src/js/reducers/api-version.js
@@ -1,10 +1,12 @@
+'use strict';
+
+import { createReducer } from '@reduxjs/toolkit';
import {
API_VERSION,
- API_VERSION_ERROR,
API_VERSION_COMPATIBLE,
+ API_VERSION_ERROR,
API_VERSION_INCOMPATIBLE
} from '../actions/types';
-import { createReducer } from '@reduxjs/toolkit';
export const initialState = {
versionNumber: '',
@@ -13,33 +15,20 @@ export const initialState = {
};
export default createReducer(initialState, {
-
[API_VERSION]: (state, action) => {
- return {
- ...state,
- versionNumber: action.payload.versionNumber,
- warning: ''
- };
+ state.versionNumber = action.payload.versionNumber;
+ state.warning = '';
},
- [API_VERSION_ERROR]: (state, action) => {
- return {
- ...state,
- apiVersion: action.payload.error.message,
- warning: 'Failed to acquire Cumulus API Version'
- };
+ [API_VERSION_COMPATIBLE]: (state) => {
+ state.isCompatible = true;
+ state.warning = '';
},
- [API_VERSION_COMPATIBLE]: (state, action) => {
- return {
- ...state,
- isCompatible: true,
- warning: ''
- };
+ [API_VERSION_ERROR]: (state, action) => {
+ state.apiVersion = action.payload.error.message;
+ state.warning = 'Failed to acquire Cumulus API Version';
},
[API_VERSION_INCOMPATIBLE]: (state, action) => {
- return {
- ...state,
- isCompatible: false,
- warning: action.payload.warning
- };
- }
+ state.isCompatible = false;
+ state.warning = action.payload.warning;
+ },
});
diff --git a/app/src/js/reducers/api.js b/app/src/js/reducers/api.js
index bd583fe7f..cf7bab08b 100644
--- a/app/src/js/reducers/api.js
+++ b/app/src/js/reducers/api.js
@@ -1,66 +1,65 @@
'use strict';
-import { set } from 'object-path';
-import { get as getToken, set as setToken } from '../utils/auth';
+import { get as getToken, set as setToken } from '../utils/auth';
+import { createReducer } from '@reduxjs/toolkit';
import {
DELETE_TOKEN,
LOGIN,
- LOGIN_INFLIGHT,
LOGIN_ERROR,
+ LOGIN_INFLIGHT,
LOGOUT,
REFRESH_TOKEN,
REFRESH_TOKEN_ERROR,
REFRESH_TOKEN_INFLIGHT,
- SET_TOKEN
+ SET_TOKEN,
} from '../actions/types';
-import { createReducer } from '@reduxjs/toolkit';
export const initialState = {
- authenticated: !!getToken(),
+ authenticated: getToken() !== null,
inflight: false,
error: null,
tokens: {
error: null,
inflight: false,
- token: getToken()
- }
+ token: getToken(),
+ },
};
export default createReducer(initialState, {
[DELETE_TOKEN]: (state) => {
- set(state, 'tokens.token', null);
setToken('');
+ state.tokens.token = null;
},
[LOGIN]: (state) => {
- set(state, 'authenticated', true);
- set(state, 'inflight', false);
- },
- [LOGIN_INFLIGHT]: (state) => {
- set(state, 'inflight', true);
+ state.authenticated = true;
+ state.inflight = false;
},
[LOGIN_ERROR]: (state, action) => {
- set(state, 'error', action.error);
- set(state, 'inflight', false);
- set(state, 'authenticated', false);
+ state.error = action.error;
+ state.inflight = false;
+ state.authenticated = false;
+ },
+ [LOGIN_INFLIGHT]: (state) => {
+ state.inflight = true;
},
[LOGOUT]: (state) => {
- set(state, 'authenticated', false);
+ state.authenticated = false;
},
[REFRESH_TOKEN]: (state, action) => {
- set(state, 'tokens.error', null);
- set(state, 'tokens.inflight', false);
- set(state, 'tokens.token', action.token);
setToken(action.token);
+ state.tokens.token = action.token;
+ state.tokens.error = null;
+ state.tokens.inflight = false;
},
[REFRESH_TOKEN_ERROR]: (state, action) => {
- set(state, 'tokens.error', action.error);
- set(state, 'tokens.inflight', false);
+ state.tokens.error = action.error;
+ state.tokens.inflight = false;
},
[REFRESH_TOKEN_INFLIGHT]: (state) => {
- set(state, 'tokens.inflight', true);
+ state.tokens.inflight = true;
},
[SET_TOKEN]: (state, action) => {
- set(state, 'tokens.token', action.token);
setToken(action.token);
- }
+ state.tokens.token = action.token;
+ },
});
diff --git a/app/src/js/reducers/collections.js b/app/src/js/reducers/collections.js
index e039ac595..cfb770276 100644
--- a/app/src/js/reducers/collections.js
+++ b/app/src/js/reducers/collections.js
@@ -1,46 +1,51 @@
'use strict';
-import { set, del } from 'object-path';
-import assignDate from './assign-date';
+import { createReducer } from '@reduxjs/toolkit';
+import { deconstructCollectionId } from '../utils/format';
+import assignDate from './utils/assign-date';
import {
- COLLECTION,
- COLLECTION_INFLIGHT,
- COLLECTION_ERROR,
- COLLECTION_APPLYWORKFLOW,
- COLLECTION_APPLYWORKFLOW_INFLIGHT,
+ createClearItemReducer,
+ createErrorReducer,
+ createInflightReducer,
+ createSuccessReducer
+} from './utils/reducer-creators';
+import {
+ CLEAR_COLLECTIONS_FILTER,
+ CLEAR_COLLECTIONS_SEARCH,
COLLECTION_APPLYWORKFLOW_ERROR,
- COLLECTIONS,
- COLLECTIONS_INFLIGHT,
+ COLLECTION_APPLYWORKFLOW_INFLIGHT,
+ COLLECTION_APPLYWORKFLOW,
+ COLLECTION_DELETE_ERROR,
+ COLLECTION_DELETE_INFLIGHT,
+ COLLECTION_DELETE,
+ COLLECTION_ERROR,
+ COLLECTION_INFLIGHT,
+ COLLECTION,
COLLECTIONS_ERROR,
- NEW_COLLECTION,
- NEW_COLLECTION_INFLIGHT,
+ COLLECTIONS_INFLIGHT,
+ COLLECTIONS,
+ FILTER_COLLECTIONS,
NEW_COLLECTION_ERROR,
- COLLECTION_DELETE,
- COLLECTION_DELETE_INFLIGHT,
- COLLECTION_DELETE_ERROR,
- UPDATE_COLLECTION,
- UPDATE_COLLECTION_INFLIGHT,
- UPDATE_COLLECTION_ERROR,
- UPDATE_COLLECTION_CLEAR,
+ NEW_COLLECTION_INFLIGHT,
+ NEW_COLLECTION,
SEARCH_COLLECTIONS,
- CLEAR_COLLECTIONS_SEARCH,
- FILTER_COLLECTIONS,
- CLEAR_COLLECTIONS_FILTER
+ UPDATE_COLLECTION_CLEAR,
+ UPDATE_COLLECTION_ERROR,
+ UPDATE_COLLECTION_INFLIGHT,
+ UPDATE_COLLECTION,
} from '../actions/types';
-import { createReducer } from '@reduxjs/toolkit';
-import { deconstructCollectionId } from '../utils/format';
export const initialState = {
list: {
data: [],
meta: {},
- params: {}
+ params: {},
},
created: {},
deleted: {},
executed: {},
map: {},
- updated: {}
+ updated: {},
};
export default createReducer(initialState, {
@@ -48,109 +53,74 @@ export default createReducer(initialState, {
const { id, data } = action;
const { name } = deconstructCollectionId(id);
const collection = data.results.find((element) => element.name === name);
- set(state, ['map', id, 'inflight'], false);
- set(state, ['map', id, 'data'], assignDate(collection));
- del(state, ['deleted', id]);
+
+ state.map[id] = {
+ inflight: false,
+ data: assignDate(collection),
+ };
+ delete state.deleted[id];
},
[COLLECTION_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['map', id, 'inflight'], true);
+ state.map[action.id] = { inflight: true };
},
[COLLECTION_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['map', id, 'inflight'], false);
- set(state, ['map', id, 'error'], action.error);
+ const { id, error } = action;
+ state.map[id] = {
+ inflight: false,
+ error,
+ };
},
-
[COLLECTION_APPLYWORKFLOW]: (state, action) => {
- const { id } = action;
- set(state, ['executed', id, 'status'], 'success');
- set(state, ['executed', id, 'error'], null);
- },
- [COLLECTION_APPLYWORKFLOW_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['executed', id, 'status'], 'inflight');
- },
- [COLLECTION_APPLYWORKFLOW_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['executed', id, 'status'], 'error');
- set(state, ['executed', id, 'error'], action.error);
+ state.executed[action.id] = {
+ status: 'success',
+ error: null,
+ };
},
-
+ [COLLECTION_APPLYWORKFLOW_INFLIGHT]: createInflightReducer('executed'),
+ [COLLECTION_APPLYWORKFLOW_ERROR]: createErrorReducer('executed'),
[COLLECTIONS]: (state, action) => {
- const { data } = action;
- set(state, ['list', 'data'], data.results);
- set(state, ['list', 'meta'], assignDate(data.meta));
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], false);
+ state.list.data = action.data.results;
+ state.list.meta = assignDate(action.data.meta);
+ state.list.inflight = false;
+ state.list.error = false;
},
- [COLLECTIONS_INFLIGHT]: (state, action) => {
- set(state, ['list', 'inflight'], true);
+ [COLLECTIONS_INFLIGHT]: (state) => {
+ state.list.inflight = true;
},
[COLLECTIONS_ERROR]: (state, action) => {
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], action.error);
- },
-
- [NEW_COLLECTION]: (state, action) => {
- const { id } = action;
- set(state, ['created', id, 'status'], 'success');
- },
- [NEW_COLLECTION_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['created', id, 'status'], 'inflight');
+ state.list.inflight = false;
+ state.list.error = action.error;
},
- [NEW_COLLECTION_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['created', id, 'status'], 'error');
- set(state, ['created', id, 'error'], action.error);
- },
-
+ [NEW_COLLECTION]: createSuccessReducer('created'),
+ [NEW_COLLECTION_INFLIGHT]: createInflightReducer('created'),
+ [NEW_COLLECTION_ERROR]: createErrorReducer('created'),
[UPDATE_COLLECTION]: (state, action) => {
const { id, data } = action;
- set(state, ['map', id, 'data'], data);
- set(state, ['updated', id, 'status'], 'success');
- },
- [UPDATE_COLLECTION_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['updated', id, 'status'], 'inflight');
- },
- [UPDATE_COLLECTION_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['updated', id, 'status'], 'error');
- set(state, ['updated', id, 'error'], action.error);
+ state.map[id] = { data };
+ state.updated[id] = { status: 'success' };
},
- [UPDATE_COLLECTION_CLEAR]: (state, action) => {
- const { id } = action;
- del(state, ['updated', id]);
- },
-
+ [UPDATE_COLLECTION_INFLIGHT]: createInflightReducer('updated'),
+ [UPDATE_COLLECTION_ERROR]: createErrorReducer('updated'),
+ [UPDATE_COLLECTION_CLEAR]: createClearItemReducer('updated'),
[COLLECTION_DELETE]: (state, action) => {
- const { id } = action;
- set(state, ['deleted', id, 'status'], 'success');
- set(state, ['deleted', id, 'error'], null);
- },
- [COLLECTION_DELETE_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['deleted', id, 'status'], 'inflight');
- },
- [COLLECTION_DELETE_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['deleted', id, 'status'], 'error');
- set(state, ['deleted', id, 'error'], action.error);
+ state.deleted[action.id] = {
+ status: 'success',
+ error: null,
+ };
},
-
+ [COLLECTION_DELETE_INFLIGHT]: createInflightReducer('deleted'),
+ [COLLECTION_DELETE_ERROR]: createErrorReducer('deleted'),
[SEARCH_COLLECTIONS]: (state, action) => {
- set(state, ['list', 'params', 'prefix'], action.prefix);
+ state.list.params.prefix = action.prefix;
},
- [CLEAR_COLLECTIONS_SEARCH]: (state, action) => {
- set(state, ['list', 'params', 'prefix'], null);
+ [CLEAR_COLLECTIONS_SEARCH]: (state) => {
+ state.list.params.prefix = null;
},
-
[FILTER_COLLECTIONS]: (state, action) => {
- set(state, ['list', 'params', action.param.key], action.param.value);
+ const { key, value } = action.param;
+ state.list.params[key] = value;
},
[CLEAR_COLLECTIONS_FILTER]: (state, action) => {
- set(state, ['list', 'params', action.paramKey], null);
- }
+ state.list.params[action.paramKey] = null;
+ },
});
diff --git a/app/src/js/reducers/cumulus-instance.js b/app/src/js/reducers/cumulus-instance.js
index a433669ec..cbdd5b60f 100644
--- a/app/src/js/reducers/cumulus-instance.js
+++ b/app/src/js/reducers/cumulus-instance.js
@@ -1,23 +1,15 @@
'use strict';
-import { get } from 'object-path';
-import { ADD_INSTANCE_META } from '../actions/types';
-// In Node 12.0.0+, use built-in Object.fromEntries instead of fromPairs
-import fromPairs from 'lodash.frompairs';
import { createReducer } from '@reduxjs/toolkit';
+import { ADD_INSTANCE_META } from '../actions/types';
export const initialState = {};
export default createReducer(initialState, {
[ADD_INSTANCE_META]: (state, action) => {
- const { data } = action;
- return {
- ...state,
- ...fromPairs([
- ['cmrEnvironment', get(data, 'cmr.environment')],
- ['cmrProvider', get(data, 'cmr.provider')],
- ['stackName', get(data, 'cumulus.stackName')]
- ].filter(([_, value]) => value))
- };
- }
+ const { cmr = {}, cumulus = {} } = action.data;
+ if (cmr.environment) state.cmrEnvironment = cmr.environment;
+ if (cmr.provider) state.cmrProvider = cmr.provider;
+ if (cumulus.stackName) state.stackName = cumulus.stackName;
+ },
});
diff --git a/app/src/js/reducers/datepicker.js b/app/src/js/reducers/datepicker.js
index 76649c4a7..1f72f8c13 100644
--- a/app/src/js/reducers/datepicker.js
+++ b/app/src/js/reducers/datepicker.js
@@ -1,23 +1,20 @@
'use strict';
+import { msPerDay, allDateRanges } from '../utils/datepicker';
+import { createReducer } from '@reduxjs/toolkit';
import {
DATEPICKER_DATECHANGE,
DATEPICKER_DROPDOWN_FILTER,
- DATEPICKER_HOUR_FORMAT
+ DATEPICKER_HOUR_FORMAT,
} from '../actions/types';
-import { msPerDay, allDateRanges } from '../utils/datepicker';
-import { createReducer } from '@reduxjs/toolkit';
// Also becomes default props for Datepicker
-export const initialState = () => {
- const now = Date.now();
- return {
- startDateTime: now - msPerDay,
- endDateTime: null,
- dateRange: allDateRanges.find((a) => a.value === 'Recent'),
- hourFormat: '12HR'
- };
-};
+export const initialState = () => ({
+ startDateTime: null,
+ endDateTime: null,
+ dateRange: allDateRanges.find((a) => a.value === 'Custom'),
+ hourFormat: '12HR'
+});
/**
* Computes the desired time range from present.
@@ -34,40 +31,49 @@ const computeDateTimeDelta = (timeDeltaInDays) => {
endDateTime = Date.now();
startDateTime = endDateTime - timeDeltaInDays * msPerDay;
}
+
return { startDateTime, endDateTime };
};
/**
-* Sets the state for recent data start time is 24 hours ago, end time is null
-*
-* @returns {Object} with startDateTime and dateRange set to "Recent"
-*/
-const recentData = () => {
- const endDateTime = null;
- const startDateTime = Date.now() - msPerDay;
- return { startDateTime, endDateTime, dateRange: allDateRanges.find((a) => a.value === 'Recent') };
-};
+ * Sets the state for recent data start time is 24 hours ago, end time is null
+ *
+ * @returns {Object} with startDateTime and dateRange set to "Recent"
+ */
+const recentData = () => ({
+ startDateTime: Date.now() - msPerDay,
+ endDateTime: null,
+ dateRange: allDateRanges.find((a) => a.value === 'Recent'),
+});
export default createReducer(initialState(), {
-
[DATEPICKER_DROPDOWN_FILTER]: (state, action) => {
const { data } = action;
+
switch (data.dateRange.label) {
case 'Custom':
case 'All':
- return { ...state, ...data, startDateTime: null, endDateTime: null };
+ Object.assign(state, data, {
+ startDateTime: null,
+ endDateTime: null,
+ });
+ break;
case 'Recent':
- return { ...state, ...data, ...recentData() };
+ Object.assign(state, data, recentData());
+ break;
default:
- return { ...state, ...computeDateTimeDelta(data.dateRange.value), ...data };
+ Object.assign(
+ state,
+ computeDateTimeDelta(data.dateRange.value),
+ data
+ );
+ break;
}
},
[DATEPICKER_DATECHANGE]: (state, action) => {
- const { data } = action;
- return { ...state, ...data };
+ Object.assign(state, action.data);
},
[DATEPICKER_HOUR_FORMAT]: (state, action) => {
- const { data } = action;
- return { ...state, hourFormat: data };
- }
+ state.hourFormat = action.data;
+ },
});
diff --git a/app/src/js/reducers/dist.js b/app/src/js/reducers/dist.js
index af03fcdb4..b3991235c 100644
--- a/app/src/js/reducers/dist.js
+++ b/app/src/js/reducers/dist.js
@@ -1,8 +1,7 @@
'use strict';
import get from 'lodash.get';
-import { set } from 'object-path';
-
+import { createReducer } from '@reduxjs/toolkit';
import {
DIST_APIGATEWAY,
DIST_APIGATEWAY_INFLIGHT,
@@ -15,122 +14,80 @@ import {
DIST_TEA_LAMBDA_ERROR,
DIST_S3ACCESS,
DIST_S3ACCESS_INFLIGHT,
- DIST_S3ACCESS_ERROR
+ DIST_S3ACCESS_ERROR,
} from '../actions/types';
-import { createReducer } from '@reduxjs/toolkit';
-const initialState = {
+export const initialState = {
apiGateway: {
- execution: { errors: {}, successes: {} },
- access: { errors: {}, successes: {} }
+ execution: { errors: null, successes: null },
+ access: { errors: null, successes: null },
},
- apiLambda: { errors: {}, successes: {} },
- teaLambda: { errors: {}, successes: {} },
- s3Access: { errors: {}, successes: {} }
+ apiLambda: { errors: null, successes: null },
+ teaLambda: { errors: null, successes: null },
+ s3Access: { errors: null, successes: null },
};
-const countsFromElasticSearchQuery = (data, name) => {
- return get(data, `aggregations.2.buckets.${name}.doc_count`, null);
-};
+const count = (data, name) =>
+ get(data, `aggregations.2.buckets.${name}.doc_count`, 0);
export default createReducer(initialState, {
-
[DIST_APIGATEWAY]: (state, action) => {
- set(state, 'apiGateway.error', null);
- set(state, 'apiGateway.inflight', false);
- set(state, 'apiGateway.queriedAt', Date.now());
- set(
- state,
- 'apiGateway.access.errors',
- countsFromElasticSearchQuery(action.data, 'ApiAccessErrors')
- );
- set(
- state,
- 'apiGateway.access.successes',
- countsFromElasticSearchQuery(action.data, 'ApiAccessSuccesses')
- );
- set(
- state,
- 'apiGateway.execution.errors',
- countsFromElasticSearchQuery(action.data, 'ApiExecutionErrors')
- );
- set(
- state,
- 'apiGateway.execution.successes',
- countsFromElasticSearchQuery(action.data, 'ApiExecutionSuccesses')
- );
+ const { data } = action;
+ state.apiGateway.error = null;
+ state.apiGateway.inflight = false;
+ state.apiGateway.queriedAt = Date.now();
+ state.apiGateway.access.errors = count(data, 'ApiAccessErrors');
+ state.apiGateway.access.successes = count(data, 'ApiAccessSuccesses');
+ state.apiGateway.execution.errors = count(data, 'ApiExecutionErrors');
+ state.apiGateway.execution.successes = count(data, 'ApiExecutionSuccesses');
},
- [DIST_APIGATEWAY_INFLIGHT]: (state, action) => {
- set(state, 'apiGateway.inflight', true);
+ [DIST_APIGATEWAY_INFLIGHT]: (state) => {
+ state.apiGateway.inflight = true;
},
[DIST_APIGATEWAY_ERROR]: (state, action) => {
- set(state, 'apiGateway.inflight', false);
- set(state, 'apiGateway.error', action.error);
+ state.apiGateway.inflight = false;
+ state.apiGateway.error = action.error;
},
[DIST_API_LAMBDA]: (state, action) => {
- set(state, 'apiLambda.error', null);
- set(state, 'apiLambda.inflight', false);
- set(state, 'apiLambda.queriedAt', Date.now());
- set(
- state,
- 'apiLambda.errors',
- countsFromElasticSearchQuery(action.data, 'LambdaAPIErrors')
- );
- set(
- state,
- 'apiLambda.successes',
- countsFromElasticSearchQuery(action.data, 'LambdaAPISuccesses')
- );
+ state.apiLambda.error = null;
+ state.apiLambda.inflight = false;
+ state.apiLambda.queriedAt = Date.now();
+ state.apiLambda.errors = count(action.data, 'LambdaAPIErrors');
+ state.apiLambda.successes = count(action.data, 'LambdaAPISuccesses');
},
- [DIST_API_LAMBDA_INFLIGHT]: (state, action) => {
- set(state, 'apiLambda.inflight', true);
+ [DIST_API_LAMBDA_INFLIGHT]: (state) => {
+ state.apiLambda.inflight = true;
},
[DIST_API_LAMBDA_ERROR]: (state, action) => {
- set(state, 'apiLambda.inflight', false);
- set(state, 'apiLambda.error', action.error);
+ state.apiLambda.inflight = false;
+ state.apiLambda.error = action.error;
},
[DIST_TEA_LAMBDA]: (state, action) => {
- set(state, 'teaLambda.error', null);
- set(state, 'teaLambda.inflight', false);
- set(state, 'teaLambda.queriedAt', Date.now());
- set(
- state,
- 'teaLambda.errors',
- countsFromElasticSearchQuery(action.data, 'TEALambdaErrors')
- );
- set(
- state,
- 'teaLambda.successes',
- countsFromElasticSearchQuery(action.data, 'TEALambdaSuccesses')
- );
+ state.teaLambda.error = null;
+ state.teaLambda.inflight = false;
+ state.teaLambda.queriedAt = Date.now();
+ state.teaLambda.errors = count(action.data, 'TEALambdaErrors');
+ state.teaLambda.successes = count(action.data, 'TEALambdaSuccesses');
},
- [DIST_TEA_LAMBDA_INFLIGHT]: (state, action) => {
- set(state, 'teaLambda.inflight', true);
+ [DIST_TEA_LAMBDA_INFLIGHT]: (state) => {
+ state.teaLambda.inflight = true;
},
[DIST_TEA_LAMBDA_ERROR]: (state, action) => {
- set(state, 'teaLambda.inflight', false);
- set(state, 'teaLambda.error', action.error);
+ state.teaLambda.inflight = false;
+ state.teaLambda.error = action.error;
},
[DIST_S3ACCESS]: (state, action) => {
- set(state, 's3Access.error', null);
- set(state, 's3Access.inflight', false);
- set(state, 's3Access.queriedAt', Date.now());
- set(
- state,
- 's3Access.errors',
- countsFromElasticSearchQuery(action.data, 's3AccessFailures')
- );
- set(
- state,
- 's3Access.successes',
- countsFromElasticSearchQuery(action.data, 's3AccessSuccesses')
- );
+ state.s3Access.error = null;
+ state.s3Access.inflight = false;
+ state.s3Access.queriedAt = Date.now();
+ state.s3Access.errors = count(action.data, 's3AccessFailures');
+ state.s3Access.successes = count(action.data, 's3AccessSuccesses');
},
- [DIST_S3ACCESS_INFLIGHT]: (state, action) => {
- set(state, 's3Access.inflight', true);
+ [DIST_S3ACCESS_INFLIGHT]: (state) => {
+ state.s3Access.inflight = true;
},
[DIST_S3ACCESS_ERROR]: (state, action) => {
- set(state, 's3Access.inflight', false);
- set(state, 's3Access.error', action.error);
- }
+ state.s3Access.inflight = false;
+ state.s3Access.error = action.error;
+ },
});
diff --git a/app/src/js/reducers/execution-logs.js b/app/src/js/reducers/execution-logs.js
index 9970e9828..3ec73093f 100644
--- a/app/src/js/reducers/execution-logs.js
+++ b/app/src/js/reducers/execution-logs.js
@@ -1,35 +1,32 @@
'use strict';
-import { set } from 'object-path';
+import { createReducer } from '@reduxjs/toolkit';
import {
EXECUTION_LOGS,
EXECUTION_LOGS_INFLIGHT,
- EXECUTION_LOGS_ERROR
+ EXECUTION_LOGS_ERROR,
} from '../actions/types';
-import { createReducer } from '@reduxjs/toolkit';
export const initialState = {
results: null,
details: null,
inflight: false,
error: false,
- meta: {}
+ meta: {},
};
export default createReducer(initialState, {
-
[EXECUTION_LOGS]: (state, action) => {
- const { data } = action;
- set(state, ['inflight'], false);
- set(state, ['error'], false);
- set(state, ['details'], data.meta);
- set(state, ['results'], data.results);
+ state.inflight = false;
+ state.error = false;
+ state.details = action.data.meta;
+ state.results = action.data.results;
},
- [EXECUTION_LOGS_INFLIGHT]: (state, action) => {
- set(state, ['inflight'], true);
+ [EXECUTION_LOGS_INFLIGHT]: (state) => {
+ state.inflight = true;
},
[EXECUTION_LOGS_ERROR]: (state, action) => {
- set(state, ['inflight'], false);
- set(state, ['error'], action.error);
- }
+ state.inflight = false;
+ state.error = action.error;
+ },
});
diff --git a/app/src/js/reducers/execution-status.js b/app/src/js/reducers/execution-status.js
index 9333c1e57..ee87afbd2 100644
--- a/app/src/js/reducers/execution-status.js
+++ b/app/src/js/reducers/execution-status.js
@@ -1,14 +1,13 @@
'use strict';
-import { set } from 'object-path';
+import { createReducer } from '@reduxjs/toolkit';
import {
EXECUTION_STATUS,
EXECUTION_STATUS_INFLIGHT,
EXECUTION_STATUS_ERROR,
SEARCH_EXECUTION_EVENTS,
- CLEAR_EXECUTION_EVENTS_SEARCH
+ CLEAR_EXECUTION_EVENTS_SEARCH,
} from '../actions/types';
-import { createReducer } from '@reduxjs/toolkit';
export const initialState = {
execution: null,
@@ -17,51 +16,38 @@ export const initialState = {
searchString: null,
inflight: false,
error: false,
- meta: {}
+ meta: {},
};
-/**
- * Filters intput data by searchString on the data'a object's type.
-*
- * @param {Array} rawData - An array of objects with a type parameter.
- * @param {string} searchString - a string to check if type includes.
- * @returns {Array} Filtered Array of rawData's objects who's type include searchString.
- */
-export const filterData = (rawData, searchString) => {
- if (searchString !== null) {
- const data = {
- execution: rawData.execution,
- stateMachine: rawData.stateMachine,
- executionHistory: rawData.executionHistory
- };
- const filteredEvents = rawData.executionHistory.events.filter(d => d.type.toLowerCase().includes(searchString.toLowerCase()));
- data.executionHistory.events = filteredEvents;
- return data;
- }
- return rawData;
-};
+const typeContains = (string) => ({ type }) =>
+ type.toLowerCase().includes(string.toLowerCase());
export default createReducer(initialState, {
[EXECUTION_STATUS]: (state, action) => {
- const { data: rawData } = action;
- const data = filterData(rawData, state.searchString);
- set(state, ['inflight'], false);
- set(state, ['error'], false);
- set(state, ['execution'], data.execution);
- set(state, ['executionHistory'], data.executionHistory);
- set(state, ['stateMachine'], data.stateMachine);
+ const { data } = action;
+ state.inflight = false;
+ state.error = false;
+ state.execution = data.execution;
+ state.executionHistory = data.executionHistory;
+ state.stateMachine = data.stateMachine;
+
+ if (state.searchString) {
+ state.executionHistory.events = data.executionHistory.events.filter(
+ typeContains(state.searchString)
+ );
+ }
},
- [EXECUTION_STATUS_INFLIGHT]: (state, action) => {
- set(state, ['inflight'], true);
+ [EXECUTION_STATUS_INFLIGHT]: (state) => {
+ state.inflight = true;
},
[EXECUTION_STATUS_ERROR]: (state, action) => {
- set(state, ['inflight'], false);
- set(state, ['error'], action.error);
+ state.inflight = false;
+ state.error = action.error;
},
[SEARCH_EXECUTION_EVENTS]: (state, action) => {
- set(state, ['searchString'], action.searchString);
+ state.searchString = action.searchString;
},
[CLEAR_EXECUTION_EVENTS_SEARCH]: (state) => {
- set(state, ['searchString'], null);
+ state.searchString = null;
},
});
diff --git a/app/src/js/reducers/executions.js b/app/src/js/reducers/executions.js
index 96e059a25..b792f8960 100644
--- a/app/src/js/reducers/executions.js
+++ b/app/src/js/reducers/executions.js
@@ -1,18 +1,16 @@
'use strict';
-import { set } from 'object-path';
-import assignDate from './assign-date';
+
+import assignDate from './utils/assign-date';
+import { createReducer } from '@reduxjs/toolkit';
import {
EXECUTIONS,
EXECUTIONS_INFLIGHT,
EXECUTIONS_ERROR,
-
FILTER_EXECUTIONS,
CLEAR_EXECUTIONS_FILTER,
-
SEARCH_EXECUTIONS,
- CLEAR_EXECUTIONS_SEARCH
+ CLEAR_EXECUTIONS_SEARCH,
} from '../actions/types';
-import { createReducer } from '@reduxjs/toolkit';
export const initialState = {
list: {
@@ -20,37 +18,35 @@ export const initialState = {
meta: {},
params: {},
inflight: false,
- error: false
+ error: false,
},
- map: {}
+ map: {},
};
export default createReducer(initialState, {
[EXECUTIONS]: (state, action) => {
- set(state, ['list', 'data'], action.data.results);
- set(state, ['list', 'meta'], assignDate(action.data.meta));
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], false);
+ state.list.data = action.data.results;
+ state.list.meta = assignDate(action.data.meta);
+ state.list.inflight = false;
+ state.list.error = false;
},
- [EXECUTIONS_INFLIGHT]: (state, action) => {
- set(state, ['list', 'inflight'], true);
+ [EXECUTIONS_INFLIGHT]: (state) => {
+ state.list.inflight = true;
},
[EXECUTIONS_ERROR]: (state, action) => {
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], action.error);
+ state.list.inflight = false;
+ state.list.error = action.error;
},
-
[FILTER_EXECUTIONS]: (state, action) => {
- set(state, ['list', 'params', action.param.key], action.param.value);
+ state.list.params[action.param.key] = action.param.value;
},
[CLEAR_EXECUTIONS_FILTER]: (state, action) => {
- set(state, ['list', 'params', action.paramKey], null);
+ state.list.params[action.paramKey] = null;
},
-
[SEARCH_EXECUTIONS]: (state, action) => {
- set(state, ['list', 'prefix'], action.prefix);
+ state.list.prefix = action.prefix;
+ },
+ [CLEAR_EXECUTIONS_SEARCH]: (state) => {
+ state.list.prefix = null;
},
- [CLEAR_EXECUTIONS_SEARCH]: (state, action) => {
- set(state, ['list', 'prefix'], null);
- }
});
diff --git a/app/src/js/reducers/granule-csv.js b/app/src/js/reducers/granule-csv.js
index a8d8546e7..d36d02658 100644
--- a/app/src/js/reducers/granule-csv.js
+++ b/app/src/js/reducers/granule-csv.js
@@ -1,26 +1,29 @@
'use strict';
+import { createReducer } from '@reduxjs/toolkit';
import {
GRANULE_CSV,
GRANULE_CSV_INFLIGHT,
- GRANULE_CSV_ERROR
+ GRANULE_CSV_ERROR,
} from '../actions/types';
-import { createReducer } from '@reduxjs/toolkit';
export const initialState = {
data: null,
inflight: false,
- error: null
+ error: null,
};
export default createReducer(initialState, {
[GRANULE_CSV]: (state, action) => {
- return { ...state, data: action.data, inflight: false, error: null };
+ state.data = action.data;
+ state.inflight = false;
+ state.error = null;
},
[GRANULE_CSV_INFLIGHT]: (state) => {
- return { ...state, inflight: true, error: state.error };
+ state.inflight = true;
},
[GRANULE_CSV_ERROR]: (state, action) => {
- return { ...state, inflight: false, error: action.error };
- }
+ state.inflight = false;
+ state.error = action.error;
+ },
});
diff --git a/app/src/js/reducers/granules.js b/app/src/js/reducers/granules.js
index 601675671..84f5644a2 100644
--- a/app/src/js/reducers/granules.js
+++ b/app/src/js/reducers/granules.js
@@ -1,59 +1,55 @@
'use strict';
-import { set, del } from 'object-path';
-import assignDate from './assign-date';
-import removeDeleted from './remove-deleted';
+
+import { set } from 'object-path';
+import assignDate from './utils/assign-date';
+import removeDeleted from './utils/remove-deleted';
+import { createReducer } from '@reduxjs/toolkit';
+import { getCollectionId } from '../utils/format';
+import {
+ createErrorReducer,
+ createInflightReducer,
+ createSuccessReducer,
+} from './utils/reducer-creators';
import {
GRANULE,
GRANULE_INFLIGHT,
GRANULE_ERROR,
-
GRANULES,
GRANULES_INFLIGHT,
GRANULES_ERROR,
-
GRANULE_REPROCESS,
GRANULE_REPROCESS_INFLIGHT,
GRANULE_REPROCESS_ERROR,
-
GRANULE_REINGEST,
GRANULE_REINGEST_INFLIGHT,
GRANULE_REINGEST_ERROR,
-
GRANULE_APPLYWORKFLOW,
GRANULE_APPLYWORKFLOW_INFLIGHT,
GRANULE_APPLYWORKFLOW_ERROR,
-
GRANULE_REMOVE,
GRANULE_REMOVE_INFLIGHT,
GRANULE_REMOVE_ERROR,
-
BULK_GRANULE,
BULK_GRANULE_INFLIGHT,
BULK_GRANULE_ERROR,
-
GRANULE_DELETE,
GRANULE_DELETE_INFLIGHT,
GRANULE_DELETE_ERROR,
-
SEARCH_GRANULES,
CLEAR_GRANULES_SEARCH,
-
FILTER_GRANULES,
CLEAR_GRANULES_FILTER,
-
OPTIONS_COLLECTIONNAME,
OPTIONS_COLLECTIONNAME_INFLIGHT,
- OPTIONS_COLLECTIONNAME_ERROR
+ OPTIONS_COLLECTIONNAME_ERROR,
} from '../actions/types';
-import { createReducer } from '@reduxjs/toolkit';
-import { getCollectionId } from '../utils/format';
export const initialState = {
list: {
data: [],
meta: {},
- params: {}
+ params: {},
},
dropdowns: {},
map: {},
@@ -64,159 +60,90 @@ export const initialState = {
recovered: {},
executed: {},
deleted: {},
- recent: {}
+ recent: {},
};
+const getConfigRequestId = ({ config: { requestId } }) => requestId;
+
export default createReducer(initialState, {
[GRANULE]: (state, action) => {
- const { id, data } = action;
- set(state, ['map', id, 'inflight'], false);
- set(state, ['map', id, 'data'], assignDate(data));
- del(state, ['deleted', id]);
+ state.map[action.id] = {
+ inflight: false,
+ data: assignDate(action.data),
+ };
+ delete state.deleted[action.id];
},
[GRANULE_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['map', id, 'inflight'], true);
+ state.map[action.id] = { inflight: true };
},
[GRANULE_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['map', id, 'inflight'], false);
- set(state, ['map', id, 'error'], action.error);
+ state.map[action.id] = {
+ inflight: false,
+ error: action.error,
+ };
},
-
[GRANULES]: (state, action) => {
- const { data } = action;
- set(state, ['list', 'data'], removeDeleted('granuleId', data.results, state.deleted));
- set(state, ['list', 'meta'], assignDate(data.meta));
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], false);
+ state.list = {
+ ...state.list,
+ data: removeDeleted('granuleId', action.data.results, state.deleted),
+ meta: assignDate(action.data.meta),
+ inflight: false,
+ error: false
+ };
},
- [GRANULES_INFLIGHT]: (state, action) => {
- set(state, ['list', 'inflight'], true);
+ [GRANULES_INFLIGHT]: (state) => {
+ state.list.inflight = true;
},
[GRANULES_ERROR]: (state, action) => {
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], action.error);
- },
-
- [GRANULE_REPROCESS]: (state, action) => {
- const { id } = action;
- set(state, ['reprocessed', id, 'status'], 'success');
- set(state, ['reprocessed', id, 'error'], null);
- },
- [GRANULE_REPROCESS_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['reprocessed', id, 'status'], 'inflight');
- },
- [GRANULE_REPROCESS_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['reprocessed', id, 'status'], 'error');
- set(state, ['reprocessed', id, 'error'], action.error);
- },
-
- [GRANULE_REINGEST]: (state, action) => {
- const { id } = action;
- set(state, ['reingested', id, 'status'], 'success');
- set(state, ['reingested', id, 'error'], null);
- },
- [GRANULE_REINGEST_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['reingested', id, 'status'], 'inflight');
- },
- [GRANULE_REINGEST_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['reingested', id, 'status'], 'error');
- set(state, ['reingested', id, 'error'], action.error);
- },
-
- [GRANULE_APPLYWORKFLOW]: (state, action) => {
- const { id } = action;
- set(state, ['executed', id, 'status'], 'success');
- set(state, ['executed', id, 'error'], null);
- },
- [GRANULE_APPLYWORKFLOW_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['executed', id, 'status'], 'inflight');
- },
- [GRANULE_APPLYWORKFLOW_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['executed', id, 'status'], 'error');
- set(state, ['executed', id, 'error'], action.error);
- },
-
- [GRANULE_REMOVE]: (state, action) => {
- const { id } = action;
- set(state, ['removed', id, 'status'], 'success');
- set(state, ['removed', id, 'error'], null);
- },
- [GRANULE_REMOVE_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['removed', id, 'status'], 'inflight');
- },
- [GRANULE_REMOVE_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['removed', id, 'status'], 'error');
- set(state, ['removed', id, 'error'], action.error);
- },
-
- [BULK_GRANULE]: (state, action) => {
- const { data, config } = action;
- set(state, ['bulk', config.requestId, 'data'], data);
- set(state, ['bulk', config.requestId, 'status'], 'success');
- set(state, ['bulk', config.requestId, 'error'], null);
- },
- [BULK_GRANULE_INFLIGHT]: (state, action) => {
- const { config } = action;
- set(state, ['bulk', config.requestId, 'status'], 'inflight');
- },
- [BULK_GRANULE_ERROR]: (state, action) => {
- const { config } = action;
- set(state, ['bulk', config.requestId, 'status'], 'error');
- set(state, ['bulk', config.requestId, 'error'], action.error);
- },
-
- [GRANULE_DELETE]: (state, action) => {
- const { id } = action;
- set(state, ['deleted', id, 'status'], 'success');
- set(state, ['deleted', id, 'error'], null);
- },
- [GRANULE_DELETE_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['deleted', id, 'status'], 'inflight');
- },
- [GRANULE_DELETE_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['deleted', id, 'status'], 'error');
- set(state, ['deleted', id, 'error'], action.error);
- },
+ state.list.inflight = false;
+ state.list.error = action.error;
+ },
+
+ [GRANULE_REPROCESS]: createSuccessReducer('reprocessed'),
+ [GRANULE_REPROCESS_INFLIGHT]: createInflightReducer('reprocessed'),
+ [GRANULE_REPROCESS_ERROR]: createErrorReducer('reprocessed'),
+ [GRANULE_REINGEST]: createSuccessReducer('reingested'),
+ [GRANULE_REINGEST_INFLIGHT]: createInflightReducer('reingested'),
+ [GRANULE_REINGEST_ERROR]: createErrorReducer('reingested'),
+ [GRANULE_APPLYWORKFLOW]: createSuccessReducer('executed'),
+ [GRANULE_APPLYWORKFLOW_INFLIGHT]: createInflightReducer('executed'),
+ [GRANULE_APPLYWORKFLOW_ERROR]: createErrorReducer('executed'),
+ [GRANULE_REMOVE]: createSuccessReducer('removed'),
+ [GRANULE_REMOVE_INFLIGHT]: createInflightReducer('removed'),
+ [GRANULE_REMOVE_ERROR]: createErrorReducer('removed'),
+ [BULK_GRANULE]: createSuccessReducer('bulk', getConfigRequestId),
+ [BULK_GRANULE_INFLIGHT]: createInflightReducer('bulk', getConfigRequestId),
+ [BULK_GRANULE_ERROR]: createErrorReducer('bulk', getConfigRequestId),
+ [GRANULE_DELETE]: createSuccessReducer('deleted'),
+ [GRANULE_DELETE_INFLIGHT]: createInflightReducer('deleted'),
+ [GRANULE_DELETE_ERROR]: createErrorReducer('deleted'),
[SEARCH_GRANULES]: (state, action) => {
- set(state, ['list', 'params', 'prefix'], action.prefix);
+ state.list.params.prefix = action.prefix;
},
- [CLEAR_GRANULES_SEARCH]: (state, action) => {
- set(state, ['list', 'params', 'prefix'], null);
+ [CLEAR_GRANULES_SEARCH]: (state) => {
+ state.list.params.prefix = null;
},
-
[FILTER_GRANULES]: (state, action) => {
- set(state, ['list', 'params', action.param.key], action.param.value);
+ state.list.params[action.param.key] = action.param.value;
},
[CLEAR_GRANULES_FILTER]: (state, action) => {
- set(state, ['list', 'params', action.paramKey], null);
+ state.list.params[action.paramKey] = null;
},
-
[OPTIONS_COLLECTIONNAME]: (state, action) => {
const options = action.data.results.reduce(
(obj, { name, version }) =>
Object.assign(obj, {
- [`${name} ${version}`]: getCollectionId({ name, version })
+ [`${name} ${version}`]: getCollectionId({ name, version }),
}),
{}
);
- set(state, ['dropdowns', 'collectionName', 'options'], options);
+
+ set(state.dropdowns, 'collectionName.options', options);
},
[OPTIONS_COLLECTIONNAME_INFLIGHT]: () => {},
[OPTIONS_COLLECTIONNAME_ERROR]: (state, action) => {
- set(state, ['dropdowns', 'collectionName', 'options'], []);
- set(state, ['list', 'error'], action.error);
- }
+ set(state.dropdowns, 'collectionName.options', []);
+ state.list.error = action.error;
+ },
});
diff --git a/app/src/js/reducers/index.js b/app/src/js/reducers/index.js
index 07cf7eec7..366513d06 100644
--- a/app/src/js/reducers/index.js
+++ b/app/src/js/reducers/index.js
@@ -3,7 +3,7 @@ import { connectRouter } from 'connected-react-router';
import api from './api';
import apiVersion from './api-version';
import collections from './collections';
-import config from './config';
+import config from './utils/config';
import dist from './dist';
import datepicker from './datepicker';
import granules from './granules';
@@ -13,6 +13,7 @@ import pdrs from './pdrs';
import providers from './providers';
import logs from './logs';
import schema from './schema';
+import timer from './timer';
import workflows from './workflows';
import executions from './executions';
import executionStatus from './execution-status';
@@ -23,7 +24,7 @@ import reconciliationReports from './reconciliation-reports';
import mmtLinks from './mmtLinks';
import cumulusInstance from './cumulus-instance';
-const def = (state = {}, action) => state;
+const def = (state, _action) => state || {};
export const reducers = {
def,
@@ -38,6 +39,7 @@ export const reducers = {
granules,
granuleCSV,
stats,
+ timer,
pdrs,
providers,
logs,
@@ -48,10 +50,11 @@ export const reducers = {
executionLogs,
operations,
rules,
- reconciliationReports
+ reconciliationReports,
};
-export const createRootReducer = (history) => combineReducers({
- router: connectRouter(history),
- ...reducers
-});
+export const createRootReducer = (history) =>
+ combineReducers({
+ router: connectRouter(history),
+ ...reducers,
+ });
diff --git a/app/src/js/reducers/logs.js b/app/src/js/reducers/logs.js
index 8ba236a37..4f612942f 100644
--- a/app/src/js/reducers/logs.js
+++ b/app/src/js/reducers/logs.js
@@ -1,76 +1,61 @@
'use strict';
-import { set, get } from 'object-path';
-import moment from 'moment';
-import {
- LOGS,
- LOGS_ERROR,
- LOGS_INFLIGHT,
- CLEAR_LOGS
-} from '../actions/types';
+import moment from 'moment';
+import uniqBy from 'lodash/fp';
+import { get } from 'object-path';
import { createReducer } from '@reduxjs/toolkit';
-
-export const initialState = {
- items: []
-};
+import { LOGS, LOGS_ERROR, LOGS_INFLIGHT, CLEAR_LOGS } from '../actions/types';
// https://momentjs.com/docs/#/displaying/
const format = 'MM/DD/YY hh:mma ss:SSS[s]';
-export default createReducer(initialState, {
+const processLog = (logEntry) => ({
+ ...logEntry,
+ displayTime: moment(logEntry.timestamp).format(format),
+ displayText: logEntry.message || logEntry.msg,
+ key: `${logEntry.timestamp}-${logEntry.displayText}`,
+ searchKey: Object.values(logEntry).join(' '),
+});
+
+export const initialState = {
+ items: [],
+};
+export default createReducer(initialState, {
[LOGS]: (state, action) => {
const { data } = action;
+
if (Array.isArray(data.results) && data.results.length) {
- data.results.forEach(processLog);
- let items = data.results.concat(state.items);
- items = dedupe(items);
- set(state, 'items', items);
+ state.items = uniqBy(
+ 'key',
+ data.results
+ .filter((result) => result.timestamp && result.displayText)
+ .map(processLog)
+ .concat(state.items)
+ );
}
- set(state, 'inflight', false);
- set(state, 'queriedAt', Date.now());
- set(state, 'error', false);
+
+ state.inflight = false;
+ state.queriedAt = Date.now();
+ state.error = false;
},
[LOGS_INFLIGHT]: (state, action) => {
const query = get(action.config, 'qs.q', '');
- const replace = state.query !== query;
- if (replace) {
- set(state, 'items', []);
+
+ if (state.query !== query) {
+ state.query = query;
+ state.items = [];
}
- set(state, 'inflight', true);
- set(state, 'query', query);
+
+ state.inflight = true;
},
[LOGS_ERROR]: (state, action) => {
- set(state, 'inflight', false);
- set(state, 'error', action.error);
+ state.inflight = false;
+ state.error = action.error;
},
[CLEAR_LOGS]: (state, action) => {
- set(state, 'inflight', false);
- set(state, 'error', action.error);
- set(state, 'items', []);
- }
-
+ state.inflight = false;
+ state.error = action.error;
+ state.items = [];
+ },
});
-
-function processLog (d) {
- d.displayTime = moment(d.timestamp).format(format);
- d.displayText = d.message || d.msg;
- d.key = d.timestamp + '-' + d.displayText;
- let metafields = '';
- for (const key in d) {
- metafields += ' ' + d[key];
- }
- d.searchkey = metafields;
-}
-
-function dedupe (items) {
- const deduped = [];
- const keymap = {};
- items.forEach(d => {
- if (d.timestamp && d.displayText && !keymap[d.key]) {
- keymap[d.key] = 1;
- deduped.push(d);
- }
- });
- return deduped;
-}
diff --git a/app/src/js/reducers/mmtLinks.js b/app/src/js/reducers/mmtLinks.js
index 25e3ef17f..701691cc2 100644
--- a/app/src/js/reducers/mmtLinks.js
+++ b/app/src/js/reducers/mmtLinks.js
@@ -1,18 +1,13 @@
'use strict';
-import { set } from 'object-path';
-import { getCollectionId } from '../utils/format';
-import {
- ADD_MMTLINK
-} from '../actions/types';
+import { getCollectionId } from '../utils/format';
import { createReducer } from '@reduxjs/toolkit';
+import { ADD_MMTLINK } from '../actions/types';
const initialState = {};
export default createReducer(initialState, {
[ADD_MMTLINK]: (state, action) => {
- const { data } = action;
- const collectionId = getCollectionId(data);
- set(state, [collectionId], data.url);
+ state[getCollectionId(action.data)] = action.data.url;
},
});
diff --git a/app/src/js/reducers/operations.js b/app/src/js/reducers/operations.js
index 7ee61b2e3..1047bac62 100644
--- a/app/src/js/reducers/operations.js
+++ b/app/src/js/reducers/operations.js
@@ -1,21 +1,19 @@
'use strict';
-import { set } from 'object-path';
-import assignDate from './assign-date';
+
+import assignDate from './utils/assign-date';
+import { createReducer } from '@reduxjs/toolkit';
import {
OPERATIONS,
OPERATIONS_INFLIGHT,
OPERATIONS_ERROR,
-
OPERATION,
OPERATION_INFLIGHT,
OPERATION_ERROR,
-
FILTER_OPERATIONS,
CLEAR_OPERATIONS_FILTER,
SEARCH_OPERATIONS,
- CLEAR_OPERATIONS_SEARCH
+ CLEAR_OPERATIONS_SEARCH,
} from '../actions/types';
-import { createReducer } from '@reduxjs/toolkit';
export const initialState = {
list: {
@@ -25,53 +23,48 @@ export const initialState = {
params: {},
internal: {},
inflight: false,
- error: false
+ error: false,
},
- map: {}
+ map: {},
};
export default createReducer(initialState, {
[OPERATIONS]: (state, action) => {
- const { data } = action;
- set(state, ['list', 'data'], data.results);
- set(state, ['list', 'meta'], assignDate(data.meta));
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], false);
+ state.list.data = action.data.results;
+ state.list.meta = assignDate(action.data.meta);
+ state.list.inflight = false;
+ state.list.error = false;
},
- [OPERATIONS_INFLIGHT]: (state, action) => {
- set(state, ['list', 'inflight'], true);
+ [OPERATIONS_INFLIGHT]: (state) => {
+ state.list.inflight = true;
},
[OPERATIONS_ERROR]: (state, action) => {
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], action.error);
+ state.list.inflight = false;
+ state.list.error = action.error;
},
-
[OPERATION]: (state, action) => {
- const { data } = action;
- set(state, ['list', 'data'], data.results);
- set(state, ['list', 'meta'], assignDate(data.meta));
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], false);
+ state.list.data = action.data.results;
+ state.list.meta = assignDate(action.data.meta);
+ state.list.inflight = false;
+ state.list.error = false;
},
- [OPERATION_INFLIGHT]: (state, action) => {
- set(state, ['list', 'inflight'], true);
+ [OPERATION_INFLIGHT]: (state) => {
+ state.list.inflight = true;
},
[OPERATION_ERROR]: (state, action) => {
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], action.error);
+ state.list.inflight = false;
+ state.list.error = action.error;
},
-
[FILTER_OPERATIONS]: (state, action) => {
- set(state, ['list', 'params', action.param.key], action.param.value);
+ state.list.params[action.param.key] = action.param.value;
},
[CLEAR_OPERATIONS_FILTER]: (state, action) => {
- set(state, ['list', 'params', action.paramKey], null);
+ delete state.list.params[action.paramKey];
},
-
[SEARCH_OPERATIONS]: (state, action) => {
- set(state, ['list', 'internal', 'prefix'], action.prefix);
+ state.list.internal.prefix = action.prefix;
+ },
+ [CLEAR_OPERATIONS_SEARCH]: (state) => {
+ delete state.list.internal.prefix;
},
- [CLEAR_OPERATIONS_SEARCH]: (state, action) => {
- set(state, ['list', 'internal', 'prefix'], null);
- }
});
diff --git a/app/src/js/reducers/pdrs.js b/app/src/js/reducers/pdrs.js
index 0e8546ba1..9b08d674b 100644
--- a/app/src/js/reducers/pdrs.js
+++ b/app/src/js/reducers/pdrs.js
@@ -1,98 +1,83 @@
'use strict';
-import { set, del } from 'object-path';
-import assignDate from './assign-date';
+import { createReducer } from '@reduxjs/toolkit';
+import assignDate from './utils/assign-date';
+import {
+ createErrorReducer,
+ createInflightReducer,
+ createSuccessReducer,
+} from './utils/reducer-creators';
import {
PDR,
PDR_INFLIGHT,
PDR_ERROR,
-
PDRS,
PDRS_INFLIGHT,
PDRS_ERROR,
-
SEARCH_PDRS,
CLEAR_PDRS_SEARCH,
-
FILTER_PDRS,
CLEAR_PDRS_FILTER,
-
PDR_DELETE,
PDR_DELETE_INFLIGHT,
- PDR_DELETE_ERROR
+ PDR_DELETE_ERROR,
} from '../actions/types';
-import { createReducer } from '@reduxjs/toolkit';
export const initialState = {
list: {
data: [],
meta: {},
- params: {}
+ params: {},
},
map: {},
search: {},
- deleted: {}
+ deleted: {},
};
export default createReducer(initialState, {
[PDR]: (state, action) => {
- const { id, data } = action;
- set(state, ['map', id, 'inflight'], false);
- set(state, ['map', id, 'data'], assignDate(data));
+ state.map[action.id] = {
+ inflight: false,
+ data: assignDate(action.data),
+ };
// https://github.com/nasa/cumulus-dashboard/issues/284
- del(state, ['deleted', id]);
+ delete state.deleted[action.id];
},
[PDR_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['map', id, 'inflight'], true);
+ state.map[action.id] = { inflight: true };
},
[PDR_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['map', id, 'inflight'], false);
- set(state, ['map', id, 'error'], action.error);
+ state.map[action.id] = {
+ inflight: false,
+ error: action.error,
+ };
},
-
[PDRS]: (state, action) => {
- const { data } = action;
- set(state, ['list', 'data'], data.results);
- set(state, ['list', 'meta'], assignDate(data.meta));
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], false);
+ state.list.data = action.data.results;
+ state.list.meta = assignDate(action.data.meta);
+ state.list.inflight = false;
+ state.list.error = false;
},
- [PDRS_INFLIGHT]: (state, action) => {
- set(state, ['list', 'inflight'], true);
+ [PDRS_INFLIGHT]: (state) => {
+ state.list.inflight = true;
},
[PDRS_ERROR]: (state, action) => {
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], action.error);
+ state.list.inflight = false;
+ state.list.error = action.error;
},
-
[SEARCH_PDRS]: (state, action) => {
- set(state, ['list', 'params', 'prefix'], action.prefix);
+ state.list.params.prefix = action.prefix;
},
- [CLEAR_PDRS_SEARCH]: (state, action) => {
- set(state, ['list', 'params', 'prefix'], null);
+ [CLEAR_PDRS_SEARCH]: (state) => {
+ delete state.list.params.prefix;
},
-
[FILTER_PDRS]: (state, action) => {
- set(state, ['list', 'params', action.param.key], action.param.value);
+ state.list.params[action.param.key] = action.param.value;
},
[CLEAR_PDRS_FILTER]: (state, action) => {
- set(state, ['list', 'params', action.paramKey], null);
- },
-
- [PDR_DELETE]: (state, action) => {
- const { id } = action;
- set(state, ['deleted', id, 'status'], 'success');
- set(state, ['deleted', id, 'error'], null);
- },
- [PDR_DELETE_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['deleted', id, 'status'], 'inflight');
+ delete state.list.params[action.paramKey];
},
- [PDR_DELETE_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['deleted', id, 'status'], 'error');
- set(state, ['deleted', id, 'error'], action.error);
- }
+ [PDR_DELETE]: createSuccessReducer('deleted'),
+ [PDR_DELETE_INFLIGHT]: createInflightReducer('deleted'),
+ [PDR_DELETE_ERROR]: createErrorReducer('deleted'),
});
diff --git a/app/src/js/reducers/providers.js b/app/src/js/reducers/providers.js
index f883414c5..fb55adb43 100644
--- a/app/src/js/reducers/providers.js
+++ b/app/src/js/reducers/providers.js
@@ -1,50 +1,48 @@
'use strict';
-import { get, set, del } from 'object-path';
-import assignDate from './assign-date';
+import { get, set } from 'object-path';
+import { createReducer } from '@reduxjs/toolkit';
+import assignDate from './utils/assign-date';
+import {
+ createClearItemReducer,
+ createErrorReducer,
+ createInflightReducer,
+ createSuccessReducer,
+} from './utils/reducer-creators';
import {
PROVIDER,
PROVIDER_INFLIGHT,
PROVIDER_ERROR,
-
NEW_PROVIDER,
NEW_PROVIDER_INFLIGHT,
NEW_PROVIDER_ERROR,
-
PROVIDER_COLLECTIONS,
PROVIDER_COLLECTIONS_INFLIGHT,
PROVIDER_COLLECTIONS_ERROR,
-
UPDATE_PROVIDER,
UPDATE_PROVIDER_INFLIGHT,
UPDATE_PROVIDER_ERROR,
UPDATE_PROVIDER_CLEAR,
-
PROVIDERS,
PROVIDERS_INFLIGHT,
PROVIDERS_ERROR,
-
SEARCH_PROVIDERS,
CLEAR_PROVIDERS_SEARCH,
-
FILTER_PROVIDERS,
CLEAR_PROVIDERS_FILTER,
-
PROVIDER_DELETE,
PROVIDER_DELETE_INFLIGHT,
PROVIDER_DELETE_ERROR,
-
OPTIONS_PROVIDERGROUP,
OPTIONS_PROVIDERGROUP_INFLIGHT,
- OPTIONS_PROVIDERGROUP_ERROR
+ OPTIONS_PROVIDERGROUP_ERROR,
} from '../actions/types';
-import { createReducer } from '@reduxjs/toolkit';
export const initialState = {
list: {
data: [],
meta: {},
- params: {}
+ params: {},
},
dropdowns: {},
map: {},
@@ -54,137 +52,96 @@ export const initialState = {
updated: {},
deleted: {},
restarted: {},
- stopped: {}
+ stopped: {},
};
export default createReducer(initialState, {
-
[PROVIDER]: (state, action) => {
- const { data, id } = action;
- set(state, ['map', id, 'inflight'], false);
- set(state, ['map', id, 'data'], data);
- set(state, ['map', id, 'error'], null);
+ const { id, data } = action;
+
+ state.map[id] = {
+ inflight: false,
+ data,
+ error: null,
+ };
+
if (get(state, ['deleted', id, 'status']) !== 'error') {
- del(state, ['deleted', id]);
+ delete state.deleted[id];
}
},
[PROVIDER_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['map', id, 'inflight'], true);
- },
- [PROVIDER_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['map', id, 'inflight'], false);
- set(state, ['map', id, 'error'], action.error);
- },
-
- [NEW_PROVIDER]: (state, action) => {
- const { id } = action;
- set(state, ['created', id, 'status'], 'success');
+ state.map[action.id] = { inflight: true };
},
- [NEW_PROVIDER_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['created', id, 'status'], 'inflight');
- },
- [NEW_PROVIDER_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['created', id, 'status'], 'error');
- set(state, ['created', id, 'error'], action.error);
- },
-
- [PROVIDER_COLLECTIONS]: (state, action) => {
- const { data, id } = action;
- set(state, ['collections', id, 'inflight'], false);
- set(state, ['collections', id, 'data'], data.results.map(c => c.collectionName));
+ [PROVIDER_ERROR]: createErrorReducer('map'),
+ [NEW_PROVIDER]: createSuccessReducer('created'),
+ [NEW_PROVIDER_INFLIGHT]: createInflightReducer('created'),
+ [NEW_PROVIDER_ERROR]: createErrorReducer('created'),
+ [PROVIDER_COLLECTIONS]: (state, { id, data }) => {
+ state.collections[id] = { data: data.results.map((c) => c.collectionName) };
},
[PROVIDER_COLLECTIONS_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['collections', id, 'inflight'], true);
+ state.collections[action.id] = { inflight: true };
},
[PROVIDER_COLLECTIONS_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['collections', id, 'inflight'], false);
- set(state, ['collections', id, 'error'], action.error);
+ state.collections[action.id] = {
+ inflight: false,
+ error: action.error,
+ };
},
-
[UPDATE_PROVIDER]: (state, action) => {
- const { data, id } = action;
- set(state, ['map', id, 'data'], data);
- set(state, ['updated', id, 'status'], 'success');
+ const { id, data } = action;
+ state.map[id] = { data };
+ state.updated = { ...state.updated, [id]: { status: 'success' } };
},
- [UPDATE_PROVIDER_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['updated', id, 'status'], 'inflight');
- },
- [UPDATE_PROVIDER_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['updated', id, 'status'], 'error');
- set(state, ['updated', id, 'error'], action.error);
- },
- [UPDATE_PROVIDER_CLEAR]: (state, action) => {
- const { id } = action;
- del(state, ['updated', id]);
- },
-
+ [UPDATE_PROVIDER_INFLIGHT]: createInflightReducer('updated'),
+ [UPDATE_PROVIDER_ERROR]: createErrorReducer('updated'),
+ [UPDATE_PROVIDER_CLEAR]: createClearItemReducer('updated'),
[PROVIDERS]: (state, action) => {
- const { data } = action;
- set(state, ['list', 'data'], data.results);
- set(state, ['list', 'meta'], assignDate(data.meta));
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], false);
+ state.list.data = action.data.results;
+ state.list.meta = assignDate(action.data.meta);
+ state.list.inflight = false;
+ state.list.error = false;
},
- [PROVIDERS_INFLIGHT]: (state, action) => {
- set(state, ['list', 'inflight'], true);
+ [PROVIDERS_INFLIGHT]: (state) => {
+ state.list.inflight = true;
},
[PROVIDERS_ERROR]: (state, action) => {
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], action.error);
+ state.list.inflight = false;
+ state.list.error = action.error;
},
-
[SEARCH_PROVIDERS]: (state, action) => {
- set(state, ['list', 'params', 'prefix'], action.prefix);
+ state.list.params.prefix = action.prefix;
},
- [CLEAR_PROVIDERS_SEARCH]: (state, action) => {
- set(state, ['list', 'params', 'prefix'], null);
+ [CLEAR_PROVIDERS_SEARCH]: (state) => {
+ delete state.list.params.prefix;
},
-
[FILTER_PROVIDERS]: (state, action) => {
- set(state, ['list', 'params', action.param.key], action.param.value);
+ state.list.params[action.param.key] = action.param.value;
},
[CLEAR_PROVIDERS_FILTER]: (state, action) => {
- set(state, ['list', 'params', action.paramKey], null);
- },
-
- [PROVIDER_DELETE]: (state, action) => {
- const { id } = action;
- set(state, ['deleted', id, 'status'], 'success');
- set(state, ['deleted', id, 'error'], null);
+ delete state.list.params[action.paramKey];
},
- [PROVIDER_DELETE_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['deleted', id, 'status'], 'inflight');
- },
- [PROVIDER_DELETE_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['deleted', id, 'status'], 'error');
- set(state, ['deleted', id, 'error'], action.error);
- },
-
+ [PROVIDER_DELETE]: createSuccessReducer('deleted'),
+ [PROVIDER_DELETE_INFLIGHT]: createInflightReducer('deleted'),
+ [PROVIDER_DELETE_ERROR]: createErrorReducer('deleted'),
[OPTIONS_PROVIDERGROUP]: (state, action) => {
- const { data } = action;
// Map the list response to an object with key-value pairs like:
// displayValue: optionElementValue
- const options = data.results.reduce((obj, provider) => {
- // Several `results` items can share a `providerName`, but
- // these are de-duplciated by the key-value structure
- obj[provider.providerName] = provider.providerName;
- return obj;
- }, { '': '' });
- set(state, ['dropdowns', 'group', 'options'], options);
- },
- [OPTIONS_PROVIDERGROUP_INFLIGHT]: () => { },
+ const options = action.data.results.reduce(
+ (obj, provider) => {
+ // Several `results` items can share a `providerName`, but
+ // these are de-duplciated by the key-value structure
+ obj[provider.providerName] = provider.providerName;
+ return obj;
+ },
+ { '': '' }
+ );
+
+ set(state.dropdowns, 'group.options', options);
+ },
+ [OPTIONS_PROVIDERGROUP_INFLIGHT]: () => {},
[OPTIONS_PROVIDERGROUP_ERROR]: (state, action) => {
- set(state, ['dropdowns', 'group', 'options'], []);
- set(state, ['list', 'error'], action.error);
- }
+ set(state.dropdowns, 'group.options', []);
+ state.list.error = action.error;
+ },
});
diff --git a/app/src/js/reducers/reconciliation-reports.js b/app/src/js/reducers/reconciliation-reports.js
index 855a99c69..f3d31b06a 100644
--- a/app/src/js/reducers/reconciliation-reports.js
+++ b/app/src/js/reducers/reconciliation-reports.js
@@ -1,82 +1,73 @@
'use strict';
-import { set, del } from 'object-path';
-import assignDate from './assign-date';
+import assignDate from './utils/assign-date';
+import { createReducer } from '@reduxjs/toolkit';
import {
RECONCILIATION,
RECONCILIATION_INFLIGHT,
RECONCILIATION_ERROR,
-
RECONCILIATIONS,
RECONCILIATIONS_INFLIGHT,
RECONCILIATIONS_ERROR,
-
SEARCH_RECONCILIATIONS,
CLEAR_RECONCILIATIONS_SEARCH,
-
NEW_RECONCILIATION_INFLIGHT,
- NEW_RECONCILIATION
+ NEW_RECONCILIATION,
} from '../actions/types';
-import { createReducer } from '@reduxjs/toolkit';
export const initialState = {
list: {
data: [],
meta: {},
- params: {}
+ params: {},
},
map: {},
createReportInflight: false,
search: {},
- deleted: {}
+ deleted: {},
};
export default createReducer(initialState, {
[RECONCILIATION]: (state, action) => {
- const { id, data } = action;
- set(state, ['map', id, 'inflight'], false);
- set(state, ['map', id, 'data'], assignDate(data));
- del(state, ['deleted', id]);
+ state.map[action.id] = {
+ inflight: false,
+ data: assignDate(action.data),
+ };
+ delete state.deleted[action.id];
},
[RECONCILIATION_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['map', id, 'inflight'], true);
+ state.map[action.id] = { inflight: true };
},
[RECONCILIATION_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['map', id, 'inflight'], false);
- set(state, ['map', id, 'error'], action.error);
+ state.map[action.id] = {
+ inflight: false,
+ error: action.error,
+ };
},
-
[RECONCILIATIONS]: (state, action) => {
- const { data } = action;
- // response.results is a array of string filenames
- const results = data.results.map((filename) => ({ reconciliationReportName: filename }));
- set(state, ['list', 'data'], results);
- set(state, ['list', 'meta'], assignDate(data.meta));
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], false);
+ const reports = action.data.results;
+ state.list.data = reports;
+ state.list.meta = assignDate(action.data.meta);
+ state.list.inflight = false;
+ state.list.error = false;
},
- [RECONCILIATIONS_INFLIGHT]: (state, action) => {
- set(state, ['list', 'inflight'], true);
+ [RECONCILIATIONS_INFLIGHT]: (state) => {
+ state.list.inflight = true;
},
[RECONCILIATIONS_ERROR]: (state, action) => {
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], action.error);
+ state.list.inflight = false;
+ state.list.error = action.error;
},
-
[SEARCH_RECONCILIATIONS]: (state, action) => {
- set(state, ['list', 'params', 'prefix'], action.prefix);
+ state.list.params.prefix = action.prefix;
},
- [CLEAR_RECONCILIATIONS_SEARCH]: (state, action) => {
- set(state, ['list', 'params', 'prefix'], null);
+ [CLEAR_RECONCILIATIONS_SEARCH]: (state) => {
+ delete state.list.params.prefix;
},
-
- [NEW_RECONCILIATION_INFLIGHT]: (state, action) => {
- set(state, 'createReportInflight', true);
+ [NEW_RECONCILIATION_INFLIGHT]: (state) => {
+ state.createReportInflight = true;
+ },
+ [NEW_RECONCILIATION]: (state) => {
+ state.createReportInflight = false;
},
-
- [NEW_RECONCILIATION]: (state, action) => {
- set(state, 'createReportInflight', false);
- }
});
diff --git a/app/src/js/reducers/rules.js b/app/src/js/reducers/rules.js
index 14ee3e435..f4bf8ad31 100644
--- a/app/src/js/reducers/rules.js
+++ b/app/src/js/reducers/rules.js
@@ -1,48 +1,46 @@
'use strict';
-import { set, del } from 'object-path';
-import assignDate from './assign-date';
-import removeDeleted from './remove-deleted';
+import { createReducer } from '@reduxjs/toolkit';
+import assignDate from './utils/assign-date';
+import removeDeleted from './utils/remove-deleted';
+import {
+ createClearItemReducer,
+ createErrorReducer,
+ createInflightReducer,
+ createSerialReducer,
+ createSuccessReducer,
+} from './utils/reducer-creators';
import {
RULES,
RULES_INFLIGHT,
RULES_ERROR,
-
RULE,
RULE_INFLIGHT,
RULE_ERROR,
-
UPDATE_RULE,
UPDATE_RULE_INFLIGHT,
UPDATE_RULE_ERROR,
UPDATE_RULE_CLEAR,
-
NEW_RULE,
NEW_RULE_INFLIGHT,
NEW_RULE_ERROR,
-
RULE_DELETE,
RULE_DELETE_INFLIGHT,
RULE_DELETE_ERROR,
-
RULE_RERUN,
RULE_RERUN_INFLIGHT,
RULE_RERUN_ERROR,
-
RULE_ENABLE,
RULE_ENABLE_INFLIGHT,
RULE_ENABLE_ERROR,
-
RULE_DISABLE,
RULE_DISABLE_INFLIGHT,
RULE_DISABLE_ERROR,
-
SEARCH_RULES,
CLEAR_RULES_SEARCH,
FILTER_RULES,
- CLEAR_RULES_FILTER
+ CLEAR_RULES_FILTER,
} from '../actions/types';
-import { createReducer } from '@reduxjs/toolkit';
export const initialState = {
list: {
@@ -50,153 +48,84 @@ export const initialState = {
meta: {},
params: {},
inflight: false,
- error: false
+ error: false,
},
map: {},
created: {},
updated: {},
deleted: {},
enabled: {},
- disabled: {}
+ disabled: {},
};
export default createReducer(initialState, {
[RULE]: (state, action) => {
- const { data, id } = action;
- set(state, ['map', id, 'inflight'], false);
- set(state, ['map', id, 'data'], data);
- del(state, ['deleted', id]);
+ state.map[action.id] = {
+ inflight: false,
+ data: action.data,
+ };
+ delete state.deleted[action.id];
},
[RULE_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['map', id, 'inflight'], true);
+ state.map[action.id] = { inflight: true };
},
[RULE_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['map', id, 'inflight'], false);
- set(state, ['map', id, 'error'], action.error);
+ state.map[action.id] = {
+ inflight: false,
+ error: action.error,
+ };
},
-
[RULES]: (state, action) => {
- const { data } = action;
- set(state, ['list', 'data'], removeDeleted('name', data.results, state.deleted));
- set(state, ['list', 'meta'], assignDate(data.meta));
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], false);
+ state.list.data = removeDeleted('name', action.data.results, state.deleted);
+ state.list.meta = assignDate(action.data.meta);
+ state.list.inflight = false;
+ state.list.error = false;
},
- [RULES_INFLIGHT]: (state, action) => {
- set(state, ['list', 'inflight'], true);
+ [RULES_INFLIGHT]: (state) => {
+ state.list.inflight = true;
},
[RULES_ERROR]: (state, action) => {
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], action.error);
+ state.list.inflight = false;
+ state.list.error = action.error;
},
-
[UPDATE_RULE]: (state, action) => {
- const { data, id } = action;
- set(state, ['map', id, 'data'], data);
- set(state, ['updated', id, 'status'], 'success');
- },
- [UPDATE_RULE_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['updated', id, 'status'], 'inflight');
- },
- [UPDATE_RULE_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['updated', id, 'status'], 'error');
- set(state, ['updated', id, 'error'], action.error);
- },
- [UPDATE_RULE_CLEAR]: (state, action) => {
- const { id } = action;
- del(state, ['updated', id]);
- },
-
- [NEW_RULE]: (state, action) => {
- const { id } = action;
- set(state, ['created', id, 'status'], 'success');
- },
- [NEW_RULE_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['created', id, 'status'], 'inflight');
- },
- [NEW_RULE_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['created', id, 'status'], 'error');
- set(state, ['created', id, 'error'], action.error);
- },
-
- [RULE_DELETE]: (state, action) => {
- const { id } = action;
- set(state, ['deleted', id, 'status'], 'success');
- set(state, ['deleted', id, 'error'], null);
- },
- [RULE_DELETE_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['deleted', id, 'status'], 'inflight');
- },
- [RULE_DELETE_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['deleted', id, 'status'], 'error');
- set(state, ['deleted', id, 'error'], action.error);
- },
-
- [RULE_RERUN]: (state, action) => {
- const { id } = action;
- set(state, ['rerun', id, 'status'], 'success');
- set(state, ['rerun', id, 'error'], null);
- },
- [RULE_RERUN_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['rerun', id, 'status'], 'inflight');
- },
- [RULE_RERUN_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['rerun', id, 'status'], 'error');
- set(state, ['rerun', id, 'error'], action.error);
- },
-
- [RULE_ENABLE]: (state, action) => {
- const { id } = action;
- set(state, ['enabled', id, 'status'], 'success');
- set(state, ['enabled', id, 'error'], null);
- del(state, ['disbled', id]);
- },
- [RULE_ENABLE_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['enabled', id, 'status'], 'inflight');
- },
- [RULE_ENABLE_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['enabled', id, 'status'], 'error');
- set(state, ['enabled', id, 'error'], action.error);
- },
-
- [RULE_DISABLE]: (state, action) => {
- const { id } = action;
- set(state, ['disabled', id, 'status'], 'success');
- set(state, ['disabled', id, 'error'], null);
- del(state, ['enabled', id]);
- },
- [RULE_DISABLE_INFLIGHT]: (state, action) => {
- const { id } = action;
- set(state, ['disabled', id, 'status'], 'inflight');
- },
- [RULE_DISABLE_ERROR]: (state, action) => {
- const { id } = action;
- set(state, ['disabled', id, 'status'], 'error');
- set(state, ['disabled', id, 'error'], action.error);
- },
-
+ state.map[action.id] = { data: action.data };
+ state.updated[action.id] = { status: 'success' };
+ },
+ [UPDATE_RULE_INFLIGHT]: createInflightReducer('updated'),
+ [UPDATE_RULE_ERROR]: createErrorReducer('updated'),
+ [UPDATE_RULE_CLEAR]: createClearItemReducer('updated'),
+ [NEW_RULE]: createSuccessReducer('created'),
+ [NEW_RULE_INFLIGHT]: createInflightReducer('created'),
+ [NEW_RULE_ERROR]: createErrorReducer('created'),
+ [RULE_DELETE]: createSuccessReducer('deleted'),
+ [RULE_DELETE_INFLIGHT]: createInflightReducer('deleted'),
+ [RULE_DELETE_ERROR]: createErrorReducer('deleted'),
+ [RULE_RERUN]: createSuccessReducer('rerun'),
+ [RULE_RERUN_INFLIGHT]: createInflightReducer('rerun'),
+ [RULE_RERUN_ERROR]: createErrorReducer('rerun'),
+ [RULE_ENABLE]: createSerialReducer(
+ createSuccessReducer('enabled'),
+ createClearItemReducer('disabled')
+ ),
+ [RULE_ENABLE_INFLIGHT]: createInflightReducer('enabled'),
+ [RULE_ENABLE_ERROR]: createErrorReducer('enabled'),
+ [RULE_DISABLE]: createSerialReducer(
+ createSuccessReducer('disabled'),
+ createClearItemReducer('enabled')
+ ),
+ [RULE_DISABLE_INFLIGHT]: createInflightReducer('disabled'),
+ [RULE_DISABLE_ERROR]: createErrorReducer('disabled'),
[SEARCH_RULES]: (state, action) => {
- set(state, ['list', 'params', 'prefix'], action.prefix);
+ state.list.params.prefix = action.prefix;
},
- [CLEAR_RULES_SEARCH]: (state, action) => {
- set(state, ['list', 'params', 'prefix'], null);
+ [CLEAR_RULES_SEARCH]: (state) => {
+ delete state.list.params.prefix;
},
[FILTER_RULES]: (state, action) => {
- set(state, ['list', 'params', action.param.key], action.param.value);
+ state.list.params[action.param.key] = action.param.value;
},
[CLEAR_RULES_FILTER]: (state, action) => {
- set(state, ['list', 'params', action.paramKey], null);
- }
+ delete state.list.params[action.paramKey];
+ },
});
diff --git a/app/src/js/reducers/schema.js b/app/src/js/reducers/schema.js
index 8acf3b4f2..3e0fa8bf5 100644
--- a/app/src/js/reducers/schema.js
+++ b/app/src/js/reducers/schema.js
@@ -1,22 +1,15 @@
'use strict';
-import {
- SCHEMA
-} from '../actions/types';
+import { SCHEMA } from '../actions/types';
import { createReducer } from '@reduxjs/toolkit';
export const initialState = {};
export default createReducer(initialState, {
-
[SCHEMA]: (state, action) => {
- const { config } = action;
- return { ...state, [key(config.url)]: action.data };
+ state[key(action.config.url)] = action.data;
}
});
// sample config url is `{rootUrl}/schema/{type}`
-function key (url) {
- const parts = url.split('/');
- return parts[parts.length - 1];
-}
+const key = (url) => url.substr(url.lastIndexOf('/') + 1);
diff --git a/app/src/js/reducers/stats.js b/app/src/js/reducers/stats.js
index d0042f6fb..87899bc22 100644
--- a/app/src/js/reducers/stats.js
+++ b/app/src/js/reducers/stats.js
@@ -1,81 +1,59 @@
'use strict';
-import assignDate from './assign-date';
-import { set } from 'object-path';
-import { createReducer } from '@reduxjs/toolkit';
-import cloneDeep from 'lodash.clonedeep';
+import assignDate from './utils/assign-date';
+import { createReducer } from '@reduxjs/toolkit';
import {
STATS,
STATS_INFLIGHT,
STATS_ERROR,
-
COUNT,
COUNT_INFLIGHT,
- COUNT_ERROR
+ COUNT_ERROR,
} from '../actions/types';
export const initialState = {
stats: {
- data: { // overview statistics from `/stats`
+ data: {
+ // overview statistics from `/stats`
collections: {},
errors: {},
granules: {},
processingTime: {},
},
inflight: false,
- error: null
+ error: null,
},
- count: { // aggregate stats from /stats/aggregate?type=
&field=status
+ count: {
+ // aggregate stats from /stats/aggregate?type=&field=status
data: {},
inflight: false,
- error: null
- }
+ error: null,
+ },
};
export default createReducer(initialState, {
- // These actions' reducers are a bit strange because the createReducer
- // function was not picking up the deep mutation, and because the wrapper
- // thought the underlying state was unchanged (it wasn't) the wrapper
- // returned the original object and the unit tests failed. cloning the state
- // on entry was a hacky way to force the wrapper to recognize new state in
- // each reducer. These could be cleaned up, but be sure the tests still pass
- // as they are.
[STATS]: (state, action) => {
- let newState = cloneDeep(state);
- const stats = { data: assignDate(action.data), inflight: false, error: null };
- newState = Object.assign({}, newState, { stats });
- return newState;
+ state.stats.data = assignDate(action.data);
+ state.stats.inflight = false;
+ state.stats.error = null;
},
[STATS_INFLIGHT]: (state) => {
- let newState = cloneDeep(state);
- const stats = { data: newState.stats.data, inflight: true, error: state.stats.error };
- newState = Object.assign({}, newState, { stats });
- return newState;
+ state.stats.inflight = true;
},
[STATS_ERROR]: (state, action) => {
- let newState = cloneDeep(state);
- const stats = { data: newState.stats.data, inflight: false, error: action.error };
- newState = Object.assign({}, newState, { stats });
- return newState;
+ state.stats.inflight = false;
+ state.stats.error = action.error;
},
-
[COUNT]: (state, action) => {
- let newState = cloneDeep(state);
- const count = Object.assign({}, newState.count, { inflight: false, error: null });
- set(count, ['data', action.config.qs.type], action.data);
- newState = Object.assign({}, newState, { count });
- return newState;
+ state.count.inflight = false;
+ state.count.error = null;
+ state.count.data[action.config.qs.type] = action.data;
},
[COUNT_INFLIGHT]: (state) => {
- let newState = cloneDeep(state);
- const count = { data: newState.count.data, inflight: true, error: newState.count.error };
- newState = Object.assign({}, newState, { count });
- return newState;
+ state.count.inflight = true;
},
[COUNT_ERROR]: (state, action) => {
- let newState = cloneDeep(state);
- const count = { data: newState.count.data, inflight: false, error: action.error };
- newState = Object.assign({}, newState, { count });
- return newState;
- }
+ state.count.inflight = false;
+ state.count.error = action.error;
+ },
});
diff --git a/app/src/js/reducers/timer.js b/app/src/js/reducers/timer.js
new file mode 100644
index 000000000..63ec5f0c6
--- /dev/null
+++ b/app/src/js/reducers/timer.js
@@ -0,0 +1,22 @@
+'use strict';
+import { createReducer } from '@reduxjs/toolkit';
+import { TIMER_START, TIMER_STOP, TIMER_SET_COUNTDOWN } from '../actions/types';
+
+export const initialState = {
+ running: false,
+ seconds: -1,
+};
+
+export default createReducer(initialState, {
+ [TIMER_STOP]: (state, action) => {
+ state.running = false;
+ state.seconds = -1;
+ },
+ [TIMER_START]: (state, action) => {
+ state.running = true;
+ state.seconds = action.secondsToRefresh;
+ },
+ [TIMER_SET_COUNTDOWN]: (state, action) => {
+ state.seconds = action.secondsToRefresh;
+ },
+});
diff --git a/app/src/js/reducers/assign-date.js b/app/src/js/reducers/utils/assign-date.js
similarity index 100%
rename from app/src/js/reducers/assign-date.js
rename to app/src/js/reducers/utils/assign-date.js
diff --git a/app/src/js/reducers/config.js b/app/src/js/reducers/utils/config.js
similarity index 64%
rename from app/src/js/reducers/config.js
rename to app/src/js/reducers/utils/config.js
index a9604e7a7..efe3924ae 100644
--- a/app/src/js/reducers/config.js
+++ b/app/src/js/reducers/utils/config.js
@@ -1,5 +1,5 @@
'use strict';
-import _config from '../config';
+import _config from '../../config';
export default (state = { ..._config }) => state;
diff --git a/app/src/js/reducers/utils/reducer-creators.js b/app/src/js/reducers/utils/reducer-creators.js
new file mode 100644
index 000000000..bcd7a0e00
--- /dev/null
+++ b/app/src/js/reducers/utils/reducer-creators.js
@@ -0,0 +1,197 @@
+'use strict';
+import { del } from 'object-path';
+
+/**
+ * Returns the value of the `id` property of the specified object.
+ *
+ * @param {object} - object to extract the `id` property from
+ * @returns {*} value of the `id` property of the specified object
+ */
+const idProp = ({ id }) => id;
+
+/**
+ * Returns a reducer function that delete's a nested object from the value
+ * of the specified state property, where the key of the nested object is
+ * obtained by applying the specified ID selector function to the action.
+ *
+ * @example
+ * createReducer(initialState, {
+ * [MY_OBJECT_CLEAR]: createClearItemReducer('map'),
+ * // The line above is equivalent to the following
+ * [MY_OBJECT_CLEAR]: (state, action) => {
+ * delete state.map[action.id];
+ * },
+ * ...
+ * }
+ *
+ * @param {string} stateProp - state property that contains nested objects
+ * @param {function} [idSelector] - function to apply to the action object to
+ * obtain an ID value for selecting a nested object from the value of the
+ * specified state property (defaults to selecting the `id` property of the
+ * action)
+ * @returns {function} reducer function that takes a state and an action and
+ * mutates the state by deleting the nested object of the specified state
+ * property where the key (property name) of the nested object is obtained
+ * by applying the ID selector function to the action
+ */
+export const createClearItemReducer = (stateProp, idSelector = idProp) => {
+ return (state, action) => {
+ const id = idSelector(action);
+ del(state, [stateProp, id]);
+ };
+};
+
+/**
+ * Returns a reducer function that sets the status property of a nested state
+ * object to `'inflight'`. The "top level" state object is associated with the
+ * specified state property, and the key of the nested object within the top
+ * level object is obtained by applying the specified ID selector function to
+ * the action object (which defaults to getting the value of the action's `id`
+ * property).
+ *
+ * @example
+ * createReducer(initialState, {
+ * [NEW_PROVIDER_INFLIGHT]: createInflightReducer('created'),
+ * // The line above is equivalent to the following
+ * [NEW_PROVIDER_INFLIGHT]: (state, action) => {
+ * state.created[action.id] = { status: 'inflight' };
+ * },
+ * ...
+ * }
+ *
+ * @param {string} stateProp - state property that contains nested objects
+ * @param {function} [idSelector] - function to apply to the action object to
+ * obtain an ID value for selecting a nested object from the value of the
+ * specified state property (defaults to selecting the `id` property of the
+ * action)
+ * @returns {function} reducer function that takes a state and an action and
+ * mutates the state by setting the `status` of the nested object to
+ * `'inflight'`
+ */
+export const createInflightReducer = (stateProp, idSelector = idProp) => {
+ return (state, action) => {
+ const id = idSelector(action);
+ state[stateProp] = { ...state[stateProp], [id]: { status: 'inflight' } };
+ };
+};
+
+/**
+ * Returns a reducer function that sets the `status` property of a nested state
+ * object to `'success'`, and also sets the `data` property to data found in
+ * the action, if any. The "top level" state object is associated with the
+ * specified state property, and the key of the nested object within the top
+ * level object is obtained by applying the specified ID selector function to
+ * the action object (which defaults to getting the value of the action's `id`
+ * property).
+ *
+ * @example
+ * createReducer(initialState, {
+ * [NEW_PROVIDER]: createSuccessReducer('created'),
+ * // The line above is equivalent to the following
+ * [NEW_PROVIDER]: (state, action) => {
+ * state.created[action.id] = {
+ * status: 'success',
+ * data: action.data
+ * };
+ * },
+ * ...
+ * }
+ *
+ * @param {string} stateProp - state property that contains nested objects
+ * @param {function} [idSelector] - function to apply to the action object to
+ * obtain an ID value for selecting a nested object from the value of the
+ * specified state property (defaults to selecting the `id` property of the
+ * action)
+ * @returns {function} reducer function that takes a state and an action and
+ * mutates the state by setting the `status` of the nested object to
+ * `'success'`, and the `data` property to the value of the action's `data`
+ * property, if it has one
+ */
+export const createSuccessReducer = (stateProp, idSelector = idProp) => {
+ return (state, action) => {
+ const id = idSelector(action);
+ state[stateProp] = {
+ ...state[stateProp],
+ [id]: {
+ status: 'success',
+ error: null,
+ data: action.data,
+ }
+ };
+ };
+};
+
+/**
+ * Returns a reducer function that sets the `status` property of a nested state
+ * object to `'error'`, and also sets the `error` property to error found in
+ * the action, if any. The "top level" state object is associated with the
+ * specified state property, and the key of the nested object within the top
+ * level object is obtained by applying the specified ID selector function to
+ * the action object (which defaults to getting the value of the action's `id`
+ * property).
+ *
+ * @example
+ * createReducer(initialState, {
+ * [NEW_PROVIDER_ERROR]: createErrorReducer('created'),
+ * // The line above is equivalent to the following
+ * [NEW_PROVIDER_ERROR]: (state, action) => {
+ * state.created[action.id] = {
+ * status: 'error',
+ * error: action.error
+ * };
+ * },
+ * ...
+ * }
+ *
+ * @param {string} stateProp - state property that contains nested objects
+ * @param {function} [idSelector] - function to apply to the action object to
+ * obtain an ID value for selecting a nested object from the value of the
+ * specified state property (defaults to selecting the `id` property of the
+ * action)
+ * @returns {function} reducer function that takes a state and an action and
+ * mutates the state by setting the `status` of the nested object to
+ * `'error'`, and the `error` property to the value of the action's `error`
+ * property, if it has one
+ */
+export const createErrorReducer = (stateProp, idSelector = idProp) => {
+ return (state, action) => {
+ const id = idSelector(action);
+ state[stateProp] = {
+ ...state[stateProp],
+ [id]: {
+ status: 'error',
+ error: action.error,
+ }
+ };
+ };
+};
+
+/**
+ * Returns a reducer function that calls all of the specified reducers (given
+ * as separate arguments, _not_ as a single array argument) in the order they
+ * appear as arguments.
+ *
+ * @example
+ * createReducer(initialState, {
+ * [ACTION_NAME]: createSerialReducer(
+ * createSuccessReducer('enabled'),
+ * createClearItemReducer('disabled')
+ * ),
+ * // The lines above are equivalent to the following
+ * [ACTION_NAME]: (state, action) => {
+ * const successReducer = createSuccessReducer('enabled');
+ * const clearReducer = createClearItemReducer('disabled');
+ * successReducer(state, action);
+ * clearReducer(state, action);
+ * },
+ * ...
+ * }
+ *
+ * @param {...any} reducers - reducer functions to be invoked in the order
+ * they are specified as individual arguments, each of which is passed a
+ * state and action, respectively
+ */
+export const createSerialReducer = (...reducers) => {
+ return (state, action) =>
+ reducers.forEach((reducer) => reducer(state, action));
+};
diff --git a/app/src/js/reducers/remove-deleted.js b/app/src/js/reducers/utils/remove-deleted.js
similarity index 100%
rename from app/src/js/reducers/remove-deleted.js
rename to app/src/js/reducers/utils/remove-deleted.js
diff --git a/app/src/js/reducers/workflows.js b/app/src/js/reducers/workflows.js
index 44a83128c..3545924b0 100644
--- a/app/src/js/reducers/workflows.js
+++ b/app/src/js/reducers/workflows.js
@@ -1,13 +1,13 @@
'use strict';
-import { set } from 'object-path';
+
+import { createReducer } from '@reduxjs/toolkit';
import {
WORKFLOWS,
WORKFLOWS_INFLIGHT,
WORKFLOWS_ERROR,
SEARCH_WORKFLOWS,
- CLEAR_WORKFLOWS_SEARCH
+ CLEAR_WORKFLOWS_SEARCH,
} from '../actions/types';
-import { createReducer } from '@reduxjs/toolkit';
export const initialState = {
list: {
@@ -20,49 +20,48 @@ export const initialState = {
searchString: null,
};
-function createMap (data) {
- const map = {};
- data.forEach(d => {
- map[d.name] = d;
- });
- return map;
-}
+const mapByName = (data) =>
+ data.reduce((map, datum) => ({ ...map, [datum.name]: datum }), {});
/**
- * Filters intput data by filterstring on the data'a object's name.
-*
- * @param {Array} rawData - An array of objects with a name parameter.
- * @param {string} filterString - a string to check if name includes.
- * @returns {Array} Filtered Array of rawData's objects who's names include filterString.
+ * Returns all items from specified data array where each item's name property
+ * contains the specified filter string, or the original array if no filter
+ * string is specified.
+ *
+ * @param {Array} data - array of objects with a name parameter
+ * @param {string} filterString - string to check if name includes
+ * @returns {Array} array of data's objects with names that include filterString
*/
-export const filterData = (rawData, filterString) => {
- if (filterString !== null) {
- return rawData.filter(d => d.name && d.name.toLowerCase().includes(filterString.toLowerCase()));
- }
- return rawData;
-};
+export const filterData = (data, filterString) =>
+ !filterString
+ ? data
+ : data.filter(
+ (item) =>
+ item.name &&
+ item.name.toLowerCase().includes(filterString.toLowerCase())
+ );
export default createReducer(initialState, {
[WORKFLOWS]: (state, action) => {
- const { data: rawData } = action;
- const data = filterData(rawData, state.searchString);
- set(state, 'map', createMap(data));
- set(state, ['list', 'data'], data);
- set(state, ['list', 'meta'], { queriedAt: Date.now() });
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], false);
+ const filteredData = filterData(action.data, state.searchString);
+
+ state.map = mapByName(filteredData);
+ state.list.data = filteredData;
+ state.list.meta = { queriedAt: Date.now() };
+ state.list.inflight = false;
+ state.list.error = false;
},
[WORKFLOWS_INFLIGHT]: (state) => {
- set(state, ['list', 'inflight'], true);
+ state.list.inflight = true;
},
[WORKFLOWS_ERROR]: (state, action) => {
- set(state, ['list', 'inflight'], false);
- set(state, ['list', 'error'], action.error);
+ state.list.inflight = false;
+ state.list.error = action.error;
},
[SEARCH_WORKFLOWS]: (state, action) => {
- set(state, ['searchString'], action.searchString);
+ state.searchString = action.searchString;
},
[CLEAR_WORKFLOWS_SEARCH]: (state) => {
- set(state, ['searchString'], null);
+ state.searchString = null;
},
});
diff --git a/app/src/js/utils/format.js b/app/src/js/utils/format.js
index b8fd95692..5d8351ea9 100644
--- a/app/src/js/utils/format.js
+++ b/app/src/js/utils/format.js
@@ -13,6 +13,11 @@ export const fullDate = function (datestring) {
return moment(datestring).format('kk:mm:ss MM/DD/YY');
};
+export const dateOnly = function (datestring) {
+ if (!datestring) { return nullValue; }
+ return moment(datestring).format('MM/DD/YYYY');
+};
+
export const parseJson = function (jsonString) {
const parsed = JSON.parse(jsonString);
return JSON.stringify(parsed, null, 2);
diff --git a/app/src/js/utils/kibana.js b/app/src/js/utils/kibana.js
index 51dd8cb88..8d6556a45 100644
--- a/app/src/js/utils/kibana.js
+++ b/app/src/js/utils/kibana.js
@@ -85,14 +85,14 @@ export const kibanaGatewayAccessErrorsLink = (cumulusInstanceMeta, datepicker) =
if (!kibanaConfigured(cumulusInstanceMeta)) return '';
const stackName = cumulusInstanceMeta.stackName;
const timeInterval = formatKibanaDate(datepicker);
- return `${_config.kibanaRoot}/app/kibana#/discover?_g=(refreshInterval:(pause:!t,value:0),time:(${timeInterval}))&_a=(columns:!(message),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:${stackName},key:_index,negate:!f,params:(query:'${stackName}-cloudwatch*',type:phrase),type:phrase,value:'${stackName}-cloudwatch*'),query:(match:(_index:(query:'${stackName}-cloudwatch*',type:phrase)))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:${stackName},key:logGroup,negate:!f,params:(query:'%22API%5C-Gateway%5C-Execution*%22',type:phrase),type:phrase,value:'%22API%5C-Gateway%5C-Execution*%22'),query:(match:(logGroup:(query:'%22API%5C-Gateway%5C-Execution*%22',type:phrase))))),index:${stackName},interval:auto,query:(language:lucene,query:'status:%5B400%20TO%20599%5D'),sort:!('@timestamp',desc))`;
+ return `${_config.kibanaRoot}/app/kibana#/discover?_g=(refreshInterval:(pause:!t,value:0),time:(${timeInterval}))&_a=(columns:!(message),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:${stackName},key:_index,negate:!f,params:(query:'${stackName}-cloudwatch*',type:phrase),type:phrase,value:'${stackName}-cloudwatch*'),query:(match:(_index:(query:'${stackName}-cloudwatch*',type:phrase)))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:${stackName},key:logGroup,negate:!f,params:(query:'%22API%5C-Gateway%5C-Execution*%22',type:phrase),type:phrase,value:'%22API%5C-Gateway%5C-Execution*%22'),query:(match:(logGroup:(query:'%22API%5C-Gateway%5C-Execution*%22',type:phrase))))),index:${stackName},interval:auto,query:(language:lucene,query:'statusCode:%5B400%20TO%20599%5D'),sort:!('@timestamp',desc))`;
};
export const kibanaGatewayAccessSuccessesLink = (cumulusInstanceMeta, datepicker) => {
if (!kibanaConfigured(cumulusInstanceMeta)) return '';
const stackName = cumulusInstanceMeta.stackName;
const timeInterval = formatKibanaDate(datepicker);
- return `${_config.kibanaRoot}/app/kibana#/discover?_g=(refreshInterval:(pause:!t,value:0),time:(${timeInterval}))&_a=(columns:!(message),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:${stackName},key:_index,negate:!f,params:(query:'${stackName}-cloudwatch*',type:phrase),type:phrase,value:'${stackName}-cloudwatch*'),query:(match:(_index:(query:'${stackName}-cloudwatch*',type:phrase)))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:${stackName},key:logGroup,negate:!f,params:(query:'%22API%5C-Gateway%5C-Execution*%22',type:phrase),type:phrase,value:'%22API%5C-Gateway%5C-Execution*%22'),query:(match:(logGroup:(query:'%22API%5C-Gateway%5C-Execution*%22',type:phrase))))),index:${stackName},interval:auto,query:(language:lucene,query:'status:%5B200%20TO%20399%5D'),sort:!('@timestamp',desc))`;
+ return `${_config.kibanaRoot}/app/kibana#/discover?_g=(refreshInterval:(pause:!t,value:0),time:(${timeInterval}))&_a=(columns:!(message),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:${stackName},key:_index,negate:!f,params:(query:'${stackName}-cloudwatch*',type:phrase),type:phrase,value:'${stackName}-cloudwatch*'),query:(match:(_index:(query:'${stackName}-cloudwatch*',type:phrase)))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:${stackName},key:logGroup,negate:!f,params:(query:'%22API%5C-Gateway%5C-Execution*%22',type:phrase),type:phrase,value:'%22API%5C-Gateway%5C-Execution*%22'),query:(match:(logGroup:(query:'%22API%5C-Gateway%5C-Execution*%22',type:phrase))))),index:${stackName},interval:auto,query:(language:lucene,query:'statusCode:%5B200%20TO%20399%5D'),sort:!('@timestamp',desc))`;
};
export const kibanaAllLogsLink = (cumulusInstanceMeta) => {
diff --git a/app/src/js/utils/table-config/collections.js b/app/src/js/utils/table-config/collections.js
index 6481c58f9..83dd0a747 100644
--- a/app/src/js/utils/table-config/collections.js
+++ b/app/src/js/utils/table-config/collections.js
@@ -85,7 +85,7 @@ export const bulkActions = function (collections) {
history,
isOnModalConfirm,
isOnModalComplete,
- error,
+ errorMessage,
results,
}) => {
const modalOptions = {};
@@ -110,7 +110,7 @@ export const bulkActions = function (collections) {
modalOptions.children = ;
}
if (isOnModalComplete) {
- modalOptions.children =
+
+ );
+
+ const overviewWrapper = providerWrapper.find('GranulesOverview').dive();
+
+ const granuleCSVButton = overviewWrapper.find('a.csv__download');
+ granuleCSVButton.simulate('click');
+
+ // should not leave extra link on the page
+ const downloadLink = overviewWrapper.find('a[href="www.example.com"]');
+ t.is(downloadLink.length, 0);
+});
diff --git a/test/components/reconciliation-reports/reconciliation-report.js b/test/components/reconciliation-reports/reconciliation-report.js
index 9dc4b49a7..febd62c31 100644
--- a/test/components/reconciliation-reports/reconciliation-report.js
+++ b/test/components/reconciliation-reports/reconciliation-report.js
@@ -18,22 +18,22 @@ const reconciliationReports = {
status: 'SUCCESS',
error: null,
okFileCount: 21,
- onlyInS3: [
- 's3://some-bucket/path/to/key-1.hdf',
- 's3://some-bucket/path/to/key-2.hdf'
- ],
- onlyInDynamoDb: [
- {
- uri: 's3://some-bucket/path/to/key-123.hdf',
- granuleId: 'g-123'
- },
- {
- uri: 's3://some-bucket/path/to/key-456.hdf',
- granuleId: 'g-456'
- }
- ],
filesInCumulus: {
- okCount: 129
+ okCount: 129,
+ onlyInS3: [
+ 's3://some-bucket/path/to/key-1.hdf',
+ 's3://some-bucket/path/to/key-2.hdf'
+ ],
+ onlyInDynamoDb: [
+ {
+ uri: 's3://some-bucket/path/to/key-123.hdf',
+ granuleId: 'g-123'
+ },
+ {
+ uri: 's3://some-bucket/path/to/key-456.hdf',
+ granuleId: 'g-456'
+ }
+ ],
},
collectionsInCumulusCmr: {
okCount: 1
@@ -57,29 +57,40 @@ const reconciliationReports = {
test('show individual report', function (t) {
const match = { params: { reconciliationReportName: 'exampleReport' } };
+ const dispatch = () => {};
+
const report = shallow(
Link : nullValue,
- id: 'link'
- }
-]
-
-const tableData = [{
- granuleId: 'g-123',
- filename: 'filename.txt',
- bucket: 'some-bucket',
- path: 's3://some-bucket/filename.txt'
-}];
-
-test('render nothing when no data is provided', function (t) {
- const report = shallow(
- Link
- ));
-});
-
-test('render buttons to show/hide table when configured', function (t) {
- const data = [
- ...tableData,
- ...tableData,
- ...tableData
- ];
-
- const report = shallow(
-
,
+
+
+ ,
{
// We must disable lifecycle methods so that when we find the Timer its
// properties will still be set to their initial values. Otherwise, a
// lifecycle method might cause the properties to change and we will not
// be able to check their initial values, which is what we want to do.
disableLifecycleMethods: true,
- context: {
- store: {
- subscribe: () => void 0,
- dispatch: () => void 0,
- getState: () => void 0
- }
- }
}
);
diff --git a/test/middleware/request.js b/test/middleware/request.js
index 13f621b86..cb588d12e 100644
--- a/test/middleware/request.js
+++ b/test/middleware/request.js
@@ -1,22 +1,42 @@
import test from 'ava';
import nock from 'nock';
+import sinon from 'sinon';
+import rewire from 'rewire';
import { CALL_API } from '../../app/src/js/actions/types';
-import { requestMiddleware } from '../../app/src/js/middleware/request';
+const request = rewire('../../app/src/js/middleware/request');
-const port = process.env.FAKEAPIPORT || 5001;
+const token = 'fake-token';
-test.beforeEach((t) => {
- const doDispatch = () => {};
- const doGetState = () => ({
- api: {
- tokens: {
- token: 'fake-token'
- }
+const requestMiddleware = request.__get__('requestMiddleware');
+const loginErrorStub = sinon.stub();
+request.__set__('loginError', () => {
+ loginErrorStub();
+});
+
+const getStateStub = sinon.stub().callsFake(() => ({
+ api: {
+ tokens: {
+ token
}
- });
- t.context.nextHandler = requestMiddleware({dispatch: doDispatch, getState: doGetState});
+ }
+}));
+const dispatchStub = sinon.stub();
+const nextStub = sinon.stub();
+
+const createTestMiddleware = () => {
+ const store = {
+ getState: getStateStub,
+ dispatch: dispatchStub
+ };
+ const next = nextStub;
+
+ const invokeMiddleware = action => requestMiddleware(store)(next)(action);
+ return { store, next, invokeMiddleware };
+};
+
+test.beforeEach((t) => {
t.context.defaultConfig = {
json: true,
resolveWithFullResponse: true,
@@ -24,75 +44,77 @@ test.beforeEach((t) => {
};
t.context.expectedHeaders = {
- Authorization: 'Bearer fake-token',
+ Authorization: `Bearer ${token}`,
'Content-Type': 'application/json'
};
});
-test('should pass action to next if not an API request action', (t) => {
- const actionObj = {};
+test.afterEach.always(() => {
+ nock.cleanAll();
+ dispatchStub.resetHistory();
+ getStateStub.resetHistory();
+ nextStub.resetHistory();
+ loginErrorStub.resetHistory();
+});
- const actionHandler = t.context.nextHandler(action => {
- t.deepEqual(action, actionObj);
- });
+test.serial('should pass action to next if not an API request action', (t) => {
+ const actionObj = {
+ type: 'ANYTHING',
+ some: 'action'
+ };
- actionHandler(actionObj);
+ const { next, invokeMiddleware } = createTestMiddleware();
+ invokeMiddleware(actionObj);
+
+ t.deepEqual(next.firstCall.args[0], actionObj);
});
-test('should throw error if no method is set on API request action', (t) => {
+test.serial('should throw error if no method is set on API request action', (t) => {
const actionObj = {
[CALL_API]: {}
};
- const actionHandler = t.context.nextHandler(() => {});
+ const { invokeMiddleware } = createTestMiddleware();
- try {
- actionHandler(actionObj);
- t.fail('Expected error to be thrown');
- } catch (err) {
- t.is(err.message, 'Request action must include a method');
- }
+ t.throws(
+ () => invokeMiddleware(actionObj),
+ { message: 'Request action must include a method' }
+ );
});
-test.cb('should add correct authorization headers to API request action', (t) => {
- nock(`http://localhost:${port}`, {
- reqheaders: {
- 'Authorization': 'Bearer fake-token'
- }
- })
- .get('/test-path')
- .reply(200);
-
+test.serial('should add correct authorization headers to API request action', async (t) => {
const requestAction = {
type: 'TEST',
method: 'GET',
- url: `http://localhost:${port}/test-path`
+ url: 'http://anyhost'
};
const actionObj = {
[CALL_API]: requestAction
};
- const actionHandler = t.context.nextHandler(action => {
- t.deepEqual(action.config.headers.Authorization, 'Bearer fake-token');
- t.end();
+ const requestPromiseStub = sinon.stub().resolves({
+ body: {},
+ statusCode: 200
});
+ const revertRequestStub = request.__set__('requestPromise', requestPromiseStub);
- actionHandler(actionObj);
-});
+ try {
+ const { invokeMiddleware } = createTestMiddleware();
-test.cb('should be able to use provided authorization headers', (t) => {
- nock(`http://localhost:${port}`, {
- reqheaders: {
- 'Authorization': 'Bearer another-token'
- }
- })
- .get('/test-path')
- .reply(200);
+ await invokeMiddleware(actionObj);
+
+ const nextAction = requestPromiseStub.firstCall.args[0];
+ t.deepEqual(nextAction.headers.Authorization, 'Bearer fake-token');
+ } finally {
+ revertRequestStub();
+ }
+});
+test.serial('should be able to use provided authorization headers', async (t) => {
const requestAction = {
type: 'TEST',
method: 'GET',
- url: `http://localhost:${port}/test-path`,
+ url: 'http://anyhost',
skipAuth: true,
headers: {
Authorization: 'Bearer another-token'
@@ -102,23 +124,35 @@ test.cb('should be able to use provided authorization headers', (t) => {
[CALL_API]: requestAction
};
- const actionHandler = t.context.nextHandler(action => {
- t.deepEqual(action.config.headers.Authorization, 'Bearer another-token');
- t.end();
+ const requestPromiseStub = sinon.stub().resolves({
+ body: {},
+ statusCode: 200
});
+ const revertRequestStub = request.__set__('requestPromise', requestPromiseStub);
- actionHandler(actionObj);
+ try {
+ const { invokeMiddleware } = createTestMiddleware();
+
+ await invokeMiddleware(actionObj);
+
+ const nextAction = requestPromiseStub.firstCall.args[0];
+ t.deepEqual(nextAction.headers.Authorization, 'Bearer another-token');
+ } finally {
+ revertRequestStub();
+ }
});
-test.cb('should dispatch error action for failed request', (t) => {
- nock(`http://localhost:${port}`)
+test.serial('should dispatch error action for failed request', async (t) => {
+ nock('http://anyhost')
.get('/test-path')
.reply(500, { message: 'Internal server error' });
+ const { next, invokeMiddleware } = createTestMiddleware();
+
const requestAction = {
type: 'TEST',
method: 'GET',
- url: `http://localhost:${port}/test-path`
+ url: 'http://anyhost/test-path'
};
const actionObj = {
[CALL_API]: requestAction
@@ -135,25 +169,61 @@ test.cb('should dispatch error action for failed request', (t) => {
type: 'TEST_ERROR'
};
- const actionHandler = t.context.nextHandler(action => {
- t.deepEqual(action, expectedAction);
- t.end();
- });
+ await invokeMiddleware(actionObj);
+ t.deepEqual(next.firstCall.args[0], expectedAction);
+});
- actionHandler(actionObj);
+test.serial('should dispatch login error action for 401 response', async (t) => {
+ nock('http://anyhost')
+ .get('/test-path')
+ .reply(401, { message: 'Unauthorized' });
+
+ const { invokeMiddleware } = createTestMiddleware();
+
+ const requestAction = {
+ type: 'TEST',
+ method: 'GET',
+ url: 'http://anyhost/test-path'
+ };
+ const actionObj = {
+ [CALL_API]: requestAction
+ };
+
+ await invokeMiddleware(actionObj);
+ t.true(loginErrorStub.called);
});
-test.cb('should return expected action for GET request action', (t) => {
+test.serial('should dispatch login error action for 403 response', async (t) => {
+ nock('http://anyhost')
+ .get('/test-path')
+ .reply(403, { message: 'Forbidden' });
+
+ const { invokeMiddleware } = createTestMiddleware();
+
+ const requestAction = {
+ type: 'TEST',
+ method: 'GET',
+ url: 'http://anyhost/test-path'
+ };
+ const actionObj = {
+ [CALL_API]: requestAction
+ };
+
+ await invokeMiddleware(actionObj);
+ t.true(loginErrorStub.called);
+});
+
+test.serial('should return expected action for GET request action', async (t) => {
const stubbedResponse = { message: 'success' };
- nock(`http://localhost:${port}`)
+ nock('http://anyhost')
.get('/test-path')
.reply(200, stubbedResponse);
const requestAction = {
type: 'TEST',
method: 'GET',
- url: `http://localhost:${port}/test-path`
+ url: 'http://anyhost/test-path'
};
const actionObj = {
[CALL_API]: requestAction
@@ -170,22 +240,21 @@ test.cb('should return expected action for GET request action', (t) => {
data: stubbedResponse
};
- const actionHandler = t.context.nextHandler(action => {
- t.deepEqual(action, expectedAction);
- t.end();
- });
+ const { next, invokeMiddleware } = createTestMiddleware();
+
+ await invokeMiddleware(actionObj);
- actionHandler(actionObj);
+ t.deepEqual(next.firstCall.args[0], expectedAction);
});
-test.cb('should return expected action for GET request action with query state', (t) => {
+test.serial('should return expected action for GET request action with query state', async (t) => {
const queryParams = {
limit: 1,
otherParam: 'value'
};
const stubbedResponse = { message: 'success' };
- nock(`http://localhost:${port}`)
+ nock('http://anyhost')
.get('/test-path')
.query(queryParams)
.reply(200, stubbedResponse);
@@ -193,7 +262,7 @@ test.cb('should return expected action for GET request action with query state',
const requestAction = {
type: 'TEST',
method: 'GET',
- url: `http://localhost:${port}/test-path`,
+ url: 'http://anyhost/test-path',
qs: queryParams
};
const actionObj = {
@@ -211,16 +280,15 @@ test.cb('should return expected action for GET request action with query state',
data: stubbedResponse
};
- const actionHandler = t.context.nextHandler(action => {
- t.deepEqual(action, expectedAction);
- t.end();
- });
+ const { next, invokeMiddleware } = createTestMiddleware();
+
+ await invokeMiddleware(actionObj);
- actionHandler(actionObj);
+ t.deepEqual(next.firstCall.args[0], expectedAction);
});
-test.cb('should return expected action for POST request action', (t) => {
- nock(`http://localhost:${port}`)
+test.serial('should return expected action for POST request action', async (t) => {
+ nock('http://anyhost')
.post('/test-path')
.reply(200, (_, requestBody) => {
return requestBody;
@@ -230,7 +298,7 @@ test.cb('should return expected action for POST request action', (t) => {
const requestAction = {
type: 'TEST',
method: 'POST',
- url: `http://localhost:${port}/test-path`,
+ url: 'http://anyhost/test-path',
body: requestBody
};
const actionObj = {
@@ -248,16 +316,15 @@ test.cb('should return expected action for POST request action', (t) => {
data: requestBody
};
- const actionHandler = t.context.nextHandler(action => {
- t.deepEqual(action, expectedAction);
- t.end();
- });
+ const { next, invokeMiddleware } = createTestMiddleware();
+
+ await invokeMiddleware(actionObj);
- actionHandler(actionObj);
+ t.deepEqual(next.firstCall.args[0], expectedAction);
});
-test.cb('should return expected action for PUT request action', (t) => {
- nock(`http://localhost:${port}`)
+test.serial('should return expected action for PUT request action', async (t) => {
+ nock('http://anyhost')
.put('/test-path')
.reply(200, (_, requestBody) => {
return requestBody;
@@ -267,7 +334,7 @@ test.cb('should return expected action for PUT request action', (t) => {
const requestAction = {
type: 'TEST',
method: 'PUT',
- url: `http://localhost:${port}/test-path`,
+ url: 'http://anyhost/test-path',
body: requestBody
};
const actionObj = {
@@ -285,24 +352,23 @@ test.cb('should return expected action for PUT request action', (t) => {
data: requestBody
};
- const actionHandler = t.context.nextHandler(action => {
- t.deepEqual(action, expectedAction);
- t.end();
- });
+ const { next, invokeMiddleware } = createTestMiddleware();
+
+ await invokeMiddleware(actionObj);
- actionHandler(actionObj);
+ t.deepEqual(next.firstCall.args[0], expectedAction);
});
-test.cb('should return expected action for DELETE request action', (t) => {
+test.serial('should return expected action for DELETE request action', async (t) => {
const stubbedResponse = { message: 'success' };
- nock(`http://localhost:${port}`)
+ nock('http://anyhost')
.delete('/test-path')
.reply(200, stubbedResponse);
const requestAction = {
type: 'TEST',
method: 'DELETE',
- url: `http://localhost:${port}/test-path`
+ url: 'http://anyhost/test-path'
};
const actionObj = {
[CALL_API]: requestAction
@@ -319,10 +385,9 @@ test.cb('should return expected action for DELETE request action', (t) => {
data: stubbedResponse
};
- const actionHandler = t.context.nextHandler(action => {
- t.deepEqual(action, expectedAction);
- t.end();
- });
+ const { next, invokeMiddleware } = createTestMiddleware();
+
+ await invokeMiddleware(actionObj);
- actionHandler(actionObj);
+ t.deepEqual(next.firstCall.args[0], expectedAction);
});
diff --git a/test/reducers/datepicker.js b/test/reducers/datepicker.js
index 1613f4d41..2b36a7cd8 100644
--- a/test/reducers/datepicker.js
+++ b/test/reducers/datepicker.js
@@ -16,16 +16,13 @@ test('verify initial state', (t) => {
t.deepEqual(actual, inputstate);
});
-test('reducer sets initial state to "Recent" on first initialization run.', (t) => {
- const testStart = Date.now();
- sinon.useFakeTimers(testStart);
+test('reducer sets initial state to have no set start/end times.', (t) => {
const actual = reducer(undefined, { type: 'ANY' });
- t.is(actual.dateRange.label, 'Recent');
- t.is(actual.dateRange.value, 'Recent');
- t.true(actual.startDateTime.valueOf() - (new Date(testStart - msPerDay)).valueOf() < 1000);
+ t.is(actual.dateRange.label, 'Custom');
+ t.is(actual.dateRange.value, 'Custom');
+ t.is(actual.startDateTime, null);
t.is(actual.endDateTime, null);
t.is(actual.hourFormat, '12HR');
- sinon.restore();
});
test('Dropdown: "Recent" sets start time to 24 hours ago and unsets end time.', (t) => {
@@ -52,7 +49,7 @@ test('Dropdown: "Recent" sets start time to 24 hours ago and unsets end time.',
sinon.restore();
});
-test('Dropdown: "All" sets displayed start time to -infinity end time to infinity.', (t) => {
+test('Dropdown: "All" sets displayed start time to -infinity and end time to infinity.', (t) => {
const testNow = Date.now();
sinon.useFakeTimers(testNow);
const value = 'All';
@@ -71,7 +68,7 @@ test('Dropdown: "All" sets displayed start time to -infinity end time to infini
});
test('Dropdown: "Custom" unsets start and end times.', (t) => {
- let state = initialState();
+ const state = initialState();
state.startDateTime = new Date('2020-03-16T19:50:24.757Z');
state.endDateTime = new Date('2020-03-17T00:00:00.000Z');
const value = 'Custom';
diff --git a/test/reducers/dist.js b/test/reducers/dist.js
index bff626e76..4e0c5d1c6 100644
--- a/test/reducers/dist.js
+++ b/test/reducers/dist.js
@@ -6,7 +6,7 @@ import { apiGatewayFixture } from '../fixtures/apiGatewayMetrics';
import { apiLambdaFixture } from '../fixtures/apiLambdaMetrics';
import { teaLambdaFixture } from '../fixtures/teaLambdaMetrics';
import { s3AccessFixture } from '../fixtures/s3AccessMetrics';
-import reducer from '../../app/src/js/reducers/dist';
+import reducer, { initialState } from '../../app/src/js/reducers/dist';
import {
DIST_APIGATEWAY,
DIST_APIGATEWAY_INFLIGHT,
@@ -33,19 +33,18 @@ test.after((t) => {
});
test('verify initial state', (t) => {
- const initialState = { some: 'initialState' };
const newState = reducer(initialState, { data: {}, type: 'ANY' });
t.deepEqual(newState, initialState);
});
test('reducers/dist/dist_apigateway', (t) => {
- const initialState = {};
const action = {
type: DIST_APIGATEWAY,
data: JSON.parse(apiGatewayFixture)
};
const expectedState = {
+ ...initialState,
apiGateway: {
inflight: false,
error: null,
@@ -65,16 +64,9 @@ test('reducers/dist/dist_apigateway', (t) => {
});
test('reducers/dist/dist_apigateway_inflight', (t) => {
- const initialState = {};
const action = { type: DIST_APIGATEWAY_INFLIGHT };
-
- const expectedState = {
- apiGateway: {
- inflight: true
- }
- };
const newState = reducer(initialState, action);
- t.deepEqual(expectedState, newState);
+ t.true(newState.apiGateway.inflight);
});
test('reducers/dist/dist_apigateway_Error', (t) => {
@@ -96,7 +88,6 @@ test('reducers/dist/dist_apigateway_Error', (t) => {
});
test('reducers/dist/dist_apilambda', (t) => {
- const initialState = {};
const action = {
type: DIST_API_LAMBDA,
data: JSON.parse(apiLambdaFixture)
@@ -112,22 +103,15 @@ test('reducers/dist/dist_apilambda', (t) => {
}
};
const newState = reducer(initialState, action);
- t.deepEqual(expectedState, newState);
+ t.deepEqual(expectedState.apiLambda, newState.apiLambda);
});
test('reducers/dist/dist_apilambda_inflight', (t) => {
- const initialState = {};
const action = {
type: DIST_API_LAMBDA_INFLIGHT
};
-
- const expectedState = {
- apiLambda: {
- inflight: true
- }
- };
const newState = reducer(initialState, action);
- t.deepEqual(expectedState, newState);
+ t.true(newState.apiLambda.inflight);
});
test('reducers/dist/dist_apilambda_error', (t) => {
@@ -152,11 +136,10 @@ test('reducers/dist/dist_apilambda_error', (t) => {
}
};
const newState = reducer(initialState, action);
- t.deepEqual(expectedState, newState);
+ t.deepEqual(expectedState.apiLambda, newState.apiLambda);
});
test('reducers/dist/dist_tea_lambda', (t) => {
- const initialState = {};
const action = {
type: DIST_TEA_LAMBDA,
data: JSON.parse(teaLambdaFixture)
@@ -172,22 +155,13 @@ test('reducers/dist/dist_tea_lambda', (t) => {
}
};
const newState = reducer(initialState, action);
- t.deepEqual(expectedState, newState);
+ t.deepEqual(expectedState.teaLambda, newState.teaLambda);
});
test('reducers/dist/dist_tea_lambda_inflight', (t) => {
- const initialState = {};
- const action = {
- type: DIST_TEA_LAMBDA_INFLIGHT
- };
-
- const expectedState = {
- teaLambda: {
- inflight: true
- }
- };
+ const action = { type: DIST_TEA_LAMBDA_INFLIGHT };
const newState = reducer(initialState, action);
- t.deepEqual(expectedState, newState);
+ t.true(newState.teaLambda.inflight);
});
test('reducers/dist/dist_tea_lambda_error', (t) => {
@@ -212,18 +186,17 @@ test('reducers/dist/dist_tea_lambda_error', (t) => {
}
};
const newState = reducer(initialState, action);
- t.deepEqual(expectedState, newState);
+ t.deepEqual(expectedState.teaLambda, newState.teaLambda);
});
-
test('reducers/dist/dist_s3access', (t) => {
- const initialState = {};
const action = {
type: DIST_S3ACCESS,
data: JSON.parse(s3AccessFixture)
};
const expectedState = {
+ ...initialState,
s3Access: {
inflight: false,
error: null,
@@ -240,21 +213,20 @@ test('reducers/dist/dist_s3access_inflight', (t) => {
const initialState = {
apiLambda: {
inflight: false
- }
- };
- const action = {
- type: DIST_S3ACCESS_INFLIGHT
+ },
+ s3Access: {}
};
-
const expectedState = {
apiLambda: {
- inflight: false
+ inflight: false,
},
s3Access: {
- inflight: true
- }
+ inflight: true,
+ },
};
+ const action = { type: DIST_S3ACCESS_INFLIGHT };
const newState = reducer(initialState, action);
+
t.deepEqual(expectedState, newState);
});
@@ -280,5 +252,5 @@ test('reducers/dist/dist_s3access_error', (t) => {
}
};
const newState = reducer(initialState, action);
- t.deepEqual(expectedState, newState);
+ t.deepEqual(expectedState.s3Access, newState.s3Access);
});
diff --git a/test/reducers/granules.js b/test/reducers/granules.js
new file mode 100644
index 000000000..1c3f78143
--- /dev/null
+++ b/test/reducers/granules.js
@@ -0,0 +1,30 @@
+'use strict';
+
+import test from 'ava';
+import cloneDeep from 'lodash.clonedeep';
+import reducer, { initialState } from '../../app/src/js/reducers/granules';
+import { BULK_GRANULE } from '../../app/src/js/actions/types';
+
+test('BULK_GRANULE', (t) => {
+ // case BULK_GRANULE:
+ // const { id, data, config } = action;
+ // set(state, ['bulk', config.requestId, 'data'], data);
+ // set(state, ['bulk', config.requestId, 'status'], 'success');
+ // set(state, ['bulk', config.requestId, 'error'], null);
+ // break;
+ const inputState = cloneDeep(initialState);
+ const expected = cloneDeep(initialState);
+ expected.bulk = {
+ requestedId: { data: 'some Data', status: 'success', error: null }
+ };
+
+ const action = {
+ type: BULK_GRANULE,
+ config: { requestId: 'requestedId' },
+ data: 'some Data'
+ };
+
+ const actual = reducer(inputState, action);
+
+ t.deepEqual(expected, actual);
+});
diff --git a/test/reducers/providers.js b/test/reducers/providers.js
new file mode 100644
index 000000000..7dac51271
--- /dev/null
+++ b/test/reducers/providers.js
@@ -0,0 +1,22 @@
+'use strict';
+
+import test from 'ava';
+import cloneDeep from 'lodash.clonedeep';
+import reducer, { initialState } from '../../app/src/js/reducers/providers';
+import { UPDATE_PROVIDER } from '../../app/src/js/actions/types';
+
+test('UPDATE_PROVIDER reducer', (t) => {
+ const inputState = cloneDeep(initialState);
+ const expected = cloneDeep(initialState);
+
+ expected.map = { someProviderName: { data: 'some important data' } };
+ expected.updated = { someProviderName: { status: 'success' } };
+
+ const action = {
+ type: UPDATE_PROVIDER,
+ data: 'some important data',
+ id: 'someProviderName'
+ };
+ const actual = reducer(inputState, action);
+ t.deepEqual(expected, actual);
+});
diff --git a/test/reducers/reconciliation-reports.js b/test/reducers/reconciliation-reports.js
new file mode 100644
index 000000000..9a50f0ebd
--- /dev/null
+++ b/test/reducers/reconciliation-reports.js
@@ -0,0 +1,29 @@
+'use strict';
+
+import test from 'ava';
+import cloneDeep from 'lodash.clonedeep';
+import reducer, { initialState } from '../../app/src/js/reducers/reconciliation-reports';
+import {
+ RECONCILIATIONS
+} from '../../app/src/js/actions/types';
+
+test('RECONCILIATIONS reducer', function (t) {
+ const reports = [
+ { name: 'report-1' },
+ { name: 'report-2' }
+ ];
+ const inputState = cloneDeep(initialState);
+ const expected = cloneDeep(initialState);
+ expected.list.data = reports;
+
+ const action = {
+ type: RECONCILIATIONS,
+ data: {
+ results: reports
+ }
+ };
+
+ const actual = reducer(inputState, action);
+
+ t.deepEqual(expected.list.data, actual.list.data);
+});
diff --git a/test/reducers/rules.js b/test/reducers/rules.js
new file mode 100644
index 000000000..038e2cd0f
--- /dev/null
+++ b/test/reducers/rules.js
@@ -0,0 +1,40 @@
+'use strict';
+
+import test from 'ava';
+import cloneDeep from 'lodash.clonedeep';
+import reducer, { initialState } from '../../app/src/js/reducers/rules';
+import {
+ RULE_DISABLE_INFLIGHT,
+ RULE_ENABLE
+} from '../../app/src/js/actions/types';
+
+test('RULE_ENABLE reducer', (t) => {
+ const inputState = cloneDeep(initialState);
+ const id = 'someRuleNameHere';
+ inputState.disabled = {
+ [id]: { status: 'anything', error: 'anything also' }
+ };
+ const expected = cloneDeep(initialState);
+ expected.enabled = {
+ [id]: { status: 'success', error: null, data: undefined }
+ };
+
+ const action = { type: RULE_ENABLE, id };
+ const actual = reducer(inputState, action);
+ t.falsy(actual.enabled.someRuleNameHere.data);
+ t.deepEqual(expected, actual);
+});
+
+test('RULE_DISABLE_INFLIGHT reducer', (t) => {
+ const inputState = cloneDeep(initialState);
+ const id = 'someRuleName';
+ inputState.disabled = { [id]: { status: 'success' } };
+
+ const expected = cloneDeep(inputState);
+ expected.disabled[id].status = 'inflight';
+
+ const action = { type: RULE_DISABLE_INFLIGHT, id };
+ const actual = reducer(inputState, action);
+ t.falsy(actual.disabled.someRuleName.error);
+ t.deepEqual(expected, actual);
+});
diff --git a/test/reducers/test-removeDeleted.js b/test/reducers/test-removeDeleted.js
index 77c354fd6..03333da60 100644
--- a/test/reducers/test-removeDeleted.js
+++ b/test/reducers/test-removeDeleted.js
@@ -3,7 +3,7 @@
import test from 'ava';
import { randomBytes } from 'crypto';
-import removeDeleted from '../../app/src/js/reducers/remove-deleted';
+import removeDeleted from '../../app/src/js/reducers/utils/remove-deleted';
const randomId = (id) => `${id}${randomBytes(5).toString('hex')}`;
@@ -34,7 +34,7 @@ test('removeDeleted, returns filtered list if successful deleted found', (t) =>
const initialAccessor = 'accessorName';
const deletedId = initialList[1].accessorName;
const expectedList = [initialList[0], initialList[2]];
- const deleted = {[deletedId]: {status: 'success'}};
+ const deleted = { [deletedId]: { status: 'success' } };
const result = removeDeleted(initialAccessor, initialList, deleted);
t.deepEqual(result, expectedList);
});
diff --git a/test/reducers/timer.js b/test/reducers/timer.js
new file mode 100644
index 000000000..7ee8bfbea
--- /dev/null
+++ b/test/reducers/timer.js
@@ -0,0 +1,44 @@
+'use strict';
+
+import test from 'ava';
+import reducer, { initialState } from '../../app/src/js/reducers/timer';
+import {
+ TIMER_START,
+ TIMER_SET_COUNTDOWN,
+ TIMER_STOP,
+} from '../../app/src/js/actions/types';
+
+test('initialState begins with timer off', (t) => {
+ const expected = { running: false, seconds: -1 };
+ const actual = reducer(undefined, { type: 'ANY' });
+ t.deepEqual(expected, actual);
+});
+
+test('TIMER_START', (t) => {
+ const inputState = { running: false, seconds: -1 };
+ const countdownSeconds = 100;
+ const expected = { running: true, seconds: countdownSeconds };
+ const action = { type: TIMER_START, secondsToRefresh: countdownSeconds };
+ const actual = reducer(inputState, action);
+ t.deepEqual(expected, actual);
+});
+
+test('TIMER_STOP', (t) => {
+ const inputState = { running: true, seconds: 100 };
+ const expected = { running: false, seconds: -1 };
+ const action = { type: TIMER_STOP };
+ const actual = reducer(inputState, action);
+ t.deepEqual(expected, actual);
+});
+
+test('TIMER_SET_COUNTDOWN', (t) => {
+ const inputState = { ...initialState };
+ const countdownSeconds = 100;
+ const expected = { ...initialState, seconds: countdownSeconds };
+ const action = {
+ type: TIMER_SET_COUNTDOWN,
+ secondsToRefresh: countdownSeconds,
+ };
+ const actual = reducer(inputState, action);
+ t.deepEqual(expected, actual);
+});
diff --git a/test/reducers/utils/reducer-creators.js b/test/reducers/utils/reducer-creators.js
new file mode 100644
index 000000000..702eb8d71
--- /dev/null
+++ b/test/reducers/utils/reducer-creators.js
@@ -0,0 +1,129 @@
+'use strict';
+
+import test from 'ava';
+import {
+ createInflightReducer,
+ createSuccessReducer,
+ createClearItemReducer,
+ createErrorReducer
+} from '../../../app/src/js/reducers/utils/reducer-creators';
+
+test('createInflightReducer, creates a working inflight reducer', (t) => {
+ const inputState = { key: 'value' };
+ const stateProp = 'theStateProp';
+ const id = 'SomeIdField';
+
+ const expected = {
+ ...inputState,
+ [stateProp]: { [id]: { status: 'inflight' } }
+ };
+ const theInflightReducer = createInflightReducer(stateProp);
+
+ const action = { id };
+ theInflightReducer(inputState, action);
+ // Tests the mutated input state.
+ t.deepEqual(expected, inputState);
+});
+
+test('createSuccessReducer, creates a working success reducer', (t) => {
+ // Example success reducer
+ // (state, action) => {
+ // const { id } = action;
+ // set(state, ['rerun', id, 'status'], 'success');
+ // set(state, ['rerun', id, 'error'], null);
+ // };
+
+ const inputState = { key: 'value' };
+
+ const stateProp = 'rerun';
+ const id = 'someIdField';
+
+ const expected = {
+ key: 'value',
+ rerun: { someIdField: { status: 'success', error: null } }
+ };
+ const theSuccessReducer = createSuccessReducer(stateProp);
+
+ const action = { id };
+ theSuccessReducer(inputState, action);
+
+ // Tests the mutated input state.
+ // data is set to undefined in the success reducer when not part of the action.
+ t.falsy(inputState.rerun.someIdField.data);
+ delete inputState.rerun.someIdField.data;
+ t.deepEqual(expected, inputState);
+});
+
+test('createClearItemReducer, creates a working success reducer on missing values', (t) => {
+ const inputState = { key: 'value' };
+ const theClearReducer = createClearItemReducer('doesnotexist');
+ const action = { type: 'CLEAR_TYPE', id: 'what' };
+ const expected = { ...inputState };
+
+ theClearReducer(inputState, action);
+
+ t.deepEqual(expected, inputState);
+});
+
+test('createClearItemReducer, creates a working success reducer with existing values', (t) => {
+ const inputState = { key: 'value', exists: { first: 1, second: 2 } };
+ const theClearReducer = createClearItemReducer('exists');
+ const action = { type: 'CLEAR_TYPE', id: 'second' };
+ const expected = { key: 'value', exists: { first: 1 } };
+
+ theClearReducer(inputState, action);
+
+ t.deepEqual(expected, inputState);
+});
+
+test('createErrorReducer, creates valid error reducer', (t) => {
+ const inputState = { property: { someId: { status: 'inflight' } } };
+
+ const expected = {
+ property: { someId: { status: 'error', error: 'Bad Things Happened!' } }
+ };
+
+ const action = { error: 'Bad Things Happened!', id: 'someId' };
+
+ const theErrorRedcer = createErrorReducer('property');
+
+ theErrorRedcer(inputState, action);
+
+ t.deepEqual(expected, inputState);
+});
+
+test('createErrorReducer, works with extra properties', (t) => {
+ const inputState = { property: { someWrongId: { status: 'inflight' } } };
+
+ const expected = {
+ property: {
+ someWrongId: { status: 'inflight' },
+ someId: { status: 'error', error: 'Bad Things Happened!' }
+ }
+ };
+
+ const action = { error: 'Bad Things Happened!', id: 'someId' };
+
+ const theErrorRedcer = createErrorReducer('property');
+
+ theErrorRedcer(inputState, action);
+
+ t.deepEqual(expected, inputState);
+});
+
+test('createErrorReducer, works with missing properties', (t) => {
+ const inputState = { wrongProperty: { someId: { status: 'inflight' } } };
+
+ const expected = {
+ wrongProperty: { someId: { status: 'inflight' } },
+ property: { someId: { status: 'error', error: 'Bad Things Happened!' } }
+ };
+
+ const action = { error: 'Bad Things Happened!', id: 'someId' };
+
+ const theErrorRedcer = createErrorReducer('property');
+
+ theErrorRedcer(inputState, action);
+
+ t.deepEqual(expected, inputState);
+});
diff --git a/test/utils/kibana.js b/test/utils/kibana.js
index 4a4f97516..6e6130fdc 100644
--- a/test/utils/kibana.js
+++ b/test/utils/kibana.js
@@ -122,14 +122,14 @@ test('kibanaGatewayExecutionSuccessesLink() will return a Kibana link to query f
});
test('kibanaGatewayAccessErrorsLink() will return a Kibana link to query for Gateway Access Errors', function (t) {
- const expectedLink = "http://example.com/app/kibana#/discover?_g=(refreshInterval:(pause:!t,value:0),time:(from:'1970-01-01T00:00:00.000Z',to:now))&_a=(columns:!(message),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:cumulus-stack,key:_index,negate:!f,params:(query:'cumulus-stack-cloudwatch*',type:phrase),type:phrase,value:'cumulus-stack-cloudwatch*'),query:(match:(_index:(query:'cumulus-stack-cloudwatch*',type:phrase)))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:cumulus-stack,key:logGroup,negate:!f,params:(query:'%22API%5C-Gateway%5C-Execution*%22',type:phrase),type:phrase,value:'%22API%5C-Gateway%5C-Execution*%22'),query:(match:(logGroup:(query:'%22API%5C-Gateway%5C-Execution*%22',type:phrase))))),index:cumulus-stack,interval:auto,query:(language:lucene,query:'status:%5B400%20TO%20599%5D'),sort:!('@timestamp',desc))";
+ const expectedLink = "http://example.com/app/kibana#/discover?_g=(refreshInterval:(pause:!t,value:0),time:(from:'1970-01-01T00:00:00.000Z',to:now))&_a=(columns:!(message),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:cumulus-stack,key:_index,negate:!f,params:(query:'cumulus-stack-cloudwatch*',type:phrase),type:phrase,value:'cumulus-stack-cloudwatch*'),query:(match:(_index:(query:'cumulus-stack-cloudwatch*',type:phrase)))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:cumulus-stack,key:logGroup,negate:!f,params:(query:'%22API%5C-Gateway%5C-Execution*%22',type:phrase),type:phrase,value:'%22API%5C-Gateway%5C-Execution*%22'),query:(match:(logGroup:(query:'%22API%5C-Gateway%5C-Execution*%22',type:phrase))))),index:cumulus-stack,interval:auto,query:(language:lucene,query:'statusCode:%5B400%20TO%20599%5D'),sort:!('@timestamp',desc))";
const kibanaLink = kibanaGatewayAccessErrorsLink(cumulusInstanceMeta, {});
t.is(kibanaLink, expectedLink);
});
test('kibanaGatewayAccessSuccessesLink() will return a Kibana link to query for Gateway Access Successes', function (t) {
- const expectedLink = "http://example.com/app/kibana#/discover?_g=(refreshInterval:(pause:!t,value:0),time:(from:'1970-01-01T00:00:00.000Z',to:now))&_a=(columns:!(message),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:cumulus-stack,key:_index,negate:!f,params:(query:'cumulus-stack-cloudwatch*',type:phrase),type:phrase,value:'cumulus-stack-cloudwatch*'),query:(match:(_index:(query:'cumulus-stack-cloudwatch*',type:phrase)))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:cumulus-stack,key:logGroup,negate:!f,params:(query:'%22API%5C-Gateway%5C-Execution*%22',type:phrase),type:phrase,value:'%22API%5C-Gateway%5C-Execution*%22'),query:(match:(logGroup:(query:'%22API%5C-Gateway%5C-Execution*%22',type:phrase))))),index:cumulus-stack,interval:auto,query:(language:lucene,query:'status:%5B200%20TO%20399%5D'),sort:!('@timestamp',desc))";
+ const expectedLink = "http://example.com/app/kibana#/discover?_g=(refreshInterval:(pause:!t,value:0),time:(from:'1970-01-01T00:00:00.000Z',to:now))&_a=(columns:!(message),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:cumulus-stack,key:_index,negate:!f,params:(query:'cumulus-stack-cloudwatch*',type:phrase),type:phrase,value:'cumulus-stack-cloudwatch*'),query:(match:(_index:(query:'cumulus-stack-cloudwatch*',type:phrase)))),('$state':(store:appState),meta:(alias:!n,disabled:!f,index:cumulus-stack,key:logGroup,negate:!f,params:(query:'%22API%5C-Gateway%5C-Execution*%22',type:phrase),type:phrase,value:'%22API%5C-Gateway%5C-Execution*%22'),query:(match:(logGroup:(query:'%22API%5C-Gateway%5C-Execution*%22',type:phrase))))),index:cumulus-stack,interval:auto,query:(language:lucene,query:'statusCode:%5B200%20TO%20399%5D'),sort:!('@timestamp',desc))";
const kibanaLink = kibanaGatewayAccessSuccessesLink(cumulusInstanceMeta, {});
t.is(kibanaLink, expectedLink);