Merge pull request #123 from Sitecore/change-content-source

Change content source

cypress/e2e/OutcomeFlow/outcome.cy.ts

@@ -2,7 +2,7 @@ describe('Outcome Page', () => {
   it('XM Cloud should be the only product', () => {
     cy.visit('/');
     cy.get('#start').click();
-    cy.get('.css-1izj7gt > :nth-child(4)').click();
+    cy.get('[value="Developer"]').click();
     cy.get(':nth-child(9) > .chakra-button').click();
     cy.get('.chakra-container > :nth-child(3) > .chakra-button').click();
     cy.get('[value="xm"]').click();
@@ -22,7 +22,7 @@ describe('Outcome Page', () => {
     cy.visit('/');
     cy.get('#start').click();
     cy.get(':nth-child(11) > .chakra-button').click();
-    cy.get('.css-1izj7gt > :nth-child(2)').click();
+    cy.get('[value="Developer"]').click();
     cy.get('.chakra-container > :nth-child(3) > .chakra-button').click();
     cy.get('[value="xp"]').click();
     cy.get('[value="sessionpersonalization"]').click();

cypress/fixtures/themes.json

@@ -3,7 +3,7 @@
     "id": "a5F4KpHzIkO1Re9iHmJjWA",
     "name": "Fantasy Adventure",
     "description": "Migrations can be fun! Take a journey through the fantasy world of the 5th Age. You will be guided through a maze of challenges that will help you find the scroll of Sitecore migration that will guide you and your party to saving the realm!",
-    "characterImage": {
+    "image": {
       "results": [
         {
           "id": "vMw9EsLFnkuUk7bATvTOJQ",
@@ -22,4 +22,4 @@
       ]
     }
   }
-]
+]

src/GraphQL/Queries/Outcome.gql

@@ -1,9 +1,9 @@
-fragment OutcomeDetails on GameOutcome {
+fragment OutcomeDetails on Outcome {
   id
   name
   themes {
     results {
-      ... on GameTheme {
+      ... on Theme {
         id
         name
       }
@@ -13,7 +13,7 @@ fragment OutcomeDetails on GameOutcome {
   productsIntro
   outcomeReasons {
     results {
-      ... on GameOutcomeReason {
+      ... on Outcomereason {
         product
         reason
       }
@@ -34,15 +34,15 @@ fragment OutcomeDetails on GameOutcome {
 }
 
 query GetOutcomeByThemeIdQuery($id: ID!) {
-  allGameOutcome(where: { themes: { gameOutcome_ids: $id } }) {
+  allOutcome(where: { themes: { outcome_ids: $id } }) {
     results {
       ...OutcomeDetails
     }
   }
 }
 
 query GetOutcomeByIdQuery($id: String!) {
-  gameOutcome(id: $id) {
+  outcome(id: $id) {
     ...OutcomeDetails
   }
 }

src/GraphQL/Queries/Personas.gql

@@ -1,4 +1,4 @@
-fragment PersonaFragment on GamePersona {
+fragment PersonaFragment on Persona {
   id
   name
   personaImage {
@@ -10,7 +10,7 @@ fragment PersonaFragment on GamePersona {
   }
   theme {
     results {
-      ... on GameTheme {
+      ... on Theme {
         id
         name
       }
@@ -19,21 +19,21 @@ fragment PersonaFragment on GamePersona {
 }
 
 query GetAllPersonasQuery {
-  allGamePersona {
+  allPersona {
     results {
       ...PersonaFragment
     }
   }
 }
 
 query GetPersonaByIdQuery($id: String!) {
-  gamePersona(id: $id) {
+  persona(id: $id) {
     ...PersonaFragment
   }
 }
 
 query GetPersonasByThemeIdQuery($id: ID!) {
-  allGamePersona(where: { theme: { gamePersona_ids: $id } }) {
+  allPersona(where: { theme: { persona_ids: $id } }) {
     results {
       ...PersonaFragment
     }

src/GraphQL/Queries/Prompts.gql

@@ -1,13 +1,13 @@
 fragment PromptDetails on Prompt {
   id
   name
-  questionid
-  text
+  questionId
+  question
   bodyText
   theme {
     results {
       __typename
-      ... on GameTheme {
+      ... on Theme {
         id
       }
     }
@@ -21,14 +21,14 @@ fragment PromptDetails on Prompt {
   }
   persona {
     results {
-      ... on GamePersona {
+      ... on Persona {
         id
       }
     }
   }
   optionType {
     results {
-      ... on PromptOptionTypes {
+      ... on PromptOptionType {
         id
         name
       }

src/GraphQL/Queries/Themes.gql

@@ -1,11 +1,11 @@
-fragment Theme on GameTheme {
+fragment ThemeFragment on Theme {
   id
   name
   description
   chakraTheme
   startButtonText
   disabled
-  characterImage {
+  image {
     results {
       id
       fileUrl
@@ -22,15 +22,15 @@ fragment Theme on GameTheme {
 }
 
 query GetAllThemesQuery {
-  allGameTheme {
+  allTheme {
     results {
-      ...Theme
+      ...ThemeFragment
     }
   }
 }
 
 query GetThemesByIdQuery($id: String!) {
-  gameTheme(id: $id) {
-    ...Theme
+  theme(id: $id) {
+    ...ThemeFragment
   }
 }

src/components/Prompts/CurrentPrompt/CurrentPrompt.tsx

@@ -20,8 +20,8 @@ export const CurrentPrompt: FC<PromptProps> = ({ prompt, answerSelected }) => {
 
     let answer: IAnswer = {
       promptId: prompt!.id,
-      promptQuestionId: prompt!.questionid,
-      prompt: prompt!.text,
+      promptQuestionId: prompt!.questionId,
+      prompt: prompt!.question,
       value: new Array(option.value),
       valuePrettyText: new Array(option.label),
     };
@@ -32,8 +32,8 @@ export const CurrentPrompt: FC<PromptProps> = ({ prompt, answerSelected }) => {
   const multiSelectSubmit = (selectedOptions: IOption[]) => {
     let answer: IAnswer = {
       promptId: prompt!.id,
-      promptQuestionId: prompt!.questionid,
-      prompt: prompt!.text,
+      promptQuestionId: prompt!.questionId,
+      prompt: prompt!.question,
       value: selectedOptions.map((o) => o.value),
       valuePrettyText: selectedOptions.map((o) => o.label),
     };
@@ -67,7 +67,7 @@ export const CurrentPrompt: FC<PromptProps> = ({ prompt, answerSelected }) => {
             paddingLeft={{ base: '15px', md: '15px' }}
             paddingRight={{ base: '15px', md: '15px' }}
           >
-            {prompt?.text}
+            {prompt?.question}
           </Text>
         </CardBody>
         <CardFooter padding={'15px'}>

src/components/ui/ChooseCharacterDisplay/ChooseCharacter.tsx

@@ -40,9 +40,6 @@ export const ChooseCharacter: FC<ChooseCharacterProps> = ({ avatars, personas })
     router.push('/prompt');
   };
 
-  console.log('Personas', personas);
-  console.log('Avatars', avatars);
-
   return (
     <>
       <PersonaList

src/components/ui/InfoBar/InfoBar.tsx

@@ -27,12 +27,12 @@ export const InfoBar: FC<InfoBarProps> = ({ remainingQuestions, isSolution = fal
         )}
       </GridItem>
       <GridItem colSpan={6}>
-        {gameInfoContext.theme?.characterImage?.results !== undefined && (
+        {gameInfoContext.theme?.image?.results !== undefined && (
           <AvatarGroup spacing="xs">
             <Avatar
               size={'xl'}
-              src={gameInfoContext.theme.characterImage!.results[0].fileUrl}
-              title={gameInfoContext.theme.characterImage!.results[0].fileName ?? ''}
+              src={gameInfoContext.theme.image!.results[0].fileUrl}
+              title={gameInfoContext.theme.image!.results[0].fileName ?? ''}
             />
             <div style={{ flex: 1 }}>
               <Text>{gameInfoContext.theme.name}</Text>

src/components/ui/Settings/Settings.tsx

@@ -37,6 +37,8 @@ export const Settings: FC<SettingsProps> = () => {
 
     if (themes && themes.length > 0) {
       setThemes(themes);
+    } else {
+      throw new Error('No themes loaded. At least one theme is required.');
     }
 
     setLoading(false);

src/components/ui/ThemeList/ThemeList.tsx

@@ -1,14 +1,4 @@
-import {
-  Box,
-  Button,
-  Center,
-  Flex,
-  Heading,
-  Image,
-  Stack,
-  Text,
-  useColorModeValue
-} from '@chakra-ui/react';
+import { Box, Button, Center, Flex, Heading, Image, Stack, Text, useColorModeValue } from '@chakra-ui/react';
 import { ITheme } from 'models';
 import { FC } from 'react';
 
@@ -47,10 +37,10 @@ export const ThemeList: FC<ThemeListProps> = ({ themes, handleThemeChange, class
             height={'100%'}
             bg={useColorModeValue('white', 'gray.800')}
           >
-            {theme.characterImage?.results !== undefined && (
+            {theme.image?.results !== undefined && (
               <Image
-                src={theme.characterImage!.results[0].fileUrl}
-                alt={theme.characterImage!.results[0].fileName ?? ''}
+                src={theme.image!.results[0].fileUrl}
+                alt={theme.image!.results[0].fileName ?? ''}
                 maxHeight={['0', '300px']}
                 fit={'cover'}
                 rounded={['sm', 'lg']}

src/lib/OutcomeService.ts

@@ -3,18 +3,18 @@ import { GetOutcomeByIdQuery, GetOutcomeByThemeIdQuery } from '../GraphQL/Querie
 import { chOneService } from './CHOneService';
 
 export const OutcomeService = () => {
-  const GetOutcomeById = async (gameOutcomeId: string): Promise<IOutcome | undefined> => {
+  const GetOutcomeById = async (outcomeId: string): Promise<IOutcome | undefined> => {
     const { error, data } = await chOneService().query({
       query: GetOutcomeByIdQuery,
-      variables: { id: gameOutcomeId },
+      variables: { id: outcomeId },
     });
 
     if (error) {
       console.log(error);
       return undefined;
     }
 
-    const results = data?.gameOutcome as IOutcome;
+    const results = data?.outcome as IOutcome;
 
     return results;
   };
@@ -31,7 +31,7 @@ export const OutcomeService = () => {
       return undefined;
     }
 
-    const results = data?.allGameOutcome as IResult<IOutcome[]>;
+    const results = data?.allOutcome as IResult<IOutcome[]>;
 
     return results;
   };

src/lib/PersonaService.ts

@@ -11,7 +11,7 @@ export const PersonaService = () => {
       return undefined;
     }
 
-    const results = data?.gamePersona as IPersona;
+    const results = data?.persona as IPersona;
 
     return results;
   };
@@ -28,7 +28,7 @@ export const PersonaService = () => {
       return undefined;
     }
 
-    const results = data?.allGamePersona as IResult<IPersona[]>;
+    const results = data?.allPersona as IResult<IPersona[]>;
 
     return results;
   };

src/lib/ThemeService.ts

@@ -11,7 +11,7 @@ export const ThemeService = () => {
       return null;
     }
 
-    const results = data?.allGameTheme as IResult<ITheme[]>;
+    const results = data?.allTheme as IResult<ITheme[]>;
 
     return results;
   };
@@ -24,7 +24,7 @@ export const ThemeService = () => {
       return undefined;
     }
 
-    const results = data?.gameTheme as ITheme;
+    const results = data?.theme as ITheme;
 
     return results;
   };

src/models/IPrompt.ts

@@ -2,11 +2,11 @@ import { JSONContent } from '@tiptap/core';
 import { IImage, IOption, IOptionType, IPersona, IResult, ITheme } from 'models';
 
 export interface IPrompt {
-  text: string;
+  question: string;
   bodyText?: JSONContent;
   id: string;
   name: string;
-  questionid: string;
+  questionId: string;
   options?: IResult<IOption[]>;
   optionType: IResult<IOptionType[]>;
   nextPrompts?: IResult<IPrompt[]>; // If prompt requires additional prompts, this is the list of prompt ids

src/models/ITheme.ts

@@ -4,7 +4,7 @@ export interface ITheme {
   name: string;
   description: string;
   id: string;
-  characterImage?: IResult<IImage[]>;
+  image?: IResult<IImage[]>;
   avatarGallery?: IResult<IImage[]>;
   chakraTheme: string;
   startButtonText: string;

src/models/OutcomeConditions.ts

@@ -177,7 +177,7 @@ export class OutcomeConditions {
   }
 
   /**
-   * Analyzes current answers to determine if this is a complex personalizations cenario
+   * Analyzes current answers to determine if this is a complex personalization scenario
    * that would require Sitecore Personalize or CDP
    */
   isComplexPersonalization(): boolean {