project-booster-vue 9.19.1 → 9.19.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "project-booster-vue",
-  "version": "9.19.1",
+  "version": "9.19.4",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/components/projects/project-item-save/PbProjectItemSave.vue

@@ -100,19 +100,18 @@ export const answerGettersMappers: Map<string, (param: any) => void> = new Map<s
   }),
 );
 
-function adaptAnswers(answers: Record<string, ScenarioStepAnswer[]>, scenario: Scenario) {
+function adaptAnswers(answers: Map<string, ScenarioStepAnswer[]>, scenario: Record<string, any>) {
   let adaptedAnswers: ScenarioAnswer[] = [];
 
   if (answers) {
-    adaptedAnswers = Object.entries(answers)
-      .filter(([code]) => !['PbRestitution'].includes(scenario?.get(code)?.component ?? ''))
-      .filter(([code]) => code !== 'SUBPROJECT_FORM_ID')
-      .map(([questionId, answerData]) => ({
-        questionId,
-        answers: answerData.map(
-          answerGettersMappers.get(scenario?.get(questionId)?.component ?? '') ?? (() => undefined),
-        ),
-      }));
+    answers.forEach((value: ScenarioStepAnswer[], key: string) => {
+      if (!['PbRestitution'].includes(scenario[key]?.component ?? '') && key !== 'SUBPROJECT_FORM_ID') {
+        adaptedAnswers.push({
+          questionId: key,
+          answers: value.map(answerGettersMappers.get(scenario[key]?.component ?? '') ?? (() => undefined)),
+        });
+      }
+    });
   }
 
   return adaptedAnswers;

package/src/components/question/PbQuestion-Features-Answers-Conditional.stories.mdx

@@ -75,7 +75,7 @@ export const conditionalAnswersPayload = {
 <Source language="json" code={JSON.stringify(conditionalAnswersPayload, null, '  ')} />
 
 Here, the answer `ANSWER-1` will be hidden because no previous answers are provided (same as answers not matching the
-condition):
+condition), `ANSWER-2` will be hidden because of the condition on runtime options :
 
 <Canvas>
   <Story
@@ -116,7 +116,7 @@ Runtime options:
     parameters={{ controls: { disable: true } }}
     args={{
       payload: conditionalAnswersPayload,
-      answers: conditionalAnswersAnswers,
+      answers: new Map(Object.entries(conditionalAnswersAnswers)),
       runtimeOptions: conditionalAnswersRuntimeOptions,
       minHeight: 'auto',
     }}

package/src/components/question/PbQuestion-Features-Answers-Decorated.stories.mdx

@@ -100,7 +100,7 @@ Runtime options:
     parameters={{ controls: { disable: true } }}
     args={{
       payload: decoratedAnswersPayload,
-      answers: decoratedAnswersAnswers,
+      answers: new Map(Object.entries(decoratedAnswersAnswers)),
       runtimeOptions: decoratedAnswersRuntimeOptions,
       minHeight: 'auto',
     }}

package/src/components/question/PbQuestion-Features-Answers-Disabled.stories.mdx

@@ -103,7 +103,7 @@ export const disabledAnswersAnswers = {
     parameters={{ controls: { disable: true } }}
     args={{
       payload: disabledAnswersPayload,
-      answers: disabledAnswersAnswers,
+      answers: new Map(Object.entries(disabledAnswersAnswers)),
       minHeight: 'auto',
     }}
   >
@@ -120,7 +120,7 @@ condition):
     inline={false}
     height="862px"
     parameters={{ controls: { disable: true } }}
-    args={{ payload: disabledAnswersPayload, minHeight: 'auto' }}
+    args={{ payload: disabledAnswersPayload, answers: new Map(), minHeight: 'auto' }}
   >
     {TemplateSandbox.bind({})}
   </Story>

package/src/components/question/PbQuestion-Features-Question-Footer.stories.mdx

@@ -93,7 +93,7 @@ export const questionFooterAnswers = {
     parameters={{ controls: { disable: true } }}
     args={{
       payload: questionFooterPayload,
-      answers: questionFooterAnswers,
+      answers: new Map(Object.entries(questionFooterAnswers)),
       minHeight: 'auto',
     }}
   >

package/src/components/question/PbQuestion.vue

@@ -318,6 +318,7 @@ import {
   ScenarioStepPayload,
   ScenarioStepSkippableOptions,
   ScenarioStepViewModel,
+  ScenarioCondition,
 } from '@/types/pb/Scenario';
 
 const BACK_ICON =
@@ -553,10 +554,18 @@ export default defineComponent({
       return viewModel.footer && areConditionsValid(viewModel.footer.conditions!, this.answers, this.runtimeOptions);
     },
     isAnswerDisabled(answer: ScenarioStepAnswer) {
-      return (
-        answer?.viewModel?.disabled &&
-        areConditionsValid(answer.viewModel.conditions!, this.answers, this.runtimeOptions)
-      );
+      if (answer.viewModel?.disabled instanceof Boolean) {
+        return answer.viewModel.disabled;
+      } else {
+        return (
+          answer?.viewModel?.disabled &&
+          areConditionsValid(
+            (<ScenarioCondition>answer.viewModel.disabled).conditions,
+            this.answers,
+            this.runtimeOptions,
+          )
+        );
+      }
     },
     selectAnswer(stepCode: string, answer: ScenarioStepAnswer) {
       if (this.isAnswerDisabled(answer)) {

package/src/components/question/amount-input/PbAmountInput.vue

@@ -55,7 +55,6 @@ import { useForm } from 'vee-validate';
 import * as yup from 'yup';
 import cloneDeep from 'lodash.clonedeep';
 import merge from 'lodash.merge';
-import objectPath from 'object-path';
 import MFlex from './../../mozaic/flex/MFlex.vue';
 import MButton from './../../mozaic/buttons/MButton.vue';
 import MIcon from './../../mozaic/icon/MIcon.vue';

package/src/components/question/dimensions-input/PbDimensionsInput.stories.mdx

@@ -153,16 +153,14 @@ parameter is the answer's id, the second is an optional path to extract a specif
 It will try to find a value in a previous answer for a question with id `LMFR_PREVIOUS_QUESTION`,
 provided thanks to the `answers` prop. If no value is found, it will use the `defaultDecoratorValue` as a fallback.
 
-export const previousAnswers = new Map(
-  Object.entries({
-    LMFR_PREVIOUS_QUESTION: [
-      {
-        pathForLength: '4.56',
-        pathForWidth: '7.89',
-      },
-    ],
-  }),
-);
+export const previousAnswers = {
+  LMFR_PREVIOUS_QUESTION: [
+    {
+      pathForLength: '4.56',
+      pathForWidth: '7.89',
+    },
+  ],
+};
 
 <Source language="json" code={JSON.stringify(previousAnswers, null, '  ')} />
 
@@ -172,7 +170,7 @@ export const previousAnswers = new Map(
     parameters={{ controls: { disable: true } }}
     args={{
       payload: valuePayload,
-      answers: previousAnswers,
+      answers: new Map(Object.entries(previousAnswers)),
     }}
   >
     {TemplateSandbox.bind({})}

package/src/components/question/dimensions-input/PbDimensionsInput.vue

@@ -98,7 +98,6 @@ import MTextInput from './../../mozaic/text-input/MTextInput.vue';
 import DEFAULT_PAYLOAD from './default-payload.json';
 import MLink from '../../mozaic/link/MLink.vue';
 import MIcon from '../../mozaic/icon/MIcon.vue';
-import objectPath from 'object-path';
 import { ref } from 'vue';
 import { ScenarioStepAnswer } from '@/types/pb/Scenario';
 import { DimensionsInputPayload } from '@/components/question/dimensions-input/DimensionsInput';
@@ -156,13 +155,13 @@ const computeDefaultValue = (
       answers,
       runtimeOptions,
       computedPayload?.value?.value?.length,
-      computedPayload?.value?.defaultDecoratorValue,
+      computedPayload?.value?.defaultDecoratorValue ?? '',
     );
     width.value = decorate(
       answers,
       runtimeOptions,
       computedPayload?.value?.value?.width,
-      computedPayload?.value?.defaultDecoratorValue,
+      computedPayload?.value?.defaultDecoratorValue ?? '',
     );
   }
 
@@ -243,8 +242,8 @@ export default defineComponent({
       emit(props.completedEventName, {
         answers: [
           {
-            width: values[elementLengthId],
-            length: values[elementWidthId],
+            length: values[elementLengthId],
+            width: values[elementWidthId],
           },
         ],
       });

package/src/components/question/login-redirect/PbLoginRedirect.stories.mdx

@@ -160,7 +160,7 @@ export const overridenLabelsPayload = {
     buttonLabelConnect: 'Se connecter',
     buttonLabelCreateAccount: 'Créer un compte',
     forceRedirect: false,
-    link: '/espace-perso/espace-projets.html?hash=/projects/new',
+    link: '/espace-perso/espace-projets.html',
   },
 };
 

package/src/components/question/name-input/PbNameInput.stories.mdx

@@ -220,16 +220,14 @@ With optin value :
 
 `answers` prop to add a previous answer :
 
-export const previousAnswersWithOptin = new Map(
-  Object.entries({
-    LMFR_PREVIOUS_QUESTION: [
-      {
-        pathForProjectName: 'Rénover la cuisine',
-        pathForOptin: true,
-      },
-    ],
-  }),
-);
+export const previousAnswersWithOptin = {
+  LMFR_PREVIOUS_QUESTION: [
+    {
+      pathForProjectName: 'Rénover la cuisine',
+      pathForOptin: true,
+    },
+  ],
+};
 
 <Source language="json" code={JSON.stringify(previousAnswersWithOptin, null, '  ')} />
 
@@ -239,7 +237,7 @@ export const previousAnswersWithOptin = new Map(
     parameters={{ controls: { disable: true } }}
     args={{
       payload: valuePayload,
-      answers: previousAnswersWithOptin,
+      answers: new Map(Object.entries(previousAnswersWithOptin)),
       runtimeOptions: runtimeOptions,
     }}
   >

package/src/components/question/name-input/PbNameInput.vue

@@ -52,7 +52,6 @@ import { useForm } from 'vee-validate';
 import * as yup from 'yup';
 import cloneDeep from 'lodash.clonedeep';
 import merge from 'lodash.merge';
-import objectPath from 'object-path';
 import MFlex from '../../mozaic/flex/MFlex.vue';
 import MButton from '../../mozaic/buttons/MButton.vue';
 import MLink from '../../mozaic/link/MLink.vue';
@@ -99,13 +98,13 @@ const computeDefaultValue = (
       answers,
       runtimeOptions,
       computedPayload?.value?.value?.projectName,
-      computedPayload?.value?.defaultDecoratorValue,
+      computedPayload?.value?.defaultDecoratorValue ?? '',
     );
     optin.value = decorate(
       answers,
       runtimeOptions,
       computedPayload?.value?.value?.optin,
-      computedPayload?.value?.defaultDecoratorValue,
+      computedPayload?.value?.defaultDecoratorValue ?? '',
     );
   }
 

package/src/components/question/space-input/PbSpaceInput.stories.mdx

@@ -129,7 +129,7 @@ export const valuePayload = {
 <Source language="json" code={JSON.stringify(valuePayload, null, '  ')} />
 
 The `getAnswerValue` function allows to retrieve a value from one provided answer. To retrieve a value, the first
-parameter is the answer Id, the second is an optionnal path to extract a spcific value.
+parameter is the answer Id, the second is an optional path to extract a specific value.
 
 A `defaultDecoratorValue` value can be added as a fallback when no previous answer is found. When no default value is provided and no answer
 is found, the component value will be empty :
@@ -148,15 +148,13 @@ export const valueWithFallbackPayload = {
 It will try to find a value in a previous answer for a question with id `LMFR_PREVIOUS_QUESTION`,
 provided thanks to the `answers` prop. If no value is found, it will use the `defaultDecoratorValue` as a fallback.
 
-export const previousAnswers = new Map(
-  Object.entries({
-    LMFR_PREVIOUS_QUESTION: [
-      {
-        pathForSpace: '456',
-      },
-    ],
-  }),
-);
+export const previousAnswers = {
+  LMFR_PREVIOUS_QUESTION: [
+    {
+      pathForSpace: '456',
+    },
+  ],
+};
 
 <Source language="json" code={JSON.stringify(previousAnswers, null, '  ')} />
 
@@ -166,7 +164,7 @@ export const previousAnswers = new Map(
     parameters={{ controls: { disable: true } }}
     args={{
       payload: valuePayload,
-      answers: previousAnswers,
+      answers: new Map(Object.entries(previousAnswers)),
     }}
   >
     {TemplateSandbox.bind({})}

package/src/components/question/space-input/PbSpaceInput.vue

@@ -87,7 +87,6 @@ import { useForm } from 'vee-validate';
 import * as yup from 'yup';
 import cloneDeep from 'lodash.clonedeep';
 import merge from 'lodash.merge';
-import objectPath from 'object-path';
 import MFlex from '../../mozaic/flex/MFlex.vue';
 import MButton from '../../mozaic/buttons/MButton.vue';
 import MLink from '../../mozaic/link/MLink.vue';
@@ -130,7 +129,7 @@ const computeDefaultValue = (
       answers,
       runtimeOptions,
       computedPayload?.value?.value?.space,
-      computedPayload?.value?.defaultDecoratorValue,
+      computedPayload?.value?.defaultDecoratorValue ?? '',
     );
   }
   return space;

package/src/services/scenarioConditionals.ts

@@ -33,13 +33,13 @@ const Condition = (
 };
 
 export const areConditionsValid = (
-  conditions: string[],
+  conditions: boolean | string[],
   answers: Map<string, ScenarioStepAnswer[]>,
   runtimeOptions: Record<string, any>,
 ) => {
   let valid = true;
 
-  if (conditions) {
+  if (conditions && conditions instanceof Array) {
     valid = false;
     for (const condition of conditions) {
       try {

package/src/types/pb/Scenario.ts

@@ -37,6 +37,10 @@ export interface ScenarioStepAnswerDialog {
   imageUrl?: string;
 }
 
+export interface ScenarioCondition {
+  conditions: string[];
+}
+
 export interface ScenarioStepAnswerViewModel {
   title?: string;
   flagLabel?: string;
@@ -47,7 +51,7 @@ export interface ScenarioStepAnswerViewModel {
   alignVertical?: string;
   alignHorizontal?: string;
   alignText?: string;
-  disabled?: boolean;
+  disabled?: boolean | ScenarioCondition;
   footer?: ScenarioStepFooterOptions;
   conditions?: string[];
   dialog?: ScenarioStepAnswerDialog;
@@ -62,6 +66,11 @@ export interface ScenarioStepAnswer {
   meta?: {
     order: number;
     stringSort: string;
+    ProjectTypeLabel?: string;
+    domesticSpace?: string;
+    projectType?: string;
+    ranking?: number;
+    projectKind?: string;
   };
 }