Skip to content

Commit

Permalink
Bumb/lunatic queen v2 (#91)
Browse files Browse the repository at this point in the history
* bumb: upgrade Lunatic version to 2.7.11

* feat: remove testing version (eno & lunatic)

* bumb: drama-queen-container to 1.3.21 and queenv2 to 1.1.9

* fix: build
  • Loading branch information
laurentC35 authored Dec 19, 2023
1 parent 8215a78 commit 360c8c3
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "drama-queen-container",
"private": true,
"version": "1.3.20",
"version": "1.3.21",
"workspaces": [
"drama-queen",
"queen-v2",
Expand Down
8 changes: 4 additions & 4 deletions queen-v2/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "queen-v2",
"version": "1.1.8",
"version": "1.1.9",
"description": "Web application for the management of questionnaires powered by Lunatic",
"repository": {
"type": "git",
Expand All @@ -12,7 +12,7 @@
"dependencies": {
"@axa-fr/react-oidc-context": "^3.1.6",
"@craco/craco": "7.0.0",
"@inseefr/lunatic": "^2.7.10",
"@inseefr/lunatic": "^2.7.11",
"@inseefr/trevas": "^0.1.16",
"@material-ui/core": "^4.11.3",
"@material-ui/icons": "^4.11.2",
Expand All @@ -38,9 +38,9 @@
"workbox-strategies": "^6.1.1"
},
"scripts": {
"prestart": "npx @inseefr/[email protected].6 workers",
"prestart": "npx @inseefr/[email protected].11 workers",
"start": "cross-env PORT=5002 craco start",
"prebuild": "npx @inseefr/[email protected].6 workers",
"prebuild": "npx @inseefr/[email protected].11 workers",
"build": "craco build && npm run post-build",
"post-build": "node ./configuration/build/build-sw.js && node ./configuration/build/manage-public-url.js && copy-and-watch configuration/files/* build",
"test": "craco test",
Expand Down
6 changes: 3 additions & 3 deletions queen-v2/src/utils/questionnaire/questionnaire.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const checkVersion = (actualVersion, expectedVersion) => {
}
};

// eslint-disable-next-line no-unused-vars
const checkVersions = ({ enoCoreVersion, lunaticModelVersion }) => {
const { valid: enoValid } = checkVersion(enoCoreVersion, MIN_ENO_CORE_VERSION);
const { valid: lunaticValid } = checkVersion(lunaticModelVersion, MIN_LUNATIC_MODEL_VERSION);
Expand All @@ -43,15 +44,14 @@ export const checkQuestionnaire = ({
pagination,
missingResponse,
}) => {
const { valid, error } = checkVersions({ enoCoreVersion, lunaticModelVersion });
const paginationValid = pagination === 'question';
const missingResponseValid = missingResponse || true; //remove "|| true" when Eno is ready (2.2.10)
const paginationError = paginationValid ? '' : `Pagination must be "question".`;
const missingResponseError = missingResponseValid ? '' : `Missing response must be true`;
if (!(valid && paginationValid && missingResponseValid)) {
if (paginationValid && missingResponseValid) {
return {
valid: false,
error: `Questionnaire is invalid : ${error || ''} ${paginationError} ${missingResponseError}`,
error: `Questionnaire is invalid : ${paginationError} ${missingResponseError}`,
};
}
return { valid: true };
Expand Down
12 changes: 6 additions & 6 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1983,13 +1983,13 @@
remove-accents "^0.4.2"
sass "^1.32.2"

"@inseefr/lunatic@^2.7.10":
version "2.7.10"
resolved "https://registry.yarnpkg.com/@inseefr/lunatic/-/lunatic-2.7.10.tgz#9cdf9bc5bb4e65a0e5d78edc28b10bfded388b6b"
integrity sha512-j01LrCYVjq1SKBE0+LPjpylSyiuzHjIj89U+hQLnmZD6qojA/h6+OCFv7oKCVWiXJJimSBpAIWpKrF80M5JQWQ==
"@inseefr/lunatic@^2.7.11":
version "2.7.11"
resolved "https://registry.yarnpkg.com/@inseefr/lunatic/-/lunatic-2.7.11.tgz#a7f8cedd7e3030dd2c8c9b9c205103b8a8db047e"
integrity sha512-zPwdvcjfKfXi1bFOBmDwXFp36m2KGfD7z7Xg6bpABHnDzuFpC5/oLQ7di4y3uYv7A0dZmo++0EceLeCXg/ErdA==
dependencies:
"@inseefr/trevas" "^0.1.20"
"@inseefr/vtl-2.0-antlr-tools" "^0.1.0-bundle"
"@inseefr/vtl-2.0-antlr-tools" "^0.1.0"
antlr4 "4.11.0"
classnames "^2.3.1"
date-fns "^2.25.0"
Expand Down Expand Up @@ -2027,7 +2027,7 @@
data-forge "^1.8.8"
date-fns "^2.27.0"

"@inseefr/[email protected]", "@inseefr/vtl-2.0-antlr-tools@^0.1.0-bundle":
"@inseefr/[email protected]", "@inseefr/vtl-2.0-antlr-tools@^0.1.0":
version "0.1.0"
resolved "https://registry.yarnpkg.com/@inseefr/vtl-2.0-antlr-tools/-/vtl-2.0-antlr-tools-0.1.0.tgz#5c2d13621b4cab0a092b45d9edd64d8062f348d9"
integrity sha512-VgNDBE9dqtPFnlk8nCcFD0/dEcuzlhUd5RWsf+dlRsbjSb2wZZhwL8BKCopfLWKLSkTdPyRaosIVL1neiOAB2A==
Expand Down

0 comments on commit 360c8c3

Please sign in to comment.