feat: add defaults values to existing context

PrestaShopCorp · Aug 24, 2023 · b7cc8f5 · b7cc8f5
1 parent 3f9dde2
commit b7cc8f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/components/PsAccounts.vue b/src/components/PsAccounts.vue
@@ -101,7 +101,7 @@ interface PsAccountsProps {
   context?: Context;
 }
 const props = withDefaults(defineProps<PsAccountsProps>(), {
-  context: () => window.contextPsAccounts || {}
+  context: () => (window.contextPsAccounts ? contextSchema.validate(window.contextPsAccounts).value : {}) as Context
 });
 const errors = ref<string[]>([]);
 

diff --git a/src/lib/ContextValidator.ts b/src/lib/ContextValidator.ts
@@ -1,4 +1,5 @@
 import Joi from 'joi';
+import { ShopContext } from '@/types/context';
 
 export const backendUserSchema = Joi.object().keys({
   email: Joi.string().email({ tlds: false }).allow(null).default(null),
@@ -55,7 +56,7 @@ export const userSchema = Joi.object().keys({
 export const contextSchema = Joi.object().keys({
   accountsUiUrl: Joi.string().allow(null).default(null),
   backendUser: backendUserSchema.optional().allow({}).default({}),
-  currentContext: currentContextSchema.optional().allow({}).default({}),
+  currentContext: currentContextSchema.optional().default({ type: ShopContext.All }),
   // dependencies
   onboardingLink: Joi.string().uri().optional().allow(null)
     .allow('')