project-booster-vue 9.19.1 → 9.19.2

package/package.json

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

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/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/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/space-input/PbSpaceInput.stories.mdx

@@ -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/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;