Merge branch 'main' into dependabot/npm_and_yarn/moment-2.29.4

Author: pcaversaccio

src/components/CreateProjectModal/index.tsx

@@ -25,6 +25,7 @@ import {
   EMPTY_DATASET_CREATE_PROJECT_DATASET_TYPE_VALUE,
   EXISTING_DATASET_CREATE_PROJECT_DATASET_TYPE_VALUE,
   ID_TOKEN_NAME,
+  MAX_DATASET_IMAGES,
   MAX_DATASET_IMAGES_CREATE_PROJECT,
   MAX_PROJECT_DESCRIPTION_CHARACTER_LENGTH,
   MIN_DATASET_IMAGES_CREATE_PROJECT,
@@ -123,7 +124,11 @@ const CreateProjectDatasetTypeControl = function (
                   if (selectedPrebuildDataset) {
                     setPrebuildDataset(selectedPrebuildDataset);
                     setNumberOfDatasetImages(
-                      selectedPrebuildDataset.totalImage
+                      selectedPrebuildDataset?.totalImage &&
+                        selectedPrebuildDataset.totalImage > MAX_DATASET_IMAGES
+                        ? MAX_DATASET_IMAGES
+                        : selectedPrebuildDataset?.totalImage ||
+                            MIN_DATASET_IMAGES_CREATE_PROJECT
                     );
                   }
                 }}
@@ -139,7 +144,7 @@ const CreateProjectDatasetTypeControl = function (
               />
             </Box>
             <Typography variant="body2" mt={2}>
-              Number of dataset images:
+              Number of images:
             </Typography>
             <Box display="flex" alignItems="center" columnGap={1} pl={1}>
               <Slider
@@ -150,8 +155,11 @@ const CreateProjectDatasetTypeControl = function (
                 onChange={onChangeNumberOfDatasetImagesSlider}
                 min={MIN_DATASET_IMAGES_CREATE_PROJECT}
                 max={
-                  prebuildDataset?.totalImage ||
-                  MIN_DATASET_IMAGES_CREATE_PROJECT
+                  prebuildDataset?.totalImage &&
+                  prebuildDataset.totalImage > MAX_DATASET_IMAGES
+                    ? MAX_DATASET_IMAGES
+                    : prebuildDataset?.totalImage ||
+                      MIN_DATASET_IMAGES_CREATE_PROJECT
                 }
                 disabled={isCreatingProject}
               />
@@ -163,8 +171,11 @@ const CreateProjectDatasetTypeControl = function (
                 inputProps={{
                   min: MIN_DATASET_IMAGES_CREATE_PROJECT,
                   max:
-                    prebuildDataset?.totalImage ||
-                    MIN_DATASET_IMAGES_CREATE_PROJECT,
+                    prebuildDataset?.totalImage &&
+                    prebuildDataset.totalImage > MAX_DATASET_IMAGES
+                      ? MAX_DATASET_IMAGES
+                      : prebuildDataset?.totalImage ||
+                        MIN_DATASET_IMAGES_CREATE_PROJECT,
                   type: "number",
                   "aria-labelledby": "input-number-of-dataset-images-slider",
                 }}

src/components/FeedbackComponent/FeedbackForm.tsx

@@ -329,6 +329,8 @@ export const FeedbackFormSlack = function ({
             if (onSendFail) onSendFail();
             resolve({ action: FeedbackFormAction.NO_ACTION });
           });
+      } else {
+        resolve({ action: FeedbackFormAction.NO_ACTION });
       }
     });
 

src/components/TooltipToggleButton/index.tsx

@@ -7,13 +7,11 @@ type TooltipToggleButtonProps = ToggleButtonProps & {
 };
 
 const TooltipToggleButton: VFC<TooltipToggleButtonProps> = forwardRef(
-  ({ TooltipProps, ...props }, ref) => {
-    return (
-      <Tooltip {...TooltipProps}>
-        <ToggleButton ref={ref} {...props} />
-      </Tooltip>
-    );
-  }
+  ({ TooltipProps, ...props }, ref) => (
+    <Tooltip {...TooltipProps}>
+      <ToggleButton ref={ref} {...props} />
+    </Tooltip>
+  )
 );
 
 export default TooltipToggleButton;

src/constants/defaultValues.tsx

@@ -236,3 +236,5 @@ export const MAX_SIZE_FEEDBACK_ATTACHED_FILE = 2000000;
 
 export const QUIT_FEEDBACK_ALERT_MESSAGE =
   "Your feedback content will be lost. Are you sure you want to quit?";
+
+export const MAX_DATASET_IMAGES = 800;

src/routes/AnnotationPage/Editor/Layer/DetectedRectangleDrawLayer.tsx

@@ -90,14 +90,13 @@ function DetectedRectangleDrawLayer({
         <Rect
           x={-FULL_PADDING_VALUE}
           y={-FULL_PADDING_VALUE}
-          width={2 * currentAnnotationFile.width}
-          height={2 * currentAnnotationFile.height}
+          width={2 * FULL_PADDING_VALUE}
+          height={2 * FULL_PADDING_VALUE}
         />
       );
     }
     return null;
   };
-
   return (
     <Layer
       ref={layer}

src/services/authApi.tsx

@@ -54,7 +54,7 @@ const service = new Service(axios);
 
 service.register({
   onResponse(response: any) {
-    if (response && typeof response.data === "string") {
+    if (response && typeof response.data === "string" && response.data !== "") {
       const apiData = JSON.parse(response.data);
 
       if (