update queen-v2 & bump version

03a16be fwt
ddecrulle · Apr 14, 2023 · 7043c9e · 7043c9e
1 parent eed1ce5
commit 7043c9e
Show file tree

Hide file tree

Showing 12 changed files with 122 additions and 97 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -84,7 +84,7 @@ jobs:
   docker_drama:
     needs: check_if_version_upgraded
     environment: Main
-    if: needs.check_if_version_upgraded.outputs.is_drama_upgraded_version
+    if: needs.check_if_version_upgraded.outputs.is_drama_upgraded_version == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -108,7 +108,7 @@ jobs:
   docker_queen:
     needs: check_if_version_upgraded
     environment: Main
-    if: needs.check_if_version_upgraded.outputs.is_queen_upgraded_version
+    if: needs.check_if_version_upgraded.outputs.is_queen_upgraded_version == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -132,7 +132,7 @@ jobs:
   docker_queen_v2:
     needs: check_if_version_upgraded
     environment: Main
-    if: needs.check_if_version_upgraded.outputs.is_queen_v2_upgraded_version
+    if: needs.check_if_version_upgraded.outputs.is_queen_v2_upgraded_version == 'true'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -156,7 +156,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     needs: check_if_version_upgraded
-    if: needs.check_if_version_upgraded.outputs.is_upgraded_version
+    if: needs.check_if_version_upgraded.outputs.is_upgraded_version == 'true'
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/drama-queen/package.json b/drama-queen/package.json
@@ -1,7 +1,7 @@
 {
   "name": "drama-queen",
   "private": true,
-  "version": "0.1.1",
+  "version": "0.1.0",
   "type": "module",
   "scripts": {
     "dev": "vite --port 5000 --strictPort",

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "drama-queen-container",
   "private": true,
-  "version": "1.0.1",
+  "version": "1.0.0",
   "workspaces": [
     "drama-queen",
     "queen-v2",

diff --git a/queen-v2/package.json b/queen-v2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "queen-v2",
-  "version": "1.0.0-fix-nginx",
+  "version": "1.0.0-03a16be",
   "description": "Web application for the management of questionnaires powered by Lunatic",
   "repository": {
     "type": "git",
@@ -12,7 +12,7 @@
   "dependencies": {
     "@axa-fr/react-oidc-context": "^3.1.6",
     "@craco/craco": "^6.4.0",
-    "@inseefr/lunatic": "2.0.7-v2-main-2023-02-28-14-48-47",
+    "@inseefr/lunatic": "2.4.1",
     "@inseefr/trevas": "^0.1.16",
     "@material-ui/core": "^4.11.3",
     "@material-ui/icons": "^4.11.2",

diff --git a/queen-v2/src/components/lightOrchestrator/lightOrchestrator.js b/queen-v2/src/components/lightOrchestrator/lightOrchestrator.js
@@ -1,16 +1,15 @@
 import * as lunatic from '@inseefr/lunatic';
 
-import React, { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { useAsyncValue, useLunaticFetcher } from 'utils/hook';
+import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 
+import D from 'i18n';
+import { componentHasResponse } from 'utils/components/deduceState';
+import { LoopPanel } from './LoopPanel';
 import ButtonContinue from './buttons/continue/index';
 import { ComponentDisplayer } from './componentDisplayer';
-import D from 'i18n';
 import Header from './header';
-import { LoopPanel } from './LoopPanel';
-import NavBar from './navBar';
-import { componentHasResponse } from 'utils/components/deduceState';
 import { useStyles } from './lightOrchestrator.style';
+import NavBar from './navBar';
 
 function onLogChange(response, value, args) {
   console.log('onChange', { response, value, args });
@@ -32,7 +31,7 @@ function LightOrchestrator({
   readonly,
   pagination,
   source,
-  suggesters,
+  getReferentiel,
   missing = true,
   shortcut = true,
   autoSuggesterLoading,
@@ -44,8 +43,6 @@ function LightOrchestrator({
   definitiveQuit,
 }) {
   const { data } = surveyUnit;
-  const { lunaticFetcher } = useLunaticFetcher();
-  const suggesterFetcher = useAsyncValue(lunaticFetcher);
   const classes = useStyles();
   const lunaticStateRef = useRef();
 
@@ -87,8 +84,7 @@ function LightOrchestrator({
     onChange: customHandleChange,
     preferences,
     autoSuggesterLoading,
-    suggesters,
-    suggesterFetcher,
+    getReferentiel,
     missing,
     shortcut,
     missingStrategy,

diff --git a/queen-v2/src/components/orchestratorManager/orchestratorManager.js b/queen-v2/src/components/orchestratorManager/orchestratorManager.js
@@ -1,20 +1,19 @@
-import { COMPLETED, VALIDATED, useQuestionnaireState } from 'utils/hook/questionnaire';
-import { EventsManager, INIT_ORCHESTRATOR_EVENT, INIT_SESSION_EVENT } from 'utils/events';
-import { ORCHESTRATOR_COLLECT, ORCHESTRATOR_READONLY, READ_ONLY } from 'utils/constants';
-import React, { useCallback, useContext, useEffect, useMemo, useState } from 'react';
-import { useAPI, useAPIRemoteData, useAuth } from 'utils/hook';
+import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
 import { useHistory, useParams } from 'react-router-dom';
+import { ORCHESTRATOR_COLLECT, ORCHESTRATOR_READONLY, READ_ONLY } from 'utils/constants';
+import { EventsManager, INIT_ORCHESTRATOR_EVENT, INIT_SESSION_EVENT } from 'utils/events';
+import { useAPI, useAPIRemoteData, useAuth, useGetReferentiel } from 'utils/hook';
+import { COMPLETED, VALIDATED, useQuestionnaireState } from 'utils/hook/questionnaire';
 
 import { AppContext } from 'components/app';
-import Error from 'components/shared/Error';
 import LightOrchestrator from 'components/lightOrchestrator';
+import Error from 'components/shared/Error';
 import NotFound from 'components/shared/not-found';
 import Preloader from 'components/shared/preloader';
-import { buildSuggesterFromNomenclatures } from 'utils/questionnaire/nomenclatures';
-import { checkQuestionnaire } from 'utils/questionnaire';
-import paradataIdbService from 'utils/indexedbb/services/paradata-idb-service';
 import { sendCloseEvent } from 'utils/communication';
+import paradataIdbService from 'utils/indexedbb/services/paradata-idb-service';
 import surveyUnitIdbService from 'utils/indexedbb/services/surveyUnit-idb-service';
+import { checkQuestionnaire } from 'utils/questionnaire';
 
 export const OrchestratorManager = () => {
   const { standalone, apiUrl } = useContext(AppContext);
@@ -41,7 +40,7 @@ export const OrchestratorManager = () => {
   const { oidcUser } = useAuth();
   const isAuthenticated = !!oidcUser?.profile;
 
-  const [suggesters, setSuggesters] = useState(null);
+  const { getReferentiel } = useGetReferentiel();
   const [init, setInit] = useState(false);
 
   const [error, setError] = useState(null);
@@ -66,14 +65,11 @@ export const OrchestratorManager = () => {
   }, [isAuthenticated, LOGGER, questionnaire]);
 
   useEffect(() => {
-    if (!init && questionnaire && surveyUnit && nomenclatures) {
+    if (!init && questionnaire && surveyUnit) {
       const { valid, error: questionnaireError } = checkQuestionnaire(questionnaire);
       if (valid) {
         setSource(questionnaire);
-        const suggestersBuilt = buildSuggesterFromNomenclatures(apiUrl)(nomenclatures);
-        setSuggesters(suggestersBuilt);
         setInit(true);
-        console.log('suggesters injection done');
         LOGGER.log(INIT_ORCHESTRATOR_EVENT);
       } else {
         setError(questionnaireError);
@@ -167,11 +163,11 @@ export const OrchestratorManager = () => {
       {![READ_ONLY, undefined].includes(readonlyParam) && <NotFound />}
       {loadingMessage && <Preloader message={loadingMessage} />}
       {error && <Error message={error} />}
-      {!loadingMessage && !error && source && surveyUnit && suggesters && (
+      {!loadingMessage && !error && source && surveyUnit && (
         <LightOrchestrator
           surveyUnit={surveyUnit}
           source={source}
-          suggesters={suggesters}
+          getReferentiel={getReferentiel}
           autoSuggesterLoading={true}
           standalone={standalone}
           readonly={readonly}

diff --git a/queen-v2/src/components/visualizer/questionnaireForm/questionnaireForm.js b/queen-v2/src/components/visualizer/questionnaireForm/questionnaireForm.js
@@ -1,4 +1,3 @@
-import { AppVersion, Button } from 'components/designSystem';
 import {
   Checkbox,
   Container,
@@ -7,19 +6,21 @@ import {
   Typography,
   makeStyles,
 } from '@material-ui/core';
+import { AppVersion, Button } from 'components/designSystem';
+import { useEffect, useState } from 'react';
 import {
   DATA_EXAMPLE_URL,
   DEFAULT_DATA_URL,
   DEFAULT_NOMENCLATURE_URL,
+  NOMENCLATURE_EXAMPLE_URL,
   QUESTIONNAIRE_EXAMPLE_URL,
   SIMPSONS,
 } from 'utils/constants';
-import React, { useEffect, useState } from 'react';
 
 import D from 'i18n';
+import { useHistory } from 'react-router-dom';
 import Examples from './examples';
 import Helper from './helper';
-import { useHistory } from 'react-router-dom';
 
 const useStyles = makeStyles(theme => ({
   root: {
@@ -58,6 +59,7 @@ const QuestionnaireForm = () => {
   useEffect(() => {
     setQuestionnaire(selected ? QUESTIONNAIRE_EXAMPLE_URL(selected) : selected);
     setData(selected ? DATA_EXAMPLE_URL(selected) : selected);
+    setNomenclature(selected ? NOMENCLATURE_EXAMPLE_URL(selected) : selected);
   }, [selected]);
 
   const history = useHistory();
@@ -115,7 +117,7 @@ const QuestionnaireForm = () => {
         <TextField
           id="nomenclature-url-form"
           label={D.labelNomenclature}
-          placeholder={JSON.stringify(DEFAULT_NOMENCLATURE_URL)}
+          placeholder={DEFAULT_NOMENCLATURE_URL}
           helperText={D.helperTextNomenclature}
           fullWidth
           margin="normal"

diff --git a/queen-v2/src/components/visualizer/visualizer.js b/queen-v2/src/components/visualizer/visualizer.js
@@ -1,15 +1,14 @@
-import React, { useCallback, useContext, useEffect, useState } from 'react';
+import { useCallback, useContext, useEffect, useState } from 'react';
+import { useGetReferentiel, useRemoteData, useVisuQuery } from 'utils/hook';
 import { checkQuestionnaire, downloadDataAsJson } from 'utils/questionnaire';
-import { useRemoteData, useVisuQuery } from 'utils/hook';
 
 import { AppContext } from 'components/app';
-import Error from 'components/shared/Error';
 import LightOrchestrator from 'components/lightOrchestrator';
+import Error from 'components/shared/Error';
 import Preloader from 'components/shared/preloader';
-import QuestionnaireForm from './questionnaireForm';
-import { buildSuggesterFromNomenclatures } from 'utils/questionnaire/nomenclatures';
-import surveyUnitIdbService from 'utils/indexedbb/services/surveyUnit-idb-service';
 import { useHistory } from 'react-router';
+import surveyUnitIdbService from 'utils/indexedbb/services/surveyUnit-idb-service';
+import QuestionnaireForm from './questionnaireForm';
 
 const Visualizer = () => {
   const { apiUrl, standalone } = useContext(AppContext);
@@ -18,16 +17,16 @@ const Visualizer = () => {
   const [error, setError] = useState(null);
   const [source, setSource] = useState(null);
 
-  const { questionnaireUrl, dataUrl, readonly } = useVisuQuery();
+  const { questionnaireUrl, dataUrl, nomenclatures, readonly } = useVisuQuery();
   const {
     surveyUnit: suData,
     questionnaire,
-    nomenclatures,
     loadingMessage,
     errorMessage,
   } = useRemoteData(questionnaireUrl, dataUrl);
 
-  const [suggesters, setSuggesters] = useState(null);
+  const { getReferentielForVizu } = useGetReferentiel(nomenclatures);
+
   const history = useHistory();
 
   useEffect(() => {
@@ -45,17 +44,15 @@ const Visualizer = () => {
   }, [suData]);
 
   useEffect(() => {
-    if (questionnaireUrl && questionnaire && suData && nomenclatures) {
+    if (questionnaireUrl && questionnaire && suData) {
       const { valid, error: questionnaireError } = checkQuestionnaire(questionnaire);
       if (valid) {
         setSource(questionnaire);
-        const suggestersBuilt = buildSuggesterFromNomenclatures(apiUrl)(nomenclatures);
-        setSuggesters(suggestersBuilt);
       } else {
         setError(questionnaireError);
       }
     }
-  }, [questionnaireUrl, questionnaire, suData, apiUrl, nomenclatures]);
+  }, [questionnaireUrl, questionnaire, suData, apiUrl]);
 
   useEffect(() => {
     if (errorMessage) setError(errorMessage);
@@ -85,11 +82,12 @@ const Visualizer = () => {
     <>
       {loadingMessage && <Preloader message={loadingMessage} />}
       {error && <Error message={error} />}
-      {questionnaireUrl && source && surveyUnit && suggesters && (
+      {questionnaireUrl && source && surveyUnit && (
         <LightOrchestrator
           surveyUnit={surveyUnit}
           source={source}
-          suggesters={suggesters}
+          autoSuggesterLoading={true}
+          getReferentiel={getReferentielForVizu}
           standalone={standalone}
           readonly={readonly}
           pagination={true}

diff --git a/queen-v2/src/utils/api/fetcher.js b/queen-v2/src/utils/api/fetcher.js
@@ -32,10 +32,10 @@ export const fetcher = async (url, token, method, body) => {
   }
 };
 
-export const getFetcherForLunatic = token => async (url, options) => {
+export const getFetcherForLunatic = token => (url, options) => {
   const otherHeader = options?.headers || {};
   return fetch(url, {
     ...options,
     headers: token ? { ...otherHeader, Authorization: `Bearer ${token}` } : otherHeader,
-  });
+  }).then(r => r.json());
 };