project-booster-vue 9.19.0 → 9.19.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "project-booster-vue",
-  "version": "9.19.0",
+  "version": "9.19.3",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -45,7 +45,6 @@
     "core-js": "3.21.1",
     "date-fns": "2.22.1",
     "firebase": "8.6.7",
-    "he": "1.2.0",
     "hooper": "nicoinch/hooper#1.0.5",
     "lodash.clonedeep": "4.5.0",
     "lodash.debounce": "4.0.8",

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/api/appointmentQualificationsApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({
   baseURL: '/project-booster/api',
@@ -41,7 +41,7 @@ const saveAnswersByAppointmentQualificationId = async (appointmentQualificationI
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -53,7 +53,7 @@ const declarationsWithAppointment = async (data: any) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -65,7 +65,7 @@ const declarationsWithoutAppointment = async (data: any) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -81,7 +81,7 @@ const linkInhabitantProjectToAppointmentQualification = async (data: any, inhabi
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/configApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({
   baseURL: '/project-booster/api',
@@ -23,7 +23,7 @@ const getConfiguration = async () => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/configurationsApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({
   baseURL: '/project-booster/api',
@@ -39,7 +39,7 @@ const getProjectConfigurationsForProjectType = async (
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -56,7 +56,7 @@ const getAllProjectConfigurations = async (inhabitantProjectId: string, forceNoP
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -66,7 +66,7 @@ const linkConfiguration = async (id: string, inhabitantProjectId: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/consentApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({
   baseURL: '/project-booster/api',
@@ -23,7 +23,7 @@ export const getConsents = async () => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/documentsApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({
   baseURL: '/project-booster/api',
@@ -53,7 +53,7 @@ const getDocumentsByInhabitantProjectId = async (
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -63,7 +63,7 @@ const getDocumentById = async (inhabitantProjectId: string, documentId: string)
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/estimatesApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 import { Estimate } from '@/types/pb/Estimate';
 import { ScenarioAnswer } from '@/types/pb/Scenario';
 
@@ -31,7 +31,7 @@ export const getAllEstimates = async (
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -41,7 +41,7 @@ export const getEstimateById = async (id: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -51,7 +51,7 @@ export const deleteEstimateById = async (id: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -65,7 +65,7 @@ export const saveEstimate = async (estimate: Estimate) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -80,7 +80,7 @@ export const estimate = async (
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/eventsApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({
   baseURL: '/project-booster/api',
@@ -25,7 +25,7 @@ export const buildEventApi = (target: string) => async (event: any) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -37,7 +37,7 @@ export const sendAppointmentQualificationEvent = async (event: any) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -49,7 +49,7 @@ export const sendAppointmentQualificationAnswers = async (event: any) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -76,7 +76,7 @@ export const sendDocumentsEvent = async (event: {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -100,7 +100,7 @@ export const sendMediaEvent = async (event: {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -112,7 +112,7 @@ export const sendCardClickEvent = async (event: any) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -124,7 +124,7 @@ export const sendDeclarationEvent = async (event: any) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -136,7 +136,7 @@ export const sendSimulationEvent = async (event: any) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/inhabitantsApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({
   baseURL: '/project-booster/api',
@@ -23,7 +23,7 @@ export const getInhabitantById = async (inhabitantId: string, buId = '001') => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/mediaApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({
   baseURL: '/project-booster/api',
@@ -23,7 +23,7 @@ const getAllMedia = async (start: number, end: number, inhabitantProjectId: stri
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -33,7 +33,7 @@ const getMediumById = async (mediumId: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/productsApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({
   baseURL: '/project-booster/api',
@@ -24,7 +24,7 @@ export const getWorkKindsByProjectTypeId = async (projectTypeId: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -34,7 +34,7 @@ export const getProductsByWorkKind = async (workKindId: string, storeId: string)
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -44,7 +44,7 @@ export const getProductsFeatureFlag = async (projectTypeId: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -56,7 +56,7 @@ export const saveWorkKinds = async (inhabitantProjectId: string, workKinds: any)
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -66,7 +66,7 @@ export const getWorkKindsByProjectId = async (inhabitantProjectId: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/projectsApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 import { Project, ProjectToSave } from '@/types/pb/Project';
 
 export const clientApi = axios.create({
@@ -26,7 +26,7 @@ export const getAllProjects = async (currentProjectsPage: number, projectsPerPag
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -42,7 +42,7 @@ export const getAllProjectsForUserId = async (
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -52,7 +52,7 @@ export const getProjectById = async (id: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -62,7 +62,7 @@ export const deleteProjectById = async (id: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -81,7 +81,7 @@ export const saveProjectDeclaration = async (projectDeclaration: ProjectToSave)
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -91,7 +91,7 @@ export const getProjectAttributesById = async (id: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };
@@ -101,7 +101,7 @@ export const getAppointmentById = async (id: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/api/toolsApi.ts

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import he from 'he';
+import { escape } from '../../services/htmlEscape';
 
 export const clientApi = axios.create({});
 
@@ -17,7 +17,7 @@ export const getAllTools = async (projectType: string) => {
 
   return JSON.parse(
     JSON.stringify(response.data).replace(/:"([^"]+)"/g, (match, $1) => {
-      return `: "${he.escape($1)}"`;
+      return `: "${escape($1)}"`;
     }),
   );
 };

package/src/services/htmlEscape.ts

@@ -0,0 +1,27 @@
+// Issue with kobi rewriting the lib we extract the part that we need here
+
+const regexEscape: RegExp = /["&'<>`]/g;
+
+const escapeMap: Record<string, string> = {
+  '"': '&quot;',
+  '&': '&amp;',
+  "'": '&#x27;',
+  '<': '&lt;',
+  // See https://mathiasbynens.be/notes/ambiguous-ampersands: in HTML, the
+  // following is not strictly necessary unless it’s part of a tag or an
+  // unquoted attribute value. We’re only escaping it to support those
+  // situations, and for XML support.
+  '>': '&gt;',
+  // In Internet Explorer ≤ 8, the backtick character can be used
+  // to break out of (un)quoted attribute values or HTML comments.
+  // See http://html5sec.org/#102, http://html5sec.org/#108, and
+  // http://html5sec.org/#133.
+  '`': '&#x60;',
+};
+
+export const escape = (string: string) => {
+  return string.replace(regexEscape, function ($0) {
+    // Note: there is no need to check `has(escapeMap, $0)` here.
+    return escapeMap[$0];
+  });
+};

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;
   };
 }