refactor: renaming checkbox->selectionMark (#223)

* initial commit - renaming checkbox->selectionMark * refactor: rename checkbox to selectionMark Co-authored-by: kunzheng <58841788+kunzms@users.noreply.github.com> Co-authored-by: kunzms <kunzheng@microsoft.com>
microsoft · May 1, 2020 · f6c8ffa · f6c8ffa
1 parent 5bacea4
commit f6c8ffa
Show file tree

Hide file tree

Showing 14 changed files with 75 additions and 73 deletions.
diff --git a/.env b/.env
@@ -0,0 +1,5 @@
+# react-scripts build use this to generate the right path for assets
+# relative to index.html
+# without it, you'll see error like this
+#    Failed to load resource: net::ERR_FILE_NOT_FOUND /favicon.ico:1
+PUBLIC_URL=.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -89,7 +89,7 @@
         "jquery": "^3.5.0",
         "kind-of": "^6.0.3",
         "minimist": "^1.2.2",
-        "node-sass": "^4.13.0",
+        "node-sass": "^4.14.0",
         "pdfjs-dist": "2.3.200",
         "react-scripts": "3.1.2",
         "redux-immutable-state-invariant": "^2.1.0",

diff --git a/src/common/utils.ts b/src/common/utils.ts
@@ -5,7 +5,7 @@ import Guard from "./guard";
 import { IProject, ISecurityToken, IProviderOptions, ISecureString, ITag } from "../models/applicationState";
 import { encryptObject, decryptObject, encrypt, decrypt } from "./crypto";
 import UTIF from "utif";
-import HtmlFileReader from "./htmlFileReader";
+
 // tslint:disable-next-line:no-var-requires
 const tagColors = require("../react/components/common/tagColors.json");
 

diff --git a/src/models/applicationState.ts b/src/models/applicationState.ts
@@ -371,7 +371,7 @@ export enum FieldType {
     Date = "date",
     Time = "time",
     Integer = "integer",
-    Checkbox = "checkbox",
+    SelectionMark = "selectionMark",
 }
 
 export enum FieldFormat {

diff --git a/src/react/components/common/alert/alert.tsx b/src/react/components/common/alert/alert.tsx
@@ -57,7 +57,6 @@ export default class Alert extends React.Component<IAlertProps, IAlertState> {
             },
             scopedSettings: {},
         };
-        const confirmButtonTheme = this.props.confirmButtonTheme;
 
         return (
             <Customizer {...dark}>

diff --git a/src/react/components/common/arrayField/arrayFieldTemplate.tsx b/src/react/components/common/arrayField/arrayFieldTemplate.tsx
@@ -15,7 +15,7 @@ export function ArrayFieldTemplate(props: ArrayFieldTemplateProps) {
             document.getElementById("addSecurityToken").focus();
             setFocusFlag(false);
         }
-    });
+    }, [focusFlag]);
 
     return (
         <div>

diff --git a/src/react/components/common/assetPreview/pdfAsset.tsx b/src/react/components/common/assetPreview/pdfAsset.tsx
@@ -5,9 +5,7 @@ import React from "react";
 import { IAssetPreviewProps } from "./assetPreview";
 import * as pdfjsLib from "pdfjs-dist";
 import { constants } from "../../../../common/constants";
-import utils from "../imageMap/utils";
 import {resizeCanvas} from "../../../../common/utils";
-import {IAsset} from "../../../../models/applicationState";
 
 // temp hack for enabling worker
 pdfjsLib.GlobalWorkerOptions.workerSrc = constants.pdfjsWorkerSrc(pdfjsLib.version);

diff --git a/src/react/components/pages/editorPage/canvas.tsx b/src/react/components/pages/editorPage/canvas.tsx
@@ -315,7 +315,7 @@ export default class Canvas extends React.Component<ICanvasProps, ICanvasState>
         }
 
         if (selectedRegions.length === 1 && selectedRegions[0].category === FeatureCategory.Checkbox) {
-            this.setTagType(inputTag[0], FieldType.Checkbox);
+            this.setTagType(inputTag[0], FieldType.SelectionMark);
         }
 
         this.redrawAllFeatures();
@@ -1547,7 +1547,7 @@ export default class Canvas extends React.Component<ICanvasProps, ICanvasState>
         const newRegion = {
             id: this.createRegionIdFromBoundingBox(boundingBox, pangeNumber),
             type: RegionType.Polygon,
-            category: tag.type === FieldType.Checkbox ? FeatureCategory.Checkbox : FeatureCategory.Text,
+            category: tag.type === FieldType.SelectionMark ? FeatureCategory.Checkbox : FeatureCategory.Text,
             tags: [tagName],
             boundingBox: {
                 height: bottom - top,
@@ -1669,7 +1669,7 @@ export default class Canvas extends React.Component<ICanvasProps, ICanvasState>
             const prevType = prevTypes[name];
             const type = types[name];
             if (prevType !== type
-                && (prevType === FieldType.Checkbox || type === FieldType.Checkbox)) {
+                && (prevType === FieldType.SelectionMark || type === FieldType.SelectionMark)) {
                 // some tag change between checkbox and text
                 return true;
             }

diff --git a/src/react/components/pages/editorPage/canvasCommandBar.tsx b/src/react/components/pages/editorPage/canvasCommandBar.tsx
@@ -42,8 +42,8 @@ export const CanvasCommandBar: React.FunctionComponent<ICanvasCommandBarProps> =
                 onClick: () => props.handleLayerChange("tables"),
               },
               {
-                key: "checkboxes",
-                text: "Checkboxes (Preview)",
+                key: "selectionMark",
+                text: "Selection Marks (Preview)",
                 canCheck: true,
                 iconProps: { iconName: "CheckboxComposite" },
                 isChecked: props.layers["checkboxes"],

diff --git a/src/react/components/pages/predict/predictPage.tsx b/src/react/components/pages/predict/predictPage.tsx
@@ -394,7 +394,7 @@ export default class PredictPage extends React.Component<IPredictPageProps, IPre
                         this.imageMap.removeAllFeatures();
                     }
                 });
-            }) .catch((error) => {
+            }).catch((error) => {
                 this.setState({
                     isFetching: false,
                     shouldShowAlert: true,

diff --git a/src/react/components/pages/train/trainPage.tsx b/src/react/components/pages/train/trainPage.tsx
@@ -350,7 +350,7 @@ export default class TrainPage extends React.Component<ITrainPageProps, ITrainPa
     }
 
     private showCheckboxPreview = (project: IProject) => {
-        if (project.tags.find((t) => t.type === FieldType.Checkbox)) {
+        if (project.tags.find((t) => t.type === FieldType.SelectionMark)) {
             this.setState({
                 hasCheckbox: true,
             });

diff --git a/src/react/components/shell/skipButton.tsx b/src/react/components/shell/skipButton.tsx
@@ -9,10 +9,6 @@ export interface ISkipButtonProps {
 
 export class SkipButton extends React.Component<ISkipButtonProps> {
 
-    constructor(props: ISkipButtonProps) {
-        super(props);
-    }
-
     public render() {
         return (
             <div className="skip-button">

diff --git a/src/services/projectService.ts b/src/services/projectService.ts
@@ -21,6 +21,13 @@ import { toast } from "react-toastify";
 // tslint:disable-next-line:no-var-requires
 const tagColors = require("../react/components/common/tagColors.json");
 
+function normalizeFieldType(type: string): string {
+    if (type === "checkbox") {
+        return FieldType.SelectionMark;
+    }
+    return type;
+}
+
 /**
  * Functions required for a project service
  * @member save - Save a project
@@ -245,7 +252,7 @@ export default class ProjectService implements IProjectService {
                 tags.push({
                     name: field.fieldKey,
                     color: tagColors[index],
-                    type: field.fieldType,
+                    type: normalizeFieldType(field.fieldType),
                     format: field.fieldFormat,
                 } as ITag);
             });