Merge pull request #211 from InseeFr/release3.0.8

Release3.0.8

.kubernetes/deployment.yml

@@ -14,7 +14,7 @@ spec:
     spec:
       containers:
         - name: bauhaus
-          image: nicolaslaval/bauhaus:3.0.7
+          image: nicolaslaval/bauhaus:3.0.8
           env:
             - name: API_BASE_HOST
               value: 'https://bauhaus-api.toto.fr/api'

app/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "Bauhaus",
-	"version": "3.0.7",
+	"version": "3.0.8",
 	"description": "Web application for the management of concepts, classifications and other statistical objects",
 	"repository": {
 		"type": "git",

app/src/index.js

@@ -13,6 +13,7 @@ import '@inseefr/iam/dist/index.css';
 import 'bauhaus-operations/dist/index.css';
 import 'bauhaus-structures/dist/index.css';
 import 'bauhaus-utilities/dist/index.css';
+import 'bauhaus-codelists/dist/index.css';
 
 import 'main.scss';
 

app/src/js/applications/auth/open-id-connect-auth/login-container.js

@@ -1,4 +1,4 @@
-import React, { useEffect, useCallback } from 'react';
+import React, { useEffect, useCallback, useState } from 'react';
 import { connect } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import Keycloak from 'keycloak';
@@ -10,6 +10,7 @@ const kcConfig = `${window.location.origin}/keycloak.json`;
 
 const kc = Keycloak(kcConfig);
 const LoginOpenIDConnect = ({ saveUserProps, authenticated, WrappedComponent }) => {
+	const [token, setToken] = useState(Auth.getToken())
 	const history = useHistory()
 	const refreshToken = useCallback(() => {
 		kc
@@ -42,7 +43,10 @@ const LoginOpenIDConnect = ({ saveUserProps, authenticated, WrappedComponent })
 				saveUserProps(
 					Auth.getAuthPropsFromToken(kc.tokenParsed)
 				);
-				kc.token && Auth.setToken(kc.token);
+				if(kc.token) {
+					Auth.setToken(kc.token);
+					setToken(kc.token)
+				}
 				setInterval(() => refreshToken(), 20000);
 				history.push({ pathname: history.location.pathname, state: 'init' });
 			})
@@ -53,7 +57,6 @@ const LoginOpenIDConnect = ({ saveUserProps, authenticated, WrappedComponent })
 		initLogin();
 	}, [initLogin])
 
-	const token = Auth.getToken();
 	if (authenticated && token && Auth.isTokenValid(token))
 		return <WrappedComponent />;
 	return <Loading textType="authentification" />;

app/src/js/applications/classifications/correspondences/home.js

@@ -2,8 +2,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { PageTitle, SearchableList } from '@inseefr/wilco';
 import D from 'js/i18n';
+import { useTitle } from 'bauhaus-utilities';
 
 const CorrespondencesHome = ({ correspondences }) => {
+	useTitle(D.classificationsTitle, D.correspondencesTitle);
 	return (
 		<div className="container">
 			<div className="row">

app/src/js/applications/classifications/correspondences/visualization/home-general.js

@@ -1,46 +1,44 @@
-import React, { Component } from 'react';
+import React  from 'react';
 import { PageTitle, Note } from '@inseefr/wilco';
 import CorrespondenceControls from './controls';
 import { generalFields } from './general-fields';
 import { ExplanatoryNote } from 'js/applications/shared/explanatory-note';
 import { D1, D2 } from 'js/i18n';
-import { propTypes as correspondencePropTypes } from 'js/applications/classifications/utils/correspondence/general';
-import { CheckSecondLang } from 'bauhaus-utilities';
+import { CheckSecondLang, useTitle } from 'bauhaus-utilities';
+import D from '../../../../i18n/build-dictionary';
 
-class HomeGeneral extends Component {
-	static propTypes = {
-		correspondence: correspondencePropTypes.isRequired,
-	};
-	render() {
-		const {
-			correspondence,
-			secondLang,
-			langs: { lg1, lg2 },
-		} = this.props;
-		const {
-			labelLg1,
-			labelLg2,
-			firstClassLabelLg2,
-			secondClassLabelLg2,
-		} = correspondence;
-		const title = secondLang ? labelLg2 : labelLg1;
-		return (
-			<div>
-				{title && <PageTitle title={title} />}
-				<CorrespondenceControls />
-				<CheckSecondLang />
-				<div className="row">
-					{(!secondLang ||
-						(secondLang && (firstClassLabelLg2 || secondClassLabelLg2))) && (
-						<Note
-							text={generalFields(correspondence, secondLang)}
-							title={D1.globalInformationsTitle}
-							alone={true}
-							allowEmpty={true}
-						/>
-					)}
-				</div>
-				<span>
+const HomeGeneral = ({
+	 correspondence,
+	 secondLang,
+	 langs: { lg1, lg2 },
+ }) =>  {
+	const {
+		labelLg1,
+		labelLg2,
+		firstClassLabelLg2,
+		secondClassLabelLg2,
+	} = correspondence;
+	const title = secondLang ? labelLg2 : labelLg1;
+
+	useTitle(D.classificationsTitle, labelLg1);
+
+	return (
+		<div>
+			{title && <PageTitle title={title} />}
+			<CorrespondenceControls />
+			<CheckSecondLang />
+			<div className="row">
+				{(!secondLang ||
+					(secondLang && (firstClassLabelLg2 || secondClassLabelLg2))) && (
+					<Note
+						text={generalFields(correspondence, secondLang)}
+						title={D1.globalInformationsTitle}
+						alone={true}
+						allowEmpty={true}
+					/>
+				)}
+			</div>
+			<span>
 					{correspondence.descriptionLg1 && (
 						<div className="row">
 							<ExplanatoryNote
@@ -60,9 +58,8 @@ class HomeGeneral extends Component {
 						</div>
 					)}
 				</span>
-			</div>
-		);
-	}
+		</div>
+	);
 }
 
 export default HomeGeneral;

app/src/js/applications/classifications/families/home.js

@@ -2,8 +2,10 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { PageTitle, SearchableList } from '@inseefr/wilco';
 import D from 'js/i18n';
+import { useTitle } from 'bauhaus-utilities';
 
 const FamiliesHome = ({ families }) => {
+	useTitle(D.classificationsTitle, D.familiesTitle);
 	return (
 		<div className="container">
 			<div className="row">

app/src/js/applications/classifications/families/visualization/home.js

@@ -2,7 +2,8 @@ import React from 'react';
 import { PageTitle } from '@inseefr/wilco';
 import Controls from './controls';
 import Members from './members';
-import { CheckSecondLang } from 'bauhaus-utilities';
+import { CheckSecondLang, useTitle } from 'bauhaus-utilities';
+import D from '../../../../i18n/build-dictionary';
 
 const FamilyVisualization = ({
 	family: {
@@ -11,6 +12,8 @@ const FamilyVisualization = ({
 	},
 	secondLang,
 }) => {
+	useTitle(D.classificationsTitle, prefLabelLg1);
+
 	return (
 		<div className="container">
 			<PageTitle title={prefLabelLg1} context="classifications" />

app/src/js/applications/classifications/home.js

@@ -2,8 +2,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { PageTitle, SearchableList } from '@inseefr/wilco';
 import D from 'js/i18n';
+import { useTitle } from 'bauhaus-utilities';
 
 const ClassificationsHome = ({ classifications }) => {
+	useTitle(D.classificationsTitle, D.classificationsTitle);
+
 	return (
 		<div className="container">
 			<div className="row">

app/src/js/applications/classifications/series/home.js

@@ -2,8 +2,11 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { PageTitle, SearchableList } from '@inseefr/wilco';
 import D from 'js/i18n';
+import { useTitle } from 'bauhaus-utilities';
 
 const SeriesHome = ({ series }) => {
+	useTitle(D.classificationsTitle, D.seriesTitle);
+
 	return (
 		<div className="container">
 			<div className="row">

app/src/js/applications/classifications/series/visualization/home.js

@@ -1,19 +1,20 @@
-import React, { Component } from 'react';
+import React from 'react';
 import { PageSubtitle, PageTitle } from '@inseefr/wilco';
 import Controls from './controls';
 import General from './general';
 import Notes from './notes';
 import Members from './members';
-import { CheckSecondLang } from 'bauhaus-utilities';
+import { CheckSecondLang, useTitle } from 'bauhaus-utilities';
+import D from '../../../../i18n/build-dictionary';
 
-class SeriesVisualization extends Component {
-	render() {
-		const {
-			series: { general, members },
-			secondLang,
-			langs,
-		} = this.props;
-		const notes = {
+const SeriesVisualization = ({
+	 series: { general, members },
+	 secondLang,
+	 langs,
+ }) => {
+	useTitle(D.classificationsTitle, general?.prefLabelLg1);
+
+	const notes = {
 			scopeNoteLg1: general.scopeNoteLg1,
 			scopeNoteLg2: general.scopeNoteLg2,
 		};
@@ -34,7 +35,6 @@ class SeriesVisualization extends Component {
 				)}
 			</div>
 		);
-	}
 }
 
 export default SeriesVisualization;

app/src/js/applications/classifications/visualization/home.js

@@ -6,7 +6,7 @@ import General from './general';
 import Notes from './notes';
 import Levels from './levels';
 import D from 'js/i18n';
-import { CheckSecondLang } from 'bauhaus-utilities';
+import { CheckSecondLang, useTitle } from 'bauhaus-utilities';
 
 const ClassificationVisualization = props => {
 	const {
@@ -15,6 +15,8 @@ const ClassificationVisualization = props => {
 		secondLang,
 		langs,
 	} = props;
+	useTitle(D.classificationsTitle, general?.prefLabelLg1);
+
 	const notes = {
 		scopeNoteLg1: general.scopeNoteLg1,
 		scopeNoteLg2: general.scopeNoteLg2,

app/src/js/applications/classifications/visualization/tree/home.js

@@ -4,9 +4,11 @@ import { PageTitle } from '@inseefr/wilco';
 import Controls from './controls';
 import DnDTree from 'js/applications/shared/tree/dnd';
 import D from 'js/i18n';
-import { CheckSecondLang } from 'bauhaus-utilities';
+import { CheckSecondLang, useTitle } from 'bauhaus-utilities';
 
 const ClassificationTree = ({ data, prefLabel }) => {
+	useTitle(D.classificationsTitle, D.classificationTreeTitle + ': ' + prefLabel);
+
 	return (
 		<div>
 			<div className="container">

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

@@ -6,12 +6,10 @@ import {
 	Home,
 	CodelistComponentView,
 	CodelistEdit,
-	D,
 	SearchFormList,
 } from 'bauhaus-codelists';
 
 const CodesListComponent = () => {
-	document.title = 'Bauhaus - ' + D.codelistsTitle;
 	document.getElementById('root-app').classList = ['codelists'];
 	return (
 		<>

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

@@ -5,6 +5,8 @@ import CollectionEditionCreationControls from './controls';
 import GeneralEdition from './general';
 import MembersEdition from './members';
 import { propTypes as generalPropTypes } from 'js/utils/collections/general';
+import { withTitle } from 'bauhaus-utilities';
+import D from '../../../i18n/build-dictionary';
 
 class CollectionEditionCreation extends Component {
 	constructor(props) {
@@ -140,4 +142,4 @@ CollectionEditionCreation.propTypes = {
 	langs: PropTypes.object.isRequired,
 };
 
-export default CollectionEditionCreation;
+export default withTitle(CollectionEditionCreation, D.collectionsTitle, props => props.general.prefLabelLg1 || D.createCollectionTitle);

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

@@ -8,13 +8,17 @@ import { Loading } from '@inseefr/wilco';
 import exportCollectionList from 'js/actions/collections/export-multi';
 import loadCollectionList from 'js/actions/collections/list';
 import { OK } from 'js/constants';
+import { useTitle } from 'bauhaus-utilities';
+import D from '../../../i18n/build-dictionary';
 
 const CollectionsToExportContainer = ({
 	collections,
 	exportStatus,
 	loadCollectionList,
 	exportCollectionList,
 }) => {
+	useTitle(D.collectionsTitle, D.exportTitle)
+
 	const [exportRequested, setExportRequested] = useState(false);
 
 	const handleExportCollectionList = useCallback(