@nyris/nyris-webapp 0.3.2 → 0.3.5

package/src/index.tsx

@@ -20,9 +20,10 @@ document.title = window.location.host;
 
 let md: MDSettings = {
   ...defaultMdSettings,
-  ...settings.materialDesign,
+  ...settings.themePage.materialDesign,
 };
 
+
 let theme = createTheme({
   typography: {
     fontFamily: md.customFontFamily,

package/src/modules/LandingPage/{indexApp.tsx → App.tsx}

@@ -1,231 +1,86 @@
 import "App.css";
-import React, { useCallback, useEffect, useState } from "react";
+import React, { useEffect, useState } from "react";
 import Result from "components/Result";
 import ExampleImages from "components/ExampleImages";
 import CategoryFilter from "components/CategoryFilter";
 import PredictedCategories from "components/PredictedCategories";
 import Codes from "components/Codes";
-import {
-  Code,
-  CategoryPrediction,
-  RectCoords,
-  Region,
-  cadExtensions,
-  isCadFile,
-  isImageFile,
-  ImageSearchOptions,
-} from "@nyris/nyris-api";
 import { useDropzone } from "react-dropzone";
 import classNames from "classnames";
 import { Animate, NodeGroup } from "react-move";
-import { AppSettings, MDSettings, CanvasWithId } from "types";
 import {
   makeFileHandler,
-  Capture,
-  Preview,
+  Capture, Preview,
 } from "@nyris/nyris-react-components";
 import { Snackbar } from "@material-ui/core";
 import MuiAlert, { AlertProps } from "@material-ui/lab/Alert";
 
-import { useAppDispatch, useAppSelector } from "Store/Store";
-import {
-  loadCadFileLoad,
-  loadFile,
-  loadFileSelectRegion,
-  loadingActionRegions,
-  loadingActionResults,
-  searchFileImageNonRegion,
-  selectionChanged,
-} from "Store/Search";
-import {
-  NyrisAppPart,
-  NyrisFeedbackState,
-  showCamera,
-  showFeedback,
-  showResults,
-  showStart,
-} from "Store/Nyris";
-import { serviceImage, serviceImageNonRegion } from "services/image";
-import { findByImage } from "services/findByImage";
-import { debounce, isEmpty } from "lodash";
-import { feedbackClickEpic } from "services/Feedback";
-export interface AppHandlers {
-  onExampleImageClick: (url: string) => void;
-  onImageClick: (position: number, url: string) => void;
-  onLinkClick: (position: number, url: string) => void;
-  onFileDropped: (file: File) => void;
-  onCaptureComplete: (image: HTMLCanvasElement) => void;
-  onCaptureCanceled: () => void;
-  onSelectFile: (f: File) => void;
-  onCameraClick: () => void;
-  onShowStart: () => void;
-  onSelectionChange: (r: RectCoords) => void;
-  onPositiveFeedback: () => void;
-  onNegativeFeedback: () => void;
-  onCloseFeedback: () => void;
-}
-
-export interface AppProps {
-  search: {
-    results: any[];
-    requestId?: string;
-    duration?: number;
-    categoryPredictions: CategoryPrediction[];
-    codes: Code[];
-    filterOptions: string[];
-    errorMessage?: string;
-    regions: Region[];
-    previewSelection: RectCoords;
-    toastErrorMessage?: string;
-  };
-  previewImage?: CanvasWithId;
-  settings: AppSettings;
-  loading: boolean;
-  showPart: NyrisAppPart;
-  feedbackState: NyrisFeedbackState;
-  handlers: AppHandlers;
-  mdSettings: MDSettings;
-}
+import {AppProps} from "./propsType";
 
 function Alert(props: AlertProps) {
   return <MuiAlert elevation={6} variant="filled" {...props} />;
 }
 
-const LandingPageApp = () => {
-  const dispatch = useAppDispatch();
-  const searchState = useAppSelector((state) => state);
-  const [toastOpen, setToastOpen] = useState(false);
-  const [rectCoords, setRectCoords] = useState<any>(undefined);
-  const { settings, search, nyris } = searchState;
+const LandingPageApp = (props: AppProps) => {
+  const {
+    handlers,
+    showPart,
+    acceptTypes,
+    settings,
+    search,
+    loading,
+    previewImage
+  } = props;
+
   const {
-    errorMessage,
     results,
     requestId,
-    fetchingRegions,
-    fetchingResults,
-    requestImage,
-    regions,
-    selectedRegion,
+    duration,
     categoryPredictions,
     codes,
     filterOptions,
-    duration,
+    errorMessage,
+    regions,
+    previewSelection
   } = search;
-  const { showPart } = nyris;
+
+  const {
+    onExampleImageClick,
+    onImageClick,
+    onLinkClick,
+    onFileDropped,
+    onCaptureComplete,
+    onCaptureCanceled,
+    onSelectFile,
+    onCameraClick,
+    onShowStart,
+    onSelectionChange,
+  } = handlers;
 
   const { getRootProps, getInputProps, isDragActive } = useDropzone({
     onDrop: (fs: File[]) => {
-      // console.log("fsssssssss", fs);
-      serviceImage(fs[0], searchState).then((res) => {
-        dispatch(loadFile(res));
-        return dispatch(showFeedback(""));
-      });
-      // return dispatch(loadFile(fs[0]));
+      onFileDropped(fs[0]);
     },
   });
-  const minPreviewHeight = 400;
-  const halfOfTheScreenHeight = Math.floor(window.innerHeight * 0.45);
-  const maxPreviewHeight = Math.max(minPreviewHeight, halfOfTheScreenHeight);
-
-  useEffect(() => {
-    if (isEmpty(rectCoords)) {
-      return;
-    }
-    onSearchOffersForImage(rectCoords);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [rectCoords]);
 
-  const acceptTypes = ["image/*"]
-    .concat(settings.cadSearch ? cadExtensions : [])
-    .join(",");
 
+  const [toastOpen, setToastOpen] = useState(false);
   useEffect(() => {
     if (errorMessage !== "") {
       setToastOpen(true);
     }
   }, [errorMessage]);
 
-  function scrollTop() {
-    // TODO might require polyfill for ios and edge
-    window.scrollTo({ top: 0, left: 0, behavior: "smooth" });
-  }
-
-  const onShowStart = () => {
-    dispatch(showStart(""));
-    scrollTop();
-  };
-
-  const onLinkClick = (_position: number, url: string) => {
-    feedbackClickEpic(searchState, _position);
-    if (url) {
-      window.open(url);
-    }
-  };
-
-  const isCheckImageFile = (file: any) => {
-    dispatch(showResults(""));
-    dispatch(loadingActionResults(""));
-    dispatch(showFeedback(""));
-    if (isImageFile(file) || typeof file === "string") {
-      return serviceImage(file, searchState).then((res) => {
-        return dispatch(loadFile(res));
-      });
-    }
-    if (isCadFile(file)) {
-      return dispatch(loadCadFileLoad(file));
-    }
-  };
-
-  const getUrlToCanvasFile = (url: string, position?: number) => {
-    dispatch(showResults(""));
-    dispatch(loadingActionResults(""));
-    if (position) {
-      feedbackClickEpic(searchState, position);
-    }
-
-    if (settings.regions) {
-      serviceImage(url, searchState).then((res) => {
-        dispatch(loadFile(res));
-        return dispatch(showFeedback(""));
-      });
-    } else {
-      serviceImageNonRegion(url, searchState, rectCoords).then((res) => {
-        dispatch(searchFileImageNonRegion(res));
-      });
-    }
-  };
-
-  const handlerRectCoords = debounce((value) => {
-    return setRectCoords(value);
-  }, 1200);
-
-  const debounceRectCoords = useCallback(
-    (value) => handlerRectCoords(value),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    []
-  );
-
-  const onSearchOffersForImage = (r: RectCoords) => {
-    const { canvas }: any = requestImage;
-    let options: ImageSearchOptions = {
-      cropRect: r,
-    };
-    dispatch(loadingActionRegions(""));
-    return findByImage(canvas, options, settings).then((res) => {
-      dispatch(loadFileSelectRegion(res));
-      return dispatch(showFeedback(""));
-    });
-  };
-
+  const minPreviewHeight = 400;
+  const halfOfTheScreenHeight = Math.floor(window.innerHeight * 0.45);
+  const maxPreviewHeight = Math.max(minPreviewHeight, halfOfTheScreenHeight);
 
   return (
-    <div>
-      {showPart === "camera" && (
+      <div>
+        {showPart === "camera" && (
         <Capture
-          onCaptureComplete={(image: HTMLCanvasElement) => {
-            return isCheckImageFile(image);
-          }}
-          onCaptureCanceled={() => dispatch(showStart)}
+          onCaptureComplete={ onCaptureComplete }
+          onCaptureCanceled={ onCaptureCanceled }
           useAppText="Use default camera app"
         />
       )}
@@ -254,7 +109,7 @@ const LandingPageApp = () => {
                 className="inputfile"
                 accept="image/*"
                 capture="environment"
-                onClick={() => dispatch(showCamera)}
+                onClick={() => onCameraClick()}
               />
               <input
                 type="file"
@@ -271,9 +126,7 @@ const LandingPageApp = () => {
                 id="select_file"
                 className="inputfile"
                 accept={acceptTypes}
-                onChange={makeFileHandler((e) => {
-                  return isCheckImageFile(e);
-                })}
+                onChange={makeFileHandler(onSelectFile)}
               />
               <div className="onDesktop">
                 Drop an image
@@ -304,9 +157,7 @@ const LandingPageApp = () => {
             </section>
             <ExampleImages
               images={settings.exampleImages}
-              onExampleImageClicked={(url: string) => {
-                return getUrlToCanvasFile(url);
-              }}
+              onExampleImageClicked={onExampleImageClick}
             />
           </div>
         </div>
@@ -349,7 +200,7 @@ const LandingPageApp = () => {
           </div>
         )}
         <Animate
-          show={fetchingRegions || fetchingResults}
+          show={loading}
           start={{ opacity: 0.0 }}
           enter={{ opacity: [1.0], timing: { duration: 300 } }}
           leave={{ opacity: [0.0], timing: { duration: 300 } }}
@@ -360,20 +211,17 @@ const LandingPageApp = () => {
             </div>
           )}
         </Animate>
-        {settings.preview && requestImage && (
+        {settings.preview && previewImage && (
           <div className="preview">
             <Preview
-              key={requestImage?.id}
+              key={previewImage?.id}
+              onSelectionChange={ onSelectionChange }
+              image={previewImage?.canvas}
+              selection={previewSelection}
+              regions={regions}
               maxWidth={document.body.clientWidth}
               maxHeight={maxPreviewHeight}
               dotColor="#4C8F9F"
-              onSelectionChange={(r: RectCoords) => {
-                dispatch(selectionChanged(r));
-                return debounceRectCoords(r);
-              }}
-              regions={regions}
-              selection={selectedRegion}
-              image={requestImage.canvas}
             />
           </div>
         )}
@@ -384,7 +232,6 @@ const LandingPageApp = () => {
           <Codes codes={codes} />
         </div>
         <CategoryFilter cats={filterOptions} />
-
         <div className="wrapper">
           <NodeGroup
             data={results}
@@ -403,9 +250,7 @@ const LandingPageApp = () => {
                     key={key}
                     noImageUrl={settings.noImageUrl}
                     template={settings.resultTemplate}
-                    onImageClick={(_pos, url) => {
-                      return getUrlToCanvasFile(url, _pos);
-                    }}
+                    onImageClick={onImageClick}
                     onLinkClick={onLinkClick}
                     result={data}
                     style={{
@@ -420,8 +265,7 @@ const LandingPageApp = () => {
 
           {(results.length === 0 &&
             showPart === "results" &&
-            fetchingRegions) ||
-            (fetchingResults && (
+            !loading && (
               <div className="noResults">
                 We did not find anything{" "}
                 <span role="img" aria-label="sad face">

package/src/modules/LandingPage/{indexAppMD.tsx → AppMD.tsx}

@@ -16,34 +16,12 @@ import {
 } from "@material-ui/core";
 import { PhotoCamera, ArrowBack, Image } from "@material-ui/icons";
 import Icon from "@material-ui/core/Icon";
-import React, { useCallback, useEffect, useState } from "react";
 import { NodeGroup } from "react-move";
 import classNames from "classnames";
-import { Capture, Preview } from "@nyris/nyris-react-components";
-import { useAppDispatch, useAppSelector } from "Store/Store";
-import {
-  RectCoords,
-  cadExtensions,
-  isCadFile,
-  isImageFile,
-  ImageSearchOptions,
-} from "@nyris/nyris-api";
-import NyrisAPI from "@nyris/nyris-api";
-import {
-  loadCadFileLoad,
-  loadFile,
-  loadFileSelectRegion,
-  loadingActionRegions,
-  loadingActionResults,
-  searchFileImageNonRegion,
-  selectionChanged,
-} from "Store/Search";
-import { showCamera, showFeedback, showResults, showStart } from "Store/Nyris";
-import _, { debounce, isEmpty } from "lodash";
-import { serviceImage, serviceImageNonRegion } from "services/image";
-import { findByImage } from "services/findByImage";
-import { feedbackRegionEpic } from "services/Feedback";
-import { MDSettings } from "../../types";
+import {Capture, Preview} from "@nyris/nyris-react-components";
+import _  from "lodash";
+import {AppProps} from "./propsType";
+import React from "react";
 
 const useStyles = makeStyles((theme) => ({
   icon: {
@@ -122,106 +100,43 @@ const makeFileHandler = (action: any) => (e: any) => {
   }
 };
 
-const LandingPageAppMD: React.FC<any> = () => {
-  const dispatch = useAppDispatch();
+const LandingPageAppMD = (props: AppProps) => {
   const classes = useStyles();
-  const [rectCoords, setRectCoords] = useState<any>();
-  const searchState = useAppSelector((state) => state);
-  const { settings, search, nyris } = searchState;
-  const { showPart } = nyris;
   const {
-    requestImage,
-    regions,
-    selectedRegion,
-    fetchingRegions,
-    fetchingResults,
+    handlers,
+    showPart,
+    acceptTypes,
+    settings,
+    search,
+    loading,
+    previewImage
+  } = props;
+
+  const mdSettings = settings.themePage.materialDesign;
+
+  const {
     results,
-    requestId,
+    regions,
+    previewSelection,
   } = search;
-  const { themePage }: any = settings;
-  useEffect(() => {
-    if (isEmpty(rectCoords)) {
-      return;
-    }
-    onSearchOffersForImage(rectCoords);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [rectCoords]);
-
-  const loading = fetchingRegions || fetchingResults;
 
-  const mdSettings: any = themePage.materialDesign as MDSettings;
+  const {
+    onLinkClick,
+    onFileDropped,
+    onCaptureComplete,
+    onCaptureCanceled,
+    onSelectFile,
+    onCameraClick,
+    onShowStart,
+    onSelectionChange,
+  } = handlers;
 
   const { getRootProps, getInputProps, isDragActive } = useDropzone({
-    onDrop: (fs: File[]) => dispatch(loadFile(fs[0])),
+    onDrop: (fs: File[]) => {
+      onFileDropped(fs[0]);
+    },
   });
 
-  const minPreviewHeight = 400;
-  const halfOfTheScreenHeight = Math.floor(window.innerHeight * 0.45);
-  const maxPreviewHeight = Math.max(minPreviewHeight, halfOfTheScreenHeight);
-  const acceptTypes = ["image/*"]
-    .concat(settings.cadSearch ? cadExtensions : [])
-    .join(",");
-
-  const isCheckImageFile = async (file: any) => {
-    dispatch(showResults(""));
-    dispatch(loadingActionResults(""));
-    dispatch(showFeedback(""));
-    if (isImageFile(file) || typeof file === "string") {
-      if (settings.regions) {
-        serviceImage(file, searchState).then((res) => {
-          dispatch(loadFile(res));
-          return dispatch(showFeedback(""));
-        });
-      } else {
-        serviceImageNonRegion(file, searchState, rectCoords).then((res) => {
-          dispatch(searchFileImageNonRegion(res));
-        });
-      }
-      // return serviceImage(file, settings).then((res) => {
-      //   return dispatch(loadFile(res));
-      // });
-    }
-    if (isCadFile(file)) {
-      return dispatch(loadCadFileLoad(file));
-    }
-  };
-
-  const feedbackClickEpic = async (position: any, _url: string) => {
-    try {
-      const api = new NyrisAPI(settings);
-      const sessionId = search.sessionId || search.requestId;
-      if (sessionId && requestId) {
-        await api.sendFeedback(sessionId, requestId, {
-          event: "click",
-          data: { positions: [position] },
-        });
-      }
-    } catch (error) {
-      console.log("err feedbackClickEpic", error);
-    }
-  };
-
-  const handlerRectCoords = debounce((value) => {
-    setRectCoords(value);
-  }, 1200);
-
-  const debounceRectCoords = useCallback(
-    (value) => handlerRectCoords(value),
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    []
-  );
-  const onSearchOffersForImage = (r: RectCoords) => {
-    const { canvas }: any = requestImage;
-    let options: ImageSearchOptions = {
-      cropRect: r,
-    };
-    feedbackRegionEpic(searchState, r);
-    dispatch(loadingActionRegions(""));
-    return findByImage(canvas, options, settings).then((res) => {
-      dispatch(loadFileSelectRegion(res));
-      return dispatch(showFeedback(""));
-    });
-  };
 
   return (
     <React.Fragment>
@@ -234,10 +149,8 @@ const LandingPageAppMD: React.FC<any> = () => {
       <CssBaseline />
       {showPart === "camera" && (
         <Capture
-          onCaptureComplete={(image: HTMLCanvasElement) =>
-            isCheckImageFile(image)
-          }
-          onCaptureCanceled={() => dispatch(showStart)}
+          onCaptureComplete={onCaptureComplete}
+          onCaptureCanceled={onCaptureCanceled}
           useAppText="Use default camera app"
         />
       )}
@@ -258,9 +171,7 @@ const LandingPageAppMD: React.FC<any> = () => {
                   <Button
                     variant={"contained"}
                     color={"primary"}
-                    onClick={() => {
-                      return dispatch(showCamera);
-                    }}
+                    onClick={onCameraClick}
                   >
                     Take a picture
                   </Button>
@@ -273,7 +184,7 @@ const LandingPageAppMD: React.FC<any> = () => {
                     accept={acceptTypes}
                     id="raised-button-file"
                     type="file"
-                    onChange={makeFileHandler((e: any) => isCheckImageFile(e))}
+                    onChange={makeFileHandler(onSelectFile)}
                     style={{
                       width: ".1px",
                       height: ".1px",
@@ -323,9 +234,7 @@ const LandingPageAppMD: React.FC<any> = () => {
                       id="raised-button-file"
                       type="file"
                       {...getInputProps()}
-                      onChange={makeFileHandler((e: any) => {
-                        return isCheckImageFile(e);
-                      })}
+                      onChange={makeFileHandler(onSelectFile)}
                       style={{
                         width: ".1px",
                         height: ".1px",
@@ -355,20 +264,17 @@ const LandingPageAppMD: React.FC<any> = () => {
           )}
           maxWidth="md"
         >
-          {requestImage && (
+          {previewImage && (
             <Card style={{ marginBottom: "4em" }} raised={true}>
               <Preview
-                key={requestImage.id}
-                maxWidth={document.body.clientWidth}
-                maxHeight={maxPreviewHeight}
-                dotColor={mdSettings.primaryColor}
-                onSelectionChange={(r: RectCoords) => {
-                  dispatch(selectionChanged(r));
-                  return debounceRectCoords(r);
-                }}
+                key={previewImage?.id}
+                onSelectionChange={onSelectionChange}
+                image={previewImage?.canvas}
+                selection={previewSelection}
                 regions={regions}
-                selection={selectedRegion}
-                image={requestImage.canvas}
+                maxWidth={400}
+                maxHeight={500}
+                dotColor="#FBD914"
               />
             </Card>
           )}
@@ -417,13 +323,13 @@ const LandingPageAppMD: React.FC<any> = () => {
                             component="h5"
                             className={classes.withElipsis}
                           >
-                            {result[mdSettings.resultFirstRowProperty]}
+                            {result[mdSettings?.resultFirstRowProperty!!]}
                           </Typography>
                           <Typography
                             variant="body2"
                             className={classes.withElipsis}
                           >
-                            {result[mdSettings.resultSecondRowProperty]}
+                            {result[mdSettings?.resultSecondRowProperty!!]}
                           </Typography>
                         </CardContent>
                         {result.l && (
@@ -435,26 +341,25 @@ const LandingPageAppMD: React.FC<any> = () => {
                               color="primary"
                               onClick={
                                 () => {
-                                  return feedbackClickEpic(
+                                  onLinkClick(
                                     result.position,
                                     result.l
                                   );
                                 }
-                                // handlers.onLinkClick(result.position, result.l)
                               }
                               onAuxClick={() => {
-                                return feedbackClickEpic(
+                                onLinkClick(
                                   result.position,
                                   result.l
                                 );
                               }}
                             >
-                              {mdSettings.resultLinkIcon && (
+                              {mdSettings?.resultLinkIcon && (
                                 <React.Fragment>
                                   <Icon>{mdSettings.resultLinkIcon}</Icon>{" "}
                                 </React.Fragment>
                               )}
-                              {mdSettings.resultLinkText}
+                              {mdSettings?.resultLinkText}
                             </Button>
                           </CardActions>
                         )}
@@ -479,7 +384,7 @@ const LandingPageAppMD: React.FC<any> = () => {
                 aria-label="back"
                 className={classes.fab}
                 color="primary"
-                onClick={() => dispatch(showStart(""))}
+                onClick={onShowStart}
               >
                 <ArrowBack />
               </Fab>