Ocv tweaks (microsoft#10434)

* put configs in a function to make sure stuff like locale loads before they're registered

* change the give feedback option to just have feedback

* change it for skillmap as well

Author: srietkerk

react-common/components/controls/Feedback/Feedback.tsx

@@ -1,7 +1,7 @@
 /// <reference path="../../../../localtypings/ocv.d.ts" />
 import { useEffect } from "react"
 import { initFeedbackEventListener, removeFeedbackEventListener } from "./FeedbackEventListener";
-import { baseConfig, ratingFeedbackConfig } from "./configs";
+import { getBaseConfig, getRatingFeedbackConfig } from "./configs";
 import { Modal } from "../Modal";
 
 // both components require onClose because the feedback modal should close when the user clicks the "finish" button
@@ -36,7 +36,7 @@ export const FeedbackModal = (props: IFeedbackModalProps) => {
 export const Feedback = (props: IFeedbackProps) => {
   const { kind, onClose } = props;
 
-  const feedbackConfig = kind === "rating" ? ratingFeedbackConfig : baseConfig ;
+  const feedbackConfig = kind === "rating" ? getRatingFeedbackConfig() : getBaseConfig();
   const frameId = kind === "rating" ? "activity-feedback-frame" : "menu-feedback-frame";
 
   const onDismiss = () => {

react-common/components/controls/Feedback/configs.ts

@@ -1,7 +1,8 @@
 /// <reference path="../../../../localtypings/ocv.d.ts" />
 
 
-export const baseConfig: ocv.IFeedbackConfig = {
+export const getBaseConfig = (): ocv.IFeedbackConfig => {
+  return {
     feedbackUiType: "NoSurface",
     hostPlatform: "IFrame",
     isDisplayed: true,
@@ -13,6 +14,7 @@ export const baseConfig: ocv.IFeedbackConfig = {
     isFeedbackForumEnabled: false,
     isMyFeedbackEnabled: false,
     isThankYouPageDisabled: false,
+  }
 }
 
 export const createRatingQuestions = () => {
@@ -47,8 +49,9 @@ export const createRatingQuestions = () => {
 }
 
 
-export const ratingFeedbackConfig: ocv.IFeedbackConfig = {
-    ...baseConfig,
+export const getRatingFeedbackConfig = (): ocv.IFeedbackConfig => {
+  return {
+    ...getBaseConfig(),
     initialFeedbackType: "Unclassified",
     scenarioConfig: {
       isScenarioEnabled: true,
@@ -61,4 +64,5 @@ export const ratingFeedbackConfig: ocv.IFeedbackConfig = {
         ]
       }
     }
+  }
 }

skillmap/src/components/HeaderBar.tsx

@@ -81,8 +81,8 @@ export class HeaderBarImpl extends React.Component<HeaderBarProps> {
         if (pxt.U.ocvEnabled()) {
             items.push({
                 id: "feedback",
-                title: lf("Give Feedback"),
-                label: lf("Give Feedback"),
+                title: lf("Feedback"),
+                label: lf("Feedback"),
                 onClick: this.onFeedbackClicked
             });
         }

webapp/src/container.tsx

@@ -364,7 +364,7 @@ export class SettingsMenu extends data.Component<SettingsMenuProps, SettingsMenu
             {
                 // we always need a way to clear local storage, regardless if signed in or not
             }
-            {showFeedbackOption ? <sui.Item role="menuitem" icon="comment" text={lf("Give Feedback")} onClick={this.showFeedbackDialog} /> : undefined}
+            {showFeedbackOption ? <sui.Item role="menuitem" icon="comment" text={lf("Feedback")} onClick={this.showFeedbackDialog} /> : undefined}
         </sui.DropdownMenu>;
     }
 }

webapp/src/projects.tsx

@@ -324,7 +324,7 @@ export class ProjectSettingsMenu extends data.Component<ProjectSettingsMenuProps
             {reportAbuse ? <sui.Item role="menuitem" icon="warning circle" text={lf("Report Abuse...")} onClick={this.showReportAbuse} /> : undefined}
             <sui.Item role="menuitem" icon='sign out' text={lf("Reset")} onClick={this.showResetDialog} />
             <sui.Item role="menuitem" text={lf("About...")} onClick={this.showAboutDialog} />
-            {showFeedbackOption ? <sui.Item role="menuitem" icon="comment" text={lf("Give Feedback")} onClick={this.showFeedbackDialog} /> : undefined}
+            {showFeedbackOption ? <sui.Item role="menuitem" icon="comment" text={lf("Feedback")} onClick={this.showFeedbackDialog} /> : undefined}
         </sui.DropdownMenu>;
     }
 }