project-booster-vue 9.17.2 → 9.18.0

package/package.json

@@ -1,12 +1,14 @@
 {
   "name": "project-booster-vue",
-  "version": "9.17.2",
+  "version": "9.18.0",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",
     "test:unit": "vue-cli-service test:unit --forceExit --detectOpenHandles",
     "kozikaza-tokens-build": "env PB_THEME=kozikaza mozaic-tokens-build",
-    "lint:js": "vue-cli-service lint --no-fix -- ./",
+    "check-types": "vue-tsc --noemit",
+    "eslint": "eslint",
+    "lint:js": "yarn eslint && npm run check-types",
     "lint:js:fix": "vue-cli-service lint --fix -- ./",
     "lint:style": "stylelint '**/*.vue' '**/*.scss'",
     "lint:style:fix": "stylelint '**/*.vue' '**/*.scss' --fix",
@@ -118,13 +120,13 @@
     "@typescript-eslint/eslint-plugin": "4.18.0",
     "@typescript-eslint/parser": "4.18.0",
     "@vue/babel-preset-app": "4.5.13",
-    "@vue/compat": "3.2.6",
     "@vue/cli": "5.0.4",
     "@vue/cli-plugin-babel": "5.0.4",
     "@vue/cli-plugin-eslint": "5.0.4",
     "@vue/cli-plugin-typescript": "5.0.4",
     "@vue/cli-plugin-unit-jest": "4.5.16",
     "@vue/cli-service": "5.0.4",
+    "@vue/compat": "3.2.6",
     "@vue/compiler-sfc": "3.2.31",
     "@vue/eslint-config-prettier": "6.0.0",
     "@vue/eslint-config-standard": "6.0.0",
@@ -174,7 +176,8 @@
     "tsconfig-paths-webpack-plugin": "3.5.2",
     "typescript": "4.1.6",
     "vue-jest": "5.0.0-alpha.10",
-    "vue-loader": "17.0.0"
+    "vue-loader": "17.0.0",
+    "vue-tsc": "0.34.13"
   },
   "eslintConfig": {
     "fix": false,

package/src/components/projects/project-hub/PbProjectHub.vue

@@ -186,7 +186,10 @@
               </div>
             </m-flex>
             <m-flex
-              v-if="isEstimatesDisplayed"
+              v-if="
+                isEstimatesDisplayed &&
+                (isLoadingEstimates || estimatesLoadError || (estimates && estimates.length > 0))
+              "
               class="pb-project-hub__section"
               direction="column"
               full-width

package/src/components/question/PbQuestion.vue

@@ -682,7 +682,7 @@ export default defineComponent({
     },
     navigateTo(viewModel: ScenarioStepViewModel) {
       if (viewModel.backLink) {
-        window.location = decorate(this.answers, this.runtimeOptions, viewModel.backLink, '');
+        (<any>window).location = decorate(this.answers, this.runtimeOptions, viewModel.backLink, '');
       } else {
         /**
          * Emitted when go back link is clicked

package/src/components/question/configurations-import/PbConfigurationsImport.vue

@@ -256,7 +256,7 @@ export default defineComponent({
 
     const navigateTo = (viewModel: ConfigurationsImportViewModel) => {
       if (viewModel.backLink) {
-        window.location = decorate(props.answers, props.runtimeOptions, viewModel.backLink);
+        (<any>window).location = decorate(props.answers, props.runtimeOptions, viewModel.backLink);
       } else {
         /**
          * Emitted when go back link is clicked

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

@@ -86,7 +86,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, computed, onMounted, ComputedRef, PropType } from 'vue';
+import { defineComponent, computed, onMounted, ComputedRef, PropType, Ref } from 'vue';
 import { v4 as uuidv4 } from 'uuid';
 import cloneDeep from 'lodash.clonedeep';
 import merge from 'lodash.merge';
@@ -117,13 +117,13 @@ const initValidation = (componentId: string, computedPayload: ComputedRef<Dimens
       [`text-input-length-${componentId}`]: yup
         .number()
         .typeError(validation.requiredErrorMessage ?? 'Veuillez remplir ce champ')
-        .required(validation.requiredErrorMessage ?? 'Veuillez remplir ce champ')
+        .required()
         .min(
           (validation.lengthMinValue ?? 0) + (!validation.thresholdsIncluded ? 0.1 : 0) ?? 0,
           validation.lengthMinErrorMessage ?? 'Veuillez saisir un nombre plus grand que ${min}',
         )
         .max(
-          (validation.lengthMinValue ?? 1000000000) - (!validation.thresholdsIncluded ? 0.1 : 0) ?? 1000000000,
+          (validation.lengthMaxValue ?? 1000000000) - (!validation.thresholdsIncluded ? 0.1 : 0) ?? 1000000000,
           validation.lengthMaxErrorMessage ?? 'Veuillez saisir un nombre plus petit que ${max}',
         ),
       [`text-input-width-${componentId}`]: yup
@@ -148,8 +148,8 @@ const computeDefaultValue = (
   answers: Map<string, ScenarioStepAnswer[]>,
   computedPayload: ComputedRef<DimensionsInputPayload>,
 ) => {
-  let length = ref(null);
-  let width = ref(null);
+  const length: Ref<string | undefined> = ref(undefined);
+  const width: Ref<string | undefined> = ref(undefined);
 
   if (computedPayload?.value?.value) {
     length.value = decorate(

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

@@ -45,7 +45,7 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, computed, ref, onMounted, ComputedRef, PropType } from 'vue';
+import { defineComponent, computed, ref, onMounted, ComputedRef, PropType, Ref } from 'vue';
 import { v4 as uuidv4 } from 'uuid';
 import { useStore } from 'vuex';
 import { useForm } from 'vee-validate';
@@ -91,8 +91,8 @@ const computeDefaultValue = (
   answers: Map<string, ScenarioStepAnswer[]>,
   computedPayload: ComputedRef<NameInputPayload>,
 ) => {
-  let name = ref(null);
-  let optin = ref(null);
+  let name: Ref<string | undefined> = ref(undefined);
+  let optin: Ref<string | undefined> = ref(undefined);
 
   if (computedPayload?.value?.value) {
     name.value = decorate(

package/src/components/scenario/PbScenario-Demo-Project.stories.js

@@ -16,135 +16,84 @@ export default {
   parameters: { storyshots: { disable: true }, layout: 'fullscreen' },
 };
 
-const generateStory = (jsonLocation) => () => ({
-  components: {
-    PbScenario,
-  },
-  props: {
-    runtimeOptions: {
-      type: Object,
-      default: () => object('Runtime options', { projectMode: true }),
+const generateStory =
+  (jsonLocation, headers = {}) =>
+  () => ({
+    components: {
+      PbScenario,
     },
-  },
-  setup() {
-    const store = useStore();
-    store.dispatch('documentsPlans/updateContext', { type: 'DOCUMENT', subType: 'PLAN' });
-    store.dispatch('documentsPictures/updateContext', { type: 'DOCUMENT', subType: 'PHOTO' });
-    store.dispatch('estimates/setSummary', {
-      cost: {},
-    });
-    const scenarios = ref(null);
-    const hasScenario = ref(false);
-    axios.get(jsonLocation).then((result) => {
-      scenarios.value = result.data.scenario ?? result.data;
-      hasScenario.value = true;
-    });
-    const handleScenarioEvent = (event) => {
-      console.log('Event', event);
-    };
-    return {
-      scenarios,
-      hasScenario,
-      handleScenarioEvent,
-    };
-  },
-  // eslint-disable-next-line
-  template:
-    '<pb-scenario v-if="hasScenario" :scenarios="scenarios" :runtime-options="runtimeOptions" @scenario-event="handleScenarioEvent" />',
-});
-
-export const estimateNewConstructionProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-subproject-forms/forms/6e3e9d6d-a019-4c1c-8d25-002a4ebfcb46.json',
-);
-export const estimateDressingProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-subproject-forms/forms/10df6aa4-4ae0-41a0-93e3-dc66eb9d39c8.json',
-);
-export const estimateBookcaseProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-subproject-forms/forms/88d96e4c-685b-4275-8eae-f50828fe4755.json',
-);
-export const estimateKitchenProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-subproject-forms/forms/068160b2-b28a-46fa-8fd6-4775450fa7b4.json',
-);
-export const estimateInsulationProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-subproject-forms/forms/60100496-92ea-49ab-8a43-c08afa57cd60.json',
-);
-export const estimateTvProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-subproject-forms/forms/dc5370cf-0761-43a0-8309-ced76be08d8b.json',
-);
-export const estimateStorageProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-subproject-forms/forms/e39126db-03f7-4b07-975a-97b4cf603ef1.json',
-);
-export const estimateHeatingProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-subproject-forms/forms/eaba8264-620d-475e-830f-89166b49a667.json',
-);
-export const estimateBathroomProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-subproject-forms/forms/c9c4df50-cbcb-4265-b9a7-6645d3adb03b.json',
-);
-export const estimateFloorProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-subproject-forms/forms/LMFR_FLOOR.json',
-);
-
-export const projectDeclarationGenericProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-project-declaration-forms/forms/project-declaration-generic-generated.json',
-);
-export const projectDeclarationBlindProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-project-declaration-forms/forms/project-declaration-blind-generated.json',
-);
-export const projectDeclarationCanopyProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-project-declaration-forms/forms/project-declaration-canopy-generated.json',
-);
-export const projectDeclarationCoolingProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-project-declaration-forms/forms/project-declaration-cooling-generated.json',
-);
-export const projectDeclarationFrontDoorProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-project-declaration-forms/forms/project-declaration-front-door-generated.json',
-);
-export const projectDeclarationGarageDoorProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-project-declaration-forms/forms/project-declaration-garage-door-generated.json',
-);
-export const projectDeclarationKitchenProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-project-declaration-forms/forms/project-declaration-kitchen-generated.json',
-);
-export const projectDeclarationShutterProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-project-declaration-forms/forms/project-declaration-shutter-generated.json',
-);
-export const projectDeclarationWindowProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-project-declaration-forms/forms/project-declaration-window-generated.json',
-);
-
-export const appointmentKitchenProd = generateStory(
-  'https://storage.googleapis.com/pb-prod-adeo-disp-subproject-forms/forms/appointment-qualification-kitchen.json',
-);
+    props: {
+      runtimeOptions: {
+        type: Object,
+        default: () => object('Runtime options', { projectMode: true }),
+      },
+    },
+    setup() {
+      const store = useStore();
+      store.dispatch('documentsPlans/updateContext', { type: 'DOCUMENT', subType: 'PLAN' });
+      store.dispatch('documentsPictures/updateContext', { type: 'DOCUMENT', subType: 'PHOTO' });
+      store.dispatch('estimates/setSummary', {
+        cost: {},
+      });
+      const scenarios = ref(null);
+      const hasScenario = ref(false);
+      axios.get(jsonLocation, { headers }).then((result) => {
+        scenarios.value = result.data.scenario ?? result.data;
+        hasScenario.value = true;
+      });
+      const handleScenarioEvent = (event) => {
+        console.log('Event', event);
+      };
+      return {
+        scenarios,
+        hasScenario,
+        handleScenarioEvent,
+      };
+    },
+    // eslint-disable-next-line
+    template:
+      '<pb-scenario v-if="hasScenario" :scenarios="scenarios" :runtime-options="runtimeOptions" @scenario-event="handleScenarioEvent" />',
+  });
 
 export const estimateNewConstructionPrep = generateStory(
-  'https://storage.googleapis.com/pb-preprod-adeo-disp-subproject-forms/forms/6e3e9d6d-a019-4c1c-8d25-002a4ebfcb46.json',
+  'https://api-prep.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/6e3e9d6d-a019-4c1c-8d25-002a4ebfcb46',
+  { 'X-gateway-apikey': 'nII0D8gvbudmDONHRJo0wbYKJAytn97x' },
 );
 export const estimateDressingPrep = generateStory(
-  'https://storage.googleapis.com/pb-preprod-adeo-disp-subproject-forms/forms/10df6aa4-4ae0-41a0-93e3-dc66eb9d39c8.json',
+  'https://api-prep.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/10df6aa4-4ae0-41a0-93e3-dc66eb9d39c8',
+  { 'X-gateway-apikey': 'nII0D8gvbudmDONHRJo0wbYKJAytn97x' },
 );
 export const estimateBookcasePrep = generateStory(
-  'https://storage.googleapis.com/pb-preprod-adeo-disp-subproject-forms/forms/88d96e4c-685b-4275-8eae-f50828fe4755.json',
+  'https://api-prep.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/88d96e4c-685b-4275-8eae-f50828fe4755',
+  { 'X-gateway-apikey': 'nII0D8gvbudmDONHRJo0wbYKJAytn97x' },
 );
 export const estimateKitchenPrep = generateStory(
-  'https://storage.googleapis.com/pb-preprod-adeo-disp-subproject-forms/forms/068160b2-b28a-46fa-8fd6-4775450fa7b4.json',
+  'https://api-prep.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/068160b2-b28a-46fa-8fd6-4775450fa7b4',
+  { 'X-gateway-apikey': 'nII0D8gvbudmDONHRJo0wbYKJAytn97x' },
 );
 export const estimateInsulationPrep = generateStory(
-  'https://storage.googleapis.com/pb-preprod-adeo-disp-subproject-forms/forms/60100496-92ea-49ab-8a43-c08afa57cd60.json',
+  'https://api-prep.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/60100496-92ea-49ab-8a43-c08afa57cd60',
+  { 'X-gateway-apikey': 'nII0D8gvbudmDONHRJo0wbYKJAytn97x' },
 );
 export const estimateTvPrep = generateStory(
-  'https://storage.googleapis.com/pb-preprod-adeo-disp-subproject-forms/forms/dc5370cf-0761-43a0-8309-ced76be08d8b.json',
+  'https://api-prep.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/dc5370cf-0761-43a0-8309-ced76be08d8b',
+  { 'X-gateway-apikey': 'nII0D8gvbudmDONHRJo0wbYKJAytn97x' },
 );
 export const estimateStoragePrep = generateStory(
-  'https://storage.googleapis.com/pb-preprod-adeo-disp-subproject-forms/forms/e39126db-03f7-4b07-975a-97b4cf603ef1.json',
+  'https://api-prep.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/e39126db-03f7-4b07-975a-97b4cf603ef1',
+  { 'X-gateway-apikey': 'nII0D8gvbudmDONHRJo0wbYKJAytn97x' },
 );
 export const estimateHeatingPrep = generateStory(
-  'https://storage.googleapis.com/pb-preprod-adeo-disp-subproject-forms/forms/eaba8264-620d-475e-830f-89166b49a667.json',
+  'https://api-prep.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/eaba8264-620d-475e-830f-89166b49a667',
+  { 'X-gateway-apikey': 'nII0D8gvbudmDONHRJo0wbYKJAytn97x' },
 );
 export const estimateBathroomPrep = generateStory(
-  'https://storage.googleapis.com/pb-preprod-adeo-disp-subproject-forms/forms/c9c4df50-cbcb-4265-b9a7-6645d3adb03b.json',
+  'https://api-prep.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/c9c4df50-cbcb-4265-b9a7-6645d3adb03b',
+  { 'X-gateway-apikey': 'nII0D8gvbudmDONHRJo0wbYKJAytn97x' },
 );
 export const estimateFloorPrep = generateStory(
-  'https://storage.googleapis.com/pb-preprod-adeo-disp-subproject-forms/forms/LMFR_FLOOR.json',
+  'https://api-prep.adeo.cloud/api-project-booster-budget-estimate/v1/scenarios/LMFR_FLOOR',
+  { 'X-gateway-apikey': 'nII0D8gvbudmDONHRJo0wbYKJAytn97x' },
 );
 
 export const projectDeclarationGenericPrep = generateStory(
@@ -176,5 +125,5 @@ export const projectDeclarationWindowPrep = generateStory(
 );
 
 export const appointmentKitchenPrep = generateStory(
-  'https://storage.googleapis.com/pb-preprod-adeo-disp-subproject-forms/forms/appointment-qualification-kitchen.json',
+  'https://storage.googleapis.com/pb-preprod-adeo-disp-appointment-qualification-forms/forms/appointment-qualification-kitchen.json',
 );

package/tsconfig.json

@@ -19,6 +19,9 @@
     "lib": ["esnext", "dom", "dom.iterable", "scripthost"],
     "resolveJsonModule": true
   },
+  "vueCompilerOptions": {
+    "experimentalDisableTemplateSupport": true
+  },
   "include": [
     "src/**/*.ts",
     "src/**/*.tsx",