@nyris/nyris-webapp 0.2.2 → 0.2.6

package/src/actions/searchActions.ts

@@ -40,7 +40,8 @@ export interface SearchState {
     requestImage?:  CanvasWithId
     requestCadFile?:  File
     categoryPredictions: CategoryPrediction[]
-    codes: Code[]
+    codes: Code[],
+    errorMessage: string
 }
 
 const initialState : SearchState = {
@@ -52,7 +53,8 @@ const initialState : SearchState = {
     fetchingRegions: false,
     filterOptions: [],
     categoryPredictions: [],
-    codes: []
+    codes: [],
+    errorMessage: ''
 };
 
 
@@ -102,6 +104,12 @@ export const reducer = (state : SearchState = initialState, action: SearchAction
                 regions: action.regions,
                 selectedRegion:  selectFirstCenteredRegion(action.regions, 0.3, state.selectedRegion)
             };
+        case "REGION_REQUEST_FAIL":
+            return {
+                ...state,
+                fetchingRegions: false,
+                errorMessage: action.exception.response.data.detail
+            };
         case "SEARCH_REQUEST_START":
             return {
                 ...state,

package/src/epics/feedback.ts

@@ -19,7 +19,7 @@ const feedbackSuccessEpic: EpicConf = (action$, state$, {api}) => action$.pipe(
 
 const feedbackRegionEpic: EpicConf = (action$, state$, {api}) => action$.pipe(
     ofType('REGION_CHANGED'),
-    debounceTime(600),
+    debounceTime(1200),
     withLatestFrom(state$),
     tap(async ([action, state]) => {
         if (action.type === 'REGION_CHANGED') {

package/src/epics/index.ts

@@ -100,9 +100,24 @@ const startSearchOnRegionsSuccessful: EpicConf = (action$, state$) => action$.pi
     })
 );
 
+const startSearchOnRegionsFailed: EpicConf = (action$, state$) => action$.pipe(
+    ofType('REGION_REQUEST_FAIL'),
+    withLatestFrom(state$),
+    switchMap(async ([action, { search: { requestImage}}]) : Promise<AppAction> => {
+        if (action.type !== 'REGION_REQUEST_FAIL') {
+            throw new Error(`Wrong action type ${action.type}`);
+        }
+        if (!requestImage) {
+            throw new Error(`No requestImage`);
+        }
+
+        return searchOffersForImage(requestImage.canvas);
+    })
+);
+
 const startSearchOnRegionChange: EpicConf = (action$, state$) => action$.pipe(
     ofType('REGION_CHANGED'),
-    debounceTime(600),
+    debounceTime(1200),
     withLatestFrom(state$),
     switchMap(async ([action, { search: { requestImage}}]) : Promise<AppAction> => {
         if (action.type !== 'REGION_CHANGED') {
@@ -124,6 +139,7 @@ const rootEpic = combineEpics(
     startSearchOnImageLoaded,
     startSearchOnCadLoaded,
     startSearchOnRegionsSuccessful,
+    startSearchOnRegionsFailed,
     startSearchOnRegionChange,
     onSearchSuccessShowResults,
     onSearchSuccessShowFeedbackDelayed,

package/src/index.tsx

@@ -111,13 +111,14 @@ const mapStateToProps = (state: AppState) => ({
         previewSelection: state.search.selectedRegion,
         regions: state.search.regions,
         duration: state.search.duration,
-        requestId: state.search.requestId
+        requestId: state.search.requestId,
+        toastErrorMessage: state.search.errorMessage
     },
     settings: state.settings,
     previewImage: state.search.requestImage,
     loading: state.search.fetchingRegions || state.search.fetchingResults,
     feedbackState: state.nyrisDesign.feedbackState,
-    mdSettings: state.settings.materialDesign || defaultMdSettings
+    mdSettings: state.settings.materialDesign || defaultMdSettings,
 });