Merge branch 'main' into romanlutz/feature_flag_fairness_integration

microsoft · Apr 4, 2022 · 2d2df43 · 2d2df43
2 parents e8b97ea + 3c37a7c
commit 2d2df43
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 24 deletions.
diff --git a/apps/widget-e2e/src/describer/modelAssessment/Constants.ts b/apps/widget-e2e/src/describer/modelAssessment/Constants.ts
@@ -28,7 +28,7 @@ export enum Locators {
   SortByDropdownOptions = "div[class^='dropdownItemsWrapper'] button:contains('CohortCreateE2E')",
   CohortOnOffSelectionContainer = "#iterative-container",
   CohortOnOffCohortCreateE2E = "#iterative-container div:contains(CohortCreateE2E) [role='checkbox']",
-  CreateNewCohortButton = "button:contains('Create new cohort')",
+  CreateNewCohortButton = "button:contains('Save cohort')",
   CohortNameInput = "#cohortEditPanel input:eq(0)",
   CohortDatasetValueInput = "#cohortEditPanel input[class^='ms-spinButton-input']",
   CohortFilterSelection = "#cohortEditPanel [type='radio']",

diff --git a/libs/core-ui/src/lib/Cohort/CohortInfoSection/CohortInfoSection.tsx b/libs/core-ui/src/lib/Cohort/CohortInfoSection/CohortInfoSection.tsx
@@ -48,15 +48,11 @@ export class CohortInfoSection extends React.PureComponent<ICohortInfoSectionPro
         </Stack>
         <Stack horizontal tokens={{ childrenGap: 25 }}>
           <DefaultButton
-            text={
-              localization.ModelAssessment.CohortInformation.SwitchGlobalCohort
-            }
+            text={localization.ModelAssessment.CohortInformation.ShiftCohort}
             onClick={this.props.toggleShiftCohortVisibility}
           />
           <DefaultButton
-            text={
-              localization.ModelAssessment.CohortInformation.CreateNewCohort
-            }
+            text={localization.ModelAssessment.CohortInformation.SaveCohort}
             onClick={this.props.toggleCreateCohortVisibility}
           />
         </Stack>

diff --git a/libs/dataset-explorer/src/lib/SidePanel.tsx b/libs/dataset-explorer/src/lib/SidePanel.tsx
@@ -17,8 +17,7 @@ import {
   DefaultButton,
   IChoiceGroupOption,
   Label,
-  Stack,
-  Text
+  Stack
 } from "office-ui-fabric-react";
 import React from "react";
 
@@ -72,7 +71,7 @@ export class SidePanel extends React.Component<ISidePanelProps> {
               }
             />
             <div className={classNames.legendAndText}>
-              {colorSeries?.length ? (
+              {colorSeries?.length && (
                 <InteractiveLegend
                   items={colorSeries.map((name, i) => {
                     return {
@@ -82,10 +81,6 @@ export class SidePanel extends React.Component<ISidePanelProps> {
                     };
                   })}
                 />
-              ) : (
-                <Text variant={"xSmall"} className={classNames.smallItalic}>
-                  {localization.Interpret.DatasetExplorer.noColor}
-                </Text>
               )}
             </div>
           </Stack.Item>

diff --git a/libs/localization/src/lib/en.json b/libs/localization/src/lib/en.json
@@ -1264,8 +1264,8 @@
       "shiftCohortDescription": "Select a cohort from the cohort list. Apply the cohort to the dashboard."
     },
     "CohortInformation": {
-      "SwitchGlobalCohort": "Switch global cohort",
-      "CreateNewCohort": "Create new cohort",
+      "ShiftCohort": "Shift cohort",
+      "SaveCohort": "Save cohort",
       "DataPoints": "Number of datapoints",
       "DefaultCohort": " (default)",
       "Filters": "Number of filters",

diff --git a/libs/model-assessment/src/lib/ModelAssessmentDashboard/Cohort/ChangeGlobalCohortButton.tsx b/libs/model-assessment/src/lib/ModelAssessmentDashboard/Cohort/ChangeGlobalCohortButton.tsx
@@ -30,9 +30,7 @@ export class ChangeGlobalCohortButton extends React.Component<
     return (
       <>
         <DefaultButton
-          text={
-            localization.ModelAssessment.CohortInformation.SwitchGlobalCohort
-          }
+          text={localization.ModelAssessment.CohortInformation.ShiftCohort}
           onClick={this.toggleShiftCohortVisibility}
         />
         <ChangeGlobalCohort

diff --git a/libs/model-assessment/src/lib/ModelAssessmentDashboard/Cohort/CohortList.styles.ts b/libs/model-assessment/src/lib/ModelAssessmentDashboard/Cohort/CohortList.styles.ts
@@ -14,7 +14,7 @@ export interface ICohortListStyles {
 export const cohortListStyles = (): IProcessedStyleSet<ICohortListStyles> => {
   return mergeStyleSets<ICohortListStyles>({
     link: {
-      fontSize: "12px"
+      fontSize: "14px"
     }
   });
 };
diff --git a/libs/model-assessment/src/lib/ModelAssessmentDashboard/Cohort/CohortList.tsx b/libs/model-assessment/src/lib/ModelAssessmentDashboard/Cohort/CohortList.tsx
@@ -165,7 +165,7 @@ export class CohortList extends React.Component<
               </Stack>
             );
           }
-          return <span>{fieldContent}</span>;
+          return <span className={style.link}>{fieldContent}</span>;
         case "detailsColumn":
           if (item.details && item.details.length === 2 && index !== 0) {
             return (

diff --git a/libs/model-assessment/src/lib/ModelAssessmentDashboard/Cohort/CreateGlobalCohortButton.tsx b/libs/model-assessment/src/lib/ModelAssessmentDashboard/Cohort/CreateGlobalCohortButton.tsx
@@ -30,7 +30,7 @@ export class CreateGlobalCohortButton extends React.Component<
     return (
       <>
         <DefaultButton
-          text={localization.ModelAssessment.CohortInformation.CreateNewCohort}
+          text={localization.ModelAssessment.CohortInformation.SaveCohort}
           onClick={this.toggleVisibility}
         />
         <CreateGlobalCohort

diff --git a/libs/model-assessment/src/lib/ModelAssessmentDashboard/Controls/MainMenu.tsx b/libs/model-assessment/src/lib/ModelAssessmentDashboard/Controls/MainMenu.tsx
@@ -95,15 +95,15 @@ export class MainMenu extends React.PureComponent<
         },
         key: "changeCohort",
         onClick: this.toggleChangeCohortVisibility,
-        text: localization.ModelAssessment.CohortInformation.SwitchGlobalCohort
+        text: localization.ModelAssessment.CohortInformation.ShiftCohort
       },
       {
         iconProps: {
           iconName: "Add"
         },
         key: "addCohort",
         onClick: this.toggleCreateCohortVisibility,
-        text: localization.ModelAssessment.CohortInformation.CreateNewCohort
+        text: localization.ModelAssessment.CohortInformation.SaveCohort
       }
     ];
     return (