use optionLabels in all question types

Author: mvidner

web/src/components/questions/GenericQuestion.test.tsx

@@ -30,6 +30,7 @@ const question: Question = {
   id: 1,
   text: "Do you write unit tests?",
   options: ["always", "sometimes", "never"],
+  optionLabels: ["Always", "Sometimes", "Never"],
   defaultOption: "sometimes",
 };
 

web/src/components/questions/GenericQuestion.tsx

@@ -51,6 +51,7 @@ export default function GenericQuestion({
       <Popup.Actions>
         <QuestionActions
           actions={question.options}
+          actionLabels={question.optionLabels}
           defaultAction={question.defaultOption}
           actionCallback={actionCallback}
         />

web/src/components/questions/LuksActivationQuestion.test.tsx

@@ -34,6 +34,7 @@ const questionMock: Question = {
   class: "storage.luks_activation",
   text: "A Luks device found. Do you want to open it?",
   options: ["decrypt", "skip"],
+  optionLabels: ["Decrypt", "Skip"],
   defaultOption: "decrypt",
   data: { attempt: "1" },
 };

web/src/components/questions/LuksActivationQuestion.tsx

@@ -88,6 +88,7 @@ export default function LuksActivationQuestion({ question, answerCallback }) {
       <Popup.Actions>
         <QuestionActions
           actions={question.options}
+          actionLabels={question.optionLabels}
           defaultAction={defaultAction}
           actionCallback={actionCallback}
           conditions={conditions}

web/src/components/questions/PackageErrorQuestion.test.tsx

@@ -32,6 +32,7 @@ const question: Question = {
   class: "software.package_error.provide_error",
   text: "Package download failed",
   options: ["Retry", "Skip"],
+  optionLabels: ["Retry", "Skip"],
   defaultOption: "Retry",
   data: { package: "foo", error_code: "INVALID" },
 };

web/src/components/questions/PackageErrorQuestion.tsx

@@ -69,6 +69,7 @@ export default function PackageErrorQuestion({
       <Popup.Actions>
         <QuestionActions
           actions={question.options}
+          actionLabels={question.optionLabels}
           defaultAction={question.defaultOption}
           actionCallback={actionCallback}
         />

web/src/components/questions/QuestionActions.test.tsx

@@ -32,6 +32,7 @@ let question: Question = {
   id: 1,
   text: "Should we use a component for rendering actions?",
   options: ["no", "maybe", "sure"],
+  optionLabels: ["Nein", "Vielleicht", "Sicher"],
   defaultOption,
 };
 
@@ -41,6 +42,7 @@ const renderQuestionActions = () =>
   installerRender(
     <QuestionActions
       actions={question.options}
+      actionLabels={question.optionLabels}
       defaultAction={question.defaultOption}
       actionCallback={actionCallback}
       conditions={{ disable: { no: true } }}
@@ -52,17 +54,17 @@ describe("QuestionActions", () => {
     it("renders the default option as primary action", async () => {
       renderQuestionActions();
 
-      const button = await screen.findByRole("button", { name: "Sure" });
+      const button = await screen.findByRole("button", { name: "Sicher" });
       expect(button.classList.contains("pf-m-primary")).toBe(true);
     });
 
     it("renders non default options as secondary actions", async () => {
       renderQuestionActions();
 
-      let button = await screen.findByRole("button", { name: "Maybe" });
+      let button = await screen.findByRole("button", { name: "Vielleicht" });
       expect(button.classList.contains("pf-m-secondary")).toBe(true);
 
-      button = await screen.findByRole("button", { name: "No" });
+      button = await screen.findByRole("button", { name: "Nein" });
       expect(button.classList.contains("pf-m-secondary")).toBe(true);
     });
   });
@@ -77,35 +79,35 @@ describe("QuestionActions", () => {
     it("renders the first option  as primary action", async () => {
       renderQuestionActions();
 
-      const button = await screen.findByRole("button", { name: "No" });
+      const button = await screen.findByRole("button", { name: "Nein" });
       expect(button.classList.contains("pf-m-primary")).toBe(true);
     });
 
     it("renders the other options as secondary actions", async () => {
       renderQuestionActions();
 
-      let button = await screen.findByRole("button", { name: "Maybe" });
+      let button = await screen.findByRole("button", { name: "Vielleicht" });
       expect(button.classList.contains("pf-m-secondary")).toBe(true);
 
-      button = await screen.findByRole("button", { name: "Sure" });
+      button = await screen.findByRole("button", { name: "Sicher" });
       expect(button.classList.contains("pf-m-secondary")).toBe(true);
     });
   });
 
   it("renders actions enabled or disabled according to given conditions", async () => {
     renderQuestionActions();
 
-    let button = await screen.findByRole("button", { name: "No" });
+    let button = await screen.findByRole("button", { name: "Nein" });
     expect(button).toHaveAttribute("disabled");
 
-    button = await screen.findByRole("button", { name: "Maybe" });
+    button = await screen.findByRole("button", { name: "Vielleicht" });
     expect(button).not.toHaveAttribute("disabled");
   });
 
   it("calls the actionCallback when user clicks on action", async () => {
     const { user } = renderQuestionActions();
 
-    const button = await screen.findByRole("button", { name: "Sure" });
+    const button = await screen.findByRole("button", { name: "Sicher" });
     await user.click(button);
 
     expect(actionCallback).toHaveBeenCalled();

web/src/components/questions/QuestionWithPassword.test.tsx

@@ -34,6 +34,7 @@ const question: Question = {
   class: "question.password",
   text: "Random question. Will you provide random password?",
   options: ["ok", "cancel"],
+  optionLabels: ["Ok", "Cancel"],
   defaultOption: "cancel",
 };
 

web/src/components/questions/QuestionWithPassword.tsx

@@ -75,6 +75,7 @@ export default function QuestionWithPassword({
       <Popup.Actions>
         <QuestionActions
           actions={question.options}
+          actionLabels={question.optionLabels}
           defaultAction={defaultAction}
           actionCallback={actionCallback}
         />

web/src/components/questions/Questions.test.tsx

@@ -49,6 +49,7 @@ const genericQuestion: Question = {
   type: QuestionType.generic,
   text: "Do you write unit tests?",
   options: ["always", "sometimes", "never"],
+  optionLabels: ["Always", "Sometimes", "Never"],
   defaultOption: "sometimes",
 };
 const passwordQuestion: Question = { id: 1, type: QuestionType.withPassword };