+ {progress < 100 && (
+
+
+
+
+
+
+ )}
+ {progress >= 100 && (
+
+ error && error.data && error.data.saveRef)
+ .reduce((memo, error) => error.error.messages
+ ? memo.concat(map(error.error.messages, (message) => error.data.saveRef
+ ? [`Row ${error.data.saveRef}:`, message]
+ : message))
+ : memo,
+ [])
+ }
+ />
+
+ )}
+ {(errors.size > 0 && progress >= 100) && (
+
+
+
+
+
+
+ )}
+
+ )}
+
+ {(errors.size > 0 && success.size === 0) && (
+
-
- {
- resetForm();
- resetProgress();
- }}
- >
-
-
-
-
-
- )}
-
-
- )}
-
- );
- }
+ )}
+ {(errors.size === 0) && (
+
+ )}
+ {(errors.size > 0) && (
+
- {progress < 100 && (
-
-
-
-
-
-
- )}
- {progress >= 100 && (
-
- error && error.data && error.data.saveRef)
- .reduce((memo, error) => error.error.messages
- ? memo.concat(map(error.error.messages, (message) => error.data.saveRef
- ? [`${error.data.saveRef}:`, message]
- : message))
- : memo,
- [])
- }
+ message={intl.formatMessage(messages.someErrors, {
+ successNo: success.size,
+ rowNo: errors.size + success.size,
+ })}
/>
-
- )}
- {(errors.size > 0 && progress >= 100) && (
-
-
-
-
-
-
- )}
-
- )}
-
-
-
-
-
-
- {progress >= 100 && (
-
- {(errors.size > 0 && success.size === 0) && (
-
- )}
- {(errors.size > 0) && (
-
- {
+ const val = ENTITY_FIELDS.measures.ATTRIBUTES[key];
+ if (!val.skipImport && checkActionAttribute(key)) {
+ return [
+ ...memo,
+ {
+ attribute: key,
+ type: val.type || 'text',
+ value: null,
+ required: !!val.required,
+ import: true,
+ },
+ ];
+ }
+ return memo;
+ }, []);
+ const relationshipFields = Object.keys(
+ ENTITY_FIELDS.measures.RELATIONSHIPS_IMPORT
+ ).reduce(
+ (memo, key) => {
+ if (
+ checkAttribute({
+ att: key,
+ attributes: ENTITY_FIELDS.measures.RELATIONSHIPS_IMPORT,
+ })
+ ) {
+ const val = ENTITY_FIELDS.measures.RELATIONSHIPS_IMPORT[key];
+ return [
+ ...memo,
+ {
+ attribute: key,
+ type: val.type || 'text',
+ required: !!val.required,
+ import: true,
+ relationshipValue: val.attribute,
+ separator: val.separator,
+ hint: val.hint,
+ },
+ ];
+ }
+ return memo;
+ },
+ [],
+ );
+
+ return (
+ {
+ handleSubmit(formData, connections, categories);
+ }}
+ handleCancel={handleCancel}
+ resetProgress={resetProgress}
+ errors={errors}
+ success={success}
+ progress={progress}
+ template={{
+ filename: `${intl.formatMessage(messages.filename, { type: lowerCase(typeLabel) })}`,
+ data: getImportFields({ fields, relationshipFields }, intl.formatMessage),
+ }}
+ />
+
+
+ );
}
ActionImport.propTypes = {
@@ -149,6 +188,8 @@ ActionImport.propTypes = {
progress: PropTypes.number,
errors: PropTypes.object,
success: PropTypes.object,
+ connections: PropTypes.object,
+ categories: PropTypes.object,
intl: PropTypes.object.isRequired,
};
@@ -156,18 +197,16 @@ const mapStateToProps = (state) => ({
progress: selectProgress(state),
errors: selectErrors(state),
success: selectSuccess(state),
- dataReady: selectReady(state, {
- path: [
- 'user_roles',
- ],
- }),
+ connections: selectMeasureConnections(state),
+ categories: selectCategories(state),
+ dataReady: selectReady(state, { path: DEPENDENCIES }),
authReady: selectReadyForAuthCheck(state),
});
function mapDispatchToProps(dispatch) {
return {
loadEntitiesIfNeeded: () => {
- dispatch(loadEntitiesIfNeeded('user_roles'));
+ DEPENDENCIES.forEach((path) => dispatch(loadEntitiesIfNeeded(path)));
},
resetProgress: () => {
dispatch(resetProgress());
@@ -175,23 +214,220 @@ function mapDispatchToProps(dispatch) {
redirectIfNotPermitted: () => {
dispatch(redirectIfNotPermitted(USER_ROLES.MANAGER.value));
},
- handleSubmit: (formValues) => {
+ handleSubmit: (formValues, connections, categories) => {
const formData = fromJS(formValues);
+ let invalidConnections = [];
if (formData.get('import') !== null) {
formData.getIn(['import', 'rows']).forEach((row, index) => {
- dispatch(save({
- attributes: row
- .mapKeys((k) => getColumnAttribute(k))
+ let rowCleanColumns = row.mapKeys((k) => getColumnAttribute(k));
+ // make sure type id is set
+ let rowClean = {
+ attributes: rowCleanColumns
+ // make sure only valid fields are imported
+ .filter((val, att) => checkActionAttribute(att))
+ // make sure we store well formatted date
+ .map((val, att) => {
+ const config = ENTITY_FIELDS.measures.ATTRIBUTES[att];
+ if (config.type === 'date' && val && val.trim() !== '') {
+ if (validateDateFormat(val, DATE_FORMAT)) {
+ return format(
+ parse(val, DATE_FORMAT, new Date()),
+ API_DATE_FORMAT
+ );
+ }
+ return '';
+ }
+ return val;
+ })
.set('draft', true)
.toJS(),
saveRef: index + 1,
- }));
+ };
+ const rowJS = row.toJS();
+ const relRows = Object.keys(rowJS).reduce(
+ (memo, key) => {
+ const hasRelData = key.indexOf('[rel:') > -1
+ && rowJS[key]
+ && rowJS[key].trim() !== '';
+ if (!hasRelData) return memo;
+ const start = key.indexOf('[');
+ const end = key.indexOf(']');
+ const [, fieldValues] = key.substring(start + 1, end).split('rel:');
+ const [field, values] = fieldValues.split('|');
+ return checkAttribute({
+ att: field,
+ attributes: ENTITY_FIELDS.measures.RELATIONSHIPS_IMPORT,
+ })
+ ? [
+ ...memo,
+ {
+ column: key,
+ value: rowJS[key],
+ values: rowJS[key].trim().split(','),
+ field,
+ fieldValues: values,
+ },
+ ]
+ : memo;
+ },
+ [],
+ );
+ // check relationships
+ if (relRows) {
+ let recommendationMeasures;
+ let measureIndicators;
+ let measureCategories;
+ // console.log(relRows);
+ Object.values(relRows).forEach(
+ (relationship) => {
+ if (relationship.values) {
+ const relField = relationship.field;
+ const relConfig = ENTITY_FIELDS.measures.RELATIONSHIPS_IMPORT[relationship.field];
+ relationship.values.forEach(
+ (relValue) => {
+ // console.log(relValue)
+ const [id, value] = relValue.trim().split('|');
+ if (relConfig) {
+ // check if connection id is valid
+ let connectionId;
+ // unless attribute specified
+ if (relConfig.lookup && relConfig.lookup.table) {
+ if (relConfig.lookup.attribute) {
+ if (categories && relConfig.lookup.table === API.CATEGORIES) {
+ const category = categories.find(
+ (entity) => entity.getIn(['attributes', relConfig.lookup.attribute])
+ && qe(entity.getIn(['attributes', relConfig.lookup.attribute]).trim(), id)
+ );
+ if (category) {
+ connectionId = category.get('id');
+ }
+ } else if (connections) {
+ const connection = connections.get(relConfig.lookup.table)
+ && connections.get(relConfig.lookup.table).find(
+ (entity) => entity.getIn(['attributes', relConfig.lookup.attribute])
+ && qe(entity.getIn(['attributes', relConfig.lookup.attribute]).trim(), id)
+ );
+ if (connection) {
+ connectionId = connection.get('id');
+ }
+ }
+ } else {
+ if (categories && relConfig.lookup.table === API.CATEGORIES) {
+ if (categories.get(`${id}`)) {
+ connectionId = id;
+ }
+ } else if (connections) {
+
+ if (
+ connections.get(relConfig.lookup.table)
+ && connections.getIn([relConfig.lookup.table, `${id}`])
+ ) {
+ connectionId = id;
+ }
+ }
+ }
+ }
+ if (typeof connectionId !== 'undefined') {
+ // measureIndicators by code
+ if (
+ relField === 'indicator-reference'
+ || relField === 'indicator-id') {
+ const create = { indicator_id: connectionId };
+ if (measureIndicators && measureIndicators.create) {
+ measureIndicators.create = [
+ ...measureIndicators.create,
+ create,
+ ];
+ } else {
+ measureIndicators = { create: [create] };
+ }
+ }
+ // recommendationMeasures by code or id
+ if (
+ relField === 'recommendation-reference'
+ || relField === 'recommendation-id'
+ ) {
+ const create = { recommendation_id: connectionId };
+ if (recommendationMeasures && recommendationMeasures.create) {
+ recommendationMeasures.create = [
+ ...recommendationMeasures.create,
+ create,
+ ];
+ } else {
+ recommendationMeasures = { create: [create] };
+ }
+ }
+
+ // measureCategories by code or id
+ if (
+ relField === 'category-reference'
+ || relField === 'category-short-title'
+ || relField === 'category-id'
+ ) {
+ const create = { category_id: connectionId };
+ if (measureCategories && measureCategories.create) {
+ measureCategories.create = [
+ ...measureCategories.create,
+ create,
+ ];
+ } else {
+ measureCategories = { create: [create] };
+ }
+ }
+ } else {
+ invalidConnections = [
+ ...invalidConnections,
+ {
+ id,
+ relField,
+ row: index + 1,
+ },
+ ];
+ }
+ } // relConfig
+ }
+ ); // forEach
+ }
+ }
+ );
+ rowClean = {
+ ...rowClean,
+ recommendationMeasures,
+ measureCategories,
+ measureIndicators,
+ };
+ }
+ // console.log('rowClean', rowClean)
+ dispatch(save(rowClean));
+ // dispatch errors for invalid entries
+ invalidConnections.forEach((invalidItem) => {
+ const error = {
+ error: `Invalid connection: ${JSON.stringify(invalidItem)}`,
+ data: invalidItem,
+ messages: [`Row ${invalidItem.row}: Invalid connection attribute for ${invalidItem.relField}: '${invalidItem.id}'`],
+ name: 'Invalid connection',
+ };
+ dispatch(saveError(
+ error,
+ invalidItem,
+ Object.assign(
+ invalidItem,
+ {
+ timestamp: `${Date.now()}-${Math.random().toString(36).slice(-8)}`,
+ }
+ ),
+ ));
+ });
});
}
},
handleCancel: () => {
dispatch(updatePath(ROUTES.MEASURES));
},
+ handleReset: () => {
+ dispatch(resetProgress());
+ dispatch(resetForm());
+ },
};
}
diff --git a/app/containers/ActionView/index.js b/app/containers/ActionView/index.js
index f0d3d7736..99d7d3a76 100644
--- a/app/containers/ActionView/index.js
+++ b/app/containers/ActionView/index.js
@@ -87,6 +87,7 @@ export class ActionView extends React.PureComponent { // eslint-disable-line rea
fields: [
getStatusField(entity),
!entity.getIn(['attributes', 'draft'])
+ && !entity.getIn(['attributes', 'is_current'])
&& getStatusField(
entity,
'is_current',
@@ -213,6 +214,7 @@ export class ActionView extends React.PureComponent { // eslint-disable-line rea
frameworks,
intl,
} = this.props;
+
const isManager = hasUserRole[USER_ROLES.MANAGER.value];
let buttons = [];
if (dataReady) {
diff --git a/app/containers/App/constants.js b/app/containers/App/constants.js
index a3c857aea..807950167 100644
--- a/app/containers/App/constants.js
+++ b/app/containers/App/constants.js
@@ -126,8 +126,8 @@ export const VIEWPORTS = {
};
export const ROUTES = {
- INTRO: '/intro',
- OVERVIEW: '/',
+ INTRO: '/',
+ OVERVIEW: '/overview',
PASSWORD: '/password',
LOGIN: '/login',
LOGIN_OAUTH_SUCCESS: '/loginOAuthSuccess',
diff --git a/app/containers/App/index.js b/app/containers/App/index.js
index 33bc4fa97..7007d9e4d 100644
--- a/app/containers/App/index.js
+++ b/app/containers/App/index.js
@@ -7,13 +7,16 @@
import React from 'react';
import PropTypes from 'prop-types';
import { connect } from 'react-redux';
-import HelmetCanonical from 'components/HelmetCanonical';
+
import ReactModal from 'react-modal';
-import GlobalStyle from 'global-styles';
import { FormattedMessage, injectIntl } from 'react-intl';
import styled from 'styled-components';
import { palette } from 'styled-theme';
+
+import GlobalStyle from 'global-styles';
+
+import HelmetCanonical from 'components/HelmetCanonical';
import Header from 'components/Header';
import SkipContent from 'components/styled/SkipContent';
import EntityNew from 'containers/EntityNew';
@@ -22,7 +25,9 @@ import GlobalSettings from 'containers/GlobalSettings';
import { sortEntities } from 'utils/sort';
import { canUserManageUsers, canUserManagePages } from 'utils/permissions';
-import { FOOTER } from 'themes/config';
+import { FOOTER, SHOW_HEADER_SHADOW_ON_HOME } from 'themes/config';
+
+import { ROUTES, DEPENDENCIES } from './constants';
import {
selectIsSignedIn,
@@ -49,27 +54,36 @@ import {
initializeSettings,
} from './actions';
-import { ROUTES, DEPENDENCIES } from './constants';
-
import messages from './messages';
const Main = styled.div`
- position: absolute;
- top: ${(props) => props.isHome
- ? props.theme.sizes.header.banner.heightMobile
- : props.theme.sizes.header.banner.heightMobile + props.theme.sizes.header.nav.heightMobile
-}px;
+ position: ${(props) => (props.isHome && !SHOW_HEADER_SHADOW_ON_HOME) ? 'relative' : 'absolute'};
+ top: ${(props) => {
+ if (props.isHome) {
+ if (!SHOW_HEADER_SHADOW_ON_HOME) return 0;
+ return props.theme.sizes.header.banner.heightMobile;
+ }
+ return props.theme.sizes.header.banner.heightMobile + props.theme.sizes.header.nav.heightMobile
+}}px;
left: 0;
right: 0;
bottom:0;
background-color: ${(props) => props.isHome ? 'transparent' : palette('mainBackground', 0)};
- overflow: ${(props) => props.isHome ? 'auto' : 'hidden'};
-
+ overflow: ${(props) => {
+ if (props.isHome) {
+ if (!SHOW_HEADER_SHADOW_ON_HOME) return 'hidden';
+ return 'auto';
+ }
+ return 'hidden';
+}};
@media (min-width: ${(props) => props.theme.breakpoints.small}) {
- top: ${(props) => props.isHome
- ? props.theme.sizes.header.banner.height
- : props.theme.sizes.header.banner.height + props.theme.sizes.header.nav.height
-}px;
+ top: ${(props) => {
+ if (props.isHome) {
+ if (!SHOW_HEADER_SHADOW_ON_HOME) return 0;
+ return props.theme.sizes.header.banner.height;
+ }
+ return props.theme.sizes.header.banner.height + props.theme.sizes.header.nav.height;
+}}px;
}
@media print {
background: white;
@@ -172,6 +186,8 @@ class App extends React.PureComponent { // eslint-disable-line react/prefer-stat
path: ROUTES.PAGES,
title: intl.formatMessage(messages.nav.pages),
isAdmin: true,
+ isPageAdmin: true,
+ isSecondary: true,
active: currentPath === ROUTES.PAGES,
},
]);
@@ -182,6 +198,8 @@ class App extends React.PureComponent { // eslint-disable-line react/prefer-stat
path: ROUTES.USERS,
title: intl.formatMessage(messages.nav.users),
isAdmin: true,
+ isUserAdmin: true,
+ isSecondary: true,
active: currentPath === ROUTES.USERS,
},
]);
@@ -191,7 +209,8 @@ class App extends React.PureComponent { // eslint-disable-line react/prefer-stat
{
path: ROUTES.BOOKMARKS,
title: intl.formatMessage(messages.nav.bookmarks),
- isAdmin: true,
+ isSecondary: true,
+ isBookmarks: true,
active: currentPath === ROUTES.BOOKMARKS,
},
]);
@@ -261,7 +280,7 @@ class App extends React.PureComponent { // eslint-disable-line react/prefer-stat
: null}
currentPath={location.pathname}
fullPath={`${location.pathname}${location.search}`}
- brandPath={ROUTES.OVERVIEW}
+ brandPath={ROUTES.INTRO}
onShowSettings={() => onShowSettings(true)}
hasSettings={dataReady && hasSettings}
/>
diff --git a/app/containers/App/messages.js b/app/containers/App/messages.js
index f8c34894c..a94e33dd0 100644
--- a/app/containers/App/messages.js
+++ b/app/containers/App/messages.js
@@ -11,6 +11,10 @@ export default defineMessages({
id: 'app.containers.App.app.title',
defaultMessage: 'Sadata',
},
+ titleHome: {
+ id: 'app.containers.App.app.titleHome',
+ defaultMessage: 'Sadata',
+ },
claim: {
id: 'app.containers.App.app.claim',
defaultMessage: 'Samoa\'s home of human rights implementation',
@@ -1395,6 +1399,58 @@ export default defineMessages({
defaultMessage: 'About tax 10',
},
},
+ 12: {
+ single: {
+ id: 'app.containers.App.entities.taxonomies.12.single',
+ defaultMessage: 'Taxonomy 12',
+ },
+ plural: {
+ id: 'app.containers.App.entities.taxonomies.12.plural',
+ defaultMessage: 'Taxonomy 12',
+ },
+ empty: {
+ id: 'app.containers.App.entities.taxonomies.12.empty',
+ defaultMessage: 'No Taxonomy 12 assigned yet',
+ },
+ shortSingle: {
+ id: 'app.containers.App.entities.taxonomies.12.shortSingle',
+ defaultMessage: 'Taxonomy 12',
+ },
+ shortPlural: {
+ id: 'app.containers.App.entities.taxonomies.12.shortPlural',
+ defaultMessage: 'Taxonomy 12',
+ },
+ description: {
+ id: 'app.containers.App.entities.taxonomies.12.description',
+ defaultMessage: 'About tax 12',
+ },
+ },
+ 13: {
+ single: {
+ id: 'app.containers.App.entities.taxonomies.13.single',
+ defaultMessage: 'Taxonomy 13',
+ },
+ plural: {
+ id: 'app.containers.App.entities.taxonomies.13.plural',
+ defaultMessage: 'Taxonomy 13',
+ },
+ empty: {
+ id: 'app.containers.App.entities.taxonomies.13.empty',
+ defaultMessage: 'No Taxonomy 13 assigned yet',
+ },
+ shortSingle: {
+ id: 'app.containers.App.entities.taxonomies.13.shortSingle',
+ defaultMessage: 'Taxonomy 13',
+ },
+ shortPlural: {
+ id: 'app.containers.App.entities.taxonomies.13.shortPlural',
+ defaultMessage: 'Taxonomy 13',
+ },
+ description: {
+ id: 'app.containers.App.entities.taxonomies.13.description',
+ defaultMessage: 'About tax 13',
+ },
+ },
},
due_dates: {
single: {
@@ -1573,6 +1629,10 @@ export default defineMessages({
id: 'app.containers.App.ui.currentStatuses.current',
defaultMessage: 'Latest cycle',
},
+ currentOrNA: {
+ id: 'app.containers.App.ui.currentStatuses.currentOrNA',
+ defaultMessage: 'Latest cycle/NA',
+ },
notCurrent: {
id: 'app.containers.App.ui.currentStatuses.notCurrent',
defaultMessage: 'Previous cycle',
diff --git a/app/containers/App/sagas.js b/app/containers/App/sagas.js
index 22792bbf1..a3e756987 100644
--- a/app/containers/App/sagas.js
+++ b/app/containers/App/sagas.js
@@ -209,7 +209,10 @@ export function* authenticateSaga(payload) {
yield put(invalidateEntities()); // important invalidate before forward to allow for reloading of entities
yield put(forwardOnAuthenticationChange());
} catch (err) {
- err.response.json = yield err.response.json();
+ console.log('ERROR in authenticateSaga');
+ if (err.response) {
+ err.response.json = yield err.response.json();
+ }
yield put(authenticateError(err));
}
}
@@ -229,10 +232,11 @@ export function* authenticateWithAzureSaga() {
location = `${location}&auth_origin_url=${encodeURIComponent(successLocation)}`;
window.location.href = location;
} catch (err) {
+ console.log('ERROR in authenticateWithAzureSaga');
if (err.response) {
err.response.json = yield err.response.json();
- yield put(authenticateError(err));
}
+ yield put(authenticateError(err));
}
}
@@ -254,7 +258,10 @@ export function* recoverSaga(payload) {
}
));
} catch (err) {
- err.response.json = yield err.response.json();
+ console.log('ERROR in recoverSaga');
+ if (err.response) {
+ err.response.json = yield err.response.json();
+ }
yield put(recoverError(err));
}
}
@@ -313,8 +320,11 @@ export function* validateTokenSaga() {
yield put(authenticateSuccess(response.data)); // need to store currentUserData
}
} catch (err) {
+ console.log('ERROR in validateTokenSaga');
yield call(clearAuthValues);
- err.response.json = yield err.response.json();
+ if (err.response) {
+ err.response.json = yield err.response.json();
+ }
yield put(authenticateError(err));
}
}
@@ -329,7 +339,7 @@ function stampPayload(payload, type) {
function* createConnectionsSaga({
- entityId, path, updates, keyPair,
+ entityId, path, updates, keyPair, saveRef,
}) {
// make sure to use new entity id for full payload
// we should have either the one (recommendation_id) or the other (measure_id)
@@ -339,7 +349,7 @@ function* createConnectionsSaga({
[keyPair[1]]: create[keyPair[1]] || entityId,
}));
- yield call(saveConnectionsSaga, { data: { path, updates: updatesUpdated } });
+ yield call(saveConnectionsSaga, { data: { path, updates: updatesUpdated, saveRef } });
}
export function* saveEntitySaga({ data }, updateClient = true, multiple = false) {
@@ -365,6 +375,7 @@ export function* saveEntitySaga({ data }, updateClient = true, multiple = false)
data: {
path: 'user_roles',
updates: data.entity.userRoles,
+ saveRef: data.saveRef,
},
});
}
@@ -375,6 +386,7 @@ export function* saveEntitySaga({ data }, updateClient = true, multiple = false)
data: {
path: 'user_categories',
updates: data.entity.userCategories,
+ saveRef: data.saveRef,
},
});
}
@@ -385,6 +397,7 @@ export function* saveEntitySaga({ data }, updateClient = true, multiple = false)
data: {
path: 'recommendation_measures',
updates: data.entity.recommendationMeasures,
+ saveRef: data.saveRef,
},
});
}
@@ -394,6 +407,7 @@ export function* saveEntitySaga({ data }, updateClient = true, multiple = false)
data: {
path: 'recommendation_indicators',
updates: data.entity.recommendationIndicators,
+ saveRef: data.saveRef,
},
});
}
@@ -404,6 +418,7 @@ export function* saveEntitySaga({ data }, updateClient = true, multiple = false)
data: {
path: 'measure_indicators',
updates: data.entity.measureIndicators,
+ saveRef: data.saveRef,
},
});
}
@@ -414,6 +429,7 @@ export function* saveEntitySaga({ data }, updateClient = true, multiple = false)
data: {
path: 'measure_categories',
updates: data.entity.measureCategories,
+ saveRef: data.saveRef,
},
});
}
@@ -424,6 +440,7 @@ export function* saveEntitySaga({ data }, updateClient = true, multiple = false)
data: {
path: 'recommendation_categories',
updates: data.entity.recommendationCategories,
+ saveRef: data.saveRef,
},
});
}
@@ -436,8 +453,11 @@ export function* saveEntitySaga({ data }, updateClient = true, multiple = false)
yield put(invalidateEntities(data.invalidateEntitiesOnSuccess));
}
} catch (err) {
- err.response.json = yield err.response.json();
- yield put(saveError(err, dataTS));
+ console.log('ERROR in saveEntitySaga');
+ if (err.response) {
+ err.response.json = yield err.response.json();
+ yield put(saveError(err, dataTS));
+ }
if (updateClient) {
yield put(invalidateEntities(data.path));
}
@@ -475,8 +495,11 @@ export function* deleteEntitySaga({ data }, updateClient = true, multiple = fals
}
yield put(deleteSuccess(dataTS));
} catch (err) {
- err.response.json = yield err.response.json();
- yield put(deleteError(err, dataTS));
+ console.log('ERROR in deleteEntitySaga');
+ if (err.response) {
+ err.response.json = yield err.response.json();
+ yield put(deleteError(err, dataTS));
+ }
if (updateClient) {
yield put(invalidateEntities(data.path));
}
@@ -519,6 +542,7 @@ export function* newEntitySaga({ data }, updateClient = true, multiple = false)
path: 'recommendation_measures',
updates: data.entity.recommendationMeasures,
keyPair: ['recommendation_id', 'measure_id'],
+ saveRef: data.saveRef,
});
}
// update sdgtarget-indicator connections
@@ -586,7 +610,10 @@ export function* newEntitySaga({ data }, updateClient = true, multiple = false)
yield put(invalidateEntities(data.invalidateEntitiesOnSuccess));
}
} catch (err) {
- err.response.json = yield err.response.json();
+ console.log('ERROR in newEntitySaga');
+ if (err.response) {
+ err.response.json = yield err.response.json();
+ }
yield put(saveError(err, dataTS));
if (updateClient) {
yield put(invalidateEntities(data.path));
@@ -623,9 +650,12 @@ export function* saveConnectionsSaga({ data }) {
yield put(updateConnections(data.path, connectionsUpdated));
yield put(saveSuccess(dataTS));
} catch (err) {
- err.response.json = yield err.response.json();
+ console.log('ERROR in saveConnectionsSaga', err);
+ if (err.response) {
+ err.response.json = yield err.response.json();
+ }
yield put(saveError(err, dataTS));
- yield put(invalidateEntities(data.path));
+ // yield put(invalidateEntities(data.path));
}
}
}
@@ -809,7 +839,7 @@ export function* updatePathSaga({ path, args }) {
} else {
// otherwise keep "specific args" incl framework (unless explicitly removed)
const argsRemove = query
- ? asArray(query).filter((item) => item.remove).map((item) => item.arg)
+ ? asArray(query).filter((item) => item.remove || item.replace).map((item) => item.arg)
: [];
const queryKeep = location.get('query').filter(
(val, key) => KEEP_QUERY_ARGS.indexOf(key) > -1 && argsRemove.indexOf(key) === -1
diff --git a/app/containers/App/selectors.js b/app/containers/App/selectors.js
index 346e3b086..39ef29c63 100644
--- a/app/containers/App/selectors.js
+++ b/app/containers/App/selectors.js
@@ -17,6 +17,7 @@ import asList from 'utils/as-list';
import { sortEntities } from 'utils/sort';
import {
+ API,
USER_ROLES,
DB_TABLES,
CATEGORY_ADMIN_MIN_ROLE,
@@ -552,16 +553,23 @@ export const selectFWTaxonomies = createSelector(
&& fwTaxonomies
&& taxonomies.map(
(tax) => {
+ const fwNotSet = !frameworkId || frameworkId === 'all';
const hasFramework = !!tax.getIn(['attributes', 'framework_id'])
- && qe(tax.getIn(['attributes', 'framework_id']), frameworkId);
+ && (
+ fwNotSet
+ || qe(tax.getIn(['attributes', 'framework_id']), frameworkId)
+ );
// connected to current framework
const connectedToFramework = fwTaxonomies.some(
(fwt) => qe(
fwt.getIn(['attributes', 'taxonomy_id']),
tax.get('id'),
- ) && qe(
- fwt.getIn(['attributes', 'framework_id']),
- frameworkId,
+ ) && (
+ fwNotSet
+ || qe(
+ fwt.getIn(['attributes', 'framework_id']),
+ frameworkId,
+ )
)
);
// connectedFrameworks
@@ -602,6 +610,9 @@ export const selectFWTaxonomiesSorted = createSelector(
&& sortEntities(taxonomies, 'asc', 'priority', null, false)
);
+// select all categories
+export const selectCategories = (state) => selectEntities(state, API.CATEGORIES);
+
export const selectEntity = createSelector(
(state, { path }) => selectEntities(state, path),
(state, { id }) => id,
diff --git a/app/containers/CategoryView/index.js b/app/containers/CategoryView/index.js
index 3c0c6202d..2a8f5348d 100644
--- a/app/containers/CategoryView/index.js
+++ b/app/containers/CategoryView/index.js
@@ -40,7 +40,12 @@ import { loadEntitiesIfNeeded, updatePath, closeEntity } from 'containers/App/ac
import { lowerCase } from 'utils/string';
import { ROUTES, CONTENT_SINGLE } from 'containers/App/constants';
-import { CATEGORY_ADMIN_MIN_ROLE, IS_CURRENT_STATUSES, IS_ARCHIVE_STATUSES } from 'themes/config';
+import {
+ CATEGORY_ADMIN_MIN_ROLE,
+ IS_CURRENT_STATUSES,
+ IS_ARCHIVE_STATUSES,
+ CYCLE_TAXONOMY_ID,
+} from 'themes/config';
import Loading from 'components/Loading';
import Content from 'components/Content';
@@ -114,6 +119,7 @@ export class CategoryView extends React.PureComponent { // eslint-disable-line r
fields: [
isManager && getStatusField(entity),
!entity.getIn(['attributes', 'draft'])
+ && qe(entity.getIn(['taxonomy', 'id']), CYCLE_TAXONOMY_ID)
&& getStatusField(
entity,
'is_current',
diff --git a/app/containers/CategoryView/selectors.js b/app/containers/CategoryView/selectors.js
index 4207e71c3..0fb71035a 100644
--- a/app/containers/CategoryView/selectors.js
+++ b/app/containers/CategoryView/selectors.js
@@ -20,6 +20,7 @@ import {
selectRecommendationCategoriesByRecommendation,
selectRecommendationIndicatorsByRecommendation,
selectFrameworks,
+ selectSettingsFromQuery,
} from 'containers/App/selectors';
import {
@@ -29,6 +30,8 @@ import {
import { qe } from 'utils/quasi-equals';
import { sortEntities, sortCategories } from 'utils/sort';
+import { CURRENT_TAXONOMY_IDS } from 'themes/config';
+
import { DEPENDENCIES } from './constants';
@@ -99,7 +102,8 @@ export const selectChildTaxonomies = createSelector(
selectCategory,
selectTaxonomiesSorted,
(state) => selectEntities(state, 'categories'),
- (entity, taxonomies, categories) => {
+ selectSettingsFromQuery,
+ (entity, taxonomies, categories, settingsFromQuery) => {
if (entity && taxonomies) {
const taxonomy = taxonomies.find(
(tax) => qe(
@@ -123,6 +127,12 @@ export const selectChildTaxonomies = createSelector(
) && qe(
cat.getIn(['attributes', 'taxonomy_id']),
tax.get('id')
+ ) && (
+ CURRENT_TAXONOMY_IDS.indexOf(parseInt(tax.get('id'), 10)) === -1
+ || settingsFromQuery.loadNonCurrent
+ || !!cat.getIn(['attributes', 'is_current'])
+ ) && (
+ settingsFromQuery.loadArchived || !cat.getIn(['attributes', 'is_archive'])
)
),
tax.get('id'),
diff --git a/app/containers/EntityForm/index.js b/app/containers/EntityForm/index.js
index 624c28e7b..12a82bb24 100644
--- a/app/containers/EntityForm/index.js
+++ b/app/containers/EntityForm/index.js
@@ -167,7 +167,7 @@ class EntityForm extends React.Component { // eslint-disable-line react/prefer-s
...field,
formData: values,
values: values.getIn(field.dataPath),
- options: formData.getIn(field.dataPath) || List(),
+ // options: formData.getIn(field.dataPath) || List(),
};
} else {
const modifiedField = field.modifyFieldAttributes
diff --git a/app/containers/EntityListForm/index.js b/app/containers/EntityListForm/index.js
index cf128307c..c3372f746 100644
--- a/app/containers/EntityListForm/index.js
+++ b/app/containers/EntityListForm/index.js
@@ -72,6 +72,7 @@ class EntityListForm extends React.Component { // eslint-disable-line react/pref
} else {
formTitle = formOptions.title;
}
+
const fieldName = 'values';
return (
+
+
- this.props.handleSubmit(formData)}
- handleCancel={this.props.handleCancel}
- resetProgress={this.props.resetProgress}
- errors={this.props.errors}
- success={this.props.success}
- progress={this.props.progress}
- template={{
- filename: `${intl.formatMessage(messages.filename)}`,
- data: getImportFields({
- fields: [
- {
- attribute: 'reference',
- type: 'text',
- required: true,
- import: true,
- },
- {
- attribute: 'title',
- type: 'text',
- required: true,
- import: true,
- },
- {
- attribute: 'description',
- type: 'markdown',
- import: true,
- },
- {
- attribute: 'outcome',
- type: 'markdown',
- label: 'comment',
- import: true,
- },
- {
- disabled: true,
- attribute: 'indicator_summary',
- type: 'markdown',
- import: true,
- },
- {
- attribute: 'target_date',
- type: 'date',
- import: true,
- },
- {
- attribute: 'target_date_comment',
- type: 'text',
- import: true,
- },
- ],
- }, intl.formatMessage),
- }}
- />
-
-
- );
- }
+