Merge branch 'acceptance'

app/.env.development

@@ -1,3 +1,3 @@
-REACT_APP_API_BASE_HOST = 'http://localhost:6969/Bauhaus-Back-Office/api'
+REACT_APP_API_BASE_HOST = 'http://localhost:8080/Bauhaus_BO_war/api'
 
 REACT_APP_APPLICATIONS = "concepts,classifications"

app/.env.production

@@ -1,3 +1,3 @@
 REACT_APP_API_BASE_HOST = './api'
+REACT_APP_APPLICATIONS = "concepts,classifications,operations"
 
-REACT_APP_APPLICATIONS = "concepts,classifications"

app/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "Bauhaus",
-	"version": "2.1.2",
+	"version": "3.0.0",
 	"description": "Web application for the management of concepts, classifications and other statistical objects",
 	"repository": {
 		"type": "git",
@@ -27,7 +27,6 @@
 	"dependencies": {
 		"@inseefr/iam": "^0.0.1-rc11",
 		"@inseefr/wilco": "0.0.5",
-		"axios": "^0.19.0",
 		"bauhaus-structures": "^0.0.0",
 		"bauhaus-operations": "^0.0.0",
 		"bootstrap": "3.4.1",

app/src/js/actions/constants/app.js

@@ -9,12 +9,6 @@ export const LOAD_PROPERTIES_FAILURE = 'LOAD_PROPERTIES_FAILURE';
 //SAVE_USER_PROPS
 export const SAVE_USER_PROPS = 'SAVE_USER_PROPS';
 
-//LOAD DISSEMINTATION STATUS
-export const LOAD_DISSEMINATION_STATUS_LIST = 'LOAD_DISSEMINATION_STATUS_LIST';
-export const LOAD_DISSEMINATION_STATUS_LIST_SUCCESS =
-	'LOAD_DISSEMINATION_STATUS_LIST_SUCCESS';
-export const LOAD_DISSEMINATION_STATUS_LIST_FAILURE =
-	'LOAD_DISSEMINATION_STATUS_LIST_FAILURE';
 
 //LOAD STAMPS
 export const LOAD_STAMP_LIST = 'LOAD_STAMP_LIST';

app/src/js/actions/constants/operations/sims.js

@@ -19,3 +19,4 @@ export const PUBLISH_OPERATIONS_SIMS_SUCCESS =
 	'PUBLISH_OPERATIONS_SIMS_SUCCESS';
 export const PUBLISH_OPERATIONS_SIMS_FAILURE =
 	'PUBLISH_OPERATIONS_SIMS_FAILURE';
+export const DELETE_SIMS_SUCCESS = 'DELETE_SIMS_SUCCESS';

app/src/js/actions/operations/sims/item.js

@@ -1,6 +1,7 @@
 import api from 'js/remote-api/operations-api';
 import * as A from 'js/actions/constants';
 import { LOADING } from 'js/constants';
+import { D1, D2 } from 'js/i18n';
 
 import { getPublishFactory } from '../utils';
 
@@ -22,8 +23,8 @@ function getFetchLabelsPromise(sims, promise) {
 	function mergeLabels(parent) {
 		return {
 			...sims,
-			labelLg1: parent.prefLabelLg1,
-			labelLg2: parent.prefLabelLg2,
+			labelLg1: D1.simsTitle + parent.prefLabelLg1,
+			labelLg2: D2.simsTitle + parent.prefLabelLg2,
 		};
 	}
 	if (sims.idOperation) {
@@ -44,7 +45,7 @@ function getFetchLabelsPromise(sims, promise) {
 /**
  * This method is called when we need to save a SIMS.
  * If the sims passed as a parameter already have an id,
- * we will send a PUR request. If this property is not
+ * we will send a PUT request. If this property is not
  * present, a POST request will be send.
  *
  * @param {Sims} sims

app/src/js/applications/auth/basic-auth/login-container.js

@@ -14,26 +14,31 @@ class LoginBasicContainer extends Component {
 			updateRequested: false,
 		};
 		this.onClickValidate = (data) => {
-			const { stamp, role } = data;
-			this.props.checkAuth({ stamp, roles: role.map((r) => r.value) });
-			this.setState({
-				updateRequested: true,
-			});
+			api.postFakeUser( {
+				stamp: data.stamp,
+				roles: data.role.map(r => r.value)
+			}).finally(() => {
+				const { stamp, role } = data;
+				this.props.checkAuth({ stamp, roles: role.map((r) => r.value) });
+				this.setState({
+					updateRequested: true,
+				});
+			})
+
 		};
 	}
 
 	componentWillMount() {
 		const { stampList } = this.props;
 		const { roleList } = this.state;
-
 		if (!roleList) {
 			api.getRoleList().then((roleList) => {
 				this.setState({
 					roleList,
 				});
 			});
 		}
-		if (!stampList) this.props.loadStampList();
+		if (stampList.length === 0) this.props.loadStampList();
 	}
 
 	render() {

app/src/js/applications/auth/hoc.js

@@ -1,4 +1,4 @@
-import React, { Component } from 'react';
+import React  from 'react';
 import { connect } from 'react-redux';
 import LoginNoAuth from 'js/applications/auth/no-auth/login';
 import LoginBasic from 'js/applications/auth/basic-auth/login-container';
@@ -7,21 +7,18 @@ import * as Impl from 'js/utils/auth/auth-impl';
 import { Auth } from 'bauhaus-utilities';
 
 const auth = WrappedComponent => {
-	class AuthComponent extends Component {
-		render() {
-			const { authType, roles } = this.props;
-			if (authType === Impl.OPEN_ID_CONNECT_AUTH)
-				return <LoginOpenIDConnect WrappedComponent={WrappedComponent} />;
+	const AuthComponent = ({ authType, roles }) => {
+		if (authType === Impl.OPEN_ID_CONNECT_AUTH)
+			return <LoginOpenIDConnect WrappedComponent={WrappedComponent} />;
 
-			if (roles) return <WrappedComponent />;
-			switch (authType) {
-				case Impl.NO_AUTH:
-					return <LoginNoAuth />;
-				case Impl.BASIC_AUTH:
-					return <LoginBasic />;
-				default:
-					return <div>Error</div>;
-			}
+		if (roles) return <WrappedComponent />;
+		switch (authType) {
+			case Impl.NO_AUTH:
+				return <LoginNoAuth	 />;
+			case Impl.BASIC_AUTH:
+				return <LoginBasic />;
+			default:
+				return <div>Error</div>;
 		}
 	}
 

app/src/js/applications/auth/hoc.spec.js

@@ -1,4 +1,5 @@
 import { mapStateToProps } from './hoc';
+
 describe('mapStateToProps', () => {
 	it('should return the auth object with a role', () => {
 		const input = {

app/src/js/applications/classifications/routes/index.js

@@ -20,7 +20,6 @@ import Menu from 'js/applications/classifications/menu';
 
 export default () => {
 	document.title = 'Bauhaus - ' + D.classificationsTitle;
-	document.getElementById('root-app').classList = ['classifications'];
 	return (
 		<>
 			<Menu />

app/src/js/applications/codelists/config.js

@@ -0,0 +1 @@
+export const defaultRoute = '';

app/src/js/applications/codelists/routes/index.js

@@ -0,0 +1,22 @@
+import React  from 'react';
+import { Switch, Route } from 'react-router-dom';
+
+import { Home } from 'bauhaus-codelists';
+
+import D from 'js/i18n';
+
+const CodesListComponent = () => {
+	console.log("yo")
+	document.title = 'Bauhaus - ' + D.structuresTitle;
+	return (
+		<>
+			<div className="container">
+				<Switch>
+					<Route exact path="/codelists" component={Home} />
+				</Switch>
+			</div>
+		</>
+	);
+};
+
+export default CodesListComponent;

app/src/js/applications/collections/edition-creation/creation-container.js

@@ -36,7 +36,7 @@ class CreationContainer extends Component {
 		const { conceptList, collectionList, stampList } = this.props;
 		if (!conceptList) this.props.loadConceptList();
 		if (!collectionList) this.props.loadCollectionList();
-		if (!stampList) this.props.loadStampList();
+		if (stampList.length === 0) this.props.loadStampList();
 	}
 
 	render() {

app/src/js/applications/collections/edition-creation/edition-container.js

@@ -49,7 +49,7 @@ class EditionContainer extends Component {
 		if (!collection) this.props.loadCollection(id);
 		if (!collectionList) this.props.loadCollectionList();
 		if (!conceptList) this.props.loadConceptList();
-		if (!stampList) this.props.loadStampList();
+		if (stampList.length === 0) this.props.loadStampList();
 	}
 
 	render() {

app/src/js/applications/collections/visualization/home-container.js

@@ -29,7 +29,7 @@ class CollectionVisualizationContainer extends Component {
 	componentWillMount() {
 		const { id, collection, stampList } = this.props;
 		if (!collection) this.props.loadCollections(id);
-		if (!stampList) this.props.loadStampList();
+		if (stampList.length === 0) this.props.loadStampList();
 	}
 
 	componentWillReceiveProps({ id, validationStatus }) {

app/src/js/applications/concepts/advanced-search/home-container.js

@@ -4,7 +4,6 @@ import { Loading } from '@inseefr/wilco';
 import * as select from 'js/reducers';
 import ConceptSearchList from './home';
 import loadStampList from 'js/actions/stamp';
-import loadDisseminationStatusList from 'js/actions/dissemination-status';
 import loadConceptSearchList from 'js/actions/concepts/search-list';
 import { Stores } from 'bauhaus-utilities';
 
@@ -16,8 +15,8 @@ class ConceptSearchListContainer extends Component {
 			disseminationStatusList,
 		} = this.props;
 		if (!conceptSearchList) this.props.loadConceptSearchList();
-		if (!stampList) this.props.loadStampList();
-		if (!disseminationStatusList) this.props.loadDisseminationStatusList();
+		if (stampList.length === 0) this.props.loadStampList();
+		if (disseminationStatusList.length === 0) this.props.loadDisseminationStatusList();
 	}
 
 	render() {
@@ -43,12 +42,12 @@ class ConceptSearchListContainer extends Component {
 const mapStateToProps = (state) => ({
 	conceptSearchList: select.getConceptSearchList(state),
 	stampList: Stores.Stamps.getStampList(state),
-	disseminationStatusList: select.getDisseminationStatusList(state),
+	disseminationStatusList: Stores.DisseminationStatus.getDisseminationStatusList(state),
 });
 const mapDispatchToProps = {
 	loadConceptSearchList,
 	loadStampList,
-	loadDisseminationStatusList,
+	loadDisseminationStatusList: Stores.DisseminationStatus.loadDisseminationStatusList,
 };
 
 export default connect(