- {D.addDocument}
+ {D.addDocument} ({otherDocuments.length})
{panelStatus && (
@@ -146,11 +154,7 @@ class DocumentsBlocContainer extends Component {
}
}
render() {
- return (
- this.props.documentStoresStatus === LOADED && (
-
- )
- );
+ return
;
}
}
@@ -160,8 +164,8 @@ const mapDispatchToProps = {
const mapStateToProps = state => {
return {
- documentStoresStatus: state.operationsDocuments.status,
- documentStores: state.operationsDocuments.results,
+ documentStoresStatus: getOperationsDocumentsStatus(state),
+ documentStores: getOperationsDocuments(state),
};
};
diff --git a/src/js/components/operations/msd/documents/documents-bloc/index.spec.js b/src/js/components/operations/msd/documents/documents-bloc/index.spec.js
index ada0d0164..ecd70639d 100644
--- a/src/js/components/operations/msd/documents/documents-bloc/index.spec.js
+++ b/src/js/components/operations/msd/documents/documents-bloc/index.spec.js
@@ -10,7 +10,7 @@ const documents = [
{
uri: 'uri1-bis',
url: 'http://google.fr?q=url-1',
- updatedDate: '2019-03-04T10:00:00.000Z',
+ lastRefresh: '2019-03-04T10:00:00.000Z',
labelLg1: 'B labelLg1-0',
labelLg2: 'B labelLg2-0',
lang: 'fr',
@@ -23,7 +23,7 @@ const documents = [
{
uri: 'uri2-bis',
url: 'http://google.fr?q=url-2',
- updatedDate: '2019-04-04T10:00:00.000Z',
+ lastRefresh: '2019-04-04T10:00:00.000Z',
labelLg1: 'A labelLg1-1',
labelLg2: 'A labelLg2-1',
descriptionLg1: 'descriptionLg1-2',
@@ -69,11 +69,11 @@ describe('DocumentsBloc', () => {
general.find('li').forEach((li, i) => {
expect(li.html()).toEqual(
- `
${
orderedList[i].labelLg1
- }(${orderedList[i].aside})`
+ }
(${orderedList[i].aside})`
);
});
});
@@ -89,11 +89,11 @@ describe('DocumentsBloc', () => {
general.find('li').forEach((li, i) => {
expect(li.html()).toEqual(
- `
${
orderedList[i].labelLg2
- }(${orderedList[i].aside})`
+ }
(${orderedList[i].aside})`
);
});
});
@@ -130,7 +130,7 @@ describe('DocumentsBloc', () => {
});
});
- it('should not display the Add Document button if there is not more document to add', () => {
+ it('should display the Add Document button if there is not more document to add', () => {
const general = shallow(
{
/>
);
- expect(general.find('.documentsbloc__add')).toHaveLength(0);
+ expect(general.find('.documentsbloc__add')).toHaveLength(1);
});
it('should display the Add Document button if there is more than on document available', () => {
const general = shallow(
@@ -158,7 +158,7 @@ describe('DocumentsBloc', () => {
/>
);
- expect(general.find('.documentsbloc__add')).toHaveLength(0);
+ expect(general.find('.documentsbloc__add')).toHaveLength(1);
});
it('should not display the Add Document button for Lg2', () => {
diff --git a/src/js/components/operations/msd/documents/documents-bloc/style.scss b/src/js/components/operations/msd/documents/documents-bloc/style.scss
index 9eab727b1..02963b961 100644
--- a/src/js/components/operations/msd/documents/documents-bloc/style.scss
+++ b/src/js/components/operations/msd/documents/documents-bloc/style.scss
@@ -15,3 +15,11 @@
padding-left: 0;
}
}
+
+.documentbloc__item {
+ display: flex;
+
+ span {
+ flex: 2 1 auto;
+ }
+}
diff --git a/src/js/components/operations/msd/index.js b/src/js/components/operations/msd/index.js
index 75ecb5c14..73da9a31f 100644
--- a/src/js/components/operations/msd/index.js
+++ b/src/js/components/operations/msd/index.js
@@ -39,7 +39,6 @@ export const DUPLICATE = 'DUPLICATE';
const mapToParentType = {
operation: {
load: 'loadOperation',
- path: 'operation',
},
series: { load: 'loadSerie' },
indicator: { load: 'loadIndicator' },
@@ -196,13 +195,19 @@ const mapStateToProps = (state, ownProps) => {
function getCurrentParent(parentType) {
if (parentType === 'operation') {
- return select.getOperation(state);
+ return [
+ select.getOperation(state),
+ state.operationsIndicatorCurrentStatus,
+ ];
}
if (parentType === 'series') {
- return select.getSerie(state);
+ return [select.getSerie(state), state.operationsSeriesCurrentStatus];
}
if (parentType === 'indicator') {
- return select.getIndicator(state);
+ return [
+ select.getIndicator(state),
+ state.operationsIndicatorCurrentStatus,
+ ];
}
}
@@ -217,11 +222,12 @@ const mapStateToProps = (state, ownProps) => {
case CREATE:
idParent = extractIdParent(ownProps);
parentType = ownProps.match.params[0];
- const currentParent = getCurrentParent(parentType);
+ const [currentParent, currentParentStatus] = getCurrentParent(parentType);
currentSims = {
...getLabelsFromParent(currentParent, parentType),
};
- isParentLoaded = currentParent.id === idParent;
+ isParentLoaded =
+ currentParentStatus !== NOT_LOADED || currentParent.id === idParent;
break;
default:
currentSims = select.getOperationsSimsCurrent(state);
diff --git a/src/js/reducers/index.js b/src/js/reducers/index.js
index 65ec45347..1e7738af7 100755
--- a/src/js/reducers/index.js
+++ b/src/js/reducers/index.js
@@ -107,10 +107,9 @@ export const getLangs = state => {
export const getStatus = (state, op) =>
remoteCallsSelectors.getStatus(state.remoteCalls, op);
-export const getError = (state, op) =>
+export const getError = (state, op) =>
remoteCallsSelectors.getError(state.remoteCalls, op);
-
export const getNewlyCreatedId = state =>
remoteCallsSelectors.getNewlyCreatedId(state.remoteCalls);
diff --git a/src/js/reducers/operations/loadStatus.js b/src/js/reducers/operations/loadStatus.js
index a50d3df2f..32f800051 100644
--- a/src/js/reducers/operations/loadStatus.js
+++ b/src/js/reducers/operations/loadStatus.js
@@ -21,22 +21,48 @@ export const operationsSimsCurrentStatus = function(
}
};
+function trackStatus(LOAD_SUCCESS, SAVE, SAVE_SUCCESS, LOAD) {
+ return (state = NOT_LOADED, action) => {
+ switch (action.type) {
+ case LOAD_SUCCESS:
+ case SAVE:
+ return LOADED;
+ case SAVE_SUCCESS:
+ return NOT_LOADED;
+ case LOAD:
+ return LOADING;
+ default:
+ return state;
+ }
+ };
+}
+
/**
* Track the loading of an operation. Used to avoid sending multiple request simultaneously
*/
-export const operationsOperationCurrentStatus = function(
- state = NOT_LOADED,
- action
-) {
- switch (action.type) {
- case A.LOAD_OPERATIONS_OPERATION_SUCCESS:
- case A.SAVE_OPERATIONS_OPERATION:
- return LOADED;
- case A.SAVE_OPERATIONS_OPERATION_SUCCESS:
- return NOT_LOADED;
- case A.LOAD_OPERATIONS_OPERATION:
- return LOADING;
- default:
- return state;
- }
-};
+export const operationsOperationCurrentStatus = trackStatus(
+ A.LOAD_OPERATIONS_OPERATION_SUCCESS,
+ A.SAVE_OPERATIONS_OPERATION,
+ A.SAVE_OPERATIONS_OPERATION_SUCCESS,
+ A.LOAD_OPERATIONS_OPERATION
+);
+
+/**
+ * Track the loading of an indicator. Used to avoid sending multiple request simultaneously
+ */
+export const operationsIndicatorCurrentStatus = trackStatus(
+ A.LOAD_OPERATIONS_INDICATOR_SUCCESS,
+ A.SAVE_OPERATIONS_INDICATOR,
+ A.SAVE_OPERATIONS_INDICATOR_SUCCESS,
+ A.LOAD_OPERATIONS_INDICATOR
+);
+
+/**
+ * Track the loading of an series. Used to avoid sending multiple request simultaneously
+ */
+export const operationsSeriesCurrentStatus = trackStatus(
+ A.LOAD_OPERATIONS_SERIE_SUCCESS,
+ A.SAVE_OPERATIONS_SERIE,
+ A.SAVE_OPERATIONS_SERIE_SUCCESS,
+ A.LOAD_OPERATIONS_SERIE
+);
diff --git a/src/js/reducers/operations/selector.js b/src/js/reducers/operations/selector.js
index 78f1f09cf..10c7af6a3 100644
--- a/src/js/reducers/operations/selector.js
+++ b/src/js/reducers/operations/selector.js
@@ -7,3 +7,11 @@ export const getOperationsCodesList = state => {
const operationsCodesList = state.operationsCodesList || {};
return operationsCodesList.results || [];
};
+
+export const getOperationsDocuments = state => {
+ return state.operationsDocuments.results || [];
+};
+
+export const getOperationsDocumentsStatus = state => {
+ return state.operationsDocuments.status;
+};
diff --git a/src/js/remote-api/api.js b/src/js/remote-api/api.js
index 6ed46449e..aebc3cf26 100755
--- a/src/js/remote-api/api.js
+++ b/src/js/remote-api/api.js
@@ -10,6 +10,8 @@ const api = {
},
res => res,
],
+ getDocumentsList: () => ['documents'],
+
getDissStatusList: () => ['disseminationStatus'],
getStampList: () => ['stamps'],
getRoleList: () => ['roles'],
diff --git a/src/js/remote-api/operations-api.js b/src/js/remote-api/operations-api.js
index 6a225d70c..08a088746 100644
--- a/src/js/remote-api/operations-api.js
+++ b/src/js/remote-api/operations-api.js
@@ -9,7 +9,6 @@ const api = {
getSeriesList: () => ['series'],
getOperationsList: () => ['operations'],
getFamiliesList: () => ['families'],
- getDocumentsList: () => ['documents'],
getMetadataStructureList: () => ['metadataStructureDefinition'],
getMetadataAttributesList: () => ['metadataAttributes'],
diff --git a/src/js/types/index.js b/src/js/types/index.js
index ec833e291..cc1b7e70b 100644
--- a/src/js/types/index.js
+++ b/src/js/types/index.js
@@ -31,7 +31,7 @@
* @typedef {Object} SimsDocuments
* @property {string} uri
* @property {string} url
- * @property {string=} updatedDate
+ * @property {string=} lastRefresh
* @property {string} labelLg1
* @property {string} labelLg2
* @property {string=} lang