@nyris/nyris-webapp 0.3.23 → 0.3.25

package/src/services/Feedback.ts

@@ -1,88 +1,65 @@
-import NyrisAPI, {FeedbackEventPayload, NyrisAPISettings, RectCoords,} from '@nyris/nyris-api';
-import {RootState} from '../Store/Store';
-import {ToastHelper} from "../helpers/ToastHelper";
+import NyrisAPI, {
+  FeedbackEventPayload,
+  NyrisAPISettings,
+  RectCoords,
+} from '@nyris/nyris-api';
+import { RootState } from '../Store/Store';
+import { ToastHelper } from '../helpers/ToastHelper';
 
 export const feedbackSuccessEpic = async (
-    state: RootState,
-    success: boolean,
+  state: RootState,
+  success: boolean,
 ) => {
-    const {search, settings} = state;
-    const sessionId = search.sessionId;
-    const requestId = search.requestId || search.sessionId;
+  const { search, settings } = state;
+  const sessionId = search.sessionId;
+  const requestId = search.requestId || search.sessionId;
 
-    try {
-        const res = await sendFeedbackByApi(settings, sessionId, requestId, {
-            event: 'feedback',
-            data: {success},
-        });
-        ToastHelper.success('Thank you for your feedback.');
-        return res;
-    } catch (err: any) {
-        console.log(err)
-    }
+  try {
+    const res = await sendFeedbackByApi(settings, sessionId, requestId, {
+      event: 'feedback',
+      data: { success },
+    });
+    ToastHelper.success('Thank you for your feedback.');
+    return res;
+  } catch (err: any) {
+    console.log(err);
+  }
 };
 
 export const feedbackClickEpic = async (state: RootState, position: number) => {
-    const {search, settings} = state;
-    return await sendFeedbackByApi(settings, search.sessionId, search.requestId, {
-        event: 'click',
-        data: {positions: [position]},
-    });
+  const { search, settings } = state;
+  return await sendFeedbackByApi(settings, search.sessionId, search.requestId, {
+    event: 'click',
+    data: { positions: [position] },
+  });
 };
 
-// export const feedbackTextSearchEpic = async (
-//   state: RootState,
-//   query: string,
-//   page: number,
-//   productIds: string[],
-// ) => {
-//   try {
-//     const { search, settings } = state;
-//     const eventData = {
-//       query,
-//       page,
-//       product_ids: productIds,
-//     };
-//     const textSearchEvent = { event: 'text-search', data: eventData };
-//     // @ts-ignore
-//     return await sendFeedbackByApi(
-//       settings,
-//       search.sessionId,
-//       search.requestId,
-//       textSearchEvent,
-//     );
-//   } catch (error) {
-//     console.log('error feedbackTextSearchEpic', error);
-//   }
-// };
-
 export const feedbackRegionEpic = async (
-    state: RootState,
-    region: RectCoords,
+  state: RootState,
+  region: RectCoords,
 ) => {
-    const {settings, search} = state;
-    const {sessionId, requestId} = search;
-    const {x1, x2, y1, y2} = region;
-    const payload: FeedbackEventPayload = {
-        event: 'region',
-        data: {rect: {x: x1, y: y1, w: x2 - x1, h: y2 - y1}},
-    };
-    return await sendFeedbackByApi(settings, sessionId, requestId, payload);
+  const { settings, search } = state;
+  const { sessionId, requestId } = search;
+  const { x1, x2, y1, y2 } = region;
+  const payload: FeedbackEventPayload = {
+    event: 'region',
+    data: { rect: { x: x1, y: y1, w: x2 - x1, h: y2 - y1 } },
+  };
+  return await sendFeedbackByApi(settings, sessionId, requestId, payload);
 };
 
 export const sendFeedbackByApi = async (
-    settings: NyrisAPISettings,
-    sessionId: string | undefined,
-    requestId: string | undefined,
-    payload: FeedbackEventPayload,
+  settings: NyrisAPISettings,
+  sessionId: string | undefined,
+  requestId: string | undefined,
+  payload: FeedbackEventPayload,
 ) => {
-    const api = new NyrisAPI(settings);
-    if (sessionId && requestId) {
-        try {
-            await api.sendFeedback(sessionId, requestId, payload).then(res => {
-            });
-        } catch (error) {
-            console.log('error sendFeedbackByApi321', error);
-        }
+  const api = new NyrisAPI(settings);
+  if (sessionId && requestId) {
+    try {
+      await api.sendFeedback(sessionId, requestId, payload).then(res => {});
+    } catch (error) {
+      console.log('error sendFeedbackByApi321', error);
     }
+  }
 };

package/src/services/{filter.tsx → filter.ts}

@@ -14,7 +14,7 @@ export const getFilters = async (
 };
 
 export const searchFilters = async (
-  key: any = 'machineType',
+  key: any = '',
   value: string,
   settingsNyris: NyrisAPISettings,
 ) => {

package/src/services/types.ts

@@ -1,50 +1,41 @@
-// import {SearchAction, SearchState} from "./actions/searchActions";
-// import {NyrisAction, NyrisAppState} from "./actions/nyrisAppActions";
-
-
-import {MDSettings} from "../types";
-
 export interface SearchServiceSettings {
-    xOptions: boolean | string,
-    customSearchRequest?: ((file: Blob, client: any) => Promise<any>),
-    responseHook?: ((response: any) => any),
-    apiKey: string,
-    imageMatchingUrl?: string,
-    imageMatchingUrlBySku?: string,
-    imageMatchingSubmitManualUrl?: string,
-    regionProposalUrl?: string,
-    responseFormat?: string,
-    feedbackUrl?: string,
-    exampleImages: string[],
-    resultTemplate?: string,
-    noImageUrl?: string,
-    materialDesign?: MDSettings,
-    preview: boolean,
-    regions: boolean,
-    jpegQuality: number,
-    maxWidth: number,
-    maxHeight: number,
-    useRecommendations: boolean
+  xOptions: boolean | string;
+  customSearchRequest?: (file: Blob, client: any) => Promise<any>;
+  responseHook?: (response: any) => any;
+  apiKey: string;
+  imageMatchingUrl?: string;
+  imageMatchingUrlBySku?: string;
+  imageMatchingSubmitManualUrl?: string;
+  regionProposalUrl?: string;
+  responseFormat?: string;
+  feedbackUrl?: string;
+  exampleImages: string[];
+  noImageUrl?: string;
+  preview: boolean;
+  regions: boolean;
+  jpegQuality: number;
+  maxWidth: number;
+  maxHeight: number;
 }
 
 export interface Crop {
-    x: number,
-    y: number,
-    w: number,
-    h: number
+  x: number;
+  y: number;
+  w: number;
+  h: number;
 }
 
 export interface WH {
-    w: number,
-    h: number
+  w: number;
+  h: number;
 }
 
 export interface Result {
-    position: number,
-    sku?: string,
-    title?: string,
-    l?: string,
-    img?: { url?: string },
-    // There can be also any other data
-    [x: string]: any
+  position: number;
+  sku?: string;
+  title?: string;
+  l?: string;
+  img?: { url?: string };
+  // There can be also any other data
+  [x: string]: any;
 }

package/src/translations.ts

@@ -0,0 +1,22 @@
+export const translations = {
+  en: {
+    translation: {
+      Search: 'Search',
+      'Choose an image': 'Choose an image',
+      'or drag it here': 'or drag it here',
+      'Manufacturer Number': 'Manufacturer Number',
+      'Close group': 'Close group',
+      'Show group': 'Show group',
+    },
+  },
+  de: {
+    translation: {
+      Search: 'Suche',
+      'Choose an image': 'Bild wählen',
+      'or drag it here': 'oder hierhin ziehen',
+      'Manufacturer Number': 'Herst. Teile-Nr.',
+      'Close group': 'Schließe Gruppe',
+      'Show group': 'Zeige Gruppe',
+    },
+  },
+};

package/src/types.ts

@@ -1,22 +1,6 @@
 import { NyrisAPISettings } from '@nyris/nyris-api';
-import { NyrisAppState } from 'Store/Nyris';
-import { SearchState } from 'Store/Search';
-
-export interface MDSettings {
-  customFontFamily?: string;
-  appBarLogoUrl: string;
-  appBarTitle: string;
-  appBarCustomBackgroundColor?: string;
-  appBarCustomTextColor?: string;
-  primaryColor: string;
-  secondaryColor: string;
-  resultFirstRowProperty: string;
-  resultSecondRowProperty: string;
-
-  resultLinkText?: string;
-  resultLinkIcon?: string;
-  active?: boolean;
-}
+import { NyrisAppState } from 'Store/nyris/types';
+import { SearchState } from 'Store/search/types';
 
 export interface AlgoliaSettings {
   apiKey: string;
@@ -29,10 +13,9 @@ export interface AppSettings extends NyrisAPISettings {
   preview: boolean;
   cadSearch?: boolean;
   noImageUrl?: string;
-  resultTemplate?: string;
   regions: boolean;
   instantRedirectPatterns: string[];
-  themePage: ThemeChoice;
+  theme: SearchSuiteSettings;
   algolia?: AlgoliaSettings;
   productCtaText?: string;
   appTitle?: string;
@@ -47,28 +30,19 @@ export interface AppSettings extends NyrisAPISettings {
   alogoliaFilterField?: string;
   headerText?: string;
   brandName?: string;
-}
-
-export interface DefaultThemeSettings {
-  active: boolean;
+  shareOption?: boolean;
+  language?: string;
+  itemIdLabel?: string;
 }
 
 export interface SearchSuiteSettings {
-  active?: boolean;
-  appBarLogoUrl: string;
-  appBarLogoUrlAlt: string;
-  headerColor: string;
-  logoWidth: string;
-  logoHeight: string;
-  mobileFooterImageColor: string;
-  primaryColor: string;
-  secondaryColor: string;
-}
-
-export interface ThemeChoice {
-  default?: DefaultThemeSettings;
-  materialDesign?: MDSettings;
-  searchSuite?: SearchSuiteSettings;
+  appBarLogoUrl?: string;
+  headerColor?: string;
+  logoWidth?: string;
+  logoHeight?: string;
+  mobileFooterImageColor?: string;
+  primaryColor?: string;
+  secondaryColor?: string;
 }
 
 export type AppState = {
@@ -81,30 +55,3 @@ export interface CanvasWithId {
   canvas: HTMLCanvasElement;
   id: string;
 }
-
-export interface SearchServiceSettings {
-  xOptions: boolean | string;
-  customSearchRequest?: (file: Blob, client: any) => Promise<any>;
-  responseHook?: (response: any) => any;
-  apiKey: string;
-  imageMatchingUrl?: string;
-  imageMatchingUrlBySku?: string;
-  imageMatchingSubmitManualUrl?: string;
-  regionProposalUrl?: string;
-  responseFormat?: string;
-  feedbackUrl?: string;
-  exampleImages: string[];
-  resultTemplate?: string;
-  noImageUrl?: string;
-  materialDesign?: MDSettings;
-  preview: boolean;
-  regions: boolean;
-  jpegQuality: number;
-  maxWidth: number;
-  maxHeight: number;
-  useRecommendations: boolean;
-}
-
-export interface AlgoliaResult {
-  sku: string;
-}

package/build/js/test.js

@@ -1,84 +0,0 @@
-var settings = {
-  apiKey: 'ZKbb76cwHmBUoXR4uqwD5PqaJK3wobdZ',
-  // apiKeyDMGMori: 'nlLoWoR4GqT1BVbdkYiVsp85oMokpzMS',
-  maxWidth: 300,
-  maxHeight: 300,
-  jpegQuality: 0.9,
-  regions: true,
-  preview: true,
-  useRecommendations: false,
-  xOptions:
-    'default +estimated-category similarity.threshold=0.05 similarity.threshold.discard=0.05 exact.threshold.perfect=200 similarity.threshold.perfect=2 scoring.indicative-min-hits=1 scoring.promo-min-hits=20 scoring.interpolation-cutoff=0 +barcode +barcode-detection',
-  baseUrl: 'https://api.i.nyris.io',
-  resultTemplate: 'default',
-  responseFormat: 'application/offers.complete+json',
-  exampleImages: [
-    'https://storage.googleapis.com/nyris/share/examples_search/example_1.jpg',
-    'https://storage.googleapis.com/nyris/share/examples_search/example_2.jpg',
-    'https://storage.googleapis.com/nyris/share/examples_search/example_3.jpg',
-    'https://storage.googleapis.com/nyris/share/examples_search/example_4.jpg',
-  ],
-  deactivated: false,
-  cadSearch: false,
-  themePage: {
-    default: {
-      active: false,
-    },
-    materialDesign: {
-      active: false,
-      appBarLogoUrl: 'https://nyris.io/wp-content/themes/nyris/img/logo.svg',
-      appBarTitle: '',
-      appBarCustomBackgroundColor: 'black',
-      appBarCustomTextColor: 'white',
-
-      primaryColor: '#e31b5d',
-      secondaryColor: '#ccc',
-      resultFirstRowProperty: 'title',
-      resultSecondRowProperty: 'price',
-      resultLinkText: 'show',
-      resultLinkIcon: 'eye',
-    },
-    searchSuite: {
-      active: true,
-      moreInfoText: 'more info',
-    },
-  },
-  imageMatchingUrl: 'https://api.nyris.io/find/v1',
-  imageMatchingUrlBySku: 'https://api.nyris.io/recommend/v1',
-  imageMatchingSubmitManualUrl: 'https://api.nyris.io/find/v1/manual',
-  regionProposalUrl: 'https://api.nyris.io/find/v1/regions',
-  feedbackUrl: 'https://api.nyris.io/feedback/v1',
-  algolia: {
-    apiKey: '6d20d5463452614ea94aae323d8d038e',
-    appId: 'HBDJYUK5G4',
-    indexName: 'dmg-mori',
-  },
-  refinements: [
-    {
-      type: 'list',
-      header: 'Brands',
-      attribute: 'brand',
-    },
-    {
-      type: 'list',
-      header: 'Norm',
-      attribute: 'keyword_0',
-      options: {
-        searchable: true,
-      },
-    },
-    {
-      type: 'list',
-      header: 'Category',
-      attribute: 'custom_category',
-    },
-  ],
-  autocompleteSearchConfig: {
-    placeholders: ['brand', 'keyword_0', 'custom_category'],
-    debouncing: 800,
-    detachedMediaQuery: '(max-width: 776px)',
-  },
-  visualSearchFilterKey: 'machineType',
-};
-settings['customSearchRequest'] = null;
-settings['responseHook'] = null;